@zeniai/client-epic-state 4.11.14 → 4.11.16

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

@@ -6,22 +6,20 @@ const operators_1 = require("rxjs/operators");
 const responsePayload_1 = require("../../../../responsePayload");
 const taskDetailReducer_1 = require("../taskDetailReducer");
 const taskReducer_1 = require("../../../../entity/task/taskReducer");
-const taskListReducer_1 = require("../../taskListView/taskListReducer");
 const taskSelector_1 = require("../../../../entity/task/taskSelector");
 const snackbarReducer_1 = require("../../../../entity/snackbar/snackbarReducer");
 const formatZeniDateFY_1 = require("../../../../commonStateTypes/fiscalYearHelpers/formatZeniDateFY");
 const saveTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(taskDetailReducer_1.saveTaskDetail.match), (0, operators_1.mergeMap)((action) => {
-    const { taskId, taskGroupId } = action.payload;
+    const { taskId } = action.payload;
     const state = state$.value;
-    const payload = prepareTaskPayload(state, taskId, taskGroupId);
+    const payload = prepareTaskPayload(state, taskId);
     const saveTaskApi = taskId != null
         ? zeniAPI.putAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks/${taskId}`, payload)
         : zeniAPI.postAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks`, payload);
     return saveTaskApi.pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) &&
             response.data != null &&
-            response.data.tasks.length > 0 &&
-            taskGroupId != null) {
+            response.data.tasks.length > 0) {
             const newTaskId = response.data.tasks[0].task_id;
             const fetchActions = [
                 (0, taskReducer_1.updateTasks)(response.data.tasks),
@@ -30,10 +28,6 @@ const saveTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, oper
                     newTaskId,
                     taskId,
                 }),
-                (0, taskListReducer_1.updateTaskListOnNewTaskCreationSuccess)({
-                    taskGroupId,
-                    taskId: newTaskId,
-                }),
             ];
             return (0, rxjs_1.from)(fetchActions);
         }
@@ -64,7 +58,7 @@ const saveTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, oper
     }))));
 }));
 exports.saveTaskDetailEpic = saveTaskDetailEpic;
-const prepareTaskPayload = (state, taskId, taskGroupId) => {
+const prepareTaskPayload = (state, taskId) => {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     const { taskDetailState, taskState } = state;
     const syncToken = taskId != null ? (_b = (_a = (0, taskSelector_1.getTaskById)(taskState, taskId)) === null || _a === void 0 ? void 0 : _a.syncToken) !== null && _b !== void 0 ? _b : '' : '';
@@ -90,6 +84,5 @@ const prepareTaskPayload = (state, taskId, taskGroupId) => {
             ? (_h = (_g = localData.recurringStartDate) === null || _g === void 0 ? void 0 : _g.format(formatZeniDateFY_1.DEFAULT_DATE_FORMAT)) !== null && _h !== void 0 ? _h : null
             : null,
         sync_token: syncToken,
-        task_group_ids: taskGroupId != null ? [taskGroupId] : [],
     };
 };

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

@@ -20,9 +20,8 @@ export declare const fetchTaskDetailPage: import("@reduxjs/toolkit").ActionCreat
     taskId?: string | undefined;
 }, string>, discardTaskUpdatesInLocalStore: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     taskId?: string | undefined;
-}, string>, saveTaskDetail: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[taskId?: string | undefined, taskGroupId?: string | undefined], {
+}, string>, saveTaskDetail: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[taskId?: string | undefined], {
     taskId: string | undefined;
-    taskGroupId: string | undefined;
 }, string, never, never>, archiveTask: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[taskId: string], {
     taskId: string;
 }, string, never, never>, archiveTaskSuccessOrFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{

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

@@ -125,11 +125,10 @@ const taskDetailView = (0, toolkit_1.createSlice)({
                         } });
                 }
             },
