Improve backend (#679)

Author: justuswilhelm

backend/poetry.lock

@@ -43,7 +43,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         kwargs.setdefault("blank", True)
         kwargs.setdefault("auto_now_add", True)
         # projectify/lib/models.py:58: error: Argument 1 to "__init__" of "Field" has incompatible type "CreationDateTimeField"; expected "Field[_ST, _GT]"  [arg-type]
-        DateTimeField[datetime.datetime].__init__(self, *args, **kwargs)  # type: ignore[arg-type]
+        DateTimeField[datetime.datetime].__init__(self, *args, **kwargs)
 
     def get_internal_type(self) -> str:
         """Return internal type."""
@@ -74,7 +74,7 @@ def __init__(self, *args: Any, **kwargs: Any):
         """Enable auto_now=True."""
         kwargs.setdefault("auto_now", True)
         # projectify/lib/models.py:88: error: Argument 1 to "__init__" of "Field" has incompatible type "ModificationDateTimeField"; expected "Field[_ST, _GT]"  [arg-type]
-        DateTimeField[datetime.datetime].__init__(self, *args, **kwargs)  # type: ignore[arg-type]
+        DateTimeField[datetime.datetime].__init__(self, *args, **kwargs)
 
     def get_internal_type(self) -> str:
         """Return internal type."""

backend/projectify/lib/models.py

@@ -15,7 +15,7 @@ class LocalhostStorage(FileSystemStorage):
     """Override file system storage."""
 
     @cached_property
-    def base_url(self) -> str:  # type: ignore
+    def base_url(self) -> str:
         """Override base url to point to localhost."""
         settings = get_settings()
         if not settings.FRONTEND_URL:

backend/projectify/storage.py

@@ -51,7 +51,7 @@ def __str__(self) -> str:
 
     def get_absolute_url(self) -> str:
         """Get URL to section within project."""
-        return f"{reverse("dashboard:projects:detail", args=(str(self.project.uuid),))}#{self.uuid}"
+        return f"{reverse("dashboard:projects:detail", args=(str(self.project.uuid),))}#section-{self.uuid}"
 
     class Meta:
         """Meta."""

backend/projectify/workspace/models/section.py

@@ -29,10 +29,12 @@
 
 def project_detail_query_set(
     *,
-    team_member_uuids: Optional[list[UUID]] = None,
-    label_uuids: Optional[list[UUID]] = None,
-    unassigned_tasks: Optional[bool] = None,
-    unlabeled_tasks: Optional[bool] = None,
+    filter_by_team_members: Optional[QuerySet[TeamMember]] = None,
+    filter_by_labels: Optional[QuerySet[Label]] = None,
+    # TODO rename to filter_by_unassigned
+    unassigned_tasks: bool = False,
+    # TODO rename to filter_by_unlabeled
+    unlabeled_tasks: bool = False,
     task_search_query: Optional[str] = None,
     who: Optional[User] = None,
 ) -> QuerySet[Project]:
@@ -46,39 +48,51 @@ def project_detail_query_set(
             task_count=Count("tasklabel", filter=project_not_archived),
         )
     )
+
     task_q = Q()
-    assignee_uuid = Q(assignee__uuid__in=team_member_uuids)
+
+    # Annotate team members in side nav with whether they're filtered or not
+    assignee_contained = Q(assignee__in=filter_by_team_members)
     assignee_empty = Q(assignee__isnull=True)
-    match team_member_uuids, unassigned_tasks:
-        case None, None | False:
+    team_member_is_filtered: Union[Value, Exists] = Value(False)
+    match filter_by_team_members, unassigned_tasks:
+        case None, False:
             pass
         case None, True:
             task_q = task_q & assignee_empty
