From 1127864ba98bb02630561d40e877123b13a48650 Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Thu, 10 Jul 2025 13:18:01 -0400 Subject: [PATCH] feature/IO-3291-Tasks-Notifications: Checkpoint --- .../components/header/header.component.jsx | 6 +- .../task-center/task-center.component.jsx | 18 +- .../task-center/task-center.container.jsx | 12 +- .../task-list/task-list.container.jsx | 4 +- .../src/contexts/SocketIO/socketProvider.jsx | 107 +- hasura/metadata/tables.yaml | 2 + package-lock.json | 958 ++++++++++-------- package.json | 24 +- server/notifications/eventHandlers.js | 49 +- server/web-sockets/redisSocketEvents.js | 39 +- 10 files changed, 749 insertions(+), 470 deletions(-) diff --git a/client/src/components/header/header.component.jsx b/client/src/components/header/header.component.jsx index d1d6a44b1..f1f480821 100644 --- a/client/src/components/header/header.component.jsx +++ b/client/src/components/header/header.component.jsx @@ -342,7 +342,11 @@ function Header(props) { )}
- setTaskCenterVisible(false)} /> + setTaskCenterVisible(false)} + />
); diff --git a/client/src/components/task-center/task-center.component.jsx b/client/src/components/task-center/task-center.component.jsx index 705a2bb0b..0c2b8e899 100644 --- a/client/src/components/task-center/task-center.component.jsx +++ b/client/src/components/task-center/task-center.component.jsx @@ -13,7 +13,7 @@ import { } from "@ant-design/icons"; const TaskCenterComponent = forwardRef( - ({ visible, tasks, loading, error, onTaskClick, onLoadMore, hasMore, createNewTask }, ref) => { + ({ visible, tasks, loading, error, onTaskClick, onLoadMore, hasMore, createNewTask, incompleteTaskCount }, ref) => { const { t } = useTranslation(); const virtuosoRef = useRef(null); @@ -56,11 +56,17 @@ const TaskCenterComponent = forwardRef( const getPriorityColor = (priority) => priorityColors[priority] || null; const groupContent = (groupIndex) => { - const { label } = groups[groupIndex]; + const { label, tasks } = groups[groupIndex]; + let displayCount = tasks.length; + if (label === t("tasks.labels.no_due_date")) { + displayCount = + incompleteTaskCount - + groups.reduce((sum, group, idx) => (idx !== groupIndex ? sum + group.tasks.length : sum), 0); + } return (
{sectionIcons[label]} - {label} ({groups[groupIndex].tasks.length}) + {label} ({displayCount})
); }; @@ -112,9 +118,9 @@ const TaskCenterComponent = forwardRef( return (
-

- {t("tasks.labels.my_tasks_center")} ({tasks.length}) -

+ +

{t("tasks.labels.my_tasks_center")}

+