-            prepare(taskId, taskGroupId) {
+            prepare(taskId) {
                 return {
                     payload: {
                         taskId,
-                        taskGroupId,
                     },
                 };
             },

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

@@ -4,7 +4,5 @@ import { fetchTaskListPage, fetchTaskList } from './taskListReducer';
 import { RootState } from '../../../reducer';
 import { fetchUserListByType } from '../../userListView/userListViewReducer';
 import { fetchClassList } from '../../classList/classListReducer';
-import { fetchTagList } from '../../tagView/tagViewReducer';
-import { fetchAllTaskGroups } from '../taskGroupView/taskGroupViewReducer';
-export declare type ActionType = ReturnType<typeof fetchTaskListPage> | ReturnType<typeof fetchTaskList> | ReturnType<typeof fetchUserListByType> | ReturnType<typeof fetchTagList> | ReturnType<typeof fetchAllTaskGroups> | ReturnType<typeof fetchClassList>;
+export declare type ActionType = ReturnType<typeof fetchTaskListPage> | ReturnType<typeof fetchTaskList> | ReturnType<typeof fetchUserListByType> | ReturnType<typeof fetchClassList>;
 export declare const fetchTaskListPageEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

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

@@ -6,8 +6,6 @@ const operators_1 = require("rxjs/operators");
 const taskListReducer_1 = require("./taskListReducer");
 const userListViewReducer_1 = require("../../userListView/userListViewReducer");
 const classListReducer_1 = require("../../classList/classListReducer");
-const tagViewReducer_1 = require("../../tagView/tagViewReducer");
-const taskGroupViewReducer_1 = require("../taskGroupView/taskGroupViewReducer");
 const fetchTaskListPageEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(taskListReducer_1.fetchTaskListPage.match), (0, operators_1.mergeMap)((action) => {
     const { cacheOverride } = action.payload;
     const taskListPageActions = [];
@@ -16,8 +14,6 @@ const fetchTaskListPageEpic = (actions$, state$) => actions$.pipe((0, operators_
         taskListPageActions.push((0, taskListReducer_1.fetchTaskList)());
         taskListPageActions.push((0, classListReducer_1.fetchClassList)());
         taskListPageActions.push((0, userListViewReducer_1.fetchUserListByType)('taskManagerCandidate', true));
-        taskListPageActions.push((0, tagViewReducer_1.fetchTagList)());
-        taskListPageActions.push((0, taskGroupViewReducer_1.fetchAllTaskGroups)());
     }
     else {
         taskListPageActions.push((0, taskListReducer_1.fetchTaskList)());
@@ -30,14 +26,6 @@ const fetchTaskListPageEpic = (actions$, state$) => actions$.pipe((0, operators_
             taskManageUsers.fetchState !== 'In-Progress') {
             taskListPageActions.push((0, userListViewReducer_1.fetchUserListByType)('taskManagerCandidate', false));
         }
-        if (state.tagViewState.hasValidState() === false &&
-            state.tagViewState.fetchState !== 'In-Progress') {
-            taskListPageActions.push((0, tagViewReducer_1.fetchTagList)());
-        }
-        if (state.taskGroupViewState.hasValidState() === false &&
-            state.taskGroupViewState.fetchState !== 'In-Progress') {
-            taskListPageActions.push((0, taskGroupViewReducer_1.fetchAllTaskGroups)());
-        }
     }
     return (0, rxjs_1.concat)((0, rxjs_1.from)(taskListPageActions));
 }));

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

@@ -1,25 +1,12 @@
-import { FetchedState, FetchStateAndError, ID } from '../../../commonStateTypes/common';
+import { FetchedState, ID } from '../../../commonStateTypes/common';
 import { ZeniDate } from '../../../zeniDayJS';
 import { SpendManagementUIState } from '../../spendManagement/billPay/billList/billListState';
 import { CategoryCombinationOperator, FilterCategoryType } from '../../spendManagement/spendManagementFilterHelpers';
-export interface NewTaskGroupLocalData {
-    taskIds: ID[];
-    groupName: string;
-}
-export interface TaskListLocalData {
-    newTaskGroupName: string;
-    selectedTaskIds: ID[];
-    existingTaskGroupNamesByGroupId: Record<ID, string>;
-    defaultTaskGroupId: ID | null;
-}
 export interface TaskListState extends FetchedState {
     taskIds: ID[];
-    taskIdsByGroupsIds: Record<ID, ID[]>;
     uiState: TaskListUIState;
     searchText: string;
     filters: TaskListFilters;
-    localData: TaskListLocalData;
-    updateTasksFetchState: FetchStateAndError;
 }
 export interface TaskListFilters {
     categoryCombinationOperator: CategoryCombinationOperator;

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

@@ -1,11 +1,7 @@
-import { FetchState, ID, UpdateType } from '../../../commonStateTypes/common';
+import { FetchState, UpdateType } from '../../../commonStateTypes/common';
 import { TaskPayload } from '../../../entity/task/taskPayload';
 import { ZeniAPIStatus } from '../../../responsePayload';
-import { TaskListFilters, TaskListLocalData, TaskListState, TaskListUIState } from './taskList';
-import { TaskGroup } from '../../../entity/taskGroup/taskGroupState';
-import { Task } from '../../../entity/task/taskState';
-import { TaskGroupPayload } from '../../../entity/taskGroup/taskGroupPayload';
-export declare const initialLocalData: TaskListLocalData;
+import { TaskListFilters, TaskListState, TaskListUIState } from './taskList';
 export declare const initialState: TaskListState;
 export declare const fetchTaskListPage: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride: boolean], {
     cacheOverride: boolean;
@@ -21,31 +17,6 @@ export declare const fetchTaskListPage: import("@reduxjs/toolkit").ActionCreator
     uiState: Partial<TaskListUIState>;
 }, string>, updateTaskFilters: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     filters: TaskListFilters;
-}, string>, updateTaskListOnNewGroupCreationSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    newTaskGroup: TaskGroupPayload;
-}, string>, bulkUpdateTaskList: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[taskIds: string[], updates: Partial<Task>], {
-    taskIds: string[];
-    updates: Partial<Task>;
-}, string, never, never>, updateTasksListOnBulkUpdateTasksSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    taskIds: ID[];
-    groupId: ID | null;
-}, string>, updateTasksListOnBulkUpdateTasksFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    error: ZeniAPIStatus;
-}, string>, initiateTaskListLocalData: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    taskGroupById: Record<ID, TaskGroup>;
-}, string>, updateTaskListLocalData: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    localData: TaskListLocalData;
-}, string>, updateTaskListOnTaskGroupDeletion: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    taskGroupId: ID;
-}, string>, dragNDropTasks: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[taskIds: string[], groupId: any], {
-    taskIds: string[];
-    groupId: any;
-}, string, never, never>, updateTaskListOnNewTaskCreationSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    taskId: ID;
-    taskGroupId: ID;
-}, string>, updateTaskListOnTaskGroupNameUpdate: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    taskGroupName: ID;
-    taskGroupId: ID;
 }, string>, clearTaskList: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
 declare const _default: import("@reduxjs/toolkit").Reducer<TaskListState, import("@reduxjs/toolkit").AnyAction>;
 export default _default;

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