-        case uuids, None | False:
-            task_q = task_q & assignee_uuid
-            team_member_qs = team_member_qs.annotate(
-                is_filtered=Q(uuid__in=uuids)
+        case QuerySet(), False:
+            task_q = task_q & assignee_contained
+            team_member_is_filtered = Exists(
+                filter_by_team_members.filter(pk=OuterRef("pk"))
             )
-        case uuids, True:
-            task_q = task_q & (assignee_uuid & assignee_empty)
-            team_member_qs = team_member_qs.annotate(
-                is_filtered=Q(uuid__in=uuids)
+        case QuerySet(), True:
+            task_q = task_q & (assignee_contained | assignee_empty)
+            team_member_is_filtered = Exists(
+                filter_by_team_members.filter(pk=OuterRef("pk"))
             )
+    team_member_qs = team_member_qs.annotate(
+        is_filtered=team_member_is_filtered
+    )
 
-    labels_uuid = Q(labels__uuid__in=label_uuids)
+    # Annotate labels shown in side nav with whether they're filtered or not
+    label_contained = Q(labels__in=filter_by_labels)
     labels_empty = Q(labels__isnull=True)
-    label_is_filtered: Union[Value, Q] = Value(False)
-    match label_uuids, unlabeled_tasks:
-        case None, None | False:
+    label_is_filtered: Union[Value, Exists] = Value(False)
+    match filter_by_labels, unlabeled_tasks:
+        case None, False:
             pass
         case None, True:
             task_q = task_q & labels_empty
-        case uuids, None | False:
-            task_q = task_q & labels_uuid
-            label_is_filtered = Q(uuid__in=uuids)
-        case uuids, True:
-            task_q = task_q & (labels_uuid | labels_empty)
-            label_is_filtered = Q(uuid__in=uuids)
+        case QuerySet(), False:
+            task_q = task_q & label_contained
+            label_is_filtered = Exists(
+                filter_by_labels.filter(pk=OuterRef("pk"))
+            )
+        case QuerySet(), True:
+            task_q = task_q & (label_contained | labels_empty)
+            label_is_filtered = Exists(
+                filter_by_labels.filter(pk=OuterRef("pk"))
+            )
     label_qs = label_qs.annotate(is_filtered=label_is_filtered)
 
     if task_search_query is not None:

backend/projectify/workspace/selectors/project.py

@@ -6,17 +6,28 @@
 from typing import Optional
 from uuid import UUID
 
-from django.db.models import QuerySet
+from django.db.models import Prefetch, QuerySet
 
 from projectify.user.models import User
+from projectify.workspace.models.label import Label
+from projectify.workspace.models.project import Project
 from projectify.workspace.models.section import Section
+from projectify.workspace.selectors.labels import labels_annotate_with_colors
 
 SectionDetailQuerySet = Section.objects.prefetch_related(
     "task_set",
     "task_set__assignee",
     "task_set__assignee__user",
     "task_set__labels",
     "task_set__subtask_set",
+    Prefetch(
+        "project__workspace__project_set",
+        queryset=Project.objects.filter(archived__isnull=True),
+    ),
+    Prefetch(
+        "project__workspace__label_set",
+        queryset=labels_annotate_with_colors(Label.objects.all()),
+    ),
 ).select_related(
     "project",
     "project__workspace",

backend/projectify/workspace/selectors/section.py

@@ -13,12 +13,13 @@
 
 from ..models.chat_message import ChatMessage
 from ..models.label import Label
+from ..models.project import Project
 from ..models.task import Task
 from .labels import labels_annotate_with_colors
 
 TaskDetailQuerySet: QuerySet[Task] = (
     Task.objects.select_related(
-        "section__project__workspace",
+        "workspace",
         "assignee",
         "assignee__user",
     )
@@ -31,6 +32,12 @@
             queryset=labels_annotate_with_colors(Label.objects.all()),
         ),
     )
+    .prefetch_related(
+        Prefetch(
+            "workspace__label_set",
+            queryset=labels_annotate_with_colors(Label.objects.all()),
+        ),
+    )
     .prefetch_related(
         Prefetch(
             "chatmessage_set",
@@ -40,6 +47,12 @@
             ),
         ),
     )
+    .prefetch_related(
+        Prefetch(
+            "workspace__project_set",
+            queryset=Project.objects.filter(archived__isnull=True),
+        ),
+    )
     .annotate(
         sub_task_progress=Count(
             "subtask",

backend/projectify/workspace/selectors/task.py

@@ -31,84 +31,22 @@
                     <p class=" font-bold truncate py-2">{% trans "Filter team members" %}</p>
                 </legend>
                 <div class="flex flex-col gap-2">
-                    <div class="flex flex-col overflow-y-auto">
-                        <div class="grid grid-cols-[auto_1fr_auto] gap-2 items-center hover:bg-background p-2">
-                            <input type="checkbox"
-                                   id="{{ task_filter_form.filter_by_unassigned.id_for_label }}"
-                                   name="{{ task_filter_form.filter_by_unassigned.html_name }}"
-                                   value="on"
-                                   {% if task_filter_form.filter_by_unassigned.data %}checked{% endif %}
-                                   class="cursor-pointer" />
-                            <label for="{{ task_filter_form.filter_by_unassigned.id_for_label }}"
-                                   class="flex flex-1 gap-2 text-regular min-w-0 cursor-pointer">
-                                {% user_avatar None %}
-                                <span class="truncate">{{ task_filter_form.filter_by_unassigned.label }}</span>
-                            </label>
-                            {# no count #}
-                        </div>
-                        {% for member in task_filter_form.filter_by_team_member %}
-                            <div class="grid grid-cols-[auto_1fr_auto] gap-2 items-center hover:bg-background p-2">
-                                <input type="checkbox"
-                                       id="{{ member.data.attrs.id }}"
-                                       name="{{ task_filter_form.filter_by_team_member.html_name }}"
-                                       {% if member.data.is_filtered %}checked{% endif %}
-                                       value="{{ member.data.value }}"
-                                       class="cursor-pointer" />
-                                <label for="{{ member.id_for_label }}"
-                                       class="flex flex-1 gap-2 text-regular min-w-0 cursor-pointer">
-                                    {% user_avatar member.data.member %}
-                                    <span class="truncate">{{ member.choice_label }}</span>
-                                </label>
-                                <div class="flex shrink-0 flex-row items-center gap-2 rounded-2.5xl bg-background px-2 py-0.5 text-primary group-hover:bg-foreground">
-                                    {{ member.data.task_count }}
-                                </div>
-                            </div>
-                        {% endfor %}
-                    </div>
+                    <div class="flex flex-col overflow-y-auto">{{ task_filter_form.filter_by_team_member }}</div>
                 </div>
             </fieldset>
         </div>
-        <div class="flex flex-col px-4">
-            <fieldset class="w-full max-w-full">
+        <div class="flex flex-col gap-4 px-4">
+            <fieldset class="w-full max-w-full min-w-0">
                 <legend class="flex items-center gap-2">
                     <div class="w-4 h-4">{% include "heroicons/tag.svg" %}</div>
                     <p class=" font-bold truncate py-2">{% trans "Filter labels" %}</p>
                 </legend>
-                <div class="flex flex-col gap-2">
-                    <div class="flex flex-col overflow-y-auto">
-                        <div class="grid grid-cols-[auto_1fr_auto] gap-2 items-center hover:bg-background p-2">
-                            <input type="checkbox"
-                                   id="{{ task_filter_form.filter_by_unlabeled.id_for_label }}"
-                                   name="{{ task_filter_form.filter_by_unlabeled.html_name }}"
-                                   {% if task_filter_form.filter_by_unlabeled.data %}checked{% endif %}
-                                   value="on">
-                            <label class="flex items-center min-w-0 gap-2"
-                                   for="{{ task_filter_form.filter_by_unlabeled.id_for_label }}">
-                                <div class="h-6 w-6 shrink-0 rounded-full border border-utility"></div>
-                                <div class="text-regular truncate min-w-0">{{ task_filter_form.filter_by_unlabeled.label }}</div>
-                            </label>
-                        </div>
-                        {% for label in task_filter_form.filter_by_label %}
-                            <div class="grid grid-cols-[auto_1fr_auto] gap-2 items-center hover:bg-background p-2">
-                                <input type="checkbox"
-                                       id="{{ label.data.attrs.id }}"
-                                       name="{{ task_filter_form.filter_by_label.html_name }}"
-                                       {% if label.data.is_filtered %}checked{% endif %}
-                                       value="{{ label.data.value }}">
-                                <label class="flex items-center min-w-0 gap-2"
-                                       for="{{ label.id_for_label }}">
-                                    <div class="h-6 w-6 shrink-0 rounded-full {{ label.data.bg_class }} border {{ label.data.border_class }}"></div>
-                                    <div class="text-regular truncate min-w-0">{{ label.choice_label }}</div>
-                                </label>
-                                <div class="flex shrink-0 flex-row items-center gap-2 rounded-2.5xl bg-background px-2 py-0.5 text-primary group-hover:bg-foreground">
-                                    {{ label.data.task_count }}
-                                </div>
-                            </div>
-                        {% endfor %}
-                    </div>
-                </div>
+                <div class="flex flex-col overflow-y-auto">{{ task_filter_form.filter_by_label }}</div>
             </fieldset>
+            {% if workspace %}
+                {% anchor "dashboard:workspaces:labels" _("Edit labels") workspace_uuid=workspace.uuid %}
+            {% endif %}
+            {% include "projectify/forms/submit.html" with text=_("Filter") %}
         </div>
-        {% include "projectify/forms/submit.html" with text=_("Filter") %}
     </form>
 {% endif %}

backend/projectify/workspace/templates/workspace/common/sidebar/project_details.html

@@ -0,0 +1,36 @@
+{# SPDX-FileCopyrightText: 2026 JWP Consulting GK #}
+{# SPDX-License-Identifier: AGPL-3.0-or-later #}
+{# SPDX-License-Identifier: BSD-3-Clause #}
+{# SPDX-FileCopyrightText: Django Software Foundation and individual contributors. #}
+{% if errors %}
+    <tr>
+        <td colspan="2">
+            {{ errors }}
+            {% if not fields %}
+                {% for field in hidden_fields %}{{ field }}{% endfor %}
+            {% endif %}
+        </td>
+    </tr>
+{% endif %}
+{% for field, errors in fields %}
+    <tr class="contents">
+        <th scope="row" class="col-span-1 text-left font-bold">
+            {% if field.label %}{{ field.label_tag }}{% endif %}
+        </th>
+        <td class="col-span-3">
+            {% if errors %}<div class="text-destructive">{{ errors }}</div>{% endif %}
+            {{ field }}
+            {% if field.help_text %}
+                <br>
+                <span class="helptext"
+                      {% if field.auto_id %}id="{{ field.auto_id }}_helptext"{% endif %}>{{ field.help_text|safe }}</span>
+            {% endif %}
+            {% if forloop.last %}
+                {% for field in hidden_fields %}{{ field }}{% endfor %}
+            {% endif %}
+        </td>
+    </tr>
+{% endfor %}
+{% if not fields and not errors %}
+    {% for field in hidden_fields %}{{ field }}{% endfor %}
+{% endif %}

backend/projectify/workspace/templates/workspace/forms/table.html

@@ -0,0 +1,24 @@
+{# SPDX-FileCopyrightText: 2026 JWP Consulting GK #}
+{# SPDX-License-Identifier: AGPL-3.0-or-later #}
+{% load projectify %}
+<div class="grid grid-cols-[auto_1fr_auto] gap-2 items-center hover:bg-background p-2">
+    <input type="radio"
+           name="{{ widget.name }}"
+           value="{{ widget.value }}"
+           class="cursor-pointer"
+           {% include "django/forms/widgets/attrs.html" %}>
+    <label for="{{ widget.attrs.id }}"
+           class="flex flex-1 gap-2 text-regular min-w-0 cursor-pointer">
+        {% if widget.value.instance %}
+            {% user_avatar widget.value.instance %}
+        {% else %}
+            {% user_avatar None %}
+        {% endif %}
+        <span class="truncate">{{ widget.label }}</span>
+    </label>
+    {% if widget.task_count is not None %}
+        <div class="flex shrink-0 flex-row items-center gap-2 rounded-2.5xl bg-background px-2 py-0.5 text-primary group-hover:bg-foreground">
+            {{ widget.task_count }}
+        </div>
+    {% endif %}
+</div>