diff --git a/bookmarks/frontend/components/SearchAutoComplete.svelte b/bookmarks/frontend/components/SearchAutoComplete.svelte index 94f4e33..d31ff0b 100644 --- a/bookmarks/frontend/components/SearchAutoComplete.svelte +++ b/bookmarks/frontend/components/SearchAutoComplete.svelte @@ -103,7 +103,7 @@ } // Recent search suggestions - const search = searchHistory.getRecentSearches(value, 5).map(value => ({ + const recentSearches = searchHistory.getRecentSearches(value, 5).map(value => ({ type: 'search', index: nextIndex(), label: value, @@ -132,7 +132,7 @@ }) } - updateSuggestions(search, bookmarks, tagSuggestions) + updateSuggestions(recentSearches, bookmarks, tagSuggestions) if (hasSuggestions()) { open() @@ -143,17 +143,17 @@ const debouncedLoadSuggestions = debounce(loadSuggestions) - function updateSuggestions(search, bookmarks, tagSuggestions) { - search = search || [] + function updateSuggestions(recentSearches, bookmarks, tagSuggestions) { + recentSearches = recentSearches || [] bookmarks = bookmarks || [] tagSuggestions = tagSuggestions || [] suggestions = { - search, + recentSearches, bookmarks, tags: tagSuggestions, total: [ ...tagSuggestions, - ...search, + ...recentSearches, ...bookmarks, ] } @@ -215,10 +215,10 @@ {/each} - {#if suggestions.search.length > 0} + {#if suggestions.recentSearches.length > 0}
  • Recent Searches
    • {/if} - {#each suggestions.search as suggestion} + {#each suggestions.recentSearches as suggestion}
  • completeSuggestion(suggestion)}> {suggestion.label} diff --git a/bookmarks/models.py b/bookmarks/models.py index e563d4e..07ae443 100644 --- a/bookmarks/models.py +++ b/bookmarks/models.py @@ -130,21 +130,28 @@ class BookmarkSearch: SORT_TITLE_ASC = 'title_asc' SORT_TITLE_DESC = 'title_desc' - params = ['q', 'user', 'sort'] + FILTER_SHARED_OFF = '' + FILTER_SHARED_SHARED = 'shared' + FILTER_SHARED_UNSHARED = 'unshared' + + params = ['q', 'user', 'sort', 'shared'] defaults = { 'q': '', 'user': '', 'sort': SORT_ADDED_DESC, + 'shared': FILTER_SHARED_OFF, } def __init__(self, q: str = defaults['q'], query: str = defaults['q'], # alias for q user: str = defaults['user'], - sort: str = defaults['sort']): + sort: str = defaults['sort'], + shared: str = defaults['shared']): self.q = q or query self.user = user self.sort = sort + self.shared = shared @property def query(self): @@ -180,10 +187,16 @@ class BookmarkSearchForm(forms.Form): (BookmarkSearch.SORT_TITLE_ASC, 'Title ↑'), (BookmarkSearch.SORT_TITLE_DESC, 'Title ↓'), ] + FILTER_SHARED_CHOICES = [ + (BookmarkSearch.FILTER_SHARED_OFF, 'Off'), + (BookmarkSearch.FILTER_SHARED_SHARED, 'Shared'), + (BookmarkSearch.FILTER_SHARED_UNSHARED, 'Unshared'), + ] q = forms.CharField() user = forms.ChoiceField() sort = forms.ChoiceField(choices=SORT_CHOICES) + shared = forms.ChoiceField(choices=FILTER_SHARED_CHOICES, widget=forms.RadioSelect) def __init__(self, search: BookmarkSearch, editable_fields: List[str] = None, users: List[User] = None): super().__init__() diff --git a/bookmarks/queries.py b/bookmarks/queries.py index 398db80..a529cd3 100644 --- a/bookmarks/queries.py +++ b/bookmarks/queries.py @@ -69,6 +69,12 @@ def _base_bookmarks_query(user: Optional[User], profile: UserProfile, search: Bo unread=True ) + # Shared filter + if search.shared == BookmarkSearch.FILTER_SHARED_SHARED: + query_set = query_set.filter(shared=True) + elif search.shared == BookmarkSearch.FILTER_SHARED_UNSHARED: + query_set = query_set.filter(shared=False) + # Sort by date added if search.sort == BookmarkSearch.SORT_ADDED_ASC: query_set = query_set.order_by('date_added') diff --git a/bookmarks/styles/bookmark-page.scss b/bookmarks/styles/bookmark-page.scss index 788e629..22cf14d 100644 --- a/bookmarks/styles/bookmark-page.scss +++ b/bookmarks/styles/bookmark-page.scss @@ -58,7 +58,7 @@ border-bottom-right-radius: 0; } - .dropdown button { + .dropdown-toggle { border-top-left-radius: 0; border-bottom-left-radius: 0; } @@ -71,7 +71,7 @@ .dropdown { .menu { padding: $unit-4; - min-width: 220px; + min-width: 250px; } &:focus-within { @@ -85,6 +85,23 @@ display: flex; justify-content: space-between; } + + .radio-group { + .form-label { + padding-bottom: 0; + } + .form-radio.form-inline { + margin: 0 $unit-2 0 0; + padding: 0; + display: inline-flex; + align-items: center; + column-gap: $unit-1; + } + .form-icon { + top: 0; + position: relative; + } + } } } diff --git a/bookmarks/styles/spectre.scss b/bookmarks/styles/spectre.scss index ffd3be1..86fcaa3 100644 --- a/bookmarks/styles/spectre.scss +++ b/bookmarks/styles/spectre.scss @@ -63,6 +63,19 @@ a:visited:hover { transition: none !important; } +// Fix radio button sub-pixel size +.form-radio .form-icon { + width: 14px; + height: 14px; + border-width: 1px; +} + +.form-radio input:checked + .form-icon::before { + top: 3px; + left: 3px; + transform: unset; +} + // Make code work with light and dark theme code { color: $gray-color-dark; diff --git a/bookmarks/styles/theme-dark.scss b/bookmarks/styles/theme-dark.scss index 202c461..8229ab8 100644 --- a/bookmarks/styles/theme-dark.scss +++ b/bookmarks/styles/theme-dark.scss @@ -44,6 +44,10 @@ a:focus, .btn:focus { border-color: $dt-primary-button-color; } +.form-radio input:checked + .form-icon::before { + background: $light-color; +} + // Pagination .pagination .page-item.active a { background: $dt-primary-button-color; diff --git a/bookmarks/templates/bookmarks/search.html b/bookmarks/templates/bookmarks/search.html index 8f2ea23..bf970b7 100644 --- a/bookmarks/templates/bookmarks/search.html +++ b/bookmarks/templates/bookmarks/search.html @@ -27,6 +27,16 @@ {{ form.sort|add_class:"form-select select-sm" }} +
    +
    Shared filter
    + {% for radio in form.shared %} + + {% endfor %} +
    @@ -47,6 +57,7 @@ const search = { q: '{{ search.query }}', user: '{{ search.user }}', + shared: '{{ search.shared }}', } const apiClient = new linkding.ApiClient('{% url 'bookmarks:api-root' %}') const input = document.querySelector('#search input[name="q"]') diff --git a/bookmarks/templatetags/bookmarks.py b/bookmarks/templatetags/bookmarks.py index c08fb16..478b33f 100644 --- a/bookmarks/templatetags/bookmarks.py +++ b/bookmarks/templatetags/bookmarks.py @@ -22,7 +22,7 @@ def bookmark_form(context, form: BookmarkForm, cancel_url: str, bookmark_id: int def bookmark_search(context, search: BookmarkSearch, tags: [Tag], mode: str = ''): tag_names = [tag.name for tag in tags] tags_string = build_tag_string(tag_names, ' ') - form = BookmarkSearchForm(search, editable_fields=['q', 'sort']) + form = BookmarkSearchForm(search, editable_fields=['q', 'sort', 'shared']) return { 'request': context['request'], 'search': search, diff --git a/bookmarks/tests/test_bookmark_search_form.py b/bookmarks/tests/test_bookmark_search_form.py index 468b506..90980cb 100644 --- a/bookmarks/tests/test_bookmark_search_form.py +++ b/bookmarks/tests/test_bookmark_search_form.py @@ -12,13 +12,18 @@ class BookmarkSearchFormTest(TestCase, BookmarkFactoryMixin): self.assertEqual(form['q'].initial, '') self.assertEqual(form['sort'].initial, BookmarkSearch.SORT_ADDED_DESC) self.assertEqual(form['user'].initial, '') + self.assertEqual(form['shared'].initial, '') # with params - search = BookmarkSearch(q='search query', sort=BookmarkSearch.SORT_ADDED_ASC, user='user123') + search = BookmarkSearch(q='search query', + sort=BookmarkSearch.SORT_ADDED_ASC, + user='user123', + shared=BookmarkSearch.FILTER_SHARED_SHARED) form = BookmarkSearchForm(search) self.assertEqual(form['q'].initial, 'search query') self.assertEqual(form['sort'].initial, BookmarkSearch.SORT_ADDED_ASC) self.assertEqual(form['user'].initial, 'user123') + self.assertEqual(form['shared'].initial, BookmarkSearch.FILTER_SHARED_SHARED) def test_user_options(self): users = [ @@ -43,16 +48,22 @@ class BookmarkSearchFormTest(TestCase, BookmarkFactoryMixin): self.assertEqual(len(form.hidden_fields()), 0) # some modified params - search = BookmarkSearch(q='search query', sort=BookmarkSearch.SORT_ADDED_ASC) + search = BookmarkSearch(q='search query', + sort=BookmarkSearch.SORT_ADDED_ASC) form = BookmarkSearchForm(search) self.assertCountEqual(form.hidden_fields(), [form['q'], form['sort']]) # all modified params - search = BookmarkSearch(q='search query', sort=BookmarkSearch.SORT_ADDED_ASC, user='user123') + search = BookmarkSearch(q='search query', + sort=BookmarkSearch.SORT_ADDED_ASC, + user='user123', + shared=BookmarkSearch.FILTER_SHARED_SHARED) form = BookmarkSearchForm(search) - self.assertCountEqual(form.hidden_fields(), [form['q'], form['sort'], form['user']]) + self.assertCountEqual(form.hidden_fields(), [form['q'], form['sort'], form['user'], form['shared']]) # some modified params are editable fields - search = BookmarkSearch(q='search query', sort=BookmarkSearch.SORT_ADDED_ASC, user='user123') + search = BookmarkSearch(q='search query', + sort=BookmarkSearch.SORT_ADDED_ASC, + user='user123') form = BookmarkSearchForm(search, editable_fields=['q', 'user']) self.assertCountEqual(form.hidden_fields(), [form['sort']]) diff --git a/bookmarks/tests/test_bookmark_search_model.py b/bookmarks/tests/test_bookmark_search_model.py index 54699b4..a876ca1 100644 --- a/bookmarks/tests/test_bookmark_search_model.py +++ b/bookmarks/tests/test_bookmark_search_model.py @@ -13,6 +13,7 @@ class BookmarkSearchModelTest(TestCase): self.assertEqual(search.q, '') self.assertEqual(search.sort, BookmarkSearch.SORT_ADDED_DESC) self.assertEqual(search.user, '') + self.assertEqual(search.shared, '') # some params mock_request.GET = { @@ -24,18 +25,21 @@ class BookmarkSearchModelTest(TestCase): self.assertEqual(bookmark_search.q, 'search query') self.assertEqual(bookmark_search.sort, BookmarkSearch.SORT_ADDED_DESC) self.assertEqual(bookmark_search.user, 'user123') + self.assertEqual(bookmark_search.shared, '') # all params mock_request.GET = { 'q': 'search query', 'user': 'user123', - 'sort': BookmarkSearch.SORT_TITLE_ASC + 'sort': BookmarkSearch.SORT_TITLE_ASC, + 'shared': BookmarkSearch.FILTER_SHARED_SHARED, } search = BookmarkSearch.from_request(mock_request) self.assertEqual(search.q, 'search query') self.assertEqual(search.user, 'user123') self.assertEqual(search.sort, BookmarkSearch.SORT_TITLE_ASC) + self.assertEqual(search.shared, BookmarkSearch.FILTER_SHARED_SHARED) def test_modified_params(self): # no params @@ -44,7 +48,7 @@ class BookmarkSearchModelTest(TestCase): self.assertEqual(len(modified_params), 0) # params are default values - bookmark_search = BookmarkSearch(q='', sort=BookmarkSearch.SORT_ADDED_DESC, user='') + bookmark_search = BookmarkSearch(q='', sort=BookmarkSearch.SORT_ADDED_DESC, user='', shared='') modified_params = bookmark_search.modified_params self.assertEqual(len(modified_params), 0) @@ -54,6 +58,6 @@ class BookmarkSearchModelTest(TestCase): self.assertCountEqual(modified_params, ['q', 'sort']) # all modified params - bookmark_search = BookmarkSearch(q='search query', sort=BookmarkSearch.SORT_ADDED_ASC, user='user123') + bookmark_search = BookmarkSearch(q='search query', sort=BookmarkSearch.SORT_ADDED_ASC, user='user123', shared=BookmarkSearch.FILTER_SHARED_SHARED) modified_params = bookmark_search.modified_params - self.assertCountEqual(modified_params, ['q', 'sort', 'user']) + self.assertCountEqual(modified_params, ['q', 'sort', 'user', 'shared']) diff --git a/bookmarks/tests/test_bookmark_search_tag.py b/bookmarks/tests/test_bookmark_search_tag.py index e75e807..9df79a7 100644 --- a/bookmarks/tests/test_bookmark_search_tag.py +++ b/bookmarks/tests/test_bookmark_search_tag.py @@ -44,11 +44,13 @@ class BookmarkSearchTagTest(TestCase, BookmarkFactoryMixin): self.assertNoHiddenInput(rendered_template, 'user') self.assertNoHiddenInput(rendered_template, 'q') self.assertNoHiddenInput(rendered_template, 'sort') + self.assertNoHiddenInput(rendered_template, 'shared') # With params - url = '/test?q=foo&user=john&sort=title_asc' + url = '/test?q=foo&user=john&sort=title_asc&shared=shared' rendered_template = self.render_template(url) self.assertHiddenInput(rendered_template, 'user', 'john') self.assertNoHiddenInput(rendered_template, 'q') self.assertNoHiddenInput(rendered_template, 'sort') + self.assertNoHiddenInput(rendered_template, 'shared') diff --git a/bookmarks/tests/test_bookmarks_api.py b/bookmarks/tests/test_bookmarks_api.py index 176bf0d..d9bca4f 100644 --- a/bookmarks/tests/test_bookmarks_api.py +++ b/bookmarks/tests/test_bookmarks_api.py @@ -70,6 +70,25 @@ class BookmarksApiTestCase(LinkdingApiTestCase, BookmarkFactoryMixin): expected_status_code=status.HTTP_200_OK) self.assertBookmarkListEqual(response.data['results'], bookmarks) + def test_list_bookmarks_filter_shared(self): + self.authenticate() + unshared_bookmarks = self.setup_numbered_bookmarks(5) + shared_bookmarks = self.setup_numbered_bookmarks(5, shared=True) + + # Filter off + response = self.get(reverse('bookmarks:bookmark-list'), expected_status_code=status.HTTP_200_OK) + self.assertBookmarkListEqual(response.data['results'], unshared_bookmarks + shared_bookmarks) + + # Filter shared + response = self.get(reverse('bookmarks:bookmark-list') + '?shared=shared', + expected_status_code=status.HTTP_200_OK) + self.assertBookmarkListEqual(response.data['results'], shared_bookmarks) + + # Filter unshared + response = self.get(reverse('bookmarks:bookmark-list') + '?shared=unshared', + expected_status_code=status.HTTP_200_OK) + self.assertBookmarkListEqual(response.data['results'], unshared_bookmarks) + def test_list_bookmarks_should_respect_sort(self): self.authenticate() bookmarks = self.setup_numbered_bookmarks(5) diff --git a/bookmarks/tests/test_queries.py b/bookmarks/tests/test_queries.py index 4a403fd..50f29d3 100644 --- a/bookmarks/tests/test_queries.py +++ b/bookmarks/tests/test_queries.py @@ -419,6 +419,25 @@ class QueriesTestCase(TestCase, BookmarkFactoryMixin): query = queries.query_archived_bookmarks(self.user, self.profile, BookmarkSearch(query='!unread')) self.assertCountEqual(list(query), unread_bookmarks) + def test_query_bookmarks_filter_shared(self): + unshared_bookmarks = self.setup_numbered_bookmarks(5) + shared_bookmarks = self.setup_numbered_bookmarks(5, shared=True) + + # Filter is off + search = BookmarkSearch(shared=BookmarkSearch.FILTER_SHARED_OFF) + query = queries.query_bookmarks(self.user, self.profile, search) + self.assertCountEqual(list(query), unshared_bookmarks + shared_bookmarks) + + # Filter for shared + search = BookmarkSearch(shared=BookmarkSearch.FILTER_SHARED_SHARED) + query = queries.query_bookmarks(self.user, self.profile, search) + self.assertCountEqual(list(query), shared_bookmarks) + + # Filter for unshared + search = BookmarkSearch(shared=BookmarkSearch.FILTER_SHARED_UNSHARED) + query = queries.query_bookmarks(self.user, self.profile, search) + self.assertCountEqual(list(query), unshared_bookmarks) + def test_query_bookmark_tags_should_return_all_tags_for_empty_query(self): self.setup_tag_search_data() @@ -662,6 +681,29 @@ class QueriesTestCase(TestCase, BookmarkFactoryMixin): BookmarkSearch(query=f'!untagged #{tag.name}')) self.assertCountEqual(list(query), []) + def test_query_bookmark_tags_filter_shared(self): + unshared_bookmarks = self.setup_numbered_bookmarks(5, with_tags=True) + shared_bookmarks = self.setup_numbered_bookmarks(5, with_tags=True, shared=True) + + unshared_tags = self.get_tags_from_bookmarks(unshared_bookmarks) + shared_tags = self.get_tags_from_bookmarks(shared_bookmarks) + all_tags = unshared_tags + shared_tags + + # Filter is off + search = BookmarkSearch(shared=BookmarkSearch.FILTER_SHARED_OFF) + query = queries.query_bookmark_tags(self.user, self.profile, search) + self.assertCountEqual(list(query), all_tags) + + # Filter for shared + search = BookmarkSearch(shared=BookmarkSearch.FILTER_SHARED_SHARED) + query = queries.query_bookmark_tags(self.user, self.profile, search) + self.assertCountEqual(list(query), shared_tags) + + # Filter for unshared + search = BookmarkSearch(shared=BookmarkSearch.FILTER_SHARED_UNSHARED) + query = queries.query_bookmark_tags(self.user, self.profile, search) + self.assertCountEqual(list(query), unshared_tags) + def test_query_shared_bookmarks(self): user1 = self.setup_user(enable_sharing=True) user2 = self.setup_user(enable_sharing=True) diff --git a/bookmarks/tests/test_user_select_tag.py b/bookmarks/tests/test_user_select_tag.py index 1ef1448..f2bb1fa 100644 --- a/bookmarks/tests/test_user_select_tag.py +++ b/bookmarks/tests/test_user_select_tag.py @@ -78,11 +78,13 @@ class UserSelectTagTest(TestCase, BookmarkFactoryMixin): self.assertNoHiddenInput(rendered_template, 'user') self.assertNoHiddenInput(rendered_template, 'q') self.assertNoHiddenInput(rendered_template, 'sort') + self.assertNoHiddenInput(rendered_template, 'shared') # With params - url = '/test?q=foo&user=john&sort=title_asc' + url = '/test?q=foo&user=john&sort=title_asc&shared=shared' rendered_template = self.render_template(url) self.assertNoHiddenInput(rendered_template, 'user') self.assertHiddenInput(rendered_template, 'q', 'foo') self.assertHiddenInput(rendered_template, 'sort', 'title_asc') + self.assertHiddenInput(rendered_template, 'shared', 'shared')