@zeniai/client-epic-state 5.1.41-beta0ND → 5.1.41-betaDI3

package/lib/view/tagView/epics/deleteTagEpic.d.ts

@@ -6,9 +6,9 @@ import { deleteTag, updateDeleteTagStatus } from '../tagViewReducer';
 export type ActionType = ReturnType<typeof deleteTag> | ReturnType<typeof updateDeleteTagStatus> | ReturnType<typeof updateTags>;
 export declare const deleteTagEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => import("rxjs").Observable<{
     payload: {
-        messageSection: import("../../../entity/snackbar/snackbarTypes").SnackbarMessageSections;
-        messageText: import("../../../entity/snackbar/snackbarTypes").SnackbarMessageSectionTexts;
-        type: import("../../../entity/snackbar/snackbarTypes").SnackbarMessageType;
+        messageSection: import("../../..").SnackbarMessageSections;
+        messageText: import("../../..").SnackbarMessageSectionTexts;
+        type: import("../../..").SnackbarMessageType;
         showStatusIcon?: boolean;
         variables?: {
             variableName: string;
@@ -18,8 +18,8 @@ export declare const deleteTagEpic: (actions$: ActionsObservable<ActionType>, _s
     type: "snackbar/openSnackbar";
 } | {
     payload: {
-        fetchState: import("../../../commonStateTypes/common").FetchState;
-        tagId: import("../../../commonStateTypes/common").ID;
+        fetchState: import("../../..").FetchState;
+        tagId: import("../../..").ID;
         error?: import("../../../responsePayload").ZeniAPIStatus;
     };
     type: "tagView/updateDeleteTagStatus";
@@ -28,8 +28,8 @@ export declare const deleteTagEpic: (actions$: ActionsObservable<ActionType>, _s
     type: "tag/removeTag";
 } | {
     payload: {
-        tagId: import("../../../commonStateTypes/common").ID | undefined;
-        taskId: import("../../../commonStateTypes/common").ID | undefined;
+        tagId: import("../../..").ID | undefined;
+        taskId: import("../../..").ID | undefined;
     };
     type: "taskDetailView/updateDeletedTagToLocalStore";
 }>;

package/lib/view/taskManager/taskDetailView/epics/createSubTaskEpic.d.ts

@@ -0,0 +1,9 @@
+import { ActionsObservable, StateObservable } from 'redux-observable';
+import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
+import { appendSubTaskId, updateTasks } from '../../../../entity/task/taskReducer';
+import { RootState } from '../../../../reducer';
+import { ZeniAPI } from '../../../../zeniAPI';
+import { updateTaskListOnNewTaskCreationSuccess } from '../../taskListView/taskListReducer';
+import { createSubTask, createSubTaskSuccessOrFailure } from '../taskDetailReducer';
+export type ActionType = ReturnType<typeof createSubTask> | ReturnType<typeof updateTasks> | ReturnType<typeof appendSubTaskId> | ReturnType<typeof openSnackbar> | ReturnType<typeof updateTaskListOnNewTaskCreationSuccess> | ReturnType<typeof createSubTaskSuccessOrFailure>;
+export declare const createSubTaskEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => import("rxjs").Observable<ActionType>;

package/lib/view/taskManager/taskDetailView/epics/createSubTaskEpic.js

@@ -0,0 +1,100 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createSubTaskEpic = void 0;
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const formatMinutesToFromHHMM_1 = require("../../../../commonStateTypes/fiscalYearHelpers/formatMinutesToFromHHMM");
+const snackbarReducer_1 = require("../../../../entity/snackbar/snackbarReducer");
+const taskReducer_1 = require("../../../../entity/task/taskReducer");
+const taskSelector_1 = require("../../../../entity/task/taskSelector");
+const responsePayload_1 = require("../../../../responsePayload");
+const taskListReducer_1 = require("../../taskListView/taskListReducer");
+const taskDetailReducer_1 = require("../taskDetailReducer");
+const createSubTaskEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(taskDetailReducer_1.createSubTask.match), (0, operators_1.mergeMap)((action) => {
+    const state = state$.value;
+    const parentTask = (0, taskSelector_1.getTaskById)(state.taskState, action.payload.parentTaskId);
+    // Subtasks inherit every parent group membership, not just the first,
+    // so the subtask surfaces in all the same buckets as its parent.
+    const parentTaskGroupIds = parentTask?.taskGroupIds ?? [];
+    const parentTaskGroupId = parentTaskGroupIds[0];
+    const isTaskListFetched = state.taskListState.fetchState === 'Completed';
+    const payload = prepareSubTaskPayload(action.payload, parentTaskGroupIds);
+    return zeniAPI
+        .postAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks`, payload)
+        .pipe((0, operators_1.mergeMap)((response) => {
+        if ((0, responsePayload_1.isSuccessResponse)(response) &&
+            response.data != null &&
+            response.data.tasks.length > 0) {
+            const newTaskId = response.data.tasks[0].task_id;
+            const actions = [
+                (0, taskReducer_1.updateTasks)(response.data.tasks),
+                (0, taskReducer_1.appendSubTaskId)({
+                    parentTaskId: action.payload.parentTaskId,
+                    subTaskId: newTaskId,
+                }),
+                (0, taskDetailReducer_1.createSubTaskSuccessOrFailure)({
+                    fetchState: 'Completed',
+                    newTaskId,
+                }),
+                (0, snackbarReducer_1.openSnackbar)({
+                    messageSection: 'create_sub_task',
+                    messageText: 'success',
+                    type: 'success',
+                }),
+            ];
+            // The task list is keyed on parent tasks (no parent_task_id)
+            // — subtasks belong to their parent's children list, not the
+            // top-level list. Pushing a subtask into the list would
+            // surface it as an orphan row at the top of the group.
+            // Only fire the list-update for actual parent tasks.
+            const createdTask = response.data.tasks[0];
+            const isSubtask = createdTask.parent_task_id != null &&
+                createdTask.parent_task_id !== '';
+            if (!isSubtask &&
+                isTaskListFetched === true &&
+                parentTaskGroupId != null) {
+                actions.push((0, taskListReducer_1.updateTaskListOnNewTaskCreationSuccess)({
+                    taskGroupId: parentTaskGroupId,
+                    task: createdTask,
+                }));
+            }
+            return (0, rxjs_1.from)(actions);
+        }
+        else {
+            return (0, rxjs_1.of)((0, taskDetailReducer_1.createSubTaskSuccessOrFailure)({
+                fetchState: 'Error',
+                error: response.status,
+            }), (0, snackbarReducer_1.openSnackbar)({
+                messageSection: 'create_sub_task',
+                messageText: 'failed',
+                type: 'error',
+                variables: [
+                    {
+                        variableName: '_api-error_',
+                        variableValue: response.status.message,
+                    },
+                ],
+            }));
+        }
+    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, taskDetailReducer_1.createSubTaskSuccessOrFailure)({
+        fetchState: 'Error',
+        error: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Create Sub Task REST API call errored out' +
+            JSON.stringify(error)),
+    }))));
+}));
+exports.createSubTaskEpic = createSubTaskEpic;
+const prepareSubTaskPayload = (subTask, parentTaskGroupIds) => ({
+    name: subTask.name,
+    assignees: subTask.assignee,
+    description: subTask.description,
+    priority: subTask.priority,
+    status: subTask.status,
+    tags: subTask.tagIds,
+    time_spent: (0, formatMinutesToFromHHMM_1.convertHHMMStrToMinutes)(subTask.timeSpent),
+    group_assignees: subTask.groupAssignees,
+    parent_task_id: subTask.parentTaskId,
+    // Inherit every parent group, not just the first — see callsite for
+    // the two-scope rationale.
+    task_group_ids: parentTaskGroupIds,
+    due_date: subTask.dueDate?.format('YYYY-MM-DD') ?? null,
+});

package/lib/view/taskManager/taskDetailView/epics/fetchSubTasksEpic.d.ts

@@ -0,0 +1,8 @@
+import { ActionsObservable, StateObservable } from 'redux-observable';
+import { Observable } from 'rxjs';
+import { setSubTaskIds, updateTasks } from '../../../../entity/task/taskReducer';
+import { RootState } from '../../../../reducer';
+import { ZeniAPI } from '../../../../zeniAPI';
+import { fetchSubTasks, updateSubTasks, updateSubTasksFetchStatus } from '../taskDetailReducer';
+export type ActionType = ReturnType<typeof fetchSubTasks> | ReturnType<typeof updateTasks> | ReturnType<typeof setSubTaskIds> | ReturnType<typeof updateSubTasks> | ReturnType<typeof updateSubTasksFetchStatus>;
+export declare const fetchSubTasksEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/taskManager/taskDetailView/epics/fetchSubTasksEpic.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchSubTasksEpic = void 0;
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const taskReducer_1 = require("../../../../entity/task/taskReducer");
+const responsePayload_1 = require("../../../../responsePayload");
+const taskDetailReducer_1 = require("../taskDetailReducer");
+const fetchSubTasksEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(taskDetailReducer_1.fetchSubTasks.match), 
+// Use mergeMap, not switchMap: switchMap cancels in-flight requests for
+// the previous parent without dispatching success or failure, leaving
+// subTaskListFetchStatusByParentId stuck at In-Progress and blocking the
+// detail page's combined fetchStatus via reduceAnyFetchState. Per-parent
+// races on the same parentTaskId are handled last-write-wins downstream.
+(0, operators_1.mergeMap)((action) => {
+    const { parentTaskId } = action.payload;
+    const query = JSON.stringify({
+        task_type: 'subtasks',
+        parent_task_id: parentTaskId,
+    });
+    return zeniAPI
+        .getJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks?query=${encodeURIComponent(query)}`)
+        .pipe((0, operators_1.mergeMap)((response) => {
+        if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
+            const { tasks } = response.data;
+            // Keep the parent's `subTasksIds` in sync with the fetched
+            // bucket. Without this, the parent entity record can drift
+            // out of sync with what the children fetch returned —
+            // e.g. a server-side delete won't drop from the parent
+            // record until the next list re-fetch.
+            const fetchedChildIds = tasks
+                .filter((t) => t.parent_task_id === parentTaskId)
+                .map((t) => t.task_id);
+            return (0, rxjs_1.of)((0, taskReducer_1.updateTasks)(tasks), (0, taskReducer_1.setSubTaskIds)({
+                parentTaskId,
+                subTaskIds: fetchedChildIds,
+            }), (0, taskDetailReducer_1.updateSubTasks)({
+                parentTaskId,
+            }));
+        }
+        else {
+            return (0, rxjs_1.of)((0, taskDetailReducer_1.updateSubTasksFetchStatus)({
+                parentTaskId,
+                fetchState: 'Error',
+                error: response.status,
+            }));
+        }
+    }), (0, operators_1.catchError)((error) => {
+        return (0, rxjs_1.of)((0, taskDetailReducer_1.updateSubTasksFetchStatus)({
+            parentTaskId,
+            fetchState: 'Error',
+            error: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Fetch Sub Tasks REST API call errored out' +
+                JSON.stringify(error)),
+        }));
+    }));
+}));
+exports.fetchSubTasksEpic = fetchSubTasksEpic;

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

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