@@ -1,17 +1,10 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.clearTaskList = exports.updateTaskFilters = exports.updateTaskListUIState = exports.updateTaskListSearchText = exports.updateTaskListFetchStatus = exports.updateTaskList = exports.fetchTaskList = exports.fetchTaskListPage = exports.initialState = 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,
@@ -33,11 +26,6 @@ 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',
@@ -58,40 +46,15 @@ const taskList = (0, toolkit_1.createSlice)({
             draft.error = undefined;
         },
         updateTaskList(draft, action) {
-            const { data } = action.payload;
+            var _a;
+            const { data, updateType } = action.payload;
             draft.fetchState = 'Completed';
             draft.error = undefined;
-            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;
+            const newAccounts = (_a = data.map((task) => task.task_id)) !== null && _a !== void 0 ? _a : [];
+            draft.taskIds =
+                updateType === 'merge'
+                    ? [...new Set([...draft.taskIds, ...newAccounts])]
+                    : newAccounts;
         },
         updateTaskListFetchStatus(draft, action) {
             draft.fetchState = action.payload.fetchState;
@@ -116,100 +79,10 @@ 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.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;
+_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;
 exports.default = taskList.reducer;

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

@@ -1,27 +1,17 @@
-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, TaskListLocalData } from './taskList';
+import { TaskListFilters, TaskListUIState } 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 {
-    taskGroupsWithTasksList: TaskGroupWithTasksList[];
+    taskList: TaskWithUserDetails[];
     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,10 +12,26 @@ 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 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) => {
+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) => {
         var _a, _b;
         const tagsByIds = (0, tagSelector_1.getTagsByIds)(state.tagState, task.tagIds);
         switch (sortKey) {
@@ -34,67 +50,15 @@ const sortTasksList = (state, tasksList, sortKey, sortOrder) => {
                 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: fetchState,
+        fetchState: taskListState.fetchState,
         userList: (0, userListViewSelector_1.getUserList)(state, 'taskManagerCandidate'),
-        error: error,
+        error: taskListState.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 transactionSelector_1 = require("../../../entity/transaction/transactionSelector");
 const transactionType_1 = require("../../../entity/transaction/stateTypes/transactionType");
+const transactionSelector_1 = require("../../../entity/transaction/transactionSelector");
 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,15 +63,11 @@ const updateTransactionDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe
             }));
             actions.push((0, transactionDetailReducer_1.updateTransactionDetailSaveStatus)(transactionIdResp, 'Completed'));
             let callMarkTransactionAsNotMiscategorized = true;
-            // NOTE: If tran is vendorType OR JE OR Deposit transaction and there is no vendor chosen on this tranaction while saving,
+            // NOTE: If tran is vendorType 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 ||
-                (0, transactionType_1.toJEAndDepositTransactionTypeStrict)(response.data.transaction.transaction_type) != null) {
+            if ((0, transactionType_1.toVendorTransactionTypeStrict)(response.data.transaction.transaction_type) != null) {
                 const isAnyClassMissing = checkIfClassMissingForAnyLineItem(response.data.transaction);
-                const isVendorOrCustomerMissingInAnyLine = checkIfVendorOrCustomerMissingForAnyLineItem(response.data.transaction);
-                if (((vendorUpdates === null || vendorUpdates === void 0 ? void 0 : vendorUpdates.id) == null &&
-                    isVendorOrCustomerMissingInAnyLine == true) ||
-                    isAnyClassMissing == true) {
+                if ((vendorUpdates === null || vendorUpdates === void 0 ? void 0 : vendorUpdates.id) == null || isAnyClassMissing == true) {
                     callMarkTransactionAsNotMiscategorized = false;
                 }
             }
@@ -200,7 +196,7 @@ const toTransactionUpdatePayload = (updates, detail, vendorUpdates) => {
 };
 const checkIfClassMissingForAnyLineItem = (transactionPayload) => {
     let isAnyClassMissing = false;
-    if (transactionPayload.lines != null) {
+    if ((transactionPayload === null || transactionPayload === void 0 ? void 0 : 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) {
@@ -210,19 +206,6 @@ 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/lib/view/vendorReviewView/vendorFirstReviewView/epics/fetchVendorFirstReviewViewEpic.js

@@ -67,7 +67,6 @@ const mapVendorPayloadFromVendorFirstReviewViewResponse = (vendor) => {
         qbo_id: vendor.qbo_id,
         currency_code: vendor.currency_code,
         currency_symbol: vendor.currency_symbol,
-        transaction_attachments: vendor.transaction_attachments,
     };
 };
 const mapUsersPayloadFromVendorFirstReviewViewResponse = (vendorsResponse) => {

package/lib/view/vendorReviewView/vendorFirstReviewView/epics/saveVendorFirstReviewViewEpic.js

@@ -21,12 +21,12 @@ const fetchVendorFirstReviewViewEpic_1 = require("./fetchVendorFirstReviewViewEp
 const globalMerchantSelector_1 = require("../../../../entity/globalMerchant/globalMerchantSelector");
 const saveVendorFirstReviewViewEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(vendorFirstReviewViewReducer_1.saveVendorFirstReviewView.match), (0, operators_1.mergeMap)((action) => {
     const { vendorFirstReviewViewState, globalMerchantState, vendorState } = state$.value;
-    const { vendorId, markAsEmployee, markAsLocalContractor } = action.payload;
+    const { vendorId, markAsEmployee } = action.payload;
     const currentVendorLocalData = vendorFirstReviewViewState.vendorFirstReviewViewLocalDataById[vendorId]
         .vendorFirstReviewViewLocalData;
     const currentVendor = (0, vendorSelector_1.getVendorByVendorId)(state$.value.vendorState, vendorId);
     const { vendorName, selectedGlobalMerchant, recommendations, nonExistingRecommendations, } = getSaveVendorFirstReviewViewPayloadDetails(currentVendorLocalData, globalMerchantState, vendorState);
-    const payload = Object.assign({}, prepareSaveVendorFirstReviewViewPayload(vendorName, recommendations, nonExistingRecommendations, markAsEmployee, markAsLocalContractor, currentVendor === null || currentVendor === void 0 ? void 0 : currentVendor.qboId, selectedGlobalMerchant));
+    const payload = Object.assign({}, prepareSaveVendorFirstReviewViewPayload(vendorName, recommendations, nonExistingRecommendations, markAsEmployee, currentVendor === null || currentVendor === void 0 ? void 0 : currentVendor.qboId, selectedGlobalMerchant));
     const queryParam = {
         view: 'merchant_review_list',
     };
@@ -68,14 +68,9 @@ const saveVendorFirstReviewViewEpic = (actions$, state$, zeniAPI) => actions$.pi
                     actions.push((0, snackbarReducer_1.openSnackbar)({
                         messageSection: payload.is_employee === true
                             ? 'save_vendor_marked_as_employee'
-                            : payload.is_local_contractor === true
-                                ? 'save_vendor_marked_as_local_contractor'
-                                : 'save_vendor_sent_for_review',
+                            : 'save_vendor_sent_for_review',
                         messageText: 'success',
-                        type: payload.is_employee === true ||
-                            payload.is_local_contractor === true
-                            ? 'success'
-                            : 'info',
+                        type: payload.is_employee === true ? 'success' : 'info',
                         variables: [
                             {
                                 variableName: '_vendor_name_',
@@ -148,7 +143,7 @@ exports.saveVendorFirstReviewViewEpic = saveVendorFirstReviewViewEpic;
 /**
  * Helpers
  */
-const prepareSaveVendorFirstReviewViewPayload = (vendorName, recommendations, nonExistingRecommendations, markAsEmployee, markAsLocalContractor, vendorQboId, selectedGlobalMerchant) => {
+const prepareSaveVendorFirstReviewViewPayload = (vendorName, recommendations, nonExistingRecommendations, markAsEmployee, vendorQboId, selectedGlobalMerchant) => {
     const selectedGlobalMerchantBase = (selectedGlobalMerchant === null || selectedGlobalMerchant === void 0 ? void 0 : selectedGlobalMerchant.globalMerchantId) != null
         ? (0, omit_1.default)((0, globalMerchantPayload_1.toGlobalMerchantBasePayload)(selectedGlobalMerchant), ['create_time', 'update_time'])
         : selectedGlobalMerchant != null
@@ -160,7 +155,6 @@ const prepareSaveVendorFirstReviewViewPayload = (vendorName, recommendations, no
         selected_global_merchant: markAsEmployee === true ? null : selectedGlobalMerchantBase,
         recommendations: (0, commonTypes_2.toVendorReviewViewRecommendationPayload)(recommendations, nonExistingRecommendations),
         is_employee: markAsEmployee,
-        is_local_contractor: markAsLocalContractor,
     };
     return payload;
 };