bo/worklenz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(home-page): exclude archived projects from task queries and update project color display

Browse Source 
- 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.
This commit is contained in:
chamiakJ
2025-07-12 06:46:23 +05:30
parent 6d5aa0ccab
commit 20e7d3c51a
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
worklenz-backend/src/controllers/home-page-controller.ts
View File

@@ -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;
}

2
worklenz-frontend/src/pages/home/task-list/tasks-list.tsx
View File

@@ -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>