package/lib/view/taskManager/taskDetailView/epics/saveTaskDetailEpic.d.ts

@@ -3,7 +3,7 @@ import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
 import { updateTasks } from '../../../../entity/task/taskReducer';
 import { RootState } from '../../../../reducer';
 import { ZeniAPI } from '../../../../zeniAPI';
-import { updateTaskListOnNewTaskCreationSuccess } from '../../taskListView/taskListReducer';
+import { removeTaskFromGroupBucket, updateTaskListOnNewTaskCreationSuccess } from '../../taskListView/taskListReducer';
 import { saveTaskDetail, saveTaskSuccessOrFailure } from '../taskDetailReducer';
-export type ActionType = ReturnType<typeof saveTaskDetail> | ReturnType<typeof updateTasks> | ReturnType<typeof openSnackbar> | ReturnType<typeof updateTaskListOnNewTaskCreationSuccess> | ReturnType<typeof saveTaskSuccessOrFailure>;
+export type ActionType = ReturnType<typeof saveTaskDetail> | ReturnType<typeof updateTasks> | ReturnType<typeof openSnackbar> | ReturnType<typeof updateTaskListOnNewTaskCreationSuccess> | ReturnType<typeof removeTaskFromGroupBucket> | ReturnType<typeof saveTaskSuccessOrFailure>;
 export declare const saveTaskDetailEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => import("rxjs").Observable<ActionType>;

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

