@zeniai/client-epic-state 5.1.4 → 5.1.5-betaJK1

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

@@ -6,6 +6,7 @@ import { updateTasks } from '../../../../entity/task/taskReducer';
 import { RootState } from '../../../../reducer';
 import { ZeniAPI } from '../../../../zeniAPI';
 import { fetchFileList } from '../../../fileView/fileViewReducer';
+import { updateTaskListOnNewTaskCreationSuccess } from '../../taskListView/taskListReducer';
 import { fetchTaskDetail, initializeTaskToLocalStore, removeTaskDetail, updateEditTaskFetchStatus } from '../taskDetailReducer';
-export type ActionType = ReturnType<typeof fetchTaskDetail> | ReturnType<typeof updateTags> | ReturnType<typeof updateEditTaskFetchStatus> | ReturnType<typeof removeTaskDetail> | ReturnType<typeof updateTasks> | ReturnType<typeof initializeTaskToLocalStore> | ReturnType<typeof fetchFileList> | ReturnType<typeof openSnackbar>;
+export type ActionType = ReturnType<typeof fetchTaskDetail> | ReturnType<typeof updateTags> | ReturnType<typeof updateEditTaskFetchStatus> | ReturnType<typeof removeTaskDetail> | ReturnType<typeof updateTasks> | ReturnType<typeof initializeTaskToLocalStore> | ReturnType<typeof fetchFileList> | ReturnType<typeof openSnackbar> | ReturnType<typeof updateTaskListOnNewTaskCreationSuccess>;
 export declare const fetchTaskDetailEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -10,13 +10,16 @@ const operators_1 = require("rxjs/operators");
 const snackbarReducer_1 = require("../../../../entity/snackbar/snackbarReducer");
 const tagReducer_1 = require("../../../../entity/tag/tagReducer");
 const taskReducer_1 = require("../../../../entity/task/taskReducer");
+const taskSelector_1 = require("../../../../entity/task/taskSelector");
 const responsePayload_1 = require("../../../../responsePayload");
 const fileViewReducer_1 = require("../../../fileView/fileViewReducer");
