Display selected tags in tag cloud (#307)

* Add links to remove tags from current query

* Display selected tags in tag cloud

* Add tag cloud tests

* Fix tag cloud in archive

* Add tests for bookmark views

* Expose parse query string

* Improve tag cloud tests

* Cleanup

* Fix rebase issues

* Ignore casing when removing tags from query

Co-authored-by: Jon Hauris <jonp@hauris.org>

bookmarks/views/bookmarks.py

@@ -3,7 +3,7 @@ import urllib.parse
 from django.contrib.auth.decorators import login_required
 from django.core.handlers.wsgi import WSGIRequest
 from django.core.paginator import Paginator
-from django.db.models import QuerySet, prefetch_related_objects
+from django.db.models import QuerySet, Q, prefetch_related_objects
 from django.http import HttpResponseRedirect, Http404
 from django.shortcuts import render
 from django.urls import reverse
@@ -50,6 +50,20 @@ def shared(request):
     return render(request, 'bookmarks/shared.html', context)
 
 
+def _get_selected_tags(tags: QuerySet[Tag], query_string: str):
+    parsed_query = queries.parse_query_string(query_string)
+    tag_names = parsed_query['tag_names']
+
+    if len(tag_names) == 0:
+        return []
+
+    condition = Q()
+    for tag_name in parsed_query['tag_names']:
+        condition = condition | Q(name__iexact=tag_name)
+
+    return list(tags.filter(condition))
+
+
 def get_bookmark_view_context(request: WSGIRequest,
                               filters: BookmarkFilters,
                               query_set: QuerySet[Bookmark],
@@ -58,6 +72,7 @@ def get_bookmark_view_context(request: WSGIRequest,
     page = request.GET.get('page')
     paginator = Paginator(query_set, _default_page_size)
     bookmarks = paginator.get_page(page)
+    selected_tags = _get_selected_tags(tags, filters.query)
     # Prefetch owner relation, this avoids n+1 queries when using the owner in templates
     prefetch_related_objects(bookmarks.object_list, 'owner')
     return_url = generate_return_url(base_url, page, filters)
@@ -71,6 +86,7 @@ def get_bookmark_view_context(request: WSGIRequest,
     return {
         'bookmarks': bookmarks,
         'tags': tags,
+        'selected_tags': selected_tags,
         'filters': filters,
         'empty': paginator.count == 0,
         'return_url': return_url,