@@ -15,17 +15,46 @@ const saveTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, oper
     const { taskId, taskGroupId } = action.payload;
     const state = state$.value;
     const isTaskListFetched = state.taskListState.fetchState === 'Completed';
-    const updatedTaskGroupId = taskId == null
-        ? taskGroupId
-        : (0, taskSelector_1.getTaskById)(state.taskState, taskId)?.taskGroupIds[0];
-    const payload = prepareTaskPayload(state, taskId, updatedTaskGroupId);
+    // On edit, prefer the locally-edited group; fall back to the entity's
+    // current group. On create, use the taskGroupId from the action payload.
+    const localTaskGroupId = taskId != null
+        ? state.taskDetailState.editTaskStateById[taskId]?.taskDetailLocalData
+            ?.taskGroupId
+        : undefined;
+    // groupWasCleared distinguishes "user explicitly cleared the group"
+    // (localTaskGroupId === null → send []) from "user did not touch it"
+    // (undefined → fall back to entity). Without this, the `??` fallback
+    // would resurrect the stale entity value after a clear.
+    const groupWasCleared = taskId != null && localTaskGroupId === null;
+    const entityTaskGroupIds = taskId != null
+        ? ((0, taskSelector_1.getTaskById)(state.taskState, taskId)?.taskGroupIds ?? [])
+        : [];
+    // Distinguish three save shapes:
+    //   - cleared → []
+    //   - user picked a different group locally → [localTaskGroupId]
+    //   - no local edit → entire entityTaskGroupIds (preserves multi-
+    //     group membership; without this, unrelated field edits silently
+    //     drop extra groups).
+    const localGroupChanged = localTaskGroupId != null;
+    const taskGroupIdsForPayload = groupWasCleared
+        ? []
+        : localGroupChanged
+            ? [localTaskGroupId]
+            : taskId != null
+                ? entityTaskGroupIds
+                : taskGroupId != null
+                    ? [taskGroupId]
+                    : [];
+    // Keep `updatedTaskGroupId` (single id) for downstream list-update
+    // dispatches that still bucket against one group at a time.
+    const updatedTaskGroupId = taskGroupIdsForPayload[0];
+    const payload = prepareTaskPayload(state, taskId, taskGroupIdsForPayload);
     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);
     return saveTaskApi.pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) &&
             response.data != null &&
