@zeniai/client-epic-state 5.0.11-betaND1 → 5.0.11-betaRR2

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTaskPayload = exports.getTasksListPayload = exports.bulkUpdateTaskListEpic = void 0;
+exports.getTaskPayload = exports.bulkUpdateTaskListEpic = void 0;
 const get_1 = __importDefault(require("lodash/get"));
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
@@ -12,20 +12,25 @@ const formatZeniDateFY_1 = require("../../../../commonStateTypes/fiscalYearHelpe
 const taskReducer_1 = require("../../../../entity/task/taskReducer");
 const responsePayload_1 = require("../../../../responsePayload");
 const taskListReducer_1 = require("../taskListReducer");
-const bulkUpdateTaskListEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(taskListReducer_1.bulkUpdateTaskList.match), (0, operators_1.switchMap)((action) => {
-    const state = state$.value;
+const bulkUpdateTaskListEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(taskListReducer_1.bulkUpdateTaskList.match), (0, operators_1.switchMap)((action) => {
     const { taskIds, updates, groupId } = action.payload;
-    const payload = {
-        tasks: (0, exports.getTasksListPayload)(state, taskIds, updates),
-    };
+    const bulkUpdates = toBulkUpdatesPayload(updates);
+    if (groupId != null) {
+        bulkUpdates.task_group_ids = [groupId];
+    }
+    const payload = { task_ids: taskIds, updates: bulkUpdates };
     return zeniAPI
-        .putAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks`, payload)
+        .putAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks/bulk-update`, payload)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
+            const removeFromList = updates.isArchived === true ||
+                updates.isDeleted === true ||
+                ('snoozedUntil' in updates && updates.snoozedUntil != null);
             return (0, rxjs_1.of)((0, taskReducer_1.updateTasks)(response.data.tasks), (0, taskListReducer_1.updateTasksListOnBulkUpdateTasksSuccess)({
                 taskIds,
                 groupId,
-            }));
+                removeFromList,
+            }), (0, taskListReducer_1.fetchTaskList)());
         }
         else {
             return (0, rxjs_1.of)((0, taskListReducer_1.updateTasksListOnBulkUpdateTasksFailure)({
@@ -40,21 +45,47 @@ const bulkUpdateTaskListEpic = (actions$, state$, zeniAPI) => actions$.pipe((0,
     }));
 }));
 exports.bulkUpdateTaskListEpic = bulkUpdateTaskListEpic;