+const taskListReducer_1 = require("../../taskListView/taskListReducer");
 const taskDetailReducer_1 = require("../taskDetailReducer");
 const fetchTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(taskDetailReducer_1.fetchTaskDetail.match), (0, operators_1.mergeMap)((action) => {
     const { taskId, cacheOverride } = action.payload;
     const taskActions = [];
     const state = state$.value;
+    const isTaskListFetched = state.taskListState.fetchState === 'Completed';
     const taskDetail = (0, get_1.default)(state.taskDetailState.editTaskStateById, taskId, undefined);
     if (cacheOverride === true) {
         taskActions.push((0, taskDetailReducer_1.removeTaskDetail)(taskId));
@@ -38,6 +41,16 @@ const fetchTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, ope
                     (0, tagReducer_1.updateTags)(response.data.tasks.map((task) => task.tags).flat()),
                     (0, taskDetailReducer_1.initializeTaskToLocalStore)(taskId),
                 ];
+                if (isTaskListFetched === true) {
+                    const taskGroupId = response.data.tasks[0].task_group_ids?.[0];
+                    if (taskGroupId != null) {
+                        fetchActions.push((0, taskListReducer_1.updateTaskListOnNewTaskCreationSuccess)({
+                            taskGroupId,
+                            task: response.data.tasks[0],
+                            currentTaskState: (0, taskSelector_1.getTaskById)(state.taskState, taskId),
+                        }));
+                    }
+                }
                 const fileIds = response.data.tasks[0].file_ids;
                 if (fileIds.length > 0) {
                     fetchActions.push((0, fileViewReducer_1.fetchFileList)(fileIds));

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

@@ -3,9 +3,22 @@ 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;
+}
 export interface TaskDetailViewState {
     editTaskStateById: Record<ID, EditTaskDetail>;
     newTaskState: EditTaskDetail;
+    subTaskCreateStatus: FetchStateAndError;
+    subTaskListFetchStatusByParentId: Record<ID, FetchStateAndError>;
     taskHistoryById: Record<ID, CommonHistoryView>;
 }
 export interface EditTaskDetail {

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

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

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

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

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

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

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

@@ -33,8 +33,13 @@ const getTaskDetail = (state, taskId) => {
     let recurringSourceTaskId = undefined;
     let snoozedUntil = undefined;
     let taskGroupId = undefined;
+    let subtasks = [];
     if (taskId != null && sourceTaskDetail != null) {
         const taskEntity = (0, taskSelector_1.getTaskById)(taskState, taskId);
+        subtasks =
+            taskEntity != null
+                ? (0, taskSelector_1.getTasksByIds)(taskState, taskEntity.subTasksIds)
+                : [];
         const fileIdsInEntity = taskEntity?.fileIds ?? [];
         if (taskEntity != null) {
             createdByUser = (0, userAndRole_1.getUserAndUserRole)(userState, userRoleState, addressState, taskEntity.createdBy);
@@ -45,25 +50,27 @@ const getTaskDetail = (state, taskId) => {
             taskGroupId = taskEntity.taskGroupIds[0];
         }
         if (fileIdsInEntity.length > 0) {
-            fetchStatus = (0, reduceFetchState_1.reduceFetchState)([
+            fetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([
                 fileViewState.fetchFilesStatus,
                 sourceTaskDetail.fetchTaskStatus,
                 userList,
                 classListState,
+                taskDetailState.subTaskListFetchStatusByParentId[taskId] ?? fetchStatus,
             ]);
         }
         else {
-            fetchStatus = (0, reduceFetchState_1.reduceFetchState)([
+            fetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([
                 sourceTaskDetail.fetchTaskStatus,
                 userList,
                 classListState,
+                taskDetailState.subTaskListFetchStatusByParentId[taskId] ?? fetchStatus,
             ]);
         }
         showTaskDetailFormFooter = showFormFooter(sourceTaskDetail.taskDetailLocalData, taskEntity);
         taskHistory = taskDetailState.taskHistoryById[taskId]?.historicEvents ?? [];
     }
     else if (taskId == null) {
-        fetchStatus = (0, reduceFetchState_1.reduceFetchState)([userList, classListState]);
+        fetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([userList, classListState]);
     }
     const { classIds } = classListState;
     const allAccountingClasses = (0, classSelector_1.getClassesByIds)(classState, {
@@ -96,6 +103,7 @@ const getTaskDetail = (state, taskId) => {
         showTaskDetailFormFooter,
         snoozedUntil,
         taskGroupId,
+        subtasks,
     };
 };
 exports.getTaskDetail = getTaskDetail;
@@ -144,13 +152,16 @@ exports.allTaskPriority = [
     },
 ];
 const showFormFooter = (taskDetailLocalData, taskDetailInStore) => {
-    if (taskDetailLocalData.name !== taskDetailInStore?.name ||
+    if (taskDetailInStore == null) {
+        return false;
+    }
+    if (taskDetailLocalData.name !== taskDetailInStore.name ||
         taskDetailLocalData.description !== taskDetailInStore.description ||
         taskDetailLocalData.priority !== taskDetailInStore.priority.code ||
         taskDetailLocalData.status !== taskDetailInStore.status.code ||
         !(0, isEqual_1.default)(taskDetailInStore.tagIds, taskDetailLocalData.tagIds) ||
-        !(0, isEqual_1.default)(taskDetailLocalData.assignee, taskDetailInStore?.assignees ?? []) ||
-        !(0, isEqual_1.default)(taskDetailLocalData.groupAssignees, taskDetailInStore?.groupAssignees ?? []) ||
+        !(0, isEqual_1.default)(taskDetailLocalData.assignee, taskDetailInStore.assignees ?? []) ||
+        !(0, isEqual_1.default)(taskDetailLocalData.groupAssignees, taskDetailInStore.groupAssignees ?? []) ||
         !(0, isEqual_1.default)(taskDetailLocalData.fileIds, taskDetailInStore.fileIds ?? []) ||
         !(0, isEqual_1.default)(taskDetailLocalData.dueDate, taskDetailInStore.dueDate) ||
         !(0, isEqual_1.default)(taskDetailLocalData.type, taskDetailInStore.type) ||

package/package.json

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