@zeniai/client-epic-state 5.0.16 → 5.0.17-betaND1

package/lib/view/monthEndCloseChecksView/monthEndCloseChecksViewSelector.js

@@ -1,11 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMonthEndCloseChecksViewByTenantId = exports.isMonthEndInsightDisabled = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
-const isEqual_1 = __importDefault(require("lodash/isEqual"));
 const formatZeniDateFY_1 = require("../../commonStateTypes/fiscalYearHelpers/formatZeniDateFY");
 const timePeriod_1 = require("../../commonStateTypes/timePeriod");
 const monthEndCloseChecksSelector_1 = require("../../entity/monthEndCloseChecks/monthEndCloseChecksSelector");
@@ -18,13 +14,6 @@ const isMonthEndInsightDisabled = (currentTenant, selectedPeriod, userAllowedToA
             userAllowedToAccessMonthEndInsights === false) {
             return true;
         }
-        const previousMonthPeriod = {
-            month: (0, timePeriod_1.toMonth)((0, zeniDayJS_1.dateNow)().subtract(1, 'month').month() + 1),
-            year: (0, zeniDayJS_1.dateNow)().subtract(1, 'month').year(),
-        };
-        if (!(0, isEqual_1.default)(previousMonthPeriod, selectedPeriod)) {
-            return true;
-        }
         // if the selected period is November 2024, then book close date should not be null and book close date should be 30th November 2024
         const { bookCloseDate } = currentTenant;
         const selectedPeriodFirstDay = (0, zeniDayJS_1.date)(`${selectedPeriod.year}-${selectedPeriod.month}-01`);
@@ -63,7 +52,7 @@ exports.getMonthEndCloseChecksViewByTenantId = (0, toolkit_1.createSelector)((st
             if (check.id === 'month_end_insights') {
                 const isDisabled = monthEndCloseChecks.reportEmailSentDate == null
                     ? (0, exports.isMonthEndInsightDisabled)(currentTenant, selectedPeriod, userAllowedToAccessMonthEndInsights, monthEndCloseChecks.auditSummary)
-                    : false;
+                    : true;
                 return {
                     ...check,
                     isDisabled,

package/lib/view/taskManager/taskListView/epics/createSubtaskFromListViewEpic.d.ts

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

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

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createSubtaskFromListViewEpic = 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 taskListReducer_1 = require("../taskListReducer");
+const createSubtaskFromListViewEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(taskListReducer_1.createSubtaskFromListView.match), (0, operators_1.switchMap)((action) => {
+    const payload = action.payload;
+    const parentTaskId = payload.parent_task_id;
+    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 subtaskId = response.data.tasks[0].task_id;
+            return (0, rxjs_1.from)([
+                (0, taskReducer_1.updateTasks)(response.data.tasks),
+                (0, taskListReducer_1.updateTasksListOnCreateSubtaskFromListViewSuccess)({
+                    parentTaskId,
+                    subtaskId,
+                }),
+            ]);
+        }
+        return (0, rxjs_1.of)((0, taskListReducer_1.updateTasksListOnUpdateTaskFailure)({
+            error: response.status,
+        }));
+    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, taskListReducer_1.updateTasksListOnUpdateTaskFailure)({
+        error: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'create subtask from list view REST API call errored out' +
+            JSON.stringify(error)),
+    }))));
+}));
+exports.createSubtaskFromListViewEpic = createSubtaskFromListViewEpic;

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

