@zeniai/client-epic-state 5.1.45 → 5.1.46

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

@@ -30,40 +30,58 @@ const getTaskDetail = (state, taskId) => {
     let createdByUser = undefined;
     let isArchived = undefined;
     let isDeleted = undefined;
+    let depth = undefined;
     let recurringSourceTaskId = undefined;
     let snoozedUntil = undefined;
     let taskGroupId = undefined;
+    let subtasks = [];
     if (taskId != null && sourceTaskDetail != null) {
         const taskEntity = (0, taskSelector_1.getTaskById)(taskState, taskId);
+        subtasks =
+            taskEntity != null
+                ? (0, taskSelector_1.getTasksByIds)(taskState, taskEntity.subTasksIds)
+                : [];
         const fileIdsInEntity = taskEntity?.fileIds ?? [];
         if (taskEntity != null) {
             createdByUser = (0, userAndRole_1.getUserAndUserRole)(userState, userRoleState, addressState, taskEntity.createdBy);
+            depth = taskEntity.depth;
             isArchived = taskEntity.isArchived;
             isDeleted = taskEntity.isDeleted;
             recurringSourceTaskId = taskEntity.recurringSourceTaskId;
             snoozedUntil = taskEntity.snoozedUntil;
             taskGroupId = taskEntity.taskGroupIds[0];
         }
+        // Treat "no entry" as Completed so it doesn't block the combined
+        // fetch state. The Not-Started default would pin the detail page
+        // below Completed forever before the first fetchSubTasks dispatches.
+        const completedSubTaskStatus = {
+            fetchState: 'Completed',
+            error: undefined,
+        };
+        const subTaskStatus = taskDetailState.subTaskListFetchStatusByParentId[taskId] ??
+            completedSubTaskStatus;
         if (fileIdsInEntity.length > 0) {
-            fetchStatus = (0, reduceFetchState_1.reduceFetchState)([
+            fetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([
                 fileViewState.fetchFilesStatus,
                 sourceTaskDetail.fetchTaskStatus,
                 userList,
                 classListState,
+                subTaskStatus,
             ]);
         }
         else {
-            fetchStatus = (0, reduceFetchState_1.reduceFetchState)([
+            fetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([
                 sourceTaskDetail.fetchTaskStatus,
                 userList,
                 classListState,
+                subTaskStatus,
             ]);
         }
         showTaskDetailFormFooter = showFormFooter(sourceTaskDetail.taskDetailLocalData, taskEntity);
         taskHistory = taskDetailState.taskHistoryById[taskId]?.historicEvents ?? [];
     }
     else if (taskId == null) {
-        fetchStatus = (0, reduceFetchState_1.reduceFetchState)([userList, classListState]);
+        fetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([userList, classListState]);
     }
     const { classIds } = classListState;
     const allAccountingClasses = (0, classSelector_1.getClassesByIds)(classState, {
@@ -90,12 +108,14 @@ const getTaskDetail = (state, taskId) => {
         error: fetchStatus.error,
         version: 0,
         createdByUser,
+        depth,
         isArchived,
         isDeleted,
         recurringSourceTaskId,
         showTaskDetailFormFooter,
         snoozedUntil,
         taskGroupId,
+        subtasks,
     };
 };
 exports.getTaskDetail = getTaskDetail;
@@ -144,13 +164,16 @@ exports.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 ||
         !(0, isEqual_1.default)(taskDetailInStore.tagIds, taskDetailLocalData.tagIds) ||
-        !(0, isEqual_1.default)(taskDetailLocalData.assignee, taskDetailInStore?.assignees ?? []) ||
-        !(0, isEqual_1.default)(taskDetailLocalData.groupAssignees, taskDetailInStore?.groupAssignees ?? []) ||
+        !(0, isEqual_1.default)(taskDetailLocalData.assignee, taskDetailInStore.assignees ?? []) ||
+        !(0, isEqual_1.default)(taskDetailLocalData.groupAssignees, taskDetailInStore.groupAssignees ?? []) ||
         !(0, isEqual_1.default)(taskDetailLocalData.fileIds, taskDetailInStore.fileIds ?? []) ||
         !(0, isEqual_1.default)(taskDetailLocalData.dueDate, taskDetailInStore.dueDate) ||
         !(0, isEqual_1.default)(taskDetailLocalData.type, taskDetailInStore.type) ||
@@ -158,7 +181,10 @@ const showFormFooter = (taskDetailLocalData, taskDetailInStore) => {
         !(0, isEqual_1.default)(taskDetailLocalData.recurringFrequency, taskDetailInStore.recurringFrequency) ||
         !(0, isEqual_1.default)(taskDetailLocalData.recurringDaysOfWeek, taskDetailInStore.recurringDaysOfWeek) ||
         !(0, isEqual_1.default)(taskDetailLocalData.recurringStartDate, taskDetailInStore.recurringStartDate) ||
-        !(0, isEqual_1.default)(taskDetailLocalData.timeSpent, taskDetailInStore.timeSpent)) {
+        !(0, isEqual_1.default)(taskDetailLocalData.timeSpent, taskDetailInStore.timeSpent) ||
+        !(0, isEqual_1.default)(taskDetailLocalData.taskGroupId, taskDetailInStore.taskGroupIds.length > 0
+            ? taskDetailInStore.taskGroupIds[0]
+            : undefined)) {
         return true;
     }
     return false;

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

@@ -12,15 +12,17 @@ const fetchTaskListEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, oper
         .getJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks?query=${encodeURIComponent(`{"task_type": "all"}`)}`)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.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 (0, rxjs_1.of)((0, taskReducer_1.updateTasks)(allTasks), (0, taskListReducer_1.updateTaskList)({
                 data: tasks,
+                completed: completed ?? [],
                 deleted: deleted ?? [],
                 archived: archived ?? [],
                 snoozed: snoozed ?? [],

package/lib/view/taskManager/taskListView/taskList.d.ts

@@ -3,7 +3,7 @@ import { PriorityCodeType, TaskStatusCodeType } from '../../../entity/task/taskS
 import { ZeniDate } from '../../../zeniDayJS';
 import { SpendManagementUIState } from '../../spendManagement/billPay/billList/billListState';
 import { CategoryCombinationOperator, FilterCategoryType } from '../../spendManagement/spendManagementFilterHelpers';
-export declare const ALL_TASK_LIST_TABS: readonly ["live", "archived", "deleted", "snoozed"];
+export declare const ALL_TASK_LIST_TABS: readonly ["live", "completed", "archived", "deleted", "snoozed"];
 export type TaskListTab = (typeof ALL_TASK_LIST_TABS)[number];
 export interface TaskListTabData {
     taskIds: ID[];

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

@@ -4,6 +4,7 @@ exports.TASK_LIST_GROUP_BY_CATEGORIES = exports.TASK_LIST_FILTER_CATEGORIES = ex
 const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
 exports.ALL_TASK_LIST_TABS = [
     'live',
+    'completed',
     'archived',
     'deleted',
     'snoozed',

package/lib/view/taskManager/taskListView/taskListPayload.d.ts

@@ -3,6 +3,10 @@ import { ZeniAPIResponse } from '../../../responsePayload';
 interface FetchTaskListPayload {
     tasks: TaskPayload[];
     archived?: TaskPayload[];
+    /** Tasks whose status is "done" or "resolved". Returned as a separate
+     *  bucket so the "Completed" tab can show them without duplicating
+     *  them under Active. */
+    completed?: TaskPayload[];
     deleted?: TaskPayload[];
     snoozed?: TaskPayload[];
 }

package/lib/view/taskManager/taskListView/taskListReducer.d.ts

@@ -12,9 +12,10 @@ export declare const fetchTaskListPage: import("@reduxjs/toolkit").ActionCreator
 }, "taskList/fetchTaskListPage", never, never>, fetchTaskList: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"taskList/fetchTaskList">, updateTaskList: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     data: TaskPayload[];
     archived?: TaskPayload[];
+    completed?: TaskPayload[];
     deleted?: TaskPayload[];
     snoozed?: TaskPayload[];
-}, "taskList/updateTaskList">, updateTaskListTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"deleted" | "archived" | "live" | "snoozed", "taskList/updateTaskListTab">, updateTaskListFetchStatus: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, "taskList/updateTaskList">, updateTaskListTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"completed" | "deleted" | "archived" | "live" | "snoozed", "taskList/updateTaskListTab">, updateTaskListFetchStatus: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     fetchState: FetchState;
     error?: ZeniAPIStatus;
 }, "taskList/updateTaskListFetchStatus">, updateTaskListSearchText: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
@@ -58,6 +59,9 @@ export declare const fetchTaskListPage: import("@reduxjs/toolkit").ActionCreator
     error: ZeniAPIStatus;
 }, "taskList/updateTasksListOnUpdateTaskFailure">, updateTaskListOnCreateTaskFromTemplateSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     tasks: TaskPayload[];
-}, "taskList/updateTaskListOnCreateTaskFromTemplateSuccess">, removeTaskFromList: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "taskList/removeTaskFromList">, clearTaskList: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"taskList/clearTaskList">;
+}, "taskList/updateTaskListOnCreateTaskFromTemplateSuccess">, removeTaskFromList: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "taskList/removeTaskFromList">, removeTaskFromGroupBucket: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    taskGroupId: ID;
+    taskId: ID;
+}, "taskList/removeTaskFromGroupBucket">, clearTaskList: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"taskList/clearTaskList">;
 declare const _default: import("redux").Reducer<TaskListState>;
 export default _default;

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

@@ -1,8 +1,9 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearTaskList = exports.removeTaskFromList = exports.updateTaskListOnCreateTaskFromTemplateSuccess = exports.updateTasksListOnUpdateTaskFailure = exports.updateTasksListOnUpdateTaskSuccess = exports.updateTaskFromListView = exports.updateTaskListOnTaskGroupNameUpdate = exports.updateTaskListOnNewTaskCreationSuccess = exports.dragNDropTasks = exports.updateTaskListOnTaskGroupDeletion = exports.updateTaskListLocalData = exports.initiateTaskListLocalData = exports.updateTasksListOnBulkUpdateTasksFailure = exports.updateTasksListOnBulkUpdateTasksSuccess = exports.bulkUpdateTaskList = exports.updateTaskListOnNewGroupCreationSuccess = exports.updateTaskFilters = exports.updateTaskListUIState = exports.updateTaskListSearchText = exports.updateTaskListFetchStatus = exports.updateTaskListTab = exports.updateTaskList = exports.fetchTaskList = exports.fetchTaskListPage = exports.initialState = void 0;
+exports.clearTaskList = exports.removeTaskFromGroupBucket = exports.removeTaskFromList = exports.updateTaskListOnCreateTaskFromTemplateSuccess = exports.updateTasksListOnUpdateTaskFailure = exports.updateTasksListOnUpdateTaskSuccess = exports.updateTaskFromListView = exports.updateTaskListOnTaskGroupNameUpdate = exports.updateTaskListOnNewTaskCreationSuccess = exports.dragNDropTasks = exports.updateTaskListOnTaskGroupDeletion = exports.updateTaskListLocalData = exports.initiateTaskListLocalData = exports.updateTasksListOnBulkUpdateTasksFailure = exports.updateTasksListOnBulkUpdateTasksSuccess = exports.bulkUpdateTaskList = exports.updateTaskListOnNewGroupCreationSuccess = exports.updateTaskFilters = exports.updateTaskListUIState = exports.updateTaskListSearchText = exports.updateTaskListFetchStatus = exports.updateTaskListTab = exports.updateTaskList = exports.fetchTaskList = exports.fetchTaskListPage = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
+const taskReducer_1 = require("../../../entity/task/taskReducer");
 const taskState_1 = require("../../../entity/task/taskState");
 const zeniDayJS_1 = require("../../../zeniDayJS");
 const taskList_1 = require("./taskList");
@@ -46,6 +47,7 @@ exports.initialState = {
     currentTab: 'live',
     byTab: {
         live: { ...initialTabData },
+        completed: { ...initialTabData },
         archived: { ...initialTabData },
         deleted: { ...initialTabData },
         snoozed: { ...initialTabData },
@@ -67,14 +69,12 @@ exports.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';
@@ -106,21 +106,37 @@ const taskList = (0, toolkit_1.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;
+            // Build the nested-subtask set from the UNION of every bucket in
+            // this payload — not per-bucket. A resolved subtask can arrive in
+            // `completed` while its parent (which claims it via `subtasks`)
+            // is still in `data`; a per-bucket scan would miss the cross-tab
+            // claim and surface the subtask as a phantom top-level row in
+            // the Completed tab.
+            const nestedSubtaskIds = collectNestedSubtaskIds([
+                data,
+                completed,
+                archived,
+                deleted,
+                snoozed,
+            ]);
             // Group live tasks
-            const liveGrouped = getGroupedTaskIds(data);
+            const liveGrouped = getGroupedTaskIds(data, nestedSubtaskIds);
             draft.byTab.live = toTabData(liveGrouped);
             // Group other tabs if provided
+            if (completed != null) {
+                draft.byTab.completed = toTabData(getGroupedTaskIds(completed, nestedSubtaskIds));
+            }
             if (archived != null) {
-                draft.byTab.archived = toTabData(getGroupedTaskIds(archived));
+                draft.byTab.archived = toTabData(getGroupedTaskIds(archived, nestedSubtaskIds));
             }
             if (deleted != null) {
-                draft.byTab.deleted = toTabData(getGroupedTaskIds(deleted));
+                draft.byTab.deleted = toTabData(getGroupedTaskIds(deleted, nestedSubtaskIds));
             }
             if (snoozed != null) {
-                draft.byTab.snoozed = toTabData(getGroupedTaskIds(snoozed));
+                draft.byTab.snoozed = toTabData(getGroupedTaskIds(snoozed, nestedSubtaskIds));
             }
             // Copy active tab data to top-level fields
             const activeTabData = draft.byTab[draft.currentTab];
@@ -358,9 +374,26 @@ const taskList = (0, toolkit_1.createSlice)({
                 draft.taskIdsByAssignees[assigneeKey] = draft.taskIdsByAssignees[assigneeKey].filter((taskId) => taskId !== currentTaskState.id);
                 draft.taskIdsByTags[tagsKey] = draft.taskIdsByTags[tagsKey].filter((taskId) => taskId !== currentTaskState.id);
                 draft.taskIdsByDueDate[dueDateKey] = draft.taskIdsByDueDate[dueDateKey].filter((taskId) => taskId !== currentTaskState.id);
-                draft.taskIdsByGroupsIds[taskGroupId] = draft.taskIdsByGroupsIds[taskGroupId].filter((taskId) => taskId !== currentTaskState.id);
+                // Remove from EVERY previous group bucket the task lived in, not
+                // just the destination bucket. Otherwise a detail-page save that
+                // moves a task from group A to group B leaves the row listed
+                // under both A and B until refetch.
+                const previousGroupIds = currentTaskState.taskGroupIds ?? [];
+                const allGroupIdsToClean = new Set([
+                    ...previousGroupIds,
+                    taskGroupId,
+                ]);
+                allGroupIdsToClean.forEach((gid) => {
+                    if (draft.taskIdsByGroupsIds[gid] != null) {
+                        draft.taskIdsByGroupsIds[gid] = draft.taskIdsByGroupsIds[gid].filter((id) => id !== currentTaskState.id);
+                    }
+                });
             }
             doUpdateTaskList(draft, task, taskGroupId);
+            // Mirror top-level grouping into the active tab's byTab snapshot,
+            // otherwise the next updateTaskListTab call copies stale byTab data
+            // back over this optimistic update.
+            syncTopLevelToActiveTab(draft);
         },
         updateTaskListOnCreateTaskFromTemplateSuccess(draft, action) {
             const { tasks } = action.payload;
@@ -384,6 +417,7 @@ const taskList = (0, toolkit_1.createSlice)({
             const taskId = task.id;
             draft.updateTasksFetchState.fetchState = 'In-Progress';
             draft.updateTasksFetchState.error = undefined;
+            let didMigrateTab = false;
             if (updates.priority != null) {
                 const prevPriorityCode = (0, taskState_1.toPriorityCodeType)(task.priority.code);
                 draft.taskIdsByPriority[prevPriorityCode] = draft.taskIdsByPriority[prevPriorityCode].filter((id) => id != taskId);
@@ -395,6 +429,32 @@ const taskList = (0, toolkit_1.createSlice)({
                 draft.taskIdsByStatus[prevStatusCode] = draft.taskIdsByStatus[prevStatusCode].filter((id) => id != taskId);
                 const newStatusCode = (0, taskState_1.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.
+                //
+                // "Top-level" here means: currently rendered as a standalone
+                // row in the live or completed tab (i.e. present in
+                // `byTab.<tab>.taskIds`). We use presence in byTab — NOT a
+                // `parent_task_id == null` check — so orphan subtasks (parent
+                // hidden from the customer's payload, so we render them flat)
+                // ALSO migrate between tabs on status flip. This matches the
+                // criterion `getGroupedTaskIds` uses when it builds byTab from
+                // the initial fetch — a task is nested iff a visible parent's
+                // `subtasks` array claims it, otherwise it's top-level here.
+                const isTopLevelTask = draft.byTab.live.taskIds.includes(taskId) ||
+                    draft.byTab.completed.taskIds.includes(taskId);
+                const wasCompleted = prevStatusCode === 'resolved';
+                const isCompleted = newStatusCode === 'resolved';
+                if (isTopLevelTask && 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);
@@ -434,7 +494,18 @@ const taskList = (0, toolkit_1.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,12 +518,83 @@ const taskList = (0, toolkit_1.createSlice)({
         removeTaskFromList(draft, action) {
             removeTaskIds(draft, [action.payload]);
         },
+        /**
+         * Remove a task id from a single group bucket without touching tab
+         * membership or other groupings. Used when the user clears a task's
+         * group on the Detail page so the row stops appearing under the old
+         * group while saveTaskDetailEpic skips the standard list re-insert.
+         */
+        removeTaskFromGroupBucket(draft, action) {
+            const { taskId, taskGroupId } = action.payload;
+            if (draft.taskIdsByGroupsIds[taskGroupId] != null) {
+                draft.taskIdsByGroupsIds[taskGroupId] = draft.taskIdsByGroupsIds[taskGroupId].filter((id) => id !== taskId);
+            }
+            // Mirror to the active tab's grouping so the UI re-renders.
+            const activeTab = draft.byTab[draft.currentTab];
+            if (activeTab.taskIdsByGroupsIds[taskGroupId] != null) {
+                activeTab.taskIdsByGroupsIds[taskGroupId] =
+                    activeTab.taskIdsByGroupsIds[taskGroupId].filter((id) => id !== taskId);
+            }
+        },
         clearTaskList(draft) {
             Object.assign(draft, exports.initialState);
         },
     },
+    extraReducers: (builder) => {
+        // When the entity store receives updated tasks (e.g. from task detail
+        // save, snooze/archive/unarchive, etc.), re-bucket top-level tasks
+        // between the live and completed tabs based on the new status. Mirrors
+        // the backend split in task_handler.py: only `resolved` counts as
+        // completed.
+        //
+        // "Top-level" here means: currently rendered as a standalone row in
+        // the live or completed tab (i.e. present in
+        // `byTab.<tab>.taskIds`). Tasks that are nested under a parent's
+        // expanded subtask row live outside byTab.taskIds and are silently
+        // skipped by the "in-bucket" check below. This uses the same
+        // criterion as `getGroupedTaskIds` — a task is nested iff a visible
+        // parent's `subtasks` array claims it, otherwise it's top-level —
+        // so orphan subtasks (parent hidden from the customer's payload)
+        // migrate correctly on status flip via pusher / detail-save.
+        builder.addCase(taskReducer_1.updateTasks, (draft, action) => {
+            action.payload.forEach((taskPayload) => {
+                const taskId = taskPayload.task_id;
+                // `TaskPayload.status` is required per the type — every producer
+                // in this repo sends it, and `mapTaskPayloadToTask` dereferences
+                // it unguarded. The optional chain + null guard are defensive
+                // only, in case a downstream consumer (web-app-ui / cockpit-ui)
+                // ever dispatches `updateTasks` with a partial payload; in that
+                // case we treat missing status as "no status change" and skip
+                // re-bucketing so we don't migrate a Completed task back into
+                // the Live tab.
+                const statusCode = taskPayload.status?.code;
+                if (statusCode == null) {
+                    return;
+                }
+                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]);
+        });
+    },
 });
-_a = taskList.actions, exports.fetchTaskListPage = _a.fetchTaskListPage, exports.fetchTaskList = _a.fetchTaskList, exports.updateTaskList = _a.updateTaskList, exports.updateTaskListTab = _a.updateTaskListTab, exports.updateTaskListFetchStatus = _a.updateTaskListFetchStatus, exports.updateTaskListSearchText = _a.updateTaskListSearchText, exports.updateTaskListUIState = _a.updateTaskListUIState, exports.updateTaskFilters = _a.updateTaskFilters, exports.updateTaskListOnNewGroupCreationSuccess = _a.updateTaskListOnNewGroupCreationSuccess, exports.bulkUpdateTaskList = _a.bulkUpdateTaskList, exports.updateTasksListOnBulkUpdateTasksSuccess = _a.updateTasksListOnBulkUpdateTasksSuccess, exports.updateTasksListOnBulkUpdateTasksFailure = _a.updateTasksListOnBulkUpdateTasksFailure, exports.initiateTaskListLocalData = _a.initiateTaskListLocalData, exports.updateTaskListLocalData = _a.updateTaskListLocalData, exports.updateTaskListOnTaskGroupDeletion = _a.updateTaskListOnTaskGroupDeletion, exports.dragNDropTasks = _a.dragNDropTasks, exports.updateTaskListOnNewTaskCreationSuccess = _a.updateTaskListOnNewTaskCreationSuccess, exports.updateTaskListOnTaskGroupNameUpdate = _a.updateTaskListOnTaskGroupNameUpdate, exports.updateTaskFromListView = _a.updateTaskFromListView, exports.updateTasksListOnUpdateTaskSuccess = _a.updateTasksListOnUpdateTaskSuccess, exports.updateTasksListOnUpdateTaskFailure = _a.updateTasksListOnUpdateTaskFailure, exports.updateTaskListOnCreateTaskFromTemplateSuccess = _a.updateTaskListOnCreateTaskFromTemplateSuccess, exports.removeTaskFromList = _a.removeTaskFromList, exports.clearTaskList = _a.clearTaskList;
+_a = taskList.actions, exports.fetchTaskListPage = _a.fetchTaskListPage, exports.fetchTaskList = _a.fetchTaskList, exports.updateTaskList = _a.updateTaskList, exports.updateTaskListTab = _a.updateTaskListTab, exports.updateTaskListFetchStatus = _a.updateTaskListFetchStatus, exports.updateTaskListSearchText = _a.updateTaskListSearchText, exports.updateTaskListUIState = _a.updateTaskListUIState, exports.updateTaskFilters = _a.updateTaskFilters, exports.updateTaskListOnNewGroupCreationSuccess = _a.updateTaskListOnNewGroupCreationSuccess, exports.bulkUpdateTaskList = _a.bulkUpdateTaskList, exports.updateTasksListOnBulkUpdateTasksSuccess = _a.updateTasksListOnBulkUpdateTasksSuccess, exports.updateTasksListOnBulkUpdateTasksFailure = _a.updateTasksListOnBulkUpdateTasksFailure, exports.initiateTaskListLocalData = _a.initiateTaskListLocalData, exports.updateTaskListLocalData = _a.updateTaskListLocalData, exports.updateTaskListOnTaskGroupDeletion = _a.updateTaskListOnTaskGroupDeletion, exports.dragNDropTasks = _a.dragNDropTasks, exports.updateTaskListOnNewTaskCreationSuccess = _a.updateTaskListOnNewTaskCreationSuccess, exports.updateTaskListOnTaskGroupNameUpdate = _a.updateTaskListOnTaskGroupNameUpdate, exports.updateTaskFromListView = _a.updateTaskFromListView, exports.updateTasksListOnUpdateTaskSuccess = _a.updateTasksListOnUpdateTaskSuccess, exports.updateTasksListOnUpdateTaskFailure = _a.updateTasksListOnUpdateTaskFailure, exports.updateTaskListOnCreateTaskFromTemplateSuccess = _a.updateTaskListOnCreateTaskFromTemplateSuccess, exports.removeTaskFromList = _a.removeTaskFromList, exports.removeTaskFromGroupBucket = _a.removeTaskFromGroupBucket, exports.clearTaskList = _a.clearTaskList;
 exports.default = taskList.reducer;
 /**
  *  helpers
@@ -559,6 +701,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.
+ */
+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 = (0, taskState_1.toPriorityCodeType)(updatedTask.priority.code);
+    if (!toTab.taskIdsByPriority[priorityKey].includes(taskId)) {
+        toTab.taskIdsByPriority[priorityKey].push(taskId);
+    }
+    const statusKey = (0, taskState_1.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 = (0, taskState_1.toPriorityCodeType)(payload.priority.code);
+        if (!toTab.taskIdsByPriority[priorityKey].includes(taskId)) {
+            toTab.taskIdsByPriority[priorityKey].push(taskId);
+        }
+    }
+    if (payload.status?.code != null) {
+        const statusKey = (0, taskState_1.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);
@@ -586,7 +837,39 @@ const removeTaskIds = (draft, taskIds) => {
     removeIdsFromTabData(draft, taskIds);
     removeIdsFromTabData(draft.byTab[draft.currentTab], taskIds);
 };
-const getGroupedTaskIds = (tasks) => {
+// Collect the union of subtask ids claimed by any parent across every
+// bucket in the payload. See the callsite in `updateTaskList` for why
+// this must be cross-bucket rather than per-bucket.
+const collectNestedSubtaskIds = (buckets) => {
+    const nestedSubtaskIds = new Set();
+    buckets.forEach((bucket) => {
+        if (bucket == null) {
+            return;
+        }
+        bucket.forEach((task) => {
+            (task.subtasks ?? []).forEach((subtaskId) => nestedSubtaskIds.add(subtaskId));
+        });
+    });
+    return nestedSubtaskIds;
+};
+// A task is a "nested subtask" (hidden from the flat top-level list +
+// dropped from the tab count) iff a parent in the same payload claims
+// it via its `subtasks: [...]` array. Match this criterion exactly to
+// WC's `allSubtaskIds` union in TaskManagementPage.tsx — otherwise
+// the tab count and the visible top-level row count disagree
+// whenever the BE emits `parent_task_id` on a subtask but omits it
+// from the parent's `subtasks` array (a real inconsistency this UI
+// sees today).
+//
+// Using `parent_task_id` here would sometimes drop a task from the
+// count that WC still renders as a flat top-level row — that's the
+// bug we're fixing.
+//
+// `nestedSubtaskIds` is passed in from the caller and covers subtasks
+// claimed by parents in ANY bucket (live/completed/archived/deleted/
+// snoozed), so a subtask resolved into `completed` while its parent
+// stays in `data` is still correctly recognized as nested.
+const getGroupedTaskIds = (tasks, nestedSubtaskIds) => {
     const taskIds = [];
     const taskIdsByGroupIds = {};
     const taskIdsByAssignees = {};
@@ -601,12 +884,21 @@ const getGroupedTaskIds = (tasks) => {
     };
     const taskIdsByTags = {};
     tasks.forEach((task) => {
-        taskIds.push(task.task_id);
+        const isNestedSubtask = nestedSubtaskIds.has(task.task_id);
+        // Subtasks stay in every groupBy array so the UI can render them
+        // nested under their parent (WC's TaskManagementPage builds
+        // `subtasksByParentId` from `group.tasks` and then filters them
+        // out of top-level rows via `filterOutSubtasks`). Only the flat
+        // top-level `taskIds` array — which drives the Active/Completed/…
+        // tab counts — must exclude nested subtasks.
         const priorityKey = (0, taskState_1.toPriorityCodeType)(task.priority.code);
         const statusKey = (0, taskState_1.toTaskStatusCodeType)(task.status.code);
         const assigneeKey = getAssigneesGroupKey(task.assignees);
         const dueDateKey = getDueDateGroupKey(task.due_date);
         const tagsKey = getTagsGroupKey(task.tags);
+        if (!isNestedSubtask) {
+            taskIds.push(task.task_id);
+        }
         taskIdsGroupedByPriority[priorityKey] = [
             ...taskIdsGroupedByPriority[priorityKey],
             task.task_id,

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

@@ -342,6 +342,7 @@ exports.getAllTasks = (0, toolkit_1.createSelector)((state) => state.taskListSta
     const taskGroupTemplates = (0, taskGroupTemplateSelector_1.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,

package/lib/view/taskManager/taskListView/taskListViewHelpers.d.ts

@@ -1,5 +1,16 @@
+import { Tag } from '../../../entity/tag/tagState';
 import { Task } from '../../../entity/task/taskState';
+import { User } from '../../../entity/user/userState';
 import { ZeniDate } from '../../../zeniDayJS';
 import { TaskGroupKey } from './taskList';
+export type SubtaskSortKey = 'name' | 'status' | 'assignee' | 'tag';
+export type SubtaskSortOrder = 'asc' | 'desc';
 export declare const getDueDateValueFromDueDateGroupId: (groupId: string) => ZeniDate;
 export declare const getTaskUpdates: (groupByKey: TaskGroupKey, groupId: string) => Partial<Task>;
+/**
+ * Sort a subtask list by one of the sortable columns. Pure — no state
+ * dependency. `statusOrder` is derived from `allTaskStatus` so any new
+ * status added upstream slots in by its enum position instead of
+ * falling into a catch-all bucket.
+ */
+export declare const sortSubtasks: (subtasks: Task[], sortKey: SubtaskSortKey | null, sortOrder: SubtaskSortOrder, userList: User[], tagList: Tag[]) => Task[];