@zeniai/client-epic-state 5.1.18-betaAA0 → 5.1.18-betaDI10

package/lib/esm/view/taskManager/taskDetailView/epics/fetchTaskDetailEpic.js

@@ -4,13 +4,16 @@ import { catchError, filter, mergeMap } from 'rxjs/operators';
 import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
 import { updateTags } from '../../../../entity/tag/tagReducer';
 import { updateTasks } from '../../../../entity/task/taskReducer';
+import { getTaskById } from '../../../../entity/task/taskSelector';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { fetchFileList } from '../../../fileView/fileViewReducer';
+import { updateTaskListOnNewTaskCreationSuccess } from '../../taskListView/taskListReducer';
 import { fetchTaskDetail, initializeTaskToLocalStore, removeTaskDetail, updateEditTaskFetchStatus, } from '../taskDetailReducer';
 export const fetchTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchTaskDetail.match), mergeMap((action) => {
     const { taskId, cacheOverride } = action.payload;
     const taskActions = [];
     const state = state$.value;
+    const isTaskListFetched = state.taskListState.fetchState === 'Completed';
     const taskDetail = recordGet(state.taskDetailState.editTaskStateById, taskId, undefined);
     if (cacheOverride === true) {
         taskActions.push(removeTaskDetail(taskId));
@@ -32,6 +35,16 @@ export const fetchTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe(
                     updateTags(response.data.tasks.map((task) => task.tags).flat()),
                     initializeTaskToLocalStore(taskId),
                 ];
+                if (isTaskListFetched === true) {
+                    const taskGroupId = response.data.tasks[0].task_group_ids?.[0];
+                    if (taskGroupId != null) {
+                        fetchActions.push(updateTaskListOnNewTaskCreationSuccess({
+                            taskGroupId,
+                            task: response.data.tasks[0],
+                            currentTaskState: getTaskById(state.taskState, taskId),
+                        }));
+                    }
+                }
                 const fileIds = response.data.tasks[0].file_ids;
                 if (fileIds.length > 0) {
                     fetchActions.push(fetchFileList(fileIds));

package/lib/esm/view/taskManager/taskDetailView/epics/initializeTaskToLocalStoreEpic.js

@@ -28,6 +28,7 @@ export const initializeTaskToLocalStoreEpic = (actions$, state$) => actions$.pip
             recurringStartDate: task.recurringStartDate,
             timeSpent: task.timeSpent,
             isPrivate: task.isPrivate,
+            taskGroupId: task.taskGroupIds[0],
         };
         const actions = [
             saveTaskUpdatesToLocalStore({ taskDetailLocalData, taskId }),

package/lib/esm/view/taskManager/taskDetailView/epics/saveTaskDetailEpic.js

@@ -12,10 +12,26 @@ export const saveTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe(f
     const { taskId, taskGroupId } = action.payload;
     const state = state$.value;
     const isTaskListFetched = state.taskListState.fetchState === 'Completed';
+    // For an edit, prefer the locally-edited group (Bug 12). If absent,
+    // fall back to the entity's current group. For a create, use the
+    // taskGroupId from the action payload.
+    const localTaskGroupId = taskId != null
+        ? state.taskDetailState.editTaskStateById[taskId]?.taskDetailLocalData
+            .taskGroupId
+        : undefined;
+    // Distinguish three cases (PR #3101 review):
+    //  - create (taskId == null): use the action payload group.
+    //  - edit, group cleared (localTaskGroupId === null): send [] so
+    //    the backend persists the cleared selection. The `??` fallback
+    //    would resurrect the stale entity value otherwise.
+    //  - edit, group untouched (localTaskGroupId === undefined): use
+    //    the entity's current group.
+    const groupWasCleared = taskId != null && localTaskGroupId === null;
     const updatedTaskGroupId = taskId == null
         ? taskGroupId
-        : getTaskById(state.taskState, taskId)?.taskGroupIds[0];
-    const payload = prepareTaskPayload(state, taskId, updatedTaskGroupId);
+        : (localTaskGroupId ??
+            getTaskById(state.taskState, taskId)?.taskGroupIds[0]);
+    const payload = prepareTaskPayload(state, taskId, updatedTaskGroupId, groupWasCleared);
     const saveTaskApi = taskId != null
         ? zeniAPI.putAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks/${taskId}`, payload)
         : zeniAPI.postAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks`, payload);
@@ -67,7 +83,7 @@ export const saveTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe(f
         error: createZeniAPIStatus('Unexpected Error', 'Save Task REST API call errored out' + JSON.stringify(error)),
     }))));
 }));
