@zeniai/client-epic-state 4.11.7 → 4.11.8

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

@@ -1,10 +1,17 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearTaskList = exports.updateTaskFilters = exports.updateTaskListUIState = exports.updateTaskListSearchText = exports.updateTaskListFetchStatus = exports.updateTaskList = exports.fetchTaskList = exports.fetchTaskListPage = exports.initialState = void 0;
+exports.clearTaskList = 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 = exports.initialLocalData = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
+exports.initialLocalData = {
+    newTaskGroupName: '',
+    existingTaskGroupNamesByGroupId: {},
+    selectedTaskIds: [],
+    defaultTaskGroupId: null,
+};
 exports.initialState = {
     taskIds: [],
+    taskIdsByGroupsIds: {},
     fetchState: 'Not-Started',
     searchText: '',
     error: undefined,
@@ -26,6 +33,11 @@ exports.initialState = {
     hasValidState() {
         return this.fetchState == 'Completed';
     },
+    localData: Object.assign({}, exports.initialLocalData),
+    updateTasksFetchState: {
+        fetchState: 'Not-Started',
+        error: undefined,
+    },
 };
 const taskList = (0, toolkit_1.createSlice)({
     name: 'taskList',
@@ -46,15 +58,40 @@ const taskList = (0, toolkit_1.createSlice)({
             draft.error = undefined;
         },
         updateTaskList(draft, action) {
-            var _a;
-            const { data, updateType } = action.payload;
+            const { data } = action.payload;
             draft.fetchState = 'Completed';
             draft.error = undefined;
-            const newAccounts = (_a = data.map((task) => task.task_id)) !== null && _a !== void 0 ? _a : [];
-            draft.taskIds =
-                updateType === 'merge'
-                    ? [...new Set([...draft.taskIds, ...newAccounts])]
-                    : newAccounts;
+            const taskIdsByGroupsIds = {};
+            data.forEach((task) => {
+                draft.taskIds.push(task.task_id);
+                if (task.task_group_ids != null) {
+                    task.task_group_ids.forEach((groupId) => {
+                        if (taskIdsByGroupsIds[groupId] != null) {
+                            taskIdsByGroupsIds[groupId].push(task.task_id);
+                        }
+                        else {
+                            taskIdsByGroupsIds[groupId] = [task.task_id];
+                        }
+                    });
+                }
+            });
+            draft.taskIdsByGroupsIds = taskIdsByGroupsIds;
+        },
+        initiateTaskListLocalData(draft, action) {
+            const { taskGroupById } = action.payload;
+            const existingTaskGroupNamesByGroupId = {};
+            let defaultTaskGroupId = null;
+            Object.keys(taskGroupById).forEach((groupId) => {
+                existingTaskGroupNamesByGroupId[groupId] = taskGroupById[groupId].name;
+                if (taskGroupById[groupId].isDefault === true) {
+                    defaultTaskGroupId = groupId;
+                }
+            });
+            draft.localData = Object.assign(Object.assign({}, exports.initialLocalData), { defaultTaskGroupId,
+                existingTaskGroupNamesByGroupId });
+        },
+        updateTaskListLocalData(draft, action) {
+            draft.localData = action.payload.localData;
         },
         updateTaskListFetchStatus(draft, action) {
             draft.fetchState = action.payload.fetchState;
@@ -79,10 +116,100 @@ const taskList = (0, toolkit_1.createSlice)({
                 draft.filters = action.payload.filters;
             }
         },
+        updateTaskListOnNewGroupCreationSuccess(draft, action) {
+            const { newTaskGroup } = action.payload;
+            draft.localData = Object.assign(Object.assign({}, draft.localData), { existingTaskGroupNamesByGroupId: Object.assign(Object.assign({}, draft.localData.existingTaskGroupNamesByGroupId), { [newTaskGroup.task_group_id]: newTaskGroup.name }) });
+        },
+        bulkUpdateTaskList: {
+            reducer(draft) {
+                draft.updateTasksFetchState = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+            prepare(taskIds, updates) {
+                return {
+                    payload: {
+                        taskIds,
+                        updates,
+                    },
+                };
+            },
+        },
+        dragNDropTasks: {
+            reducer() {
+                //do nothing
+            },
+            prepare(taskIds, groupId) {
+                return {
+                    payload: {
+                        taskIds,
+                        groupId,
+                    },
+                };
+            },
+        },
+        updateTasksListOnBulkUpdateTasksSuccess(draft, action) {
+            const { taskIds, groupId } = action.payload;
+            draft.updateTasksFetchState.fetchState = 'Completed';
+            draft.updateTasksFetchState.error = undefined;
+            Object.keys(draft.taskIdsByGroupsIds).forEach((groupId) => {
+                draft.taskIdsByGroupsIds[groupId] = draft.taskIdsByGroupsIds[groupId].filter((taskId) => taskIds.includes(taskId) === false);
+            });
+            if (groupId != null) {
+                if (draft.taskIdsByGroupsIds[groupId] != null) {
+                    draft.taskIdsByGroupsIds[groupId] = [
+                        ...draft.taskIdsByGroupsIds[groupId],
+                        ...taskIds,
+                    ];
+                }
+                else {
+                    draft.taskIdsByGroupsIds = Object.assign(Object.assign({}, draft.taskIdsByGroupsIds), { [groupId]: taskIds });
+                }
+            }
+            draft.localData = Object.assign(Object.assign({}, draft.localData), { newTaskGroupName: '', selectedTaskIds: [] });
+        },
+        updateTasksListOnBulkUpdateTasksFailure(draft, action) {
+            draft.updateTasksFetchState.fetchState = 'Error';
+            draft.updateTasksFetchState.error = action.payload.error;
+        },
+        updateTaskListOnTaskGroupDeletion(draft, action) {
+            var _a;
+            const { taskGroupId } = action.payload;
+            const { defaultTaskGroupId } = draft.localData;
+            if (((_a = draft.taskIdsByGroupsIds[taskGroupId]) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+                const tasks = draft.taskIdsByGroupsIds[taskGroupId];
+                if (defaultTaskGroupId != null) {
+                    draft.taskIdsByGroupsIds[defaultTaskGroupId] = [
+                        ...draft.taskIdsByGroupsIds[defaultTaskGroupId],
+                        ...tasks,
+                    ];
+                }
+            }
+            delete draft.taskIdsByGroupsIds[taskGroupId];
+            delete draft.localData.existingTaskGroupNamesByGroupId[taskGroupId];
+        },
+        updateTaskListOnNewTaskCreationSuccess(draft, action) {
+            const { taskId, taskGroupId } = action.payload;
+            draft.taskIds.push(taskId);
+            if (draft.taskIdsByGroupsIds[taskGroupId] != null) {
+                draft.taskIdsByGroupsIds[taskGroupId] = [
+                    taskId,
+                    ...draft.taskIdsByGroupsIds[taskGroupId],
+                ];
+            }
+            else {
+                draft.taskIdsByGroupsIds[taskGroupId] = [taskId];
+            }
+        },
+        updateTaskListOnTaskGroupNameUpdate(draft, action) {
+            const { taskGroupName, taskGroupId } = action.payload;
+            draft.localData.existingTaskGroupNamesByGroupId = Object.assign(Object.assign({}, draft.localData.existingTaskGroupNamesByGroupId), { [taskGroupId]: taskGroupName });
+        },
         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.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.clearTaskList = _a.clearTaskList;
 exports.default = taskList.reducer;

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

@@ -1,17 +1,27 @@
+import { FetchStateAndError } from '../../../commonStateTypes/common';
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
 import { Task } from '../../../entity/task/taskState';
 import { RootState } from '../../../reducer';
 import { UserAndRole } from '../../companyView/types/userAndRole';
-import { TaskListFilters, TaskListUIState } from './taskList';
+import { TaskListFilters, TaskListUIState, TaskListLocalData } from './taskList';
 import { UserListSelectorView } from '../../userListView/userListViewSelector';
+import { TaskGroup } from '../../../entity/taskGroup/taskGroupState';
 export interface TaskWithUserDetails extends Task {
     assigneeUsers: UserAndRole[];
 }
+export interface TaskGroupWithTasksList extends TaskGroup {
+    tasks: TaskWithUserDetails[];
+}
 export interface TaskListSelectorView extends SelectorView {
-    taskList: TaskWithUserDetails[];
+    taskGroupsWithTasksList: TaskGroupWithTasksList[];
     searchText: string;
     uiState: TaskListUIState;
     filters: TaskListFilters;
     userList: UserListSelectorView;
+    localData: TaskListLocalData;
+    updateTasksFetchState: FetchStateAndError;
+    taskGroupDeleteStatus: FetchStateAndError;
+    taskGroupUpdateStatus: FetchStateAndError;
+    taskGroupCreationStatus: FetchStateAndError;
 }
 export declare const getAllTasks: (state: RootState) => TaskListSelectorView;

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

@@ -12,26 +12,10 @@ const userAndRole_1 = require("../../companyView/types/userAndRole");
 const userListViewSelector_1 = require("../../userListView/userListViewSelector");
 const spendManagementFilterHelpers_1 = require("../../spendManagement/spendManagementFilterHelpers");
 const tagSelector_1 = require("../../../entity/tag/tagSelector");
-const getAllTasks = (state) => {
-    const { taskListState, taskState, userState, userRoleState, addressState } = state;
-    const searchText = taskListState.searchText;
-    const unFilteredTaskList = taskListState.taskIds
-        .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 Object.assign(Object.assign({}, task), { assigneeUsers });
-        }
-        return undefined;
-    })
-        .filter((value) => value != null);
-    const searchedTaskList = unFilteredTaskList.filter((task) => task.name.toLowerCase().includes(searchText.toLowerCase()));
-    const sortKey = taskListState.uiState.sortKey;
-    const sortOrder = (0, sortOrderPayload_1.getSortOrder)(taskListState.uiState.sortOrder);
-    const filteredTaskList = (0, spendManagementFilterHelpers_1.applyAdvancedFiltersOnList)('task_management', searchedTaskList, taskListState.filters);
-    const tasksInOrder = (0, orderBy_1.default)(filteredTaskList, (task) => {
+const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
+const taskGroupSelector_1 = require("../../../entity/taskGroup/taskGroupSelector");
+const sortTasksList = (state, tasksList, sortKey, sortOrder) => {
+    const tasksInOrder = (0, orderBy_1.default)(tasksList, (task) => {
         var _a, _b;
         const tagsByIds = (0, tagSelector_1.getTagsByIds)(state.tagState, task.tagIds);
         switch (sortKey) {
@@ -50,15 +34,67 @@ const getAllTasks = (state) => {
                 return task.name.toLowerCase();
         }
     }, sortOrder);
+    return tasksInOrder;
+};
+const getAllTasks = (state) => {
+    const { taskListState, taskState, userState, userRoleState, addressState, taskGroupState, taskGroupViewState, tagViewState, } = state;
+    const { localData, searchText } = taskListState;
+    const sortKey = taskListState.uiState.sortKey;
+    const sortOrder = (0, sortOrderPayload_1.getSortOrder)(taskListState.uiState.sortOrder);
+    const taskGroupIds = taskGroupViewState.taskGroupsIds;
+    const taskGroupsWithTasksList = taskGroupIds
+        .map((taskGroupId) => {
+        var _a;
+        const taskGroup = (0, taskGroupSelector_1.getTaskGroupById)(taskGroupState, taskGroupId);
+        const taskIds = (_a = taskListState.taskIdsByGroupsIds[taskGroupId]) !== null && _a !== void 0 ? _a : [];
+        const tasks = taskIds
+            .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 Object.assign(Object.assign({}, task), { assigneeUsers });
+            }
+            return undefined;
+        })
+            .filter((value) => (value === null || value === void 0 ? void 0 : value.name.toLowerCase().includes(searchText.toLowerCase())) ===
+            true);
+        if (taskGroup != null) {
+            const filteredTaskList = (0, spendManagementFilterHelpers_1.applyAdvancedFiltersOnList)('task_management', tasks, taskListState.filters);
+            const sortedTaskList = sortTasksList(state, filteredTaskList, sortKey, sortOrder);
+            return Object.assign(Object.assign({}, taskGroup), { tasks: sortedTaskList });
+        }
+        return undefined;
+    })
+        .filter((value) => value != null);
+    taskGroupsWithTasksList.sort((a, b) => {
+        return b.createdAt.valueOf() - a.createdAt.valueOf();
+    });
+    const sortedTaskGroupsWithTasksList = taskGroupsWithTasksList.filter((taskGroup) => taskGroup.isDefault === false);
+    const defaultTaskGroup = taskGroupsWithTasksList.find((taskGroup) => taskGroup.isDefault === true);
+    if (defaultTaskGroup != null) {
+        sortedTaskGroupsWithTasksList.push(defaultTaskGroup);
+    }
+    const { fetchState, error } = (0, reduceFetchState_1.reduceAnyFetchState)([
+        taskListState,
+        taskGroupViewState,
+        tagViewState,
+    ]);
     return {
-        taskList: tasksInOrder,
         searchText: taskListState.searchText,
         uiState: taskListState.uiState,
         filters: taskListState.filters,
-        fetchState: taskListState.fetchState,
+        fetchState: fetchState,
         userList: (0, userListViewSelector_1.getUserList)(state, 'taskManagerCandidate'),
-        error: taskListState.error,
+        error: error,
         version: 0,
+        taskGroupsWithTasksList: sortedTaskGroupsWithTasksList,
+        localData,
+        updateTasksFetchState: taskListState.updateTasksFetchState,
+        taskGroupDeleteStatus: taskGroupViewState.taskGroupDeleteStatus,
+        taskGroupUpdateStatus: taskGroupViewState.taskGroupUpdateStatus,
+        taskGroupCreationStatus: taskGroupViewState.taskGroupCreationStatus,
     };
 };
 exports.getAllTasks = getAllTasks;

package/lib/view/transactionDetail/epics/updateTransactionDetailEpic.js

@@ -23,8 +23,8 @@ const snackbarReducer_1 = require("../../../entity/snackbar/snackbarReducer");
 const recommendationPayload_1 = require("../../../commonPayloadTypes/recommendationPayload");
 const vendorSelector_1 = require("../../../entity/vendor/vendorSelector");
 const vendorReducer_1 = require("../../../entity/vendor/vendorReducer");
-const transactionType_1 = require("../../../entity/transaction/stateTypes/transactionType");
 const transactionSelector_1 = require("../../../entity/transaction/transactionSelector");
+const transactionType_1 = require("../../../entity/transaction/stateTypes/transactionType");
 const updateTransactionDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(transactionDetailReducer_1.updateTransactionDetail.match), (0, operators_1.mergeMap)((action) => {
     const { transactionState, vendorState, transactionDetailState } = state$.value;
     return zeniAPI
@@ -63,11 +63,15 @@ const updateTransactionDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe
             }));
             actions.push((0, transactionDetailReducer_1.updateTransactionDetailSaveStatus)(transactionIdResp, 'Completed'));
             let callMarkTransactionAsNotMiscategorized = true;
-            // NOTE: If tran is vendorType transaction and there is no vendor chosen on this tranaction while saving,
+            // NOTE: If tran is vendorType OR JE OR Deposit transaction and there is no vendor chosen on this tranaction while saving,
             // then we need to skip mark-miscategorized-as-correct api call
-            if ((0, transactionType_1.toVendorTransactionTypeStrict)(response.data.transaction.transaction_type) != null) {
+            if ((0, transactionType_1.toVendorTransactionTypeStrict)(response.data.transaction.transaction_type) != null ||
+                (0, transactionType_1.toJEAndDepositTransactionTypeStrict)(response.data.transaction.transaction_type) != null) {
                 const isAnyClassMissing = checkIfClassMissingForAnyLineItem(response.data.transaction);
-                if ((vendorUpdates === null || vendorUpdates === void 0 ? void 0 : vendorUpdates.id) == null || isAnyClassMissing == true) {
+                const isVendorOrCustomerMissingInAnyLine = checkIfVendorOrCustomerMissingForAnyLineItem(response.data.transaction);
+                if (((vendorUpdates === null || vendorUpdates === void 0 ? void 0 : vendorUpdates.id) == null &&
+                    isVendorOrCustomerMissingInAnyLine == true) ||
+                    isAnyClassMissing == true) {
                     callMarkTransactionAsNotMiscategorized = false;
                 }
             }
@@ -196,7 +200,7 @@ const toTransactionUpdatePayload = (updates, detail, vendorUpdates) => {
 };
 const checkIfClassMissingForAnyLineItem = (transactionPayload) => {
     let isAnyClassMissing = false;
-    if ((transactionPayload === null || transactionPayload === void 0 ? void 0 : transactionPayload.lines) != null) {
+    if (transactionPayload.lines != null) {
         transactionPayload.lines.forEach((line) => {
             var _a;
             if (((_a = line.line_detail) === null || _a === void 0 ? void 0 : _a.class.accounting_class_id) == null) {
@@ -206,6 +210,19 @@ const checkIfClassMissingForAnyLineItem = (transactionPayload) => {
     }
     return isAnyClassMissing;
 };
+const checkIfVendorOrCustomerMissingForAnyLineItem = (transactionPayload) => {
+    let isAnyVendorOrCustomerMissing = false;
+    if (transactionPayload.lines != null) {
+        transactionPayload.lines.forEach((line) => {
+            var _a, _b;
+            if (((_a = line.line_detail) === null || _a === void 0 ? void 0 : _a.vendor) == null &&
+                ((_b = line.line_detail) === null || _b === void 0 ? void 0 : _b.customer) == null) {
+                isAnyVendorOrCustomerMissing = true;
+            }
+        });
+    }
+    return isAnyVendorOrCustomerMissing;
+};
 const toEntityUpdatePayload = (entityUpdates) => {
     const entityUpdatesPayload = [];
     let entityKey;

package/package.json

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