-            updatedTaskGroupId != null &&
             response.data.tasks.length > 0) {
             const newTaskId = response.data.tasks[0].task_id;
             const actions = [
@@ -36,7 +65,24 @@ const saveTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, oper
                     taskId,
                 }),
             ];
-            if (isTaskListFetched === true) {
+            // Only suppress the list-insert on the live/completed tabs
+            // when the saved task's status no longer matches the tab —
+            // otherwise doUpdateTaskList writes the row back into the
+            // current tab's grouping arrays even after updateTasks moved
+            // it to Completed. Archived/snoozed/deleted are owned by
+            // their dedicated actions and must keep the pre-PR optimistic
+            // update path so their grouping arrays don't go stale.
+            const savedTask = response.data.tasks[0];
+            const savedIsCompleted = savedTask.status?.code === 'resolved';
+            const activeTab = state.taskListState.currentTab;
+            const isLiveOrCompletedTab = activeTab === 'live' || activeTab === 'completed';
+            const statusMatchesActiveTab = !isLiveOrCompletedTab ||
+                (savedIsCompleted && activeTab === 'completed') ||
+                (!savedIsCompleted && activeTab === 'live');
+            if (isTaskListFetched === true &&
+                groupWasCleared === false &&
+                updatedTaskGroupId != null &&
+                statusMatchesActiveTab === true) {
                 actions.push((0, taskListReducer_1.updateTaskListOnNewTaskCreationSuccess)({
                     taskGroupId: updatedTaskGroupId,
                     task: response.data.tasks[0],
@@ -45,6 +91,21 @@ const saveTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, oper
                         : undefined,
                 }));
             }
+            else if (isTaskListFetched === true &&
+                groupWasCleared === true &&
+                taskId != null) {
+                // Group was cleared — skip the list-insert action (no
+                // destination bucket) and explicitly drop the row from every
+                // previously-held group so the list re-renders without the
+                // stale entry under the old group until next refetch.
+                const previousTask = (0, taskSelector_1.getTaskById)(state.taskState, taskId);
+                previousTask?.taskGroupIds.forEach((previousGroupId) => {
+                    actions.push((0, taskListReducer_1.removeTaskFromGroupBucket)({
+                        taskId,
+                        taskGroupId: previousGroupId,
+                    }));
+                });
+            }
             return (0, rxjs_1.from)(actions);
         }
         else {
@@ -71,7 +132,7 @@ const saveTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, oper
     }))));
 }));
 exports.saveTaskDetailEpic = saveTaskDetailEpic;