-const getTasksListPayload = (state, taskIds, updates) => {
-    const { taskState } = state;
-    const tasksList = taskIds
-        .map((taskId) => {
-        const task = (0, get_1.default)(taskState.taskByID, taskId);
-        return {
-            ...task,
-            ...updates,
-        };
-    })
-        .filter((task) => task != null);
-    const tasksPayload = tasksList.map((task) => toTaskPayload(state, task));
-    return tasksPayload;
+/**
+ * Helpers
+ */
+const toBulkUpdatesPayload = (updates) => {
+    const payload = {};
+    if (updates.status != null) {
+        payload.status = updates.status.code;
+    }
+    if (updates.priority != null) {
+        payload.priority = updates.priority.code;
+    }
+    if (updates.assignees != null) {
+        payload.assignees = updates.assignees;
+    }
+    if (updates.groupAssignees != null) {
+        payload.group_assignees = updates.groupAssignees;
+    }
+    if (updates.dueDate != null) {
+        payload.due_date = updates.dueDate.format(formatZeniDateFY_1.DEFAULT_DATE_FORMAT);
+    }
+    if (updates.tagIds != null) {
+        payload.tags = updates.tagIds;
+    }
+    if (updates.timeSpent != null) {
+        payload.time_spent = (0, formatMinutesToFromHHMM_1.convertHHMMStrToMinutes)(updates.timeSpent.replace(/\D/g, ''));
+    }
+    if (updates.isArchived != null) {
+        payload.is_archived = updates.isArchived;
+    }
+    if (updates.isDeleted != null) {
+        payload.is_deleted = updates.isDeleted;
+    }
+    // Bulk snooze is not supported — only bulk unsnooze (clear all snooze fields)
+    if ('snoozedUntil' in updates) {
+        payload.snoozed_until = null;
+        payload.snoozed_by = null;
+        payload.snoozed_at = null;
+        payload.is_snooze_notification_sent = false;
+    }
+    return payload;
 };
-exports.getTasksListPayload = getTasksListPayload;
 const getTaskPayload = (state, taskId, updates) => {
     const { taskState } = state;
     const taskData = (0, get_1.default)(taskState.taskByID, taskId);
@@ -80,6 +111,9 @@ const toTaskPayload = (state, task) => {
         assignees: task.assignees,
         description: task.description,
         group_assignees: task.groupAssignees,
+        is_archived: task.isArchived,
+        is_deleted: task.isDeleted,
+        snoozed_until: task.snoozedUntil != null ? task.snoozedUntil.toISOString() : null,
         due_date: task.dueDate != null ? task.dueDate.format(formatZeniDateFY_1.DEFAULT_DATE_FORMAT) : null,
         priority: task.priority.code,
         status: task.status.code,

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

@@ -14,6 +14,7 @@ const dragNDropTasksEpic = (actions$, state$) => actions$.pipe((0, operators_1.f
         (0, taskListReducer_1.updateTasksListOnBulkUpdateTasksSuccess)({
             taskIds,
             groupId,
+            removeFromList: false,
         }),
         (0, taskListReducer_1.bulkUpdateTaskList)(taskIds, groupId, updates),
     ];

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

@@ -6,19 +6,26 @@ const operators_1 = require("rxjs/operators");
 const tagReducer_1 = require("../../../../entity/tag/tagReducer");
 const taskReducer_1 = require("../../../../entity/task/taskReducer");
 const responsePayload_1 = require("../../../../responsePayload");
-const taskListPayload_1 = require("../taskListPayload");
 const taskListReducer_1 = require("../taskListReducer");
 const fetchTaskListEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(taskListReducer_1.fetchTaskList.match), (0, operators_1.switchMap)(() => {
     return zeniAPI
         .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 } = response.data;
-            const tasksForEntity = (0, taskListPayload_1.flattenTasksAndSubtasksForEntity)(tasks);
-            return (0, rxjs_1.of)((0, taskReducer_1.updateTasks)(tasksForEntity), (0, taskListReducer_1.updateTaskList)({
+            const { tasks, deleted, archived, snoozed } = response.data;
+            const allTasks = [
+                ...tasks,
+                ...(deleted ?? []),
+                ...(archived ?? []),
+                ...(snoozed ?? []),
+            ];
+            return (0, rxjs_1.of)((0, taskReducer_1.updateTasks)(allTasks), (0, taskListReducer_1.updateTaskList)({
                 data: tasks,
+                deleted: deleted ?? [],
+                archived: archived ?? [],
+                snoozed: snoozed ?? [],
                 updateType: 'replace',
-            }), (0, tagReducer_1.updateTags)(tasksForEntity.map((task) => task.tags).flat()));
+            }), (0, tagReducer_1.updateTags)(allTasks.map((task) => task.tags).flat()));
         }
         else {
             return (0, rxjs_1.of)((0, taskListReducer_1.updateTaskListFetchStatus)({

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

@@ -11,9 +11,10 @@ const updateTaskFromListViewEpic = (actions$, state$, zeniAPI) => actions$.pipe(
     const state = state$.value;
     const { task, updates } = action.payload;
     const taskId = task.id;
-    const taskData = (0, bulkUpdateTaskListEpic_1.getTaskPayload)(state, taskId, updates);
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const { snoozed_until: _snoozedUntil, ...taskData } = (0, bulkUpdateTaskListEpic_1.getTaskPayload)(state, taskId, updates);
     return zeniAPI
-        .putAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks/${taskId}`, { ...taskData })
+        .putAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks/${taskId}`, taskData)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             return (0, rxjs_1.from)([

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

@@ -3,6 +3,17 @@ 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 type TaskListTab = (typeof ALL_TASK_LIST_TABS)[number];
+export interface TaskListTabData {
+    taskIds: ID[];
+    taskIdsByAssignees: Record<ID, ID[]>;
+    taskIdsByDueDate: Record<DueDateGroupKey, ID[]>;
+    taskIdsByGroupsIds: Record<ID, ID[]>;
+    taskIdsByPriority: Record<PriorityCodeType, ID[]>;
+    taskIdsByStatus: Record<TaskStatusCodeType, ID[]>;
+    taskIdsByTags: Record<ID, ID[]>;
+}
 export interface TaskListLocalData {
     defaultTaskGroupId: ID | null;
     existingTaskGroupNamesByGroupId: Record<ID, string>;
@@ -13,10 +24,10 @@ export declare const DUE_DATE_GROUP_KEYS: readonly ["overdue", "today", "this_we
 export declare const toDueDateGroupKeyType: (v: string) => "overdue" | "today" | "this_week" | "this_month" | "upcoming";
 export declare type DueDateGroupKey = ReturnType<typeof toDueDateGroupKeyType>;
 export interface TaskListState extends FetchedState {
+    byTab: Record<TaskListTab, TaskListTabData>;
+    currentTab: TaskListTab;
     filters: TaskListFilters;
     localData: TaskListLocalData;
-    /** Maps each list (parent) task id to ordered subtask ids from the last list fetch. */
-    subtaskIdsByParentTaskId: Record<ID, ID[]>;
     taskIds: ID[];
     taskIdsByAssignees: Record<ID, ID[]>;
     taskIdsByDueDate: Record<DueDateGroupKey, ID[]>;
@@ -47,7 +58,7 @@ export interface TaskListUIState extends SpendManagementUIState {
     searchText: string;
     sortKey: TaskListViewSortKey;
 }
-declare const toTaskListSortKeyType: (v: string) => "status" | "name" | "dueDate" | "tag" | "priority" | "timeSpent" | "assignee" | "creationDate";
+declare const toTaskListSortKeyType: (v: string) => "status" | "name" | "dueDate" | "tag" | "priority" | "timeSpent" | "assignee" | "creationDate" | "visibility";
 export declare type TaskListViewSortKey = ReturnType<typeof toTaskListSortKeyType>;
 export declare const TASK_LIST_FILTER_CATEGORIES: TaskListFilterCategoryOption[];
 interface TaskListFilterCategoryOption {

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

@@ -1,7 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TASK_LIST_GROUP_BY_CATEGORIES = exports.TASK_LIST_FILTER_CATEGORIES = exports.toTaskListGroupByKeyTypeStrict = exports.toTaskListGroupByKeyType = exports.TASK_LIST_GROUP_BY_KEYS = exports.toDueDateGroupKeyType = exports.DUE_DATE_GROUP_KEYS = void 0;
+exports.TASK_LIST_GROUP_BY_CATEGORIES = exports.TASK_LIST_FILTER_CATEGORIES = exports.toTaskListGroupByKeyTypeStrict = exports.toTaskListGroupByKeyType = exports.TASK_LIST_GROUP_BY_KEYS = exports.toDueDateGroupKeyType = exports.DUE_DATE_GROUP_KEYS = exports.ALL_TASK_LIST_TABS = void 0;
 const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
+exports.ALL_TASK_LIST_TABS = [
+    'live',
+    'archived',
+    'deleted',
+    'snoozed',
+];
 exports.DUE_DATE_GROUP_KEYS = [
     'overdue',
     'today',
@@ -32,6 +38,7 @@ const ALL_TASK_LIST_SORT_KEYS = [
     'status',
     'priority',
     'timeSpent',
+    'visibility',
 ];
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const toTaskListSortKeyType = (v) => (0, stringToUnion_1.stringToUnion)(v, ALL_TASK_LIST_SORT_KEYS);

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

@@ -1,37 +1,10 @@
-import { ID } from '../../../commonStateTypes/common';
 import { TaskPayload } from '../../../entity/task/taskPayload';
 import { ZeniAPIResponse } from '../../../responsePayload';
-/**
- * Task row returned by the task list API. Subtasks share the same wire shape
- * as tasks but are nested under their parent and indexed separately in list state.
- */
-export interface TaskListTaskPayload extends TaskPayload {
-    subtasks?: TaskPayload[];
-}
 interface FetchTaskListPayload {
-    tasks: TaskListTaskPayload[];
+    tasks: TaskPayload[];
+    archived?: TaskPayload[];
+    deleted?: TaskPayload[];
+    snoozed?: TaskPayload[];
 }
 export type FetchTaskListResponse = ZeniAPIResponse<FetchTaskListPayload>;
-/** Request body for POST `/task-manager/tasks` when creating a subtask from the list view. */
-export interface CreateSubtaskFromListViewPayload {
-    assignees: string[];
-    description: string;
-    due_date: string | null;
-    file_ids: string[];
-    group_assignees: string[];
-    name: string;
-    parent_task_id: ID;
-    priority: string;
-    recurring_end_date: string | null;
-    recurring_frequency: string | null;
-    recurring_start_date: string | null;
-    status: string;
-    sync_token: string;
-    tags: string[];
-    task_group_ids: string[];
-    time_spent: number;
-    type: string;
-}
-/** Parent tasks and nested subtasks as flat `TaskPayload`s for `updateTasks`. */
-export declare const flattenTasksAndSubtasksForEntity: (tasks: TaskListTaskPayload[]) => TaskPayload[];
 export {};

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

@@ -1,9 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.flattenTasksAndSubtasksForEntity = void 0;
-/** Parent tasks and nested subtasks as flat `TaskPayload`s for `updateTasks`. */
-const flattenTasksAndSubtasksForEntity = (tasks) => tasks.flatMap((task) => {
-    const { subtasks, ...parent } = task;
-    return [parent, ...(subtasks ?? [])];
-});
-exports.flattenTasksAndSubtasksForEntity = flattenTasksAndSubtasksForEntity;

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

@@ -5,15 +5,17 @@ import { TaskGroupPayload } from '../../../entity/taskGroup/taskGroupPayload';
 import { TaskGroup } from '../../../entity/taskGroup/taskGroupState';
 import { ZeniAPIStatus } from '../../../responsePayload';
 import { TaskListFilters, TaskListLocalData, TaskListState, TaskListUIState } from './taskList';
-import { CreateSubtaskFromListViewPayload, TaskListTaskPayload } from './taskListPayload';
 export declare const initialState: TaskListState;
 export declare const fetchTaskListPage: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride: boolean, isTaskTemplatesEnabled: boolean], {
     cacheOverride: boolean;
     isTaskTemplatesEnabled: boolean;
 }, "taskList/fetchTaskListPage", never, never>, fetchTaskList: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"taskList/fetchTaskList">, updateTaskList: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    data: TaskListTaskPayload[];
+    data: TaskPayload[];
     updateType: UpdateType;
-}, "taskList/updateTaskList">, updateTaskListFetchStatus: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    archived?: TaskPayload[];
+    deleted?: TaskPayload[];
+    snoozed?: TaskPayload[];
+}, "taskList/updateTaskList">, updateTaskListTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"deleted" | "live" | "archived" | "snoozed", "taskList/updateTaskListTab">, updateTaskListFetchStatus: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     fetchState: FetchState;
     error?: ZeniAPIStatus;
 }, "taskList/updateTaskListFetchStatus">, updateTaskListSearchText: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
@@ -30,6 +32,7 @@ export declare const fetchTaskListPage: import("@reduxjs/toolkit").ActionCreator
     groupId: string;
 }, "taskList/bulkUpdateTaskList", never, never>, updateTasksListOnBulkUpdateTasksSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     groupId: ID | null;
+    removeFromList: boolean;
     taskIds: ID[];
 }, "taskList/updateTasksListOnBulkUpdateTasksSuccess">, updateTasksListOnBulkUpdateTasksFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     error: ZeniAPIStatus;
@@ -49,16 +52,13 @@ export declare const fetchTaskListPage: import("@reduxjs/toolkit").ActionCreator
 }, "taskList/updateTaskListOnNewTaskCreationSuccess">, updateTaskListOnTaskGroupNameUpdate: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     taskGroupId: ID;
     taskGroupName: ID;
-}, "taskList/updateTaskListOnTaskGroupNameUpdate">, createSubtaskFromListView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: CreateSubtaskFromListViewPayload], CreateSubtaskFromListViewPayload, "taskList/createSubtaskFromListView", never, never>, updateTaskFromListView: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, "taskList/updateTaskListOnTaskGroupNameUpdate">, updateTaskFromListView: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     task: Task;
     updates: Partial<Task>;
-}, "taskList/updateTaskFromListView">, updateTasksListOnCreateSubtaskFromListViewSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    parentTaskId: ID;
-    subtaskId: ID;
-}, "taskList/updateTasksListOnCreateSubtaskFromListViewSuccess">, updateTasksListOnUpdateTaskSuccess: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"taskList/updateTasksListOnUpdateTaskSuccess">, updateTasksListOnUpdateTaskFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, "taskList/updateTaskFromListView">, updateTasksListOnUpdateTaskSuccess: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"taskList/updateTasksListOnUpdateTaskSuccess">, updateTasksListOnUpdateTaskFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     error: ZeniAPIStatus;
 }, "taskList/updateTasksListOnUpdateTaskFailure">, updateTaskListOnCreateTaskFromTemplateSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     tasks: TaskPayload[];
-}, "taskList/updateTaskListOnCreateTaskFromTemplateSuccess">, 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;

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

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearTaskList = exports.updateTaskListOnCreateTaskFromTemplateSuccess = exports.updateTasksListOnUpdateTaskFailure = exports.updateTasksListOnUpdateTaskSuccess = exports.updateTasksListOnCreateSubtaskFromListViewSuccess = exports.updateTaskFromListView = exports.createSubtaskFromListView = 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.updateTaskList = exports.fetchTaskList = exports.fetchTaskListPage = exports.initialState = void 0;
+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;
 const toolkit_1 = require("@reduxjs/toolkit");
 const taskState_1 = require("../../../entity/task/taskState");
 const zeniDayJS_1 = require("../../../zeniDayJS");
@@ -33,8 +33,23 @@ const initialTaskIdsByDueDate = {
     today: [],
     upcoming: [],
 };
+const initialTabData = {
+    taskIds: [],
+    taskIdsByAssignees: {},
+    taskIdsByDueDate: { ...initialTaskIdsByDueDate },
+    taskIdsByGroupsIds: {},
+    taskIdsByPriority: { ...initialTaskIdsByPriority },
+    taskIdsByStatus: { ...initialTaskIdsByStatus },
+    taskIdsByTags: {},
+};
 exports.initialState = {
-    subtaskIdsByParentTaskId: {},
+    currentTab: 'live',
+    byTab: {
+        live: { ...initialTabData },
+        archived: { ...initialTabData },
+        deleted: { ...initialTabData },
+        snoozed: { ...initialTabData },
+    },
     taskIds: [],
     taskIdsByGroupsIds: {},
     taskIdsByPriority: initialTaskIdsByPriority,
@@ -91,18 +106,30 @@ const taskList = (0, toolkit_1.createSlice)({
             draft.error = undefined;
         },
         updateTaskList(draft, action) {
-            const { data } = action.payload;
+            const { data, archived, deleted, snoozed } = action.payload;
             draft.fetchState = 'Completed';
             draft.error = undefined;
-            draft.subtaskIdsByParentTaskId = buildSubtaskIdsByParentTaskId(data);
-            const { taskIds, taskIdsGroupedByPriority, taskIdsByGroupIds, taskIdsGroupedByStatus, taskIdsByAssignees, taskIdsByDueDate, taskIdsByTags, } = getGroupedTaskIds(data);
-            draft.taskIds = taskIds;
-            draft.taskIdsByGroupsIds = taskIdsByGroupIds;
-            draft.taskIdsByPriority = taskIdsGroupedByPriority;
-            draft.taskIdsByStatus = taskIdsGroupedByStatus;
-            draft.taskIdsByAssignees = taskIdsByAssignees;
-            draft.taskIdsByDueDate = taskIdsByDueDate;
-            draft.taskIdsByTags = taskIdsByTags;
+            // Group live tasks
+            const liveGrouped = getGroupedTaskIds(data);
+            draft.byTab.live = toTabData(liveGrouped);
+            // Group other tabs if provided
+            if (archived != null) {
+                draft.byTab.archived = toTabData(getGroupedTaskIds(archived));
+            }
+            if (deleted != null) {
+                draft.byTab.deleted = toTabData(getGroupedTaskIds(deleted));
+            }
+            if (snoozed != null) {
+                draft.byTab.snoozed = toTabData(getGroupedTaskIds(snoozed));
+            }
+            // Copy active tab data to top-level fields
+            const activeTabData = draft.byTab[draft.currentTab];
+            copyTabDataToTopLevel(draft, activeTabData);
+        },
+        updateTaskListTab(draft, action) {
+            draft.currentTab = action.payload;
+            const activeTabData = draft.byTab[action.payload];
+            copyTabDataToTopLevel(draft, activeTabData);
         },
         initiateTaskListLocalData(draft, action) {
             const { taskGroupById } = action.payload;
@@ -190,10 +217,13 @@ const taskList = (0, toolkit_1.createSlice)({
             },
         },
         updateTasksListOnBulkUpdateTasksSuccess(draft, action) {
-            const { taskIds, groupId } = action.payload;
+            const { taskIds, groupId, removeFromList } = action.payload;
             draft.updateTasksFetchState.fetchState = 'Completed';
             draft.updateTasksFetchState.error = undefined;
-            if (groupId != null) {
+            if (removeFromList) {
+                removeTaskIds(draft, taskIds);
+            }
+            else if (groupId != null) {
                 const { groupByKey } = draft.uiState;
                 if (groupByKey === 'groupName') {
                     Object.keys(draft.taskIdsByGroupsIds).forEach((gId) => {
@@ -346,17 +376,6 @@ const taskList = (0, toolkit_1.createSlice)({
                 [taskGroupId]: taskGroupName,
             };
         },
-        createSubtaskFromListView: {
-            reducer(draft) {
-                draft.updateTasksFetchState = {
-                    fetchState: 'In-Progress',
-                    error: undefined,
-                };
-            },
-            prepare(payload) {
-                return { payload };
-            },
-        },
         updateTaskFromListView(draft, action) {
             const { updates, task } = action.payload;
             const taskId = task.id;
@@ -413,13 +432,6 @@ const taskList = (0, toolkit_1.createSlice)({
                 }
             }
         },
-        updateTasksListOnCreateSubtaskFromListViewSuccess(draft, action) {
-            const { parentTaskId, subtaskId } = action.payload;
-            draft.updateTasksFetchState.fetchState = 'Completed';
-            draft.updateTasksFetchState.error = undefined;
-            const existing = draft.subtaskIdsByParentTaskId[parentTaskId] ?? [];
-            draft.subtaskIdsByParentTaskId[parentTaskId] = [...existing, subtaskId];
-        },
         updateTasksListOnUpdateTaskSuccess(draft) {
             draft.updateTasksFetchState.fetchState = 'Completed';
             draft.updateTasksFetchState.error = undefined;
@@ -428,12 +440,15 @@ const taskList = (0, toolkit_1.createSlice)({
             draft.updateTasksFetchState.fetchState = 'Error';
             draft.updateTasksFetchState.error = action.payload.error;
         },
+        removeTaskFromList(draft, action) {
+            removeTaskIds(draft, [action.payload]);
+        },
         clearTaskList(draft) {
             Object.assign(draft, exports.initialState);
         },
     },
 });
-_a = taskList.actions, exports.fetchTaskListPage = _a.fetchTaskListPage, exports.fetchTaskList = _a.fetchTaskList, exports.updateTaskList = _a.updateTaskList, 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.createSubtaskFromListView = _a.createSubtaskFromListView, exports.updateTaskFromListView = _a.updateTaskFromListView, exports.updateTasksListOnCreateSubtaskFromListViewSuccess = _a.updateTasksListOnCreateSubtaskFromListViewSuccess, exports.updateTasksListOnUpdateTaskSuccess = _a.updateTasksListOnUpdateTaskSuccess, exports.updateTasksListOnUpdateTaskFailure = _a.updateTasksListOnUpdateTaskFailure, exports.updateTaskListOnCreateTaskFromTemplateSuccess = _a.updateTaskListOnCreateTaskFromTemplateSuccess, 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.clearTaskList = _a.clearTaskList;
 exports.default = taskList.reducer;
 /**
  *  helpers
@@ -512,14 +527,49 @@ const getTagsGroupKey = (tags) => {
     tagIds.sort();
     return tagIds.join(',');
 };
-const buildSubtaskIdsByParentTaskId = (tasks) => {
-    const subtaskIdsByParentTaskId = {};
-    tasks.forEach((task) => {
-        if (task.subtasks != null && task.subtasks.length > 0) {
-            subtaskIdsByParentTaskId[task.task_id] = task.subtasks.map((s) => s.task_id);
-        }
+const toTabData = (grouped) => ({
+    taskIds: grouped.taskIds,
+    taskIdsByAssignees: grouped.taskIdsByAssignees,
+    taskIdsByDueDate: grouped.taskIdsByDueDate,
+    taskIdsByGroupsIds: grouped.taskIdsByGroupIds,
+    taskIdsByPriority: grouped.taskIdsGroupedByPriority,
+    taskIdsByStatus: grouped.taskIdsGroupedByStatus,
+    taskIdsByTags: grouped.taskIdsByTags,
+});
+const copyTabDataToTopLevel = (draft, tabData) => {
+    draft.taskIds = tabData.taskIds;
+    draft.taskIdsByGroupsIds = tabData.taskIdsByGroupsIds;
+    draft.taskIdsByPriority = tabData.taskIdsByPriority;
+    draft.taskIdsByStatus = tabData.taskIdsByStatus;
+    draft.taskIdsByAssignees = tabData.taskIdsByAssignees;
+    draft.taskIdsByDueDate = tabData.taskIdsByDueDate;
+    draft.taskIdsByTags = tabData.taskIdsByTags;
+};
+const removeIdsFromTabData = (tabData, taskIds) => {
+    const isRemoved = (id) => taskIds.includes(id);
+    tabData.taskIds = tabData.taskIds.filter((id) => !isRemoved(id));
+    Object.keys(tabData.taskIdsByGroupsIds).forEach((gId) => {
+        tabData.taskIdsByGroupsIds[gId] = tabData.taskIdsByGroupsIds[gId].filter((id) => !isRemoved(id));
+    });
+    Object.keys(tabData.taskIdsByPriority).forEach((key) => {
+        tabData.taskIdsByPriority[key] = tabData.taskIdsByPriority[key].filter((id) => !isRemoved(id));
+    });
+    Object.keys(tabData.taskIdsByStatus).forEach((key) => {
+        tabData.taskIdsByStatus[key] = tabData.taskIdsByStatus[key].filter((id) => !isRemoved(id));
     });
-    return subtaskIdsByParentTaskId;
+    Object.keys(tabData.taskIdsByDueDate).forEach((key) => {
+        tabData.taskIdsByDueDate[key] = tabData.taskIdsByDueDate[key].filter((id) => !isRemoved(id));
+    });
+    Object.keys(tabData.taskIdsByAssignees).forEach((key) => {
+        tabData.taskIdsByAssignees[key] = tabData.taskIdsByAssignees[key].filter((id) => !isRemoved(id));
+    });
+    Object.keys(tabData.taskIdsByTags).forEach((key) => {
+        tabData.taskIdsByTags[key] = tabData.taskIdsByTags[key].filter((id) => !isRemoved(id));
+    });
+};
+const removeTaskIds = (draft, taskIds) => {
+    removeIdsFromTabData(draft, taskIds);
+    removeIdsFromTabData(draft.byTab[draft.currentTab], taskIds);
 };
 const getGroupedTaskIds = (tasks) => {
     const taskIds = [];

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

@@ -1,19 +1,20 @@
-import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
+import { FetchStateAndError } from '../../../commonStateTypes/common';
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
 import { AddressState } from '../../../entity/address/addressState';
 import { TagState } from '../../../entity/tag/tagState';
 import { Task, TaskState } from '../../../entity/task/taskState';
 import { TaskGroupTemplate } from '../../../entity/taskGroupTemplate/taskGroupTemplateState';
 import { UserState } from '../../../entity/user/userState';
+import { UserGroupsState } from '../../../entity/userGroups/userGroupsState';
 import { UserRoleState } from '../../../entity/userRole/userRoleState';
 import { RootState } from '../../../reducer';
 import { UserAndRole } from '../../companyView/types/userAndRole';
 import { UserGroupListSelectorView } from '../../userGroupListView/userGroupListViewSelector';
 import { UserListSelectorView } from '../../userListView/userListViewSelector';
-import { TaskListFilters, TaskListLocalData, TaskListState, TaskListUIState } from './taskList';
+import { TaskListFilters, TaskListLocalData, TaskListState, TaskListTab, TaskListUIState } from './taskList';
 export interface TaskWithUserDetails extends Task {
     assigneeUsers: UserAndRole[];
-    subtasks: TaskWithUserDetails[];
+    firstAssigneeSortName: string;
 }
 export interface TaskGroupWithTasksList {
     groupName: string;
@@ -22,10 +23,10 @@ export interface TaskGroupWithTasksList {
     tasks: TaskWithUserDetails[];
 }
 export interface TaskListSelectorView extends SelectorView {
+    currentTab: TaskListTab;
     filters: TaskListFilters;
     localData: TaskListLocalData;
-    /** Subtask ids grouped by parent list task id (from the task list API). */
-    subtaskIdsByParentTaskId: Record<ID, ID[]>;
+    tabCounts: Record<TaskListTab, number>;
     taskCreationFromTemplateStatus: FetchStateAndError;
     taskGroupCreationStatus: FetchStateAndError;
     taskGroupDeleteStatus: FetchStateAndError;
@@ -37,11 +38,12 @@ export interface TaskListSelectorView extends SelectorView {
     userGroupList: UserGroupListSelectorView;
     userList: UserListSelectorView;
 }
-export declare const getTaskListGroupedByAssignees: ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }: {
+export declare const getTaskListGroupedByAssignees: ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }: {
     addressState: AddressState;
     tagState: TagState;
     taskListState: TaskListState;
     taskState: TaskState;
+    userGroupsState: UserGroupsState;
     userRoleState: UserRoleState;
     userState: UserState;
 }) => {
@@ -50,11 +52,12 @@ export declare const getTaskListGroupedByAssignees: ({ taskListState, taskState,
     isDefault: boolean;
     tasks: TaskWithUserDetails[];
 }[];
-export declare const getTaskListGroupedByPriority: ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }: {
+export declare const getTaskListGroupedByPriority: ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }: {
     addressState: AddressState;
     tagState: TagState;
     taskListState: TaskListState;
     taskState: TaskState;
+    userGroupsState: UserGroupsState;
     userRoleState: UserRoleState;
     userState: UserState;
 }) => {