-const prepareTaskPayload = (state, taskId, taskGroupId) => {
+const prepareTaskPayload = (state, taskId, taskGroupId, groupWasCleared = false) => {
     const { taskDetailState, taskState } = state;
     const syncToken = taskId != null ? (getTaskById(taskState, taskId)?.syncToken ?? '') : '';
     const sourceState = taskId != null
@@ -96,7 +112,11 @@ const prepareTaskPayload = (state, taskId, taskGroupId) => {
             ? (localData.recurringDaysOfWeek ?? [])
             : [],
         sync_token: syncToken,
-        task_group_ids: taskGroupId != null ? [taskGroupId] : [],
+        task_group_ids: groupWasCleared
+            ? []
+            : taskGroupId != null
+                ? [taskGroupId]
+                : [],
         time_spent: convertHHMMStrToMinutes(localData.timeSpent),
         group_assignees: localData.groupAssignees,
         ...(taskId == null ? { is_private: localData.isPrivate ?? false } : {}),

package/lib/esm/view/taskManager/taskDetailView/epics/sendCommentMentionNotificationEpic.js

@@ -0,0 +1,37 @@
+import { createAction } from '@reduxjs/toolkit';
+import { EMPTY, of } from 'rxjs';
+import { catchError, filter, mergeMap } from 'rxjs/operators';
+/**
+ * Fire-and-forget action — dispatched by the task-comments UI when a comment
+ * is created with @-mentions. The epic POSTs to task-manager's
+ * `/comment-mention-notification` endpoint which fans out Slack DMs to each
+ * mentioned internal user.
+ *
+ * Result is intentionally not captured in redux state: comment creation
+ * itself is owned by Liveblocks, and a network failure on the notification
+ * should not surface in the UI (the comment is still persisted in Liveblocks).
+ */
+export const sendCommentMentionNotification = createAction('taskDetailView/sendCommentMentionNotification', (taskId, mentionedUserIds, performedById) => ({
+    payload: { taskId, mentionedUserIds, performedById },
+}));
+export const sendCommentMentionNotificationEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(sendCommentMentionNotification.match), mergeMap((action) => handleSendCommentMentionNotification(action.payload, zeniAPI)));
+const handleSendCommentMentionNotification = ({ taskId, mentionedUserIds, performedById, }, zeniAPI) => {
+    // Short-circuit when there's nothing to send. Avoids a useless round-trip
+    // (server would also short-circuit with a 200/no-op, but we may as well
+    // not enqueue the request at all).
+    if (mentionedUserIds.length === 0) {
+        return EMPTY;
+    }
+    const url = `${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks/${taskId}/comment-mention-notification`;
+    const request$ = zeniAPI.postAndGetJSON(url, {
+        mentioned_user_ids: mentionedUserIds,
+        performed_by_id: performedById,
+    });
+    return request$.pipe(mergeMap(() => {
+        // Liveblocks owns the comment itself; the Slack fan-out is
+        // best-effort and intentionally silent. We swallow both
+        // non-success responses and network errors so a Slack outage
+        // does not pollute the dev console for every @-mention.
+        return EMPTY;
+    }), catchError(() => of()));
+};

package/lib/esm/view/taskManager/taskDetailView/taskDetailReducer.js

@@ -6,6 +6,11 @@ import { initialTaskDetail, } from './taskDetail';
 export const initialState = {
     newTaskState: initialTaskDetail,
     editTaskStateById: {},
+    subTaskCreateStatus: {
+        fetchState: 'Not-Started',
+        error: undefined,
+    },
+    subTaskListFetchStatusByParentId: {},
     taskHistoryById: {},
 };
 const taskDetailView = createSlice({
@@ -50,7 +55,7 @@ const taskDetailView = createSlice({
         updateEditTaskFetchStatus(draft, action) {
             const { taskId, fetchState, error } = action.payload;
             draft.editTaskStateById[taskId] = {
-                ...draft.editTaskStateById[taskId],
+                ...(draft.editTaskStateById[taskId] ?? initialTaskDetail),
                 fetchTaskStatus: {
                     fetchState,
                     error: fetchState === 'Error' ? error : undefined,
@@ -318,10 +323,59 @@ const taskDetailView = createSlice({
                 error,
             };
         },
+        createSubTask: {
+            reducer(draft) {
+                draft.subTaskCreateStatus = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+            prepare(payload) {
+                return { payload };
+            },
+        },
+        createSubTaskSuccessOrFailure(draft, action) {
+            const { fetchState, error } = action.payload;
+            draft.subTaskCreateStatus = {
+                fetchState,
+                error,
+            };
+        },
+        resetSubTaskCreateStatus(draft) {
+            draft.subTaskCreateStatus = {
+                ...initialState.subTaskCreateStatus,
+            };
+        },
+        fetchSubTasks: {
+            reducer(draft, action) {
+                const { parentTaskId } = action.payload;
+                draft.subTaskListFetchStatusByParentId[parentTaskId] = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+            prepare(parentTaskId) {
+                return { payload: { parentTaskId } };
+            },
+        },
+        updateSubTasks(draft, action) {
+            const { parentTaskId } = action.payload;
+            draft.subTaskListFetchStatusByParentId[parentTaskId] = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+        },
+        updateSubTasksFetchStatus(draft, action) {
+            const { parentTaskId, fetchState, error } = action.payload;
+            draft.subTaskListFetchStatusByParentId[parentTaskId] = {
+                fetchState,
+                error,
+            };
+        },
         clearTaskDetail(draft) {
             Object.assign(draft, initialState);
         },
     },
 });
-export const { fetchTaskDetailPage, fetchTaskDetail, initializeTaskToLocalStore, updateEditTaskFetchStatus, saveTaskUpdatesToLocalStore, discardTaskUpdatesInLocalStore, saveTaskDetail, archiveTask, archiveTaskSuccessOrFailure, saveTaskSuccessOrFailure, deleteTask, removeTaskDetail, deleteTaskSuccessOrFailure, snoozeTask, snoozeTaskSuccessOrFailure, unsnoozeTask, fetchTaskHistory, updateTaskHistory, updateTaskHistoryFetchStatus, clearTaskDetail, updateCreatedTagToLocalStore, updateDeletedTagToLocalStore, } = taskDetailView.actions;
+export const { fetchTaskDetailPage, fetchTaskDetail, initializeTaskToLocalStore, updateEditTaskFetchStatus, saveTaskUpdatesToLocalStore, discardTaskUpdatesInLocalStore, saveTaskDetail, archiveTask, archiveTaskSuccessOrFailure, saveTaskSuccessOrFailure, createSubTask, createSubTaskSuccessOrFailure, resetSubTaskCreateStatus, fetchSubTasks, updateSubTasks, updateSubTasksFetchStatus, deleteTask, removeTaskDetail, deleteTaskSuccessOrFailure, snoozeTask, snoozeTaskSuccessOrFailure, unsnoozeTask, fetchTaskHistory, updateTaskHistory, updateTaskHistoryFetchStatus, clearTaskDetail, updateCreatedTagToLocalStore, updateDeletedTagToLocalStore, } = taskDetailView.actions;
 export default taskDetailView.reducer;

package/lib/esm/view/taskManager/taskDetailView/taskDetailSelector.js

@@ -1,8 +1,8 @@
 import isEqual from 'lodash/isEqual';
-import { reduceFetchState } from '../../../commonStateTypes/reduceFetchState';
+import { reduceAnyFetchState } from '../../../commonStateTypes/reduceFetchState';
 import { getClassesByIds } from '../../../entity/class/classSelector';
 import { getFilesByFileIds } from '../../../entity/file/fileSelector';
-import { getTaskById } from '../../../entity/task/taskSelector';
+import { getTaskById, getTasksByIds } from '../../../entity/task/taskSelector';
 import { getUserAndUserRole, } from '../../companyView/types/userAndRole';
 import { getFileDeleteStatusById, getFileUpdateNameStatusById, } from '../../fileView/fileViewSelector';
 import { getUserList, } from '../../userListView/userListViewSelector';
@@ -27,8 +27,13 @@ export const getTaskDetail = (state, taskId) => {
     let recurringSourceTaskId = undefined;
     let snoozedUntil = undefined;
     let taskGroupId = undefined;
+    let subtasks = [];
     if (taskId != null && sourceTaskDetail != null) {
         const taskEntity = getTaskById(taskState, taskId);
+        subtasks =
+            taskEntity != null
+                ? getTasksByIds(taskState, taskEntity.subTasksIds)
+                : [];
         const fileIdsInEntity = taskEntity?.fileIds ?? [];
         if (taskEntity != null) {
             createdByUser = getUserAndUserRole(userState, userRoleState, addressState, taskEntity.createdBy);
@@ -39,25 +44,27 @@ export const getTaskDetail = (state, taskId) => {
             taskGroupId = taskEntity.taskGroupIds[0];
         }
         if (fileIdsInEntity.length > 0) {
-            fetchStatus = reduceFetchState([
+            fetchStatus = reduceAnyFetchState([
                 fileViewState.fetchFilesStatus,
                 sourceTaskDetail.fetchTaskStatus,
                 userList,
                 classListState,
+                taskDetailState.subTaskListFetchStatusByParentId[taskId] ?? fetchStatus,
             ]);
         }
         else {
-            fetchStatus = reduceFetchState([
+            fetchStatus = reduceAnyFetchState([
                 sourceTaskDetail.fetchTaskStatus,
                 userList,
                 classListState,
+                taskDetailState.subTaskListFetchStatusByParentId[taskId] ?? fetchStatus,
             ]);
         }
         showTaskDetailFormFooter = showFormFooter(sourceTaskDetail.taskDetailLocalData, taskEntity);
         taskHistory = taskDetailState.taskHistoryById[taskId]?.historicEvents ?? [];
     }
     else if (taskId == null) {
-        fetchStatus = reduceFetchState([userList, classListState]);
+        fetchStatus = reduceAnyFetchState([userList, classListState]);
     }
     const { classIds } = classListState;
     const allAccountingClasses = getClassesByIds(classState, {
@@ -90,6 +97,7 @@ export const getTaskDetail = (state, taskId) => {
         showTaskDetailFormFooter,
         snoozedUntil,
         taskGroupId,
+        subtasks,
     };
 };
 export const allTaskStatus = [
@@ -137,13 +145,16 @@ export const allTaskPriority = [
     },
 ];
 const showFormFooter = (taskDetailLocalData, taskDetailInStore) => {
-    if (taskDetailLocalData.name !== taskDetailInStore?.name ||
+    if (taskDetailInStore == null) {
+        return false;
+    }
+    if (taskDetailLocalData.name !== taskDetailInStore.name ||
         taskDetailLocalData.description !== taskDetailInStore.description ||
         taskDetailLocalData.priority !== taskDetailInStore.priority.code ||
         taskDetailLocalData.status !== taskDetailInStore.status.code ||
         !isEqual(taskDetailInStore.tagIds, taskDetailLocalData.tagIds) ||
-        !isEqual(taskDetailLocalData.assignee, taskDetailInStore?.assignees ?? []) ||
-        !isEqual(taskDetailLocalData.groupAssignees, taskDetailInStore?.groupAssignees ?? []) ||
+        !isEqual(taskDetailLocalData.assignee, taskDetailInStore.assignees ?? []) ||
+        !isEqual(taskDetailLocalData.groupAssignees, taskDetailInStore.groupAssignees ?? []) ||
         !isEqual(taskDetailLocalData.fileIds, taskDetailInStore.fileIds ?? []) ||
         !isEqual(taskDetailLocalData.dueDate, taskDetailInStore.dueDate) ||
         !isEqual(taskDetailLocalData.type, taskDetailInStore.type) ||
@@ -151,7 +162,8 @@ const showFormFooter = (taskDetailLocalData, taskDetailInStore) => {
         !isEqual(taskDetailLocalData.recurringFrequency, taskDetailInStore.recurringFrequency) ||
         !isEqual(taskDetailLocalData.recurringDaysOfWeek, taskDetailInStore.recurringDaysOfWeek) ||
         !isEqual(taskDetailLocalData.recurringStartDate, taskDetailInStore.recurringStartDate) ||
-        !isEqual(taskDetailLocalData.timeSpent, taskDetailInStore.timeSpent)) {
+        !isEqual(taskDetailLocalData.timeSpent, taskDetailInStore.timeSpent) ||
+        !isEqual(taskDetailLocalData.taskGroupId, taskDetailInStore.taskGroupIds[0])) {
         return true;
     }
     return false;

package/lib/esm/view/taskManager/taskListView/epics/fetchTaskListEpic.js

@@ -9,15 +9,17 @@ export const fetchTaskListEpic = (actions$, _state$, zeniAPI) => actions$.pipe(f
         .getJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks?query=${encodeURIComponent(`{"task_type": "all"}`)}`)
         .pipe(mergeMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
-            const { tasks, deleted, archived, snoozed } = response.data;
+            const { tasks, deleted, archived, snoozed, completed } = response.data;
             const allTasks = [
                 ...tasks,
+                ...(completed ?? []),
                 ...(deleted ?? []),
                 ...(archived ?? []),
                 ...(snoozed ?? []),
             ];
             return of(updateTasks(allTasks), updateTaskList({
                 data: tasks,
+                completed: completed ?? [],
                 deleted: deleted ?? [],
                 archived: archived ?? [],
                 snoozed: snoozed ?? [],

package/lib/esm/view/taskManager/taskListView/taskList.js

@@ -1,6 +1,7 @@
 import { stringToUnion, stringToUnionStrict, } from '../../../commonStateTypes/stringToUnion';
 export const ALL_TASK_LIST_TABS = [
     'live',
+    'completed',
     'archived',
     'deleted',
     'snoozed',

package/lib/esm/view/taskManager/taskListView/taskListReducer.js

@@ -1,4 +1,5 @@
 import { createSlice } from '@reduxjs/toolkit';
+import { updateTasks } from '../../../entity/task/taskReducer';
 import { toPriorityCodeType, toTaskStatusCodeType, } from '../../../entity/task/taskState';
 import { date, dateNow } from '../../../zeniDayJS';
 import { toDueDateGroupKeyType, } from './taskList';
@@ -42,6 +43,7 @@ export const initialState = {
     currentTab: 'live',
     byTab: {
         live: { ...initialTabData },
+        completed: { ...initialTabData },
         archived: { ...initialTabData },
         deleted: { ...initialTabData },
         snoozed: { ...initialTabData },
@@ -63,14 +65,12 @@ export const initialState = {
     },
     filters: {
         categoryCombinationOperator: 'AND',
-        categories: [
-            {
-                field: 'status',
-                matchingOperator: 'not_equal',
-                values: ['resolved'],
-                valuesCombinationOperator: 'ANY',
-            },
-        ],
+        // Default to no filters. The Completed tab now owns the "hide resolved
+        // tasks from the live list" responsibility via the byTab split in
+        // updateTaskList / updateTaskFromListView / the updateTasks
+        // extraReducer. Keeping the historical `status != resolved` filter
+        // here would empty out the Completed tab.
+        categories: [],
     },
     hasValidState() {
         return this.fetchState == 'Completed';
@@ -102,13 +102,16 @@ const taskList = createSlice({
             draft.error = undefined;
         },
         updateTaskList(draft, action) {
-            const { data, archived, deleted, snoozed } = action.payload;
+            const { data, archived, completed, deleted, snoozed } = action.payload;
             draft.fetchState = 'Completed';
             draft.error = undefined;
             // Group live tasks
             const liveGrouped = getGroupedTaskIds(data);
             draft.byTab.live = toTabData(liveGrouped);
             // Group other tabs if provided
+            if (completed != null) {
+                draft.byTab.completed = toTabData(getGroupedTaskIds(completed));
+            }
             if (archived != null) {
                 draft.byTab.archived = toTabData(getGroupedTaskIds(archived));
             }
@@ -380,6 +383,7 @@ const taskList = createSlice({
             const taskId = task.id;
             draft.updateTasksFetchState.fetchState = 'In-Progress';
             draft.updateTasksFetchState.error = undefined;
+            let didMigrateTab = false;
             if (updates.priority != null) {
                 const prevPriorityCode = toPriorityCodeType(task.priority.code);
                 draft.taskIdsByPriority[prevPriorityCode] = draft.taskIdsByPriority[prevPriorityCode].filter((id) => id != taskId);
@@ -391,6 +395,25 @@ const taskList = createSlice({
                 draft.taskIdsByStatus[prevStatusCode] = draft.taskIdsByStatus[prevStatusCode].filter((id) => id != taskId);
                 const newStatusCode = toTaskStatusCodeType(updates.status.code);
                 draft.taskIdsByStatus[newStatusCode].push(taskId);
+                // Optimistically re-bucket between the live and completed tabs
+                // when status transitions in/out of "resolved", so the task
+                // moves to the Completed tab without waiting for the next
+                // fetch. Mirrors backend split in task_handler.py: only
+                // `resolved` counts as completed; `done` stays Active.
+                //
+                // Subtasks travel with their parent — they appear nested under
+                // the parent row, not as standalone entries in byTab.taskIds.
+                // So we only rebucket parent tasks (tasks with no parentTaskId).
+                const isParent = task.parentTaskId == null;
+                const wasCompleted = prevStatusCode === 'resolved';
+                const isCompleted = newStatusCode === 'resolved';
+                if (isParent && wasCompleted !== isCompleted) {
+                    const from = isCompleted ? 'live' : 'completed';
+                    const to = isCompleted ? 'completed' : 'live';
+                    const updatedTask = { ...task, ...updates };
+                    migrateTaskBetweenTabs(draft, taskId, updatedTask, from, to);
+                    didMigrateTab = true;
+                }
             }
             if (updates.assignees != null) {
                 const prevGroupId = getAssigneesGroupKey(task.assignees);
@@ -430,7 +453,18 @@ const taskList = createSlice({
                     };
                 }
             }
-            syncTopLevelToActiveTab(draft);
+            if (didMigrateTab) {
+                // The migration moved the task out of the source byTab and into
+                // the destination byTab. The active tab's grouping arrays are
+                // now authoritative — mirror them back to the top-level so the
+                // UI sees the task gone from Live (or freshly arrived in
+                // Completed). Inverse of syncTopLevelToActiveTab, used only on
+                // this path.
+                copyTabDataToTopLevel(draft, draft.byTab[draft.currentTab]);
+            }
+            else {
+                syncTopLevelToActiveTab(draft);
+            }
         },
         updateTasksListOnUpdateTaskSuccess(draft) {
             draft.updateTasksFetchState.fetchState = 'Completed';
@@ -447,6 +481,42 @@ const taskList = createSlice({
             Object.assign(draft, initialState);
         },
     },
+    extraReducers: (builder) => {
+        // When the entity store receives updated tasks (e.g. from task detail
+        // save, snooze/archive/unarchive, etc.), re-bucket parent tasks between
+        // the live and completed tabs based on the new status. Mirrors the
+        // backend split in task_handler.py: only `resolved` parents count as
+        // completed. Subtasks are nested under their parent row, so they
+        // never move between tabs on their own.
+        builder.addCase(updateTasks, (draft, action) => {
+            action.payload.forEach((taskPayload) => {
+                if (taskPayload.parent_task_id) {
+                    return;
+                }
+                const taskId = taskPayload.task_id;
+                const statusCode = taskPayload.status?.code;
+                const isCompleted = statusCode === 'resolved';
+                const targetTab = isCompleted ? 'completed' : 'live';
+                const otherTab = isCompleted ? 'live' : 'completed';
+                // Skip if the task isn't currently in either of these buckets
+                // (archived/snoozed/deleted are managed by their own actions).
+                const inLive = draft.byTab.live.taskIds.includes(taskId);
+                const inCompleted = draft.byTab.completed.taskIds.includes(taskId);
+                if (!inLive && !inCompleted) {
+                    return;
+                }
+                if (draft.byTab[otherTab].taskIds.includes(taskId)) {
+                    migrateTaskPayloadBetweenTabs(draft, taskId, taskPayload, otherTab, targetTab);
+                }
+                else if (!draft.byTab[targetTab].taskIds.includes(taskId)) {
+                    draft.byTab[targetTab].taskIds.push(taskId);
+                }
+            });
+            // Re-sync the top-level taskIds / grouping arrays for whichever
+            // tab the user is currently looking at.
+            copyTabDataToTopLevel(draft, draft.byTab[draft.currentTab]);
+        });
+    },
 });
 export const { fetchTaskListPage, fetchTaskList, updateTaskList, updateTaskListTab, updateTaskListFetchStatus, updateTaskListSearchText, updateTaskListUIState, updateTaskFilters, updateTaskListOnNewGroupCreationSuccess, bulkUpdateTaskList, updateTasksListOnBulkUpdateTasksSuccess, updateTasksListOnBulkUpdateTasksFailure, initiateTaskListLocalData, updateTaskListLocalData, updateTaskListOnTaskGroupDeletion, dragNDropTasks, updateTaskListOnNewTaskCreationSuccess, updateTaskListOnTaskGroupNameUpdate, updateTaskFromListView, updateTasksListOnUpdateTaskSuccess, updateTasksListOnUpdateTaskFailure, updateTaskListOnCreateTaskFromTemplateSuccess, removeTaskFromList, clearTaskList, } = taskList.actions;
 export default taskList.reducer;
@@ -555,6 +625,115 @@ const copyTabDataToTopLevel = (draft, tabData) => {
     draft.taskIdsByDueDate = tabData.taskIdsByDueDate;
     draft.taskIdsByTags = tabData.taskIdsByTags;
 };
+/**
+ * Migrate a parent task between two `byTab` buckets (live ↔ completed)
+ * when its status flips into / out of `resolved`. The destination tab
+ * picks up the task in EVERY grouping dimension (status, priority,
+ * group id, assignees, dueDate, tags) using the UPDATED task as the
+ * source-of-truth for the new bucket keys. Otherwise the Completed tab
+ * shows the task in the right tab-level list but the grouped views
+ * (Group by Status, Group by Priority, etc.) miss it until the next
+ * full fetch. See PR #3101 review.
+ */
+const migrateTaskBetweenTabs = (draft, taskId, updatedTask, from, to) => {
+    const fromTab = draft.byTab[from];
+    const toTab = draft.byTab[to];
+    // Source tab: drop the task from every grouping dimension.
+    removeIdsFromTabData(fromTab, [taskId]);
+    // Destination tab: add the task to taskIds (deduped) plus the
+    // appropriate bucket inside each grouping dimension based on the
+    // updated task.
+    if (!toTab.taskIds.includes(taskId)) {
+        toTab.taskIds.push(taskId);
+    }
+    const priorityKey = toPriorityCodeType(updatedTask.priority.code);
+    if (!toTab.taskIdsByPriority[priorityKey].includes(taskId)) {
+        toTab.taskIdsByPriority[priorityKey].push(taskId);
+    }
+    const statusKey = toTaskStatusCodeType(updatedTask.status.code);
+    if (!toTab.taskIdsByStatus[statusKey].includes(taskId)) {
+        toTab.taskIdsByStatus[statusKey].push(taskId);
+    }
+    const dueDateKey = updatedTask.dueDate != null
+        ? getDueDateGroupKey(updatedTask.dueDate.toString())
+        : 'upcoming';
+    if (!toTab.taskIdsByDueDate[dueDateKey].includes(taskId)) {
+        toTab.taskIdsByDueDate[dueDateKey].push(taskId);
+    }
+    const assigneeKey = getAssigneesGroupKey(updatedTask.assignees);
+    if (toTab.taskIdsByAssignees[assigneeKey] == null) {
+        toTab.taskIdsByAssignees[assigneeKey] = [taskId];
+    }
+    else if (!toTab.taskIdsByAssignees[assigneeKey].includes(taskId)) {
+        toTab.taskIdsByAssignees[assigneeKey].push(taskId);
+    }
+    const tagIds = [...updatedTask.tagIds].sort();
+    const tagsKey = tagIds.join(',');
+    if (toTab.taskIdsByTags[tagsKey] == null) {
+        toTab.taskIdsByTags[tagsKey] = [taskId];
+    }
+    else if (!toTab.taskIdsByTags[tagsKey].includes(taskId)) {
+        toTab.taskIdsByTags[tagsKey].push(taskId);
+    }
+    (updatedTask.taskGroupIds ?? []).forEach((groupId) => {
+        if (toTab.taskIdsByGroupsIds[groupId] == null) {
+            toTab.taskIdsByGroupsIds[groupId] = [taskId];
+        }
+        else if (!toTab.taskIdsByGroupsIds[groupId].includes(taskId)) {
+            toTab.taskIdsByGroupsIds[groupId].push(taskId);
+        }
+    });
+};
+/**
+ * `updateTasks` extraReducer variant — same migration semantics but
+ * keyed off the raw `TaskPayload` instead of the rich `Task` entity.
+ */
+const migrateTaskPayloadBetweenTabs = (draft, taskId, payload, from, to) => {
+    const fromTab = draft.byTab[from];
+    const toTab = draft.byTab[to];
+    removeIdsFromTabData(fromTab, [taskId]);
+    if (!toTab.taskIds.includes(taskId)) {
+        toTab.taskIds.push(taskId);
+    }
+    if (payload.priority?.code != null) {
+        const priorityKey = toPriorityCodeType(payload.priority.code);
+        if (!toTab.taskIdsByPriority[priorityKey].includes(taskId)) {
+            toTab.taskIdsByPriority[priorityKey].push(taskId);
+        }
+    }
+    if (payload.status?.code != null) {
+        const statusKey = toTaskStatusCodeType(payload.status.code);
+        if (!toTab.taskIdsByStatus[statusKey].includes(taskId)) {
+            toTab.taskIdsByStatus[statusKey].push(taskId);
+        }
+    }
+    const dueDateKey = getDueDateGroupKey(payload.due_date);
+    if (!toTab.taskIdsByDueDate[dueDateKey].includes(taskId)) {
+        toTab.taskIdsByDueDate[dueDateKey].push(taskId);
+    }
+    const assigneeKey = getAssigneesGroupKey(payload.assignees ?? []);
+    if (toTab.taskIdsByAssignees[assigneeKey] == null) {
+        toTab.taskIdsByAssignees[assigneeKey] = [taskId];
+    }
+    else if (!toTab.taskIdsByAssignees[assigneeKey].includes(taskId)) {
+        toTab.taskIdsByAssignees[assigneeKey].push(taskId);
+    }
+    const tagsKey = getTagsGroupKey(payload.tags ?? []);
+    if (toTab.taskIdsByTags[tagsKey] == null) {
+        toTab.taskIdsByTags[tagsKey] = [taskId];
+    }
+    else if (!toTab.taskIdsByTags[tagsKey].includes(taskId)) {
+        toTab.taskIdsByTags[tagsKey].push(taskId);
+    }
+    (payload.task_group_ids ?? []).forEach((groupId) => {
+        if (toTab.taskIdsByGroupsIds[groupId] == null) {
+            toTab.taskIdsByGroupsIds[groupId] = [taskId];
+        }
+        else if (!toTab.taskIdsByGroupsIds[groupId].includes(taskId)) {
+            toTab.taskIdsByGroupsIds[groupId].push(taskId);
+        }
+    });
+};
 const removeIdsFromTabData = (tabData, taskIds) => {
     const removedSet = new Set(taskIds);
     const isRemoved = (id) => removedSet.has(id);

package/lib/esm/view/taskManager/taskListView/taskListSelector.js

@@ -334,6 +334,7 @@ export const getAllTasks = createSelector((state) => state.taskListState, (state
     const taskGroupTemplates = getTaskGroupTemplateByIds(taskGroupTemplateState, taskGroupTemplateViewState.taskGroupTemplateIds);
     const tabCounts = {
         live: taskListState.byTab.live.taskIds.length,
+        completed: taskListState.byTab.completed.taskIds.length,
         archived: taskListState.byTab.archived.taskIds.length,
         deleted: taskListState.byTab.deleted.taskIds.length,
         snoozed: taskListState.byTab.snoozed.taskIds.length,