From 7ebf9507608b2aede1675b7db0dce0f986f81bc7 Mon Sep 17 00:00:00 2001
From: sakiadachi <sakiadachi.88@gmail.com>
Date: Sat, 31 May 2025 17:28:33 +0900
Subject: [PATCH 1/3] BE: Add dashboard project page sidebar

- Workspaces list
- Projects list

Simplify a project view test
---
 .../projectify/templates/dashboard_base.html  | 27 +++----------------
 .../common/sidebar/project_details.html}      |  4 +++
 .../common/sidebar/workspace_details.html     | 25 +++++++++++++++++
 .../templates/workspace/form_base.html        |  2 +-
 .../workspace/workspace_settings_base.html    |  2 +-
 .../workspace/test/views/test_project.py      | 14 ++++------
 backend/projectify/workspace/views/project.py |  3 +++
 7 files changed, 43 insertions(+), 34 deletions(-)
 rename backend/projectify/{templates/dashboard_projects.html => workspace/templates/workspace/common/sidebar/project_details.html} (91%)
 create mode 100644 backend/projectify/workspace/templates/workspace/common/sidebar/workspace_details.html

diff --git a/backend/projectify/templates/dashboard_base.html b/backend/projectify/templates/dashboard_base.html
index cdd163e7c..046b8dfc4 100644
--- a/backend/projectify/templates/dashboard_base.html
+++ b/backend/projectify/templates/dashboard_base.html
@@ -12,28 +12,9 @@
                 <div class="max-w-xs 2xl:max-w-md">
                     <nav class="flex flex-col py-4">
                         <div class="flex flex-col gap-2 px-4 pb-4">
-                            <div class="flex flex-row items-center justify-between gap-4">
-                                {% if workspace %}
-                                    <div class="min-w-0 grow">
-                                        <button class="flex w-full flex-row items-center justify-between gap-2 rounded-lg border border-border p-2 hover:bg-secondary-hover">
-                                            <div class="flex min-w-0 flex-row items-center gap-2">
-                                                <div class="h-4 w-4 shrink-0">{% include "heroicons/briefcase.svg" %}</div>
-                                                <div class="min-w-0 truncate font-bold">{{ workspace.title }}</div>
-                                            </div>
-                                            <div class="w-4 h-4 shrink-0">{% include "heroicons/chevron-down.svg" %}</div>
-                                        </button>
-                                    </div>
-                                    <div>
-                                        <a href="{% url 'dashboard:workspaces:settings' workspace.uuid %}"
-                                           aria-label="Open workspace settings"
-                                           class="w-8 h-8 p-1.5 rounded-full border border-transparent text-base-content hover:bg-secondary-hover active:bg-disabled-background disabled:bg-transparent disabled:text-disabled flex items-center justify-center">
-                                            {% include "heroicons/dots-horizontal.svg" %}
-                                        </a>
-                                    </div>
-                                {% else %}
-                                    todo no workspace
-                                {% endif %}
-                            </div>
+                            {% if workspace %}
+                                <div class="min-w-0 grow">{% include "workspace/common/sidebar/workspace_details.html" %}</div>
+                            {% endif %}
                         </div>
                         <p class="px-4">
                             {% url "help:detail" page="billing" as trial_workspace_help %}
@@ -52,7 +33,7 @@
                             </button>
                             <div class="flex shrink flex-col">
                                 {% block dashboard_projects %}
-                                    {% include "dashboard_projects.html" %}
+                                    {% include "workspace/common/sidebar/project_details.html" %}
                                 {% endblock dashboard_projects %}
                             </div>
                         </div>
diff --git a/backend/projectify/templates/dashboard_projects.html b/backend/projectify/workspace/templates/workspace/common/sidebar/project_details.html
similarity index 91%
rename from backend/projectify/templates/dashboard_projects.html
rename to backend/projectify/workspace/templates/workspace/common/sidebar/project_details.html
index a0e6474a2..8a66c5fe6 100644
--- a/backend/projectify/templates/dashboard_projects.html
+++ b/backend/projectify/workspace/templates/workspace/common/sidebar/project_details.html
@@ -22,3 +22,7 @@
         <span class="truncate">{% translate "Create new project" %}</span>
     </a>
 {% endif %}
