From 20e7d3c51ade57811ee6a98251782dee6485204e Mon Sep 17 00:00:00 2001
From: chamiakJ <chamika@ceydigital.com>
Date: Sat, 12 Jul 2025 06:46:23 +0530
Subject: [PATCH] fix(home-page): exclude archived projects from task queries
 and update project color display

- Added a condition to exclude archived projects from the task retrieval queries in the HomePageController.
- Updated the TasksList component to display the project color instead of the phase color for better visual representation.
---
 .../src/controllers/home-page-controller.ts            | 10 +++++++++-
 .../src/pages/home/task-list/tasks-list.tsx            |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/worklenz-backend/src/controllers/home-page-controller.ts b/worklenz-backend/src/controllers/home-page-controller.ts
index be290eb9..5a0d87f4 100644
--- a/worklenz-backend/src/controllers/home-page-controller.ts
+++ b/worklenz-backend/src/controllers/home-page-controller.ts
@@ -137,6 +137,10 @@ export default class HomePageController extends WorklenzControllerBase {
                                 WHERE category_id NOT IN (SELECT id
                                                           FROM sys_task_status_categories
                                                           WHERE is_done IS FALSE))
+        AND NOT EXISTS(SELECT project_id
+                       FROM archived_projects
+                       WHERE project_id = p.id
+                         AND user_id = $2)
         ${groupByClosure}
       ORDER BY t.end_date ASC`;
 
@@ -158,9 +162,13 @@ export default class HomePageController extends WorklenzControllerBase {
                                          WHERE category_id NOT IN (SELECT id
                                                                    FROM sys_task_status_categories
                                                                    WHERE is_done IS FALSE))
+                 AND NOT EXISTS(SELECT project_id
+                                FROM archived_projects
+                                WHERE project_id = p.id
+                                  AND user_id = $3)
                  ${groupByClosure}`;
 
-    const result = await db.query(q, [teamId, userId]);
+    const result = await db.query(q, [teamId, userId, userId]);
     const [row] = result.rows;
     return row;
   }
diff --git a/worklenz-frontend/src/pages/home/task-list/tasks-list.tsx b/worklenz-frontend/src/pages/home/task-list/tasks-list.tsx
index cd249062..008edbed 100644
--- a/worklenz-frontend/src/pages/home/task-list/tasks-list.tsx
+++ b/worklenz-frontend/src/pages/home/task-list/tasks-list.tsx
@@ -163,7 +163,7 @@ const TasksList: React.FC = React.memo(() => {
                 style={{ margin: 0, paddingInlineEnd: 6, maxWidth: 120 }}
                 ellipsis={{ tooltip: true }}
               >
-                <Badge color={record.phase_color || 'blue'} style={{ marginInlineEnd: 4 }} />
+                <Badge color={record.project_color || 'blue'} style={{ marginInlineEnd: 4 }} />
                 {record.project_name}
               </Typography.Paragraph>
             </Tooltip>