@@ -6,16 +6,19 @@ 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) {
-            return (0, rxjs_1.of)((0, taskReducer_1.updateTasks)(response.data.tasks), (0, taskListReducer_1.updateTaskList)({
-                data: response.data.tasks,
+            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)({
+                data: tasks,
                 updateType: 'replace',
-            }), (0, tagReducer_1.updateTags)(response.data.tasks.map((task) => task.tags).flat()));
+            }), (0, tagReducer_1.updateTags)(tasksForEntity.map((task) => task.tags).flat()));
         }
         else {
             return (0, rxjs_1.of)((0, taskListReducer_1.updateTaskListFetchStatus)({

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

@@ -15,6 +15,8 @@ export declare type DueDateGroupKey = ReturnType<typeof toDueDateGroupKeyType>;
 export interface TaskListState extends FetchedState {
     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[]>;

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

@@ -1,7 +1,37 @@
+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: TaskPayload[];
+    tasks: TaskListTaskPayload[];
 }
 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,2 +1,9 @@
 "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,12 +5,13 @@ 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: TaskPayload[];
+    data: TaskListTaskPayload[];
     updateType: UpdateType;
 }, "taskList/updateTaskList">, updateTaskListFetchStatus: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     fetchState: FetchState;
@@ -48,10 +49,13 @@ export declare const fetchTaskListPage: import("@reduxjs/toolkit").ActionCreator
 }, "taskList/updateTaskListOnNewTaskCreationSuccess">, updateTaskListOnTaskGroupNameUpdate: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     taskGroupId: ID;
     taskGroupName: ID;
-}, "taskList/updateTaskListOnTaskGroupNameUpdate">, updateTaskFromListView: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, "taskList/updateTaskListOnTaskGroupNameUpdate">, createSubtaskFromListView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: CreateSubtaskFromListViewPayload], CreateSubtaskFromListViewPayload, "taskList/createSubtaskFromListView", never, never>, updateTaskFromListView: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     task: Task;
     updates: Partial<Task>;
-}, "taskList/updateTaskFromListView">, updateTasksListOnUpdateTaskSuccess: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"taskList/updateTasksListOnUpdateTaskSuccess">, updateTasksListOnUpdateTaskFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, "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<{
     error: ZeniAPIStatus;
 }, "taskList/updateTasksListOnUpdateTaskFailure">, updateTaskListOnCreateTaskFromTemplateSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     tasks: TaskPayload[];

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.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.updateTaskList = exports.fetchTaskList = exports.fetchTaskListPage = exports.initialState = void 0;
+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;
 const toolkit_1 = require("@reduxjs/toolkit");
 const taskState_1 = require("../../../entity/task/taskState");
 const zeniDayJS_1 = require("../../../zeniDayJS");
@@ -34,6 +34,7 @@ const initialTaskIdsByDueDate = {
     upcoming: [],
 };
 exports.initialState = {
+    subtaskIdsByParentTaskId: {},
     taskIds: [],
     taskIdsByGroupsIds: {},
     taskIdsByPriority: initialTaskIdsByPriority,
@@ -93,6 +94,7 @@ const taskList = (0, toolkit_1.createSlice)({
             const { data } = 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;
@@ -344,6 +346,17 @@ 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;
@@ -400,6 +413,13 @@ 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;
@@ -413,7 +433,7 @@ const taskList = (0, toolkit_1.createSlice)({
         },
     },
 });
-_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.updateTaskFromListView = _a.updateTaskFromListView, 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.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;
 exports.default = taskList.reducer;
 /**
  *  helpers
@@ -492,6 +512,15 @@ 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);
+        }
+    });
+    return subtaskIdsByParentTaskId;
+};
 const getGroupedTaskIds = (tasks) => {
     const taskIds = [];
     const taskIdsByGroupIds = {};

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

@@ -1,4 +1,4 @@
-import { FetchStateAndError } from '../../../commonStateTypes/common';
+import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
 import { AddressState } from '../../../entity/address/addressState';
 import { TagState } from '../../../entity/tag/tagState';
@@ -13,6 +13,7 @@ import { UserListSelectorView } from '../../userListView/userListViewSelector';
 import { TaskListFilters, TaskListLocalData, TaskListState, TaskListUIState } from './taskList';
 export interface TaskWithUserDetails extends Task {
     assigneeUsers: UserAndRole[];
+    subtasks: TaskWithUserDetails[];
 }
 export interface TaskGroupWithTasksList {
     groupName: string;
@@ -23,6 +24,8 @@ export interface TaskGroupWithTasksList {
 export interface TaskListSelectorView extends SelectorView {
     filters: TaskListFilters;
     localData: TaskListLocalData;
+    /** Subtask ids grouped by parent list task id (from the task list API). */
+    subtaskIdsByParentTaskId: Record<ID, ID[]>;
     taskCreationFromTemplateStatus: FetchStateAndError;
     taskGroupCreationStatus: FetchStateAndError;
     taskGroupDeleteStatus: FetchStateAndError;

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

@@ -49,6 +49,30 @@ const sortTasksList = (tagState, tasksList, sortKey, sortOrder) => {
     }, sortOrder);
     return tasksInOrder;
 };
