@zeniai/client-epic-state 5.1.40-betaDI2 → 5.1.40

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

@@ -34,7 +34,6 @@ 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 { removeTaskFromGroupBucket, updateTaskListOnNewTaskCreationSuccess } from '../../taskListView/taskListReducer';
+import { 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 removeTaskFromGroupBucket> | ReturnType<typeof saveTaskSuccessOrFailure>;
+export type ActionType = ReturnType<typeof saveTaskDetail> | ReturnType<typeof updateTasks> | ReturnType<typeof openSnackbar> | ReturnType<typeof updateTaskListOnNewTaskCreationSuccess> | 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,46 +15,17 @@ const saveTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, oper
     const { taskId, taskGroupId } = action.payload;
     const state = state$.value;
     const isTaskListFetched = state.taskListState.fetchState === 'Completed';
-    // 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 updatedTaskGroupId = taskId == null
+        ? taskGroupId
+        : (0, taskSelector_1.getTaskById)(state.taskState, taskId)?.taskGroupIds[0];
+    const payload = prepareTaskPayload(state, taskId, updatedTaskGroupId);
     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 = [
@@ -65,24 +36,7 @@ const saveTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, oper
                     taskId,
                 }),
             ];
-            // 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) {
+            if (isTaskListFetched === true) {
                 actions.push((0, taskListReducer_1.updateTaskListOnNewTaskCreationSuccess)({
                     taskGroupId: updatedTaskGroupId,
                     task: response.data.tasks[0],
@@ -91,21 +45,6 @@ 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 {
@@ -132,7 +71,7 @@ const saveTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, oper
     }))));
 }));
 exports.saveTaskDetailEpic = saveTaskDetailEpic;
-const prepareTaskPayload = (state, taskId, taskGroupIds) => {
+const prepareTaskPayload = (state, taskId, taskGroupId) => {
     const { taskDetailState, taskState } = state;
     const syncToken = taskId != null ? ((0, taskSelector_1.getTaskById)(taskState, taskId)?.syncToken ?? '') : '';
     const sourceState = taskId != null
@@ -161,7 +100,7 @@ const prepareTaskPayload = (state, taskId, taskGroupIds) => {
             ? (localData.recurringDaysOfWeek ?? [])
             : [],
         sync_token: syncToken,
-        task_group_ids: taskGroupIds,
+        task_group_ids: taskGroupId != null ? [taskGroupId] : [],
         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,23 +3,9 @@ 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 {
@@ -54,7 +40,6 @@ 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 { CreateSubTaskPayload, EditTaskLocalData, TaskDetailViewState } from './taskDetail';
+import { 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,19 +34,7 @@ export declare const fetchTaskDetailPage: import("@reduxjs/toolkit").ActionCreat
     error?: ZeniAPIStatus;
     newTaskId?: ID;
     taskId?: ID;
-}, "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], {
+}, "taskDetailView/saveTaskSuccessOrFailure">, 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.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;
+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;
 const toolkit_1 = require("@reduxjs/toolkit");
 const get_1 = __importDefault(require("lodash/get"));
 const commonHistory_1 = require("../../spendManagement/commonHistoryView/commonHistory");
@@ -13,11 +13,6 @@ 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)({
@@ -62,7 +57,7 @@ const taskDetailView = (0, toolkit_1.createSlice)({
         updateEditTaskFetchStatus(draft, action) {
             const { taskId, fetchState, error } = action.payload;
             draft.editTaskStateById[taskId] = {
-                ...(draft.editTaskStateById[taskId] ?? taskDetail_1.initialTaskDetail),
+                ...draft.editTaskStateById[taskId],
                 fetchTaskStatus: {
                     fetchState,
                     error: fetchState === 'Error' ? error : undefined,
@@ -330,59 +325,10 @@ 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.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;
+_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;
 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 { Task, TaskPriority, TaskStatus } from '../../../entity/task/taskState';
+import { TaskPriority, TaskStatus } from '../../../entity/task/taskState';
 import { RootState } from '../../../reducer';
 import { ZeniDate } from '../../../zeniDayJS';
 import { UserAndRole } from '../../companyView/types/userAndRole';
@@ -14,7 +14,6 @@ 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,13 +33,8 @@ 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);
@@ -49,37 +44,26 @@ 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.reduceAnyFetchState)([
+            fetchStatus = (0, reduceFetchState_1.reduceFetchState)([
                 fileViewState.fetchFilesStatus,
                 sourceTaskDetail.fetchTaskStatus,
                 userList,
                 classListState,
-                subTaskStatus,
             ]);
         }
         else {
-            fetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([
+            fetchStatus = (0, reduceFetchState_1.reduceFetchState)([
                 sourceTaskDetail.fetchTaskStatus,
                 userList,
                 classListState,
-                subTaskStatus,
             ]);
         }
         showTaskDetailFormFooter = showFormFooter(sourceTaskDetail.taskDetailLocalData, taskEntity);
         taskHistory = taskDetailState.taskHistoryById[taskId]?.historicEvents ?? [];
     }
     else if (taskId == null) {
-        fetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([userList, classListState]);
+        fetchStatus = (0, reduceFetchState_1.reduceFetchState)([userList, classListState]);
     }
     const { classIds } = classListState;
     const allAccountingClasses = (0, classSelector_1.getClassesByIds)(classState, {
@@ -112,7 +96,6 @@ const getTaskDetail = (state, taskId) => {
         showTaskDetailFormFooter,
         snoozedUntil,
         taskGroupId,
-        subtasks,
     };
 };
 exports.getTaskDetail = getTaskDetail;
@@ -161,16 +144,13 @@ exports.allTaskPriority = [
     },
 ];
 const showFormFooter = (taskDetailLocalData, taskDetailInStore) => {
-    if (taskDetailInStore == null) {
-        return false;
-    }
-    if (taskDetailLocalData.name !== taskDetailInStore.name ||
+    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) ||
@@ -178,10 +158,7 @@ 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.taskGroupId, taskDetailInStore.taskGroupIds.length > 0
-            ? taskDetailInStore.taskGroupIds[0]
-            : undefined)) {
+        !(0, isEqual_1.default)(taskDetailLocalData.timeSpent, taskDetailInStore.timeSpent)) {
         return true;
     }
     return false;

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

@@ -12,17 +12,15 @@ 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, completed } = response.data;
+            const { tasks, deleted, archived, snoozed } = 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", "completed", "archived", "deleted", "snoozed"];
+export declare const ALL_TASK_LIST_TABS: readonly ["live", "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,7 +4,6 @@ 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,10 +3,6 @@ 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,10 +12,9 @@ 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<"completed" | "deleted" | "archived" | "live" | "snoozed", "taskList/updateTaskListTab">, updateTaskListFetchStatus: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, "taskList/updateTaskList">, updateTaskListTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"deleted" | "archived" | "live" | "snoozed", "taskList/updateTaskListTab">, updateTaskListFetchStatus: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     fetchState: FetchState;
     error?: ZeniAPIStatus;
 }, "taskList/updateTaskListFetchStatus">, updateTaskListSearchText: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
@@ -59,9 +58,6 @@ 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">, removeTaskFromGroupBucket: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    taskGroupId: ID;
-    taskId: ID;
-}, "taskList/removeTaskFromGroupBucket">, clearTaskList: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"taskList/clearTaskList">;
+}, "taskList/updateTaskListOnCreateTaskFromTemplateSuccess">, removeTaskFromList: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "taskList/removeTaskFromList">, clearTaskList: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"taskList/clearTaskList">;
 declare const _default: import("redux").Reducer<TaskListState>;
 export default _default;