@zeniai/client-epic-state 5.1.44 → 5.1.45-betaDI2

package/lib/entity/task/taskPayload.d.ts

@@ -22,6 +22,7 @@ export interface TaskPayload {
     update_time: string | null;
     company_id?: string;
     company_name?: string;
+    depth?: number | null;
     group_assignees?: string[];
     parent_task_id?: string | null;
     recurring_days_of_week?: string[] | null;

package/lib/entity/task/taskPayload.js

@@ -45,6 +45,14 @@ const mapTaskPayloadToTask = (payload, previousTask) => ({
     updateTime: payload.update_time != null ? (0, zeniDayJS_1.date)(payload.update_time) : undefined,
     companyId: payload.company_id,
     companyName: payload.company_name,
+    // `depth` may be absent on partial updates (e.g. pusher-driven task
+    // refreshes that don't include it). Preserve the previously-known depth
+    // there — otherwise the Redux store's depth flips to undefined and any
+    // WC depth-cap gate ("hide Create Subtask at depth 3") re-opens
+    // incorrectly. Explicit `null` from the BE still clears it via `??`.
+    depth: payload.depth !== undefined
+        ? (payload.depth ?? undefined)
+        : previousTask?.depth,
     parentTaskId: payload.parent_task_id ?? undefined,
     recurringSourceTaskId: payload.recurring_source_task_id != null
         ? payload.recurring_source_task_id

package/lib/entity/task/taskState.d.ts

@@ -23,6 +23,7 @@ export interface Task {
     type: TaskType;
     companyId?: ID;
     companyName?: string;
+    depth?: number;
     dueDate?: ZeniDate;
     parentTaskId?: ID | null;
     recurringDaysOfWeek?: DayOfWeek[];

package/lib/esm/entity/task/taskPayload.js

@@ -42,6 +42,14 @@ export const mapTaskPayloadToTask = (payload, previousTask) => ({
     updateTime: payload.update_time != null ? date(payload.update_time) : undefined,
     companyId: payload.company_id,
     companyName: payload.company_name,
+    // `depth` may be absent on partial updates (e.g. pusher-driven task
+    // refreshes that don't include it). Preserve the previously-known depth
+    // there — otherwise the Redux store's depth flips to undefined and any
+    // WC depth-cap gate ("hide Create Subtask at depth 3") re-opens
+    // incorrectly. Explicit `null` from the BE still clears it via `??`.
+    depth: payload.depth !== undefined
+        ? (payload.depth ?? undefined)
+        : previousTask?.depth,
     parentTaskId: payload.parent_task_id ?? undefined,
     recurringSourceTaskId: payload.recurring_source_task_id != null
         ? payload.recurring_source_task_id

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

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

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

@@ -824,13 +824,38 @@ const getGroupedTaskIds = (tasks) => {
         ...initialTaskIdsByDueDate,
     };
     const taskIdsByTags = {};
+    // 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.
+    const nestedSubtaskIds = new Set();
     tasks.forEach((task) => {
-        taskIds.push(task.task_id);
+        (task.subtasks ?? []).forEach((subtaskId) => nestedSubtaskIds.add(subtaskId));
+    });
+    tasks.forEach((task) => {
+        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 = toPriorityCodeType(task.priority.code);
         const statusKey = 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/taskDetailView/epics/initializeTaskToLocalStoreEpic.js

@@ -35,6 +35,7 @@ const initializeTaskToLocalStoreEpic = (actions$, state$) => actions$.pipe((0, o
             timeSpent: task.timeSpent,
             isPrivate: task.isPrivate,
             taskGroupId: task.taskGroupIds[0],
+            depth: task.depth,
         };
         const actions = [
             (0, taskDetailReducer_1.saveTaskUpdatesToLocalStore)({ taskDetailLocalData, taskId }),

package/lib/view/taskManager/taskDetailView/taskDetail.d.ts

@@ -47,6 +47,7 @@ export interface EditTaskLocalData {
     tagIds: ID[];
     timeSpent: string;
     type: TaskType;
+    depth?: number;
     dueDate?: ZeniDate;
     isPrivate?: boolean;
     recurringDaysOfWeek?: DayOfWeek[];

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

@@ -828,13 +828,38 @@ const getGroupedTaskIds = (tasks) => {
         ...initialTaskIdsByDueDate,
     };
     const taskIdsByTags = {};
+    // 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.
+    const nestedSubtaskIds = new Set();
     tasks.forEach((task) => {
-        taskIds.push(task.task_id);
+        (task.subtasks ?? []).forEach((subtaskId) => nestedSubtaskIds.add(subtaskId));
+    });
+    tasks.forEach((task) => {
+        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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.1.44",
+  "version": "5.1.45-betaDI2",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",