+const taskToTaskWithUserDetails = (task, userState, userRoleState, addressState) => ({
+    ...task,
+    assigneeUsers: task.assignees
+        .map((userId) => (0, userAndRole_1.getUserAndUserRole)(userState, userRoleState, addressState, userId))
+        .filter((value) => value != null),
+    subtasks: [],
+});
+const attachSubtasksForTask = (taskWithAssignees, taskListState, taskState, userState, userRoleState, addressState) => {
+    const subtaskIds = taskListState.subtaskIdsByParentTaskId[taskWithAssignees.id] ?? [];
+    if (subtaskIds.length === 0) {
+        return { ...taskWithAssignees, subtasks: [] };
+    }
+    const subtasks = subtaskIds
+        .map((subtaskId) => {
+        const subtask = (0, taskSelector_1.getTaskById)(taskState, subtaskId);
+        if (subtask == null) {
+            return undefined;
+        }
+        const withAssignees = taskToTaskWithUserDetails(subtask, userState, userRoleState, addressState);
+        return attachSubtasksForTask(withAssignees, taskListState, taskState, userState, userRoleState, addressState);
+    })
+        .filter((value) => value != null);
+    return { ...taskWithAssignees, subtasks };
+};
 const getTasksWithUserDetails = ({ taskListState, taskState, userState, userRoleState, addressState, taskIds, tagState, }) => {
     const { sortKey, searchText } = taskListState.uiState;
     const sortOrder = (0, sortOrderPayload_1.getSortOrder)(taskListState.uiState.sortOrder);
@@ -56,10 +80,8 @@ const getTasksWithUserDetails = ({ taskListState, taskState, userState, userRole
         .map((taskId) => {
         const task = (0, taskSelector_1.getTaskById)(taskState, taskId);
         if (task != null) {
-            const assigneeUsers = task.assignees
-                .map((userId) => (0, userAndRole_1.getUserAndUserRole)(userState, userRoleState, addressState, userId))
-                .filter((value) => value != null);
-            return { ...task, assigneeUsers };
+            const taskWithAssignees = taskToTaskWithUserDetails(task, userState, userRoleState, addressState);
+            return attachSubtasksForTask(taskWithAssignees, taskListState, taskState, userState, userRoleState, addressState);
         }
         return undefined;
     })
@@ -342,6 +364,7 @@ exports.getAllTasks = (0, toolkit_1.createSelector)((state) => state.taskListSta
     return {
         uiState: taskListState.uiState,
         filters: taskListState.filters,
+        subtaskIdsByParentTaskId: taskListState.subtaskIdsByParentTaskId,
         taskGroupTemplates,
         fetchState: fetchState,
         userList: (0, userListViewSelector_1.getUserList)(userState, userRoleState, userListViewState, 'taskManagerCandidate'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.0.16",
+  "version": "5.0.17-betaND1",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",
@@ -106,7 +106,7 @@
   "scripts": {
     "clean": "rimraf lib",
     "test:typecheck": "echo 'Typechecking test files...' && NODE_OPTIONS=--max-old-space-size=4096 time tsc -p tsconfig.typecheck.json",
-    "test": "pnpm test:typecheck && vitest run --typecheck",
+    "test": "pnpm test:typecheck",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx --fix",
     "find-dead-code": "ts-prune | grep -v '(used in module)'",
     "find-unused-exports": "ts-unused-exports ./tsconfig.json",