+<div class="flex flex-col px-4 pb-4">
+    {% block filter_team_members %}
+    {% endblock filter_team_members %}
+</div>
diff --git a/backend/projectify/workspace/templates/workspace/common/sidebar/workspace_details.html b/backend/projectify/workspace/templates/workspace/common/sidebar/workspace_details.html
new file mode 100644
index 000000000..8b6d42695
--- /dev/null
+++ b/backend/projectify/workspace/templates/workspace/common/sidebar/workspace_details.html
@@ -0,0 +1,25 @@
+{# SPDX-FileCopyrightText: 2024 JWP Consulting GK #}
+{# SPDX-License-Identifier: AGPL-3.0-or-later #}
+{% load i18n %}
+<details name="workspace-select" class="w-full">
+    <summary class="flex items-center gap-2 hover:bg-secondary-hover font-bold border rounded cursor-pointer p-2">
+        <div class="h-4 w-4 shrink-0">{% include "heroicons/briefcase.svg" %}</div>
+        <span class="truncate">{{ workspace.title }}</span>
+    </summary>
+    <ul class="flex flex-col max-h-40 overflow-y-auto">
+        <li class="flex items-center gap-2 border-b">
+            <a href="{% url 'dashboard:workspaces:settings' workspace.uuid %}"
+               class="flex w-full flex-row items-center gap-2 px-4 py-2 hover:bg-secondary-hover active:bg-disabled disabled:active:bg-secondary-hover text-base-content">
+                <div class="h-4 w-4 shrink-0">{% include "heroicons/cog.svg" %}</div>
+            {% trans "Workspace Settings" %}</a>
+        </li>
+        {% for w in workspaces %}
+            <li>
+                <a href="{% url "dashboard:workspaces:detail" w.uuid %}"
+                   class="flex w-full flex-row items-center gap-2 px-4 py-2 hover:bg-secondary-hover active:bg-disabled disabled:active:bg-secondary-hover text-base-content">
+                    <div class="h-4 w-4 shrink-0">{% include "heroicons/briefcase.svg" %}</div>
+                {{ w.title }}</a>
+            </li>
+        {% endfor %}
+    </ul>
+</details>
diff --git a/backend/projectify/workspace/templates/workspace/form_base.html b/backend/projectify/workspace/templates/workspace/form_base.html
index 0ea390b48..8085b5b53 100644
--- a/backend/projectify/workspace/templates/workspace/form_base.html
+++ b/backend/projectify/workspace/templates/workspace/form_base.html
@@ -3,7 +3,7 @@
 {% extends "dashboard_base.html" %}
 {% load i18n %}
 {% block dashboard_projects %}
-    {% include "dashboard_projects.html" %}
+    {% include "workspace/common/sidebar/project_details.html" %}
 {% endblock dashboard_projects %}
 {% block dashboard_content %}
     <div class="min-w-0 grow" role="presentation">
diff --git a/backend/projectify/workspace/templates/workspace/workspace_settings_base.html b/backend/projectify/workspace/templates/workspace/workspace_settings_base.html
index 2996df234..49654f11f 100644
--- a/backend/projectify/workspace/templates/workspace/workspace_settings_base.html
+++ b/backend/projectify/workspace/templates/workspace/workspace_settings_base.html
@@ -3,7 +3,7 @@
 {% extends "dashboard_base.html" %}
 {% load i18n %}
 {% block dashboard_projects %}
-    {% include "dashboard_projects.html" with projects=projects %}
+    {% include "workspace/common/sidebar/project_details.html" with projects=projects %}
 {% endblock dashboard_projects %}
 {% block dashboard_content %}
     <div class="min-w-0 grow" role="presentation">
diff --git a/backend/projectify/workspace/test/views/test_project.py b/backend/projectify/workspace/test/views/test_project.py
index a03921b56..c126eaf97 100644
--- a/backend/projectify/workspace/test/views/test_project.py
+++ b/backend/projectify/workspace/test/views/test_project.py
@@ -49,7 +49,8 @@ def test_get_project_detail(
         django_assert_num_queries: DjangoAssertNumQueries,
     ) -> None:
         """Test GETting the project detail page."""
-        with django_assert_num_queries(14):
+        # Gone up from 14 -> 15, since we fetch all workspaces
+        with django_assert_num_queries(15):
             response = user_client.get(resource_url)
             assert response.status_code == 200
             assert project.title.encode() in response.content
@@ -106,18 +107,13 @@ def test_create_project_success(
     ) -> None:
         """Test successfully creating a project."""
         initial_project_count = Project.objects.count()
-
-        # XXX 20 queries is a bit excessive
-        with django_assert_num_queries(20):
+        with django_assert_num_queries(6):
             response = user_client.post(
-                resource_url,
-                {"title": "New Test Project"},
-                follow=True,
+                resource_url, {"title": "New Test Project"}
             )
-            assert response.status_code == 200
+            assert response.status_code == 302
 
         assert Project.objects.count() == initial_project_count + 1
-        assert "New Test Project" in response.content.decode()
 
     def test_create_project_invalid_form(
         self,
diff --git a/backend/projectify/workspace/views/project.py b/backend/projectify/workspace/views/project.py
index 6635fabf8..af9d5c9c7 100644
--- a/backend/projectify/workspace/views/project.py
+++ b/backend/projectify/workspace/views/project.py
@@ -32,6 +32,7 @@
 from projectify.workspace.selectors.quota import workspace_get_all_quotas
 from projectify.workspace.selectors.workspace import (
     workspace_find_by_workspace_uuid,
+    workspace_find_for_user,
 )
 from projectify.workspace.serializers.base import ProjectBaseSerializer
 from projectify.workspace.serializers.project import ProjectDetailSerializer
@@ -55,6 +56,7 @@ def project_detail_view(
     if project is None:
         raise Http404(_("No project found for this uuid"))
     project.workspace.quota = workspace_get_all_quotas(project.workspace)
+    workspaces = workspace_find_for_user(who=request.user)
     projects = project_find_by_workspace_uuid(
         who=request.user,
         workspace_uuid=project.workspace.uuid,
@@ -64,6 +66,7 @@ def project_detail_view(
         "project": project,
         "labels": list(project.workspace.label_set.values()),
         "projects": projects,
+        "workspaces": workspaces,
         "workspace": project.workspace,
     }
     return render(request, "workspace/project_detail.html", context)

From 418bf7cb4073c8347667de876a91e6dd1f2bd716 Mon Sep 17 00:00:00 2001
From: sakiadachi <sakiadachi.88@gmail.com>
Date: Sun, 1 Jun 2025 16:07:18 +0900
Subject: [PATCH 2/3] BE: Add Team members filter

---
 .../projectify/templates/heroicons/search.svg |  1 +
 .../common/sidebar/filter_team_members.html   | 42 +++++++++++++++++++
 .../common/sidebar/project_details.html       | 10 ++---
 .../templates/workspace/project_detail.html   | 14 +------
 backend/projectify/workspace/views/project.py |  1 +
 5 files changed, 50 insertions(+), 18 deletions(-)
 create mode 100644 backend/projectify/templates/heroicons/search.svg
 create mode 100644 backend/projectify/workspace/templates/workspace/common/sidebar/filter_team_members.html

diff --git a/backend/projectify/templates/heroicons/search.svg b/backend/projectify/templates/heroicons/search.svg
new file mode 100644
index 000000000..7e94bb2cf
--- /dev/null
+++ b/backend/projectify/templates/heroicons/search.svg
@@ -0,0 +1 @@
+<svg fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" slot="left"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"></path></svg>
diff --git a/backend/projectify/workspace/templates/workspace/common/sidebar/filter_team_members.html b/backend/projectify/workspace/templates/workspace/common/sidebar/filter_team_members.html
new file mode 100644
index 000000000..8994dd6cd
--- /dev/null
+++ b/backend/projectify/workspace/templates/workspace/common/sidebar/filter_team_members.html
@@ -0,0 +1,42 @@
+{# SPDX-FileCopyrightText: 2024-2025 JWP Consulting GK #}
+{# SPDX-License-Identifier: AGPL-3.0-or-later #}
+{% load i18n %}
+{% load projectify %}
+<form>
+    <fieldset class="w-full max-w-full">
+        <legend class="flex items-center gap-2">
+            <div class="w-4 h-4">{% include "heroicons/user.svg" %}</div>
+            <p class=" font-bold truncate py-2">{% trans "Filter team members" %}</p>
+        </legend>
+        <div class="flex flex-col gap-2">
+            <div class="flex items-center gap-2">
+                <div class="w-4 h-4">{% include "heroicons/search.svg" %}</div>
+                <div class="flex-1">
+                    <input type="text"
+                           name="team-member-name"
+                           class="placeholder:text-task-update-text peer h-full w-full rounded-lg border border-border px-2 py-2" />
+                </div>
+            </div>
+            <div class="flex flex-col max-h-60 overflow-y-auto">
+                {% for member in team_members %}
+                    <div class="grid grid-cols-[auto_1fr_auto] gap-2 items-center hover:bg-background p-2">
+                        <input type="checkbox"
+                               id="member_{{ member.uuid }}"
+                               name="member_{{ member.uuid }}"
+                               value="{{ member.uuid }}"
+                               class="cursor-pointer" />
+                        <label for="member_{{ member.uuid }}"
+                               class="flex flex-1 gap-2 text-regular min-w-0 cursor-pointer">
+                            {% user_avatar member.user %}
+                            <span class="truncate">{{ member }}</span>
+                        </label>
+                        {# TODO:Add count #}
+                        <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">
+                            111
+                        </div>
+                    </div>
+                {% endfor %}
+            </div>
+        </div>
+    </fieldset>
+</form>
diff --git a/backend/projectify/workspace/templates/workspace/common/sidebar/project_details.html b/backend/projectify/workspace/templates/workspace/common/sidebar/project_details.html
index 8a66c5fe6..47767ea28 100644
--- a/backend/projectify/workspace/templates/workspace/common/sidebar/project_details.html
+++ b/backend/projectify/workspace/templates/workspace/common/sidebar/project_details.html
@@ -1,7 +1,6 @@
 {# SPDX-License-Identifier: AGPL-3.0-or-later #}
-{# SPDX-FileCopyrightText: 2025 JWP Consulting GK #}
+{# SPDX-FileCopyrightText: 2024-2025 JWP Consulting GK #}
 {% load i18n %}
-{# TODO this view should be in projectify/workspace/templates/ #}
 {% for project_item in projects %}
     <a class="group block flex w-full flex-row justify-between gap-1 px-4 py-1 hover:bg-base-200"
        href="{% url "dashboard:projects:detail" project_item.uuid %}">
@@ -22,7 +21,6 @@
         <span class="truncate">{% translate "Create new project" %}</span>
     </a>
 {% endif %}
-<div class="flex flex-col px-4 pb-4">
-    {% block filter_team_members %}
-    {% endblock filter_team_members %}
-</div>
+{% if team_members %}
+    {% include "workspace/common/sidebar/filter_team_members.html" %}
+{% endif %}
diff --git a/backend/projectify/workspace/templates/workspace/project_detail.html b/backend/projectify/workspace/templates/workspace/project_detail.html
index 056322e27..0b2f31b66 100644
--- a/backend/projectify/workspace/templates/workspace/project_detail.html
+++ b/backend/projectify/workspace/templates/workspace/project_detail.html
@@ -1,4 +1,4 @@
-{# SPDX-FileCopyrightText: 2024 JWP Consulting GK #}
+{# SPDX-FileCopyrightText: 2024-2025 JWP Consulting GK #}
 {# SPDX-License-Identifier: AGPL-3.0-or-later #}
 {% extends "dashboard_base.html" %}
 {% load i18n %}
@@ -28,17 +28,7 @@
                 <!--<InputField>-->
                 <button type="submit"
                         class="text-tertiary-content hover:text-tertiary-content-hover active:bg-tertiary-pressed active:text-tertiary-content-hover text-base flex min-w-max flex-row justify-center gap-2 rounded-lg px-4 py-2 font-bold disabled:bg-transparent disabled:text-disabled-content">
-                    <svg fill="none"
-                         viewBox="0 0 24 24"
-                         stroke="currentColor"
-                         aria-hidden="true"
-                         xmlns="http://www.w3.org/2000/svg"
-                         width="100%"
-                         height="100%"
-                         class="h-6 w-6">
-                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z">
-                        </path>
-                    </svg>
+                    <span class="h-6 w-6">{% include "heroicons/search.svg" %}</span>
                     Search tasks
                 </button>
                 <!--<button>-->
diff --git a/backend/projectify/workspace/views/project.py b/backend/projectify/workspace/views/project.py
index af9d5c9c7..d6db46d34 100644
--- a/backend/projectify/workspace/views/project.py
+++ b/backend/projectify/workspace/views/project.py
@@ -68,6 +68,7 @@ def project_detail_view(
         "projects": projects,
         "workspaces": workspaces,
         "workspace": project.workspace,
+        "team_members": list(project.workspace.teammember_set.all()),
     }
     return render(request, "workspace/project_detail.html", context)
 

From 67690b90c263add5d015096cd7844570096484a0 Mon Sep 17 00:00:00 2001
From: sakiadachi <sakiadachi.88@gmail.com>
Date: Sun, 1 Jun 2025 16:23:54 +0900
Subject: [PATCH 3/3] BE: Remove overflow-y in teammember filter

---
 .../templates/workspace/common/sidebar/filter_team_members.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/projectify/workspace/templates/workspace/common/sidebar/filter_team_members.html b/backend/projectify/workspace/templates/workspace/common/sidebar/filter_team_members.html
index 8994dd6cd..de6fd28d7 100644
--- a/backend/projectify/workspace/templates/workspace/common/sidebar/filter_team_members.html
+++ b/backend/projectify/workspace/templates/workspace/common/sidebar/filter_team_members.html
@@ -17,7 +17,7 @@
                            class="placeholder:text-task-update-text peer h-full w-full rounded-lg border border-border px-2 py-2" />
                 </div>
             </div>
-            <div class="flex flex-col max-h-60 overflow-y-auto">
+            <div class="flex flex-col overflow-y-auto">
                 {% for member in team_members %}
                     <div class="grid grid-cols-[auto_1fr_auto] gap-2 items-center hover:bg-background p-2">
                         <input type="checkbox"