-const prepareTaskPayload = (state, taskId, taskGroupId) => {
+const prepareTaskPayload = (state, taskId, taskGroupIds) => {
     const { taskDetailState, taskState } = state;
     const syncToken = taskId != null ? ((0, taskSelector_1.getTaskById)(taskState, taskId)?.syncToken ?? '') : '';
     const sourceState = taskId != null
@@ -100,7 +161,7 @@ const prepareTaskPayload = (state, taskId, taskGroupId) => {
             ? (localData.recurringDaysOfWeek ?? [])
             : [],
         sync_token: syncToken,
-        task_group_ids: taskGroupId != null ? [taskGroupId] : [],
+        task_group_ids: taskGroupIds,
         time_spent: (0, formatMinutesToFromHHMM_1.convertHHMMStrToMinutes)(localData.timeSpent),
         group_assignees: localData.groupAssignees,
         ...(taskId == null ? { is_private: localData.isPrivate ?? false } : {}),

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

@@ -3,9 +3,23 @@ import { DayOfWeek, PriorityCodeType, TaskStatusCodeType, TaskType } from '../..
 import { ZeniDate } from '../../../zeniDayJS';
 import { RecurringDatePickerOptions, RecurringFrequencyType } from '../../common/recurringViewHelper';
 import { CommonHistoryView } from '../../spendManagement/commonHistoryView/commonHistory';
+export interface CreateSubTaskPayload {
+    assignee: ID[];
+    description: string;
+    groupAssignees: ID[];
+    name: string;
+    parentTaskId: ID;
+    priority: PriorityCodeType;
+    status: TaskStatusCodeType;
+    tagIds: ID[];
+    timeSpent: string;
+    dueDate?: ZeniDate;
+}
 export interface TaskDetailViewState {
     editTaskStateById: Record<ID, EditTaskDetail>;
     newTaskState: EditTaskDetail;
+    subTaskCreateStatus: FetchStateAndError;
+    subTaskListFetchStatusByParentId: Record<ID, FetchStateAndError>;
     taskHistoryById: Record<ID, CommonHistoryView>;
 }
 export interface EditTaskDetail {
@@ -40,6 +54,7 @@ export interface EditTaskLocalData {
     recurringStartDate?: ZeniDate;
     savedRecurringEndDate?: ZeniDate;
     savedRecurringTasksCount?: number;
+    taskGroupId?: ID | null;
 }
 export declare const initialTaskDetailLocalData: EditTaskLocalData;
 export declare const initialTaskDetail: EditTaskDetail;

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

@@ -1,7 +1,7 @@
 import { FetchState, ID } from '../../../commonStateTypes/common';
 import { ZeniAPIStatus } from '../../../responsePayload';
 import { HistoricEventPayload } from '../../spendManagement/commonHistoryView/commonHistoryPayload';
-import { EditTaskLocalData, TaskDetailViewState } from './taskDetail';
+import { CreateSubTaskPayload, EditTaskLocalData, TaskDetailViewState } from './taskDetail';
 export declare const initialState: TaskDetailViewState;
 export declare const fetchTaskDetailPage: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride: boolean, taskId?: string | undefined], {
     cacheOverride: boolean;
@@ -34,7 +34,19 @@ export declare const fetchTaskDetailPage: import("@reduxjs/toolkit").ActionCreat
     error?: ZeniAPIStatus;
     newTaskId?: ID;
     taskId?: ID;
-}, "taskDetailView/saveTaskSuccessOrFailure">, deleteTask: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[taskId?: string | undefined], {
+}, "taskDetailView/saveTaskSuccessOrFailure">, createSubTask: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: CreateSubTaskPayload], CreateSubTaskPayload, "taskDetailView/createSubTask", never, never>, createSubTaskSuccessOrFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    fetchState: FetchState;
+    error?: ZeniAPIStatus;
+    newTaskId?: ID;
+}, "taskDetailView/createSubTaskSuccessOrFailure">, resetSubTaskCreateStatus: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"taskDetailView/resetSubTaskCreateStatus">, fetchSubTasks: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[parentTaskId: string], {
+    parentTaskId: string;
+}, "taskDetailView/fetchSubTasks", never, never>, updateSubTasks: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    parentTaskId: ID;
+}, "taskDetailView/updateSubTasks">, updateSubTasksFetchStatus: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    fetchState: FetchState;
+    parentTaskId: ID;
+    error?: ZeniAPIStatus;
+}, "taskDetailView/updateSubTasksFetchStatus">, deleteTask: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[taskId?: string | undefined], {
     taskId: string | undefined;
 }, "taskDetailView/deleteTask", never, never>, removeTaskDetail: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "taskDetailView/removeTaskDetail">, deleteTaskSuccessOrFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     fetchState: FetchState;

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

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateDeletedTagToLocalStore = exports.updateCreatedTagToLocalStore = exports.clearTaskDetail = exports.updateTaskHistoryFetchStatus = exports.updateTaskHistory = exports.fetchTaskHistory = exports.unsnoozeTask = exports.snoozeTaskSuccessOrFailure = exports.snoozeTask = exports.deleteTaskSuccessOrFailure = exports.removeTaskDetail = exports.deleteTask = exports.saveTaskSuccessOrFailure = exports.archiveTaskSuccessOrFailure = exports.archiveTask = exports.saveTaskDetail = exports.discardTaskUpdatesInLocalStore = exports.saveTaskUpdatesToLocalStore = exports.updateEditTaskFetchStatus = exports.initializeTaskToLocalStore = exports.fetchTaskDetail = exports.fetchTaskDetailPage = exports.initialState = void 0;
+exports.updateDeletedTagToLocalStore = exports.updateCreatedTagToLocalStore = exports.clearTaskDetail = exports.updateTaskHistoryFetchStatus = exports.updateTaskHistory = exports.fetchTaskHistory = exports.unsnoozeTask = exports.snoozeTaskSuccessOrFailure = exports.snoozeTask = exports.deleteTaskSuccessOrFailure = exports.removeTaskDetail = exports.deleteTask = exports.updateSubTasksFetchStatus = exports.updateSubTasks = exports.fetchSubTasks = exports.resetSubTaskCreateStatus = exports.createSubTaskSuccessOrFailure = exports.createSubTask = exports.saveTaskSuccessOrFailure = exports.archiveTaskSuccessOrFailure = exports.archiveTask = exports.saveTaskDetail = exports.discardTaskUpdatesInLocalStore = exports.saveTaskUpdatesToLocalStore = exports.updateEditTaskFetchStatus = exports.initializeTaskToLocalStore = exports.fetchTaskDetail = exports.fetchTaskDetailPage = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const get_1 = __importDefault(require("lodash/get"));
 const commonHistory_1 = require("../../spendManagement/commonHistoryView/commonHistory");
@@ -13,6 +13,11 @@ const taskDetail_1 = require("./taskDetail");
 exports.initialState = {
     newTaskState: taskDetail_1.initialTaskDetail,
     editTaskStateById: {},
+    subTaskCreateStatus: {
+        fetchState: 'Not-Started',
+        error: undefined,
+    },
+    subTaskListFetchStatusByParentId: {},
     taskHistoryById: {},
 };
 const taskDetailView = (0, toolkit_1.createSlice)({
@@ -57,7 +62,7 @@ const taskDetailView = (0, toolkit_1.createSlice)({
         updateEditTaskFetchStatus(draft, action) {
             const { taskId, fetchState, error } = action.payload;
             draft.editTaskStateById[taskId] = {
-                ...draft.editTaskStateById[taskId],
+                ...(draft.editTaskStateById[taskId] ?? taskDetail_1.initialTaskDetail),
                 fetchTaskStatus: {
                     fetchState,
                     error: fetchState === 'Error' ? error : undefined,
@@ -325,10 +330,59 @@ const taskDetailView = (0, toolkit_1.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 = {
+                ...exports.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, exports.initialState);
         },
     },
 });
-_a = taskDetailView.actions, exports.fetchTaskDetailPage = _a.fetchTaskDetailPage, exports.fetchTaskDetail = _a.fetchTaskDetail, exports.initializeTaskToLocalStore = _a.initializeTaskToLocalStore, exports.updateEditTaskFetchStatus = _a.updateEditTaskFetchStatus, exports.saveTaskUpdatesToLocalStore = _a.saveTaskUpdatesToLocalStore, exports.discardTaskUpdatesInLocalStore = _a.discardTaskUpdatesInLocalStore, exports.saveTaskDetail = _a.saveTaskDetail, exports.archiveTask = _a.archiveTask, exports.archiveTaskSuccessOrFailure = _a.archiveTaskSuccessOrFailure, exports.saveTaskSuccessOrFailure = _a.saveTaskSuccessOrFailure, exports.deleteTask = _a.deleteTask, exports.removeTaskDetail = _a.removeTaskDetail, exports.deleteTaskSuccessOrFailure = _a.deleteTaskSuccessOrFailure, exports.snoozeTask = _a.snoozeTask, exports.snoozeTaskSuccessOrFailure = _a.snoozeTaskSuccessOrFailure, exports.unsnoozeTask = _a.unsnoozeTask, exports.fetchTaskHistory = _a.fetchTaskHistory, exports.updateTaskHistory = _a.updateTaskHistory, exports.updateTaskHistoryFetchStatus = _a.updateTaskHistoryFetchStatus, exports.clearTaskDetail = _a.clearTaskDetail, exports.updateCreatedTagToLocalStore = _a.updateCreatedTagToLocalStore, exports.updateDeletedTagToLocalStore = _a.updateDeletedTagToLocalStore;
+_a = taskDetailView.actions, exports.fetchTaskDetailPage = _a.fetchTaskDetailPage, exports.fetchTaskDetail = _a.fetchTaskDetail, exports.initializeTaskToLocalStore = _a.initializeTaskToLocalStore, exports.updateEditTaskFetchStatus = _a.updateEditTaskFetchStatus, exports.saveTaskUpdatesToLocalStore = _a.saveTaskUpdatesToLocalStore, exports.discardTaskUpdatesInLocalStore = _a.discardTaskUpdatesInLocalStore, exports.saveTaskDetail = _a.saveTaskDetail, exports.archiveTask = _a.archiveTask, exports.archiveTaskSuccessOrFailure = _a.archiveTaskSuccessOrFailure, exports.saveTaskSuccessOrFailure = _a.saveTaskSuccessOrFailure, exports.createSubTask = _a.createSubTask, exports.createSubTaskSuccessOrFailure = _a.createSubTaskSuccessOrFailure, exports.resetSubTaskCreateStatus = _a.resetSubTaskCreateStatus, exports.fetchSubTasks = _a.fetchSubTasks, exports.updateSubTasks = _a.updateSubTasks, exports.updateSubTasksFetchStatus = _a.updateSubTasksFetchStatus, exports.deleteTask = _a.deleteTask, exports.removeTaskDetail = _a.removeTaskDetail, exports.deleteTaskSuccessOrFailure = _a.deleteTaskSuccessOrFailure, exports.snoozeTask = _a.snoozeTask, exports.snoozeTaskSuccessOrFailure = _a.snoozeTaskSuccessOrFailure, exports.unsnoozeTask = _a.unsnoozeTask, exports.fetchTaskHistory = _a.fetchTaskHistory, exports.updateTaskHistory = _a.updateTaskHistory, exports.updateTaskHistoryFetchStatus = _a.updateTaskHistoryFetchStatus, exports.clearTaskDetail = _a.clearTaskDetail, exports.updateCreatedTagToLocalStore = _a.updateCreatedTagToLocalStore, exports.updateDeletedTagToLocalStore = _a.updateDeletedTagToLocalStore;
 exports.default = taskDetailView.reducer;

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

@@ -2,7 +2,7 @@ import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
 import { Class } from '../../../entity/class/classState';
 import { File } from '../../../entity/file/fileState';
-import { TaskPriority, TaskStatus } from '../../../entity/task/taskState';
+import { Task, TaskPriority, TaskStatus } from '../../../entity/task/taskState';
 import { RootState } from '../../../reducer';
 import { ZeniDate } from '../../../zeniDayJS';
 import { UserAndRole } from '../../companyView/types/userAndRole';
@@ -14,6 +14,7 @@ export interface TaskDetailSelectorView extends SelectorView {
     deleteFileStatusById: Record<ID, FetchStateAndError | undefined>;
     files: File[];
     showTaskDetailFormFooter: boolean;
+    subtasks: Task[];
     taskDetailView: EditTaskDetail;
     taskHistory: HistoricEvent[];
     updateFileStatusById: Record<ID, FetchStateAndError | undefined>;

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

@@ -33,8 +33,13 @@ const getTaskDetail = (state, taskId) => {
     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);
@@ -44,26 +49,37 @@ const getTaskDetail = (state, taskId) => {
             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, {
@@ -96,6 +112,7 @@ const getTaskDetail = (state, taskId) => {
         showTaskDetailFormFooter,
         snoozedUntil,
         taskGroupId,
+        subtasks,
     };
 };
 exports.getTaskDetail = getTaskDetail;
@@ -144,13 +161,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 +178,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 ?? [],