@zeniai/client-epic-state 4.20.4 → 4.20.6

package/lib/view/financeStatement/financeStatementSelector.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFinanceStatement = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
-const coaBalanceType_1 = require("../../commonStateTypes/coaBalance/coaBalanceType");
 const coaBalancesFilter_1 = require("../../commonStateTypes/coaBalance/coaBalancesFilter");
 const coaBalancesFilterClassesView_1 = require("../../commonStateTypes/coaBalance/coaBalancesFilterClassesView");
 const dataAvailable_1 = require("../../commonStateTypes/dataAvailable");
@@ -12,7 +11,6 @@ const thisPeriodHelpers_1 = require("../../commonStateTypes/viewAndReport/thisPe
 const balanceSheetSelector_1 = require("../balanceSheet/balanceSheetSelector");
 const cashFlowSelector_1 = require("../cashFlow/cashFlowSelector");
 const profitAndLossSelector_1 = require("../profitAndLoss/profitAndLossSelector");
-const profitAndLossClassesByClassHorizontalSelector_1 = require("../profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelector");
 const profitAndLossClassesViewSelector_1 = require("../profitAndLossClassesView/profitAndLossClassesViewSelector");
 function getDateRangeForFinanceReports(profitAndLossState, balanceSheetState, cashFlowState) {
     const datesSorted = [
@@ -47,11 +45,11 @@ exports.getFinanceStatement = (0, toolkit_1.createSelector)((state) => state.acc
     if (dataAvailable != null) {
         const noFilter = (0, coaBalancesFilter_1.newBalancesFilterForDateRange)(firstMonthOfFY, financeStatementState.timeframe, dataAvailable, 'ascending_date', []);
         const profitAndLossForTimeframeTicks = (0, profitAndLossSelector_1.getProfitAndLossReport)(noFilter, undefined, accountState, accountGroupState, sectionAccountsViewState, profitAndLossState, forecastState);
-        const expensesBalances = profitAndLossForTimeframeTicks.sections.expenses?.balances ?? [];
-        const incomeBalances = profitAndLossForTimeframeTicks.sections.income?.balances ?? [];
-        balancesInTimeframe =
-            expensesBalances.length > 0 ? expensesBalances : incomeBalances;
-        if (balancesInTimeframe.length > 0) {
+        if (profitAndLossForTimeframeTicks.sections.expenses != null) {
+            balancesInTimeframe =
+                profitAndLossForTimeframeTicks.sections.expenses.balances.length > 0
+                    ? profitAndLossForTimeframeTicks.sections['expenses'].balances
+                    : profitAndLossForTimeframeTicks.sections['income'].balances;
             allTimeframeTicks = balancesInTimeframe.map((balance) => (0, timeframeTick_1.toTimeframeTick)(balance));
         }
     }
@@ -59,22 +57,12 @@ exports.getFinanceStatement = (0, toolkit_1.createSelector)((state) => state.acc
     if (thisPeriod == null && balancesInTimeframe.length > 0) {
         thisPeriod = (0, timeframeTick_1.toTimeframeTick)(balancesInTimeframe[balancesInTimeframe.length - 1]);
     }
-    const rawAdditionalBalances = financeStatementState.isAdditionalBalancesShown === true
+    const filter = (0, coaBalancesFilter_1.newBalancesFilter)(firstMonthOfFY, financeStatementState.timeframe, Math.min((0, dataAvailable_1.getNumberOfPeriods)(firstMonthOfFY, financeStatementState.timeframe, dataAvailable) ?? financeStatementState.selectedCOABalancesRange.numberOfPeriods, financeStatementState.selectedCOABalancesRange.numberOfPeriods), thisPeriod, 'ascending_date', financeStatementState.isAdditionalBalancesShown === true
         ? financeStatementState.selectedAdditionalBalances
-        : [];
-    const useHorizontalClassesLayout = profitAndLossClassesViewState.uiState.classViewLayout ===
-        'horizontal' &&
-        financeStatementState.selectedReportId === 'profit_and_loss_by_classes';
-    const additionalBalancesForFilter = useHorizontalClassesLayout
-        ? (0, coaBalanceType_1.stripCompareAdditionalBalanceTypes)(rawAdditionalBalances)
-        : rawAdditionalBalances;
-    const filter = (0, coaBalancesFilter_1.newBalancesFilter)(firstMonthOfFY, financeStatementState.timeframe, Math.min((0, dataAvailable_1.getNumberOfPeriods)(firstMonthOfFY, financeStatementState.timeframe, dataAvailable) ?? financeStatementState.selectedCOABalancesRange.numberOfPeriods, financeStatementState.selectedCOABalancesRange.numberOfPeriods), thisPeriod, 'ascending_date', additionalBalancesForFilter);
+        : []);
     const profitAndLossReport = (0, profitAndLossSelector_1.getProfitAndLossReport)(filter, undefined, accountState, accountGroupState, sectionAccountsViewState, profitAndLossState, forecastState);
     const classFilter = (0, coaBalancesFilterClassesView_1.newBalancesFilterClassesView)(filter.firstMonthOfFY, filter.timeframe, filter.balancesRange.numberOfPeriods, filter.balancesRange.thisPeriod, filter.balancesRange.orderBy, filter.additionalBalances, profitAndLossClassesViewState.uiState.classesToFilterOut);
     const profitAndLossByClassReport = (0, profitAndLossClassesViewSelector_1.getProfitAndLossClassesView)(classFilter, accountState, classState, sectionsState, profitAndLossClassesViewState);
-    const profitAndLossByClassHorizontalReport = (0, profitAndLossClassesByClassHorizontalSelector_1.getProfitAndLossClassesHorizontalView)(classFilter, accountState, classState, sectionsState, profitAndLossClassesViewState, profitAndLossClassesViewState.uiState.classViewLayout === 'horizontal'
-        ? thisPeriod
-        : undefined);
     const balanceSheetReport = (0, balanceSheetSelector_1.getBalanceSheet)(filter, accountState, accountGroupState, sectionAccountsViewState, balanceSheetState);
     const cashFlowReport = (0, cashFlowSelector_1.getCashFlow)(filter, accountState, accountGroupState, sectionAccountsViewState, cashFlowState);
     const allReports = [
@@ -122,15 +110,12 @@ exports.getFinanceStatement = (0, toolkit_1.createSelector)((state) => state.acc
         dataAvailable,
         profitAndLossReport,
         profitAndLossByClassReport,
-        profitAndLossByClassHorizontalReport,
         balanceSheetReport,
         cashFlowReport,
         filter,
         selectedReportId: financeStatementState.selectedReportId,
         downloadState: financeStatementState.downloadState,
-        isCompareModeOn: useHorizontalClassesLayout
-            ? false
-            : financeStatementState.selectedAdditionalBalances.includes('this_period_vs_last_period') ||
-                financeStatementState.selectedAdditionalBalances.includes('this_period_vs_last_period_percent'),
+        isCompareModeOn: financeStatementState.selectedAdditionalBalances.includes('this_period_vs_last_period') ||
+            financeStatementState.selectedAdditionalBalances.includes('this_period_vs_last_period_percent'),
     };
 });

package/lib/view/profitAndLossClassesView/profitAndLossClassesViewReducer.d.ts

@@ -2,7 +2,7 @@ import { NestedClassID } from '../../commonStateTypes/classesView/nestedClassID'
 import { AccountViewMode, ID } from '../../commonStateTypes/common';
 import { ZeniAPIStatus, ZeniReportData } from '../../responsePayload';
 import { ProfitAndLossClassesViewPayload } from './profitAndLossClassesViewPayload';
-import { ClassViewLayout, ProfitAndLossClassesViewState } from './profitAndLossClassesViewState';
+import { ProfitAndLossClassesViewState } from './profitAndLossClassesViewState';
 export declare const initialState: ProfitAndLossClassesViewState;
 export declare const fetchProfitAndLossClassesView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: boolean | undefined], {
     cacheOverride: boolean;
@@ -30,8 +30,6 @@ export declare const fetchProfitAndLossClassesView: import("@reduxjs/toolkit").A
     };
 }, "profitAndLossClassesView/updateProfitAndLossClassesViewUIState">, updateAccountViewMode: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     viewMode: AccountViewMode;
-}, "profitAndLossClassesView/updateAccountViewMode">, updateClassViewLayout: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    classViewLayout: ClassViewLayout;
-}, "profitAndLossClassesView/updateClassViewLayout">, resetProfitAndLossClassesNodeCollapseState: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"profitAndLossClassesView/resetProfitAndLossClassesNodeCollapseState">, clearProfitAndLossClassesView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"profitAndLossClassesView/clearProfitAndLossClassesView">;
+}, "profitAndLossClassesView/updateAccountViewMode">, resetProfitAndLossClassesNodeCollapseState: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"profitAndLossClassesView/resetProfitAndLossClassesNodeCollapseState">, clearProfitAndLossClassesView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"profitAndLossClassesView/clearProfitAndLossClassesView">;
 declare const _default: import("redux").Reducer<ProfitAndLossClassesViewState>;
 export default _default;

package/lib/view/profitAndLossClassesView/profitAndLossClassesViewReducer.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearProfitAndLossClassesView = exports.resetProfitAndLossClassesNodeCollapseState = exports.updateClassViewLayout = exports.updateAccountViewMode = exports.updateProfitAndLossClassesViewUIState = exports.updateClassesToFilterOut = exports.updateProfitAndLossForTimeframeClassesViewFailure = exports.updateProfitAndLossForTimeframeClassesView = exports.fetchProfitAndLossForTimeframeClassesView = exports.fetchProfitAndLossClassesView = exports.initialState = void 0;
+exports.clearProfitAndLossClassesView = exports.resetProfitAndLossClassesNodeCollapseState = exports.updateAccountViewMode = exports.updateProfitAndLossClassesViewUIState = exports.updateClassesToFilterOut = exports.updateProfitAndLossForTimeframeClassesViewFailure = exports.updateProfitAndLossForTimeframeClassesView = exports.fetchProfitAndLossForTimeframeClassesView = exports.fetchProfitAndLossClassesView = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const viewAndReportPayloadv2_1 = require("../../commonPayloadTypes/v2/viewAndReportPayloadv2");
 const getNestedClassIDHierarchyForReport_1 = require("../../commonStateTypes/classesView/getNestedClassIDHierarchyForReport");
@@ -27,7 +27,6 @@ exports.initialState = {
         nodeCollapseState: {},
         scrollPosition: undefined,
         accountViewMode: 'account_group',
-        classViewLayout: 'vertical',
         classesToFilterOut: [],
     },
     firstMonthOfFY: 1,
@@ -99,9 +98,6 @@ const profitAndLossClassesView = (0, toolkit_1.createSlice)({
         updateAccountViewMode(draft, action) {
             draft.uiState.accountViewMode = action.payload.viewMode;
         },
-        updateClassViewLayout(draft, action) {
-            draft.uiState.classViewLayout = action.payload.classViewLayout;
-        },
         resetProfitAndLossClassesNodeCollapseState(draft) {
             draft.uiState.nodeCollapseState = {};
         },
@@ -110,11 +106,10 @@ const profitAndLossClassesView = (0, toolkit_1.createSlice)({
         },
     },
 });
-_a = profitAndLossClassesView.actions, exports.fetchProfitAndLossClassesView = _a.fetchProfitAndLossClassesView, exports.fetchProfitAndLossForTimeframeClassesView = _a.fetchProfitAndLossForTimeframeClassesView, exports.updateProfitAndLossForTimeframeClassesView = _a.updateProfitAndLossForTimeframeClassesView, exports.updateProfitAndLossForTimeframeClassesViewFailure = _a.updateProfitAndLossForTimeframeClassesViewFailure, exports.updateClassesToFilterOut = _a.updateClassesToFilterOut, exports.updateProfitAndLossClassesViewUIState = _a.updateProfitAndLossClassesViewUIState, exports.updateAccountViewMode = _a.updateAccountViewMode, exports.updateClassViewLayout = _a.updateClassViewLayout, exports.resetProfitAndLossClassesNodeCollapseState = _a.resetProfitAndLossClassesNodeCollapseState, exports.clearProfitAndLossClassesView = _a.clearProfitAndLossClassesView;
+_a = profitAndLossClassesView.actions, exports.fetchProfitAndLossClassesView = _a.fetchProfitAndLossClassesView, exports.fetchProfitAndLossForTimeframeClassesView = _a.fetchProfitAndLossForTimeframeClassesView, exports.updateProfitAndLossForTimeframeClassesView = _a.updateProfitAndLossForTimeframeClassesView, exports.updateProfitAndLossForTimeframeClassesViewFailure = _a.updateProfitAndLossForTimeframeClassesViewFailure, exports.updateClassesToFilterOut = _a.updateClassesToFilterOut, exports.updateProfitAndLossClassesViewUIState = _a.updateProfitAndLossClassesViewUIState, exports.updateAccountViewMode = _a.updateAccountViewMode, exports.resetProfitAndLossClassesNodeCollapseState = _a.resetProfitAndLossClassesNodeCollapseState, exports.clearProfitAndLossClassesView = _a.clearProfitAndLossClassesView;
 exports.default = profitAndLossClassesView.reducer;
 const doUpdatedProfitAndLossClassesView = (draft, timeframe, pandLReport) => {
     const report = (0, viewAndReportPayloadv2_1.mapReportPayloadV2ToReportV2)(pandLReport.report);
-    draft.currency = report.currency;
     draft.dataAvailable = report.dataAvailable;
     draft.firstMonthOfFY = report.firstMonthOfFY;
     draft.bookCloseDate = report.bookCloseDate;

package/lib/view/profitAndLossClassesView/profitAndLossClassesViewSelector.js

@@ -4,7 +4,6 @@ exports.getProfitAndLossClassesView = exports.profitAndLossIdsInOrder = void 0;
 const getDifferenceOfBalancesGroupedByPeriod_1 = require("../../commonStateTypes/coaBalance/classBalances/getDifferenceOfBalancesGroupedByPeriod");
 const getSumOfBalancesGroupedByPeriod_1 = require("../../commonStateTypes/coaBalance/classBalances/getSumOfBalancesGroupedByPeriod");
 const coaBalance_1 = require("../../commonStateTypes/coaBalance/coaBalance");
-const reduceFetchState_1 = require("../../commonStateTypes/reduceFetchState");
 const sectionClassesViewSelector_1 = require("../../entity/sectionClassesViewV2/sectionClassesViewSelector");
 const profitAndLossClassesViewSelectorTypes_1 = require("./profitAndLossClassesViewSelectorTypes");
 exports.profitAndLossIdsInOrder = [
@@ -19,7 +18,7 @@ exports.profitAndLossIdsInOrder = [
     'netIncome',
 ];
 const getProfitAndLossClassesView = (filter, accountState, classState, sectionsState, profitAndLossClassesViewState) => {
-    const fetchState = (0, reduceFetchState_1.reduceFetchStateParallelTimeframes)([
+    const fetchState = reduceFetchState([
         profitAndLossClassesViewState.fetchState.month,
         profitAndLossClassesViewState.fetchState.quarter,
         profitAndLossClassesViewState.fetchState.year,
@@ -69,3 +68,31 @@ const getProfitAndLossClassesView = (filter, accountState, classState, sectionsS
     };
 };
 exports.getProfitAndLossClassesView = getProfitAndLossClassesView;
+function reduceFetchState(fetchStateList) {
+    const isAnyProgress = fetchStateList.reduce((prevValue, currentValue) => {
+        return prevValue === true || currentValue.fetchState === 'In-Progress';
+    }, false);
+    const isAllCompleted = fetchStateList.reduce((prevValue, currentValue) => {
+        return prevValue === true && currentValue.fetchState === 'Completed';
+    }, true);
+    const isAnyError = fetchStateList.reduce((prevValue, currentValue) => {
+        return prevValue === true || currentValue.fetchState === 'Error';
+    }, false);
+    const error = fetchStateList.reduce((prevValue, currentValue) => {
+        return prevValue ?? currentValue.error;
+    }, undefined);
+    let fetchState = 'Not-Started';
+    if (isAnyProgress) {
+        fetchState = 'In-Progress';
+    }
+    else if (isAllCompleted) {
+        fetchState = 'Completed';
+    }
+    else if (isAnyError) {
+        fetchState = 'Error';
+    }
+    return {
+        fetchState,
+        error,
+    };
+}

package/lib/view/profitAndLossClassesView/profitAndLossClassesViewState.d.ts

@@ -1,12 +1,9 @@
-import { Currency } from '../../commonStateTypes/amount';
 import { NestedClassHierarchyForReport, NestedClassID } from '../../commonStateTypes/classesView/nestedClassID';
 import { AccountViewMode, FetchStateAndError, ID } from '../../commonStateTypes/common';
 import { Report } from '../../commonStateTypes/viewAndReport/viewAndReport';
-export type ClassViewLayout = 'vertical' | 'horizontal';
 export interface ProfitAndLossClassesViewUIState {
     accountViewMode: AccountViewMode;
     classesToFilterOut: NestedClassID[];
-    classViewLayout: ClassViewLayout;
     nodeCollapseState: Record<ID, boolean>;
     scrollPosition: {
         scrollTop: number;
@@ -21,5 +18,4 @@ export interface ProfitAndLossClassesViewState extends Report {
         year: FetchStateAndError;
     };
     uiState: ProfitAndLossClassesViewUIState;
-    currency?: Currency;
 }

package/lib/view/profitAndLossClassesView/profitAndLossForTimeframeClassesViewEpic.js

@@ -27,13 +27,11 @@ const fetchProfitAndLossForTimeframeClassesViewEpic = (actions$, _, zeniAPI) =>
         .pipe((0, operators_1.mergeMap)((response) => {
         if (response.data != null && (0, responsePayload_1.isSuccessResponse)(response)) {
             const actions = [];
-            const report = response.data.report;
-            const currency = report.currency;
-            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'cogs', 'profit_and_loss_by_classes', report.cogs, report.classes, report.accounts, currency));
-            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'expenses', 'profit_and_loss_by_classes', report.expenses, report.classes, report.accounts, currency));
-            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'income', 'profit_and_loss_by_classes', report.income, report.classes, report.accounts, currency));
-            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'otherExpenses', 'profit_and_loss_by_classes', report.other_expenses, report.classes, report.accounts, currency));
-            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'otherIncome', 'profit_and_loss_by_classes', report.other_income, report.classes, report.accounts, currency));
+            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'cogs', 'profit_and_loss_by_classes', response.data.report.cogs, response.data.report.classes, response.data.report.accounts, response.data.report.currency));
+            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'expenses', 'profit_and_loss_by_classes', response.data.report.expenses, response.data.report.classes, response.data.report.accounts, response.data.report.currency));
+            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'income', 'profit_and_loss_by_classes', response.data.report.income, response.data.report.classes, response.data.report.accounts, response.data.report.currency));
+            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'otherExpenses', 'profit_and_loss_by_classes', response.data.report.other_expenses, response.data.report.classes, response.data.report.accounts, response.data.report.currency));
+            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'otherIncome', 'profit_and_loss_by_classes', response.data.report.other_income, response.data.report.classes, response.data.report.accounts, response.data.report.currency));
             actions.push((0, profitAndLossClassesViewReducer_1.updateProfitAndLossForTimeframeClassesView)({
                 timeframe: action.payload.timeframe,
                 report: response.data,

package/lib/view/reportUIOptions/updateReportUIOptionCOABalancesRangeEpic.js

@@ -11,13 +11,9 @@ const opExReducer_1 = require("../opEx/opExReducer");
 const revenueReducer_1 = require("../revenue/revenueReducer");
 const reportUIOptionsReducer_1 = require("./reportUIOptionsReducer");
 const updateReportUIOptionCOABalancesRangeEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(reportUIOptionsReducer_1.updateReportUIOptionCOABalancesRange.match), (0, operators_1.switchMap)((action) => {
-    const selectedRange = action.payload.selectedCOABalancesRange;
-    const thisPeriod = selectedRange.thisPeriod;
-    const orderBy = selectedRange.orderBy;
-    const numberOfPeriodsFromSelection = selectedRange.numberOfPeriods;
-    const highlightedNoOfPeriods = state$.value.reportUIOptionsState.isCompareModeOn === true
-        ? numberOfPeriodsFromSelection
-        : 1;
+    const thisPeriod = action.payload.selectedCOABalancesRange.thisPeriod;
+    const orderBy = action.payload.selectedCOABalancesRange.orderBy;
+    const highlightedNoOfPeriods = state$.value.reportUIOptionsState.isCompareModeOn === true ? 4 : 1;
     const highlightedCOABalancesRange = action.payload.highlightedCOABalancesRange == null && thisPeriod != null
         ? {
             numberOfPeriods: highlightedNoOfPeriods,
@@ -69,7 +65,9 @@ const updateReportUIOptionCOABalancesRangeEpic = (actions$, state$) => actions$.
         thisPeriod: action.payload.highlightedCOABalancesRange != null
             ? action.payload.highlightedCOABalancesRange.thisPeriod
             : thisPeriod,
-        numberOfPeriods: numberOfPeriodsFromSelection,
+        numberOfPeriods: state$.value.reportUIOptionsState.isCompareModeOn === true
+            ? 4
+            : financeStatementReducer_1.initialFinanceStatementState.maxNumOfPeriodsToHighlight,
         orderBy,
     }));
 }));

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

@@ -116,7 +116,7 @@ exports.allTaskPriority = [
     },
     {
         code: 'medium',
-        name: 'Medium',
+        name: 'Normal',
     },
     {
         code: 'low',

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

@@ -16,7 +16,6 @@ interface UpdateTaskPayload {
     description: string;
     due_date: string | null;
     file_ids: ID[];
-    group_assignees: string[];
     name: string;
     priority: string;
     recurring_end_date: string | null;

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

@@ -79,7 +79,6 @@ const toTaskPayload = (state, task) => {
         name: task.name,
         assignees: task.assignees,
         description: task.description,
-        group_assignees: task.groupAssignees,
         due_date: task.dueDate != null ? task.dueDate.format(formatZeniDateFY_1.DEFAULT_DATE_FORMAT) : null,
         priority: task.priority.code,
         status: task.status.code,

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

@@ -8,7 +8,6 @@ import { UserState } from '../../../entity/user/userState';
 import { UserRoleState } from '../../../entity/userRole/userRoleState';
 import { RootState } from '../../../reducer';
 import { UserAndRole } from '../../companyView/types/userAndRole';
-import { UserGroupListSelectorView } from '../../userGroupListView/userGroupListViewSelector';
 import { UserListSelectorView } from '../../userListView/userListViewSelector';
 import { TaskListFilters, TaskListLocalData, TaskListState, TaskListUIState } from './taskList';
 export interface TaskWithUserDetails extends Task {
@@ -31,7 +30,6 @@ export interface TaskListSelectorView extends SelectorView {
     taskGroupUpdateStatus: FetchStateAndError;
     uiState: TaskListUIState;
     updateTasksFetchState: FetchStateAndError;
-    userGroupList: UserGroupListSelectorView;
     userList: UserListSelectorView;
 }
 export declare const getTaskListGroupedByAssignees: ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }: {

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

@@ -17,7 +17,6 @@ const taskGroupTemplateSelector_1 = require("../../../entity/taskGroupTemplate/t
 const userSelector_1 = require("../../../entity/user/userSelector");
 const userAndRole_1 = require("../../companyView/types/userAndRole");
 const spendManagementFilterHelpers_1 = require("../../spendManagement/spendManagementFilterHelpers");
-const userGroupListViewSelector_1 = require("../../userGroupListView/userGroupListViewSelector");
 const userListViewSelector_1 = require("../../userListView/userListViewSelector");
 const taskDetailSelector_1 = require("../taskDetailView/taskDetailSelector");
 const taskList_1 = require("./taskList");
@@ -317,7 +316,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
         tagState,
     });
 };
-exports.getAllTasks = (0, toolkit_1.createSelector)((state) => state.taskListState, (state) => state.taskState, (state) => state.userState, (state) => state.userRoleState, (state) => state.userListViewState, (state) => state.addressState, (state) => state.taskGroupState, (state) => state.taskGroupViewState, (state) => state.tagViewState, (state) => state.tagState, (state) => state.taskGroupTemplateState, (state) => state.taskGroupTemplateViewState, (state) => state.userGroupsState, (state) => state.userGroupListViewState, (_state, isTaskTemplatesEnabled) => isTaskTemplatesEnabled, (taskListState, taskState, userState, userRoleState, userListViewState, addressState, taskGroupState, taskGroupViewState, tagViewState, tagState, taskGroupTemplateState, taskGroupTemplateViewState, userGroupsState, userGroupListViewState, isTaskTemplatesEnabled) => {
+exports.getAllTasks = (0, toolkit_1.createSelector)((state) => state.taskListState, (state) => state.taskState, (state) => state.userState, (state) => state.userRoleState, (state) => state.userListViewState, (state) => state.addressState, (state) => state.taskGroupState, (state) => state.taskGroupViewState, (state) => state.tagViewState, (state) => state.tagState, (state) => state.taskGroupTemplateState, (state) => state.taskGroupTemplateViewState, (_state, isTaskTemplatesEnabled) => isTaskTemplatesEnabled, (taskListState, taskState, userState, userRoleState, userListViewState, addressState, taskGroupState, taskGroupViewState, tagViewState, tagState, taskGroupTemplateState, taskGroupTemplateViewState, isTaskTemplatesEnabled) => {
     const { localData } = taskListState;
     const taskGroupsWithTasksList = getTaskGroupsWithTaskList({
         taskListState,
@@ -345,7 +344,6 @@ exports.getAllTasks = (0, toolkit_1.createSelector)((state) => state.taskListSta
         taskGroupTemplates,
         fetchState: fetchState,
         userList: (0, userListViewSelector_1.getUserList)(userState, userRoleState, userListViewState, 'taskManagerCandidate'),
-        userGroupList: (0, userGroupListViewSelector_1.getUserGroupList)(userGroupsState, userGroupListViewState, 'taskManagerCandidate'),
         error: error,
         version: 0,
         taskGroupsWithTasksList,

package/lib/view/twoFactorAuthentication/resendOtpEpic.d.ts

@@ -10,4 +10,4 @@ import { resendOtpCardHolder, sendOtpCardHolderFailure, sendOtpCardHolderSuccess
 import { resendOtpSpendManagementSetUp, sendOtpFailureSpendManagementSetUp, sendOtpSuccessSpendManagementSetUp } from '../spendManagement/commonSetup/setupViewReducer';
 import { resendOtp, sendOtpFailure, sendOtpSuccess } from './twoFactorAuthenticationReducer';
 export type ActionType = ReturnType<typeof resendOtp> | ReturnType<typeof sendOtpSuccess> | ReturnType<typeof sendOtpFailure> | ReturnType<typeof resendOtpSpendManagementSetUp> | ReturnType<typeof sendOtpSuccessSpendManagementSetUp> | ReturnType<typeof sendOtpFailureSpendManagementSetUp> | ReturnType<typeof resendOtpVendorView> | ReturnType<typeof sendOtpVendorViewSuccess> | ReturnType<typeof sendOtpVendorViewFailure> | ReturnType<typeof resendOnboardingOfficerOtp> | ReturnType<typeof sendOnboardingOfficerOtpSuccess> | ReturnType<typeof sendOnboardingOfficerOtpFailure> | ReturnType<typeof resendOtpCardUserOnboarding> | ReturnType<typeof sendOtpCardUserOnboardingSuccess> | ReturnType<typeof sendOtpCardUserOnboardingFailure> | ReturnType<typeof resendOtpMyProfile> | ReturnType<typeof resendOtpCardHolder> | ReturnType<typeof sendOtpCardHolderSuccess> | ReturnType<typeof sendOtpCardHolderFailure> | ReturnType<typeof sendOtpMyProfileFailure> | ReturnType<typeof sendOtpMyProfileSuccess>;
-export declare const resendOtpEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
+export declare const resendOtpEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/twoFactorAuthentication/resendOtpEpic.js

@@ -11,11 +11,20 @@ const cardUserOnboardingReducer_1 = require("../spendManagement/chargeCards/card
 const chargeCardDetailReducer_1 = require("../spendManagement/chargeCards/chargeCardDetail/chargeCardDetailReducer");
 const setupViewReducer_1 = require("../spendManagement/commonSetup/setupViewReducer");
 const twoFactorAuthenticationReducer_1 = require("./twoFactorAuthenticationReducer");
-const resendOtpEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(twoFactorAuthenticationReducer_1.resendOtp.match), (0, operators_1.mergeMap)((action) => {
+const resendOtpEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(twoFactorAuthenticationReducer_1.resendOtp.match), (0, operators_1.mergeMap)((action) => {
     const resendOtpActions = [];
     const { otpChallenge, twoFASource, entityId } = action.payload;
+    const chargeCard = twoFASource === 'ChargeCardHolder' && entityId != null
+        ? state$.value.chargeCardState.chargeCardByID[entityId]
+        : null;
     const payload = {
         otp_challenge: otpChallenge,
+        ...(chargeCard != null
+            ? {
+                provider_card_id: chargeCard.cardProviderID,
+                is_for_charge_cards: true,
+            }
+            : {}),
     };
     switch (twoFASource) {
         case 'SpendManagementSetup':
@@ -33,6 +42,11 @@ const resendOtpEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operator
         case 'CardUserOnboarding':
             resendOtpActions.push((0, cardUserOnboardingReducer_1.resendOtpCardUserOnboarding)());
             break;
+        case 'ChargeCardHolder':
+            if (entityId != null) {
+                resendOtpActions.push((0, chargeCardDetailReducer_1.resendOtpCardHolder)({ chargeCardId: entityId }));
+            }
+            break;
     }
     const resendOtp$ = zeniAPI
         .putAndGetJSON(`${zeniAPI.apiEndPoints.authMicroServiceBaseUrl}/1.0/otp/resend`, payload)

package/lib/view/userListView/fetchUserListByTypeEpic.d.ts

@@ -1,12 +1,10 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { updateAddresses } from '../../entity/address/addressReducer';
 import { updateAllUsers } from '../../entity/user/userReducer';
-import { updateAllUserGroups } from '../../entity/userGroups/userGroupsReducer';
 import { updateUserRoles } from '../../entity/userRole/userRoleReducer';
 import { RootState } from '../../reducer';
 import { ZeniAPI } from '../../zeniAPI';
 import { updateChargeCardCount, updateDebitCardCount } from '../spendManagement/chargeCards/issueChargeCard/issueChargeCardReducer';
-import { updateUserGroupIds } from '../userGroupListView/userGroupListViewReducer';
 import { fetchUserListByType, updateUserIds, updateUserListFetchFailure } from './userListViewReducer';
-export type ActionType = ReturnType<typeof fetchUserListByType> | ReturnType<typeof updateAllUsers> | ReturnType<typeof updateUserRoles> | ReturnType<typeof updateUserIds> | ReturnType<typeof updateChargeCardCount> | ReturnType<typeof updateDebitCardCount> | ReturnType<typeof updateAddresses> | ReturnType<typeof updateUserListFetchFailure> | ReturnType<typeof updateAllUserGroups> | ReturnType<typeof updateUserGroupIds>;
+export type ActionType = ReturnType<typeof fetchUserListByType> | ReturnType<typeof updateAllUsers> | ReturnType<typeof updateUserRoles> | ReturnType<typeof updateUserIds> | ReturnType<typeof updateChargeCardCount> | ReturnType<typeof updateDebitCardCount> | ReturnType<typeof updateAddresses> | ReturnType<typeof updateUserListFetchFailure>;
 export declare const fetchUserListByTypeEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => import("rxjs").Observable<ActionType>;

package/lib/view/userListView/fetchUserListByTypeEpic.js

@@ -6,11 +6,9 @@ const operators_1 = require("rxjs/operators");
 const addressReducer_1 = require("../../entity/address/addressReducer");
 const tenantSelector_1 = require("../../entity/tenant/tenantSelector");
 const userReducer_1 = require("../../entity/user/userReducer");
-const userGroupsReducer_1 = require("../../entity/userGroups/userGroupsReducer");
 const userRoleReducer_1 = require("../../entity/userRole/userRoleReducer");
 const responsePayload_1 = require("../../responsePayload");
 const issueChargeCardReducer_1 = require("../spendManagement/chargeCards/issueChargeCard/issueChargeCardReducer");
-const userGroupListViewReducer_1 = require("../userGroupListView/userGroupListViewReducer");
 const userListViewReducer_1 = require("./userListViewReducer");
 const fetchUserListByTypeEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(userListViewReducer_1.fetchUserListByType.match), (0, operators_1.mergeMap)((action) => {
     const { userType, cacheOverride } = action.payload;
@@ -34,15 +32,6 @@ const fetchUserListByTypeEpic = (actions$, state$, zeniAPI) => actions$.pipe((0,
                         usersPayload: response.data?.users ?? [],
                     }),
                 ];
-                if (response.data?.user_groups != null) {
-                    userListAction.push((0, userGroupsReducer_1.updateAllUserGroups)({ userGroups: response.data.user_groups }));
-                    if (userType === 'taskManagerCandidate') {
-                        userListAction.push((0, userGroupListViewReducer_1.updateUserGroupIds)({
-                            userGroupType: userType,
-                            userGroupsPayload: response.data.user_groups,
-                        }));
-                    }
-                }
                 if (userType === 'cardHolderCandidate') {
                     userListAction.push((0, issueChargeCardReducer_1.updateChargeCardCount)(response.data?.cards_count_by_user_id ?? []));
                     userListAction.push((0, issueChargeCardReducer_1.updateDebitCardCount)(response.data?.debit_cards_count_by_deposit_account_id ?? {}));

package/lib/view/userListView/userListViewPayload.d.ts

@@ -1,7 +1,6 @@
 import { ID } from '../../commonStateTypes/common';
 import { AddressPayload } from '../../entity/address/addressPayload';
 import { UserPayload } from '../../entity/user/userPayload';
-import { UserGroupPayload } from '../../entity/userGroups/userGroupsPayload';
 import { UserRolePayload } from '../../entity/userRole/userRolePayload';
 import { ZeniAPIResponse } from '../../responsePayload';
 interface UserListResponsePayload {
@@ -10,7 +9,6 @@ interface UserListResponsePayload {
     addresses?: AddressPayload[];
     cards_count_by_user_id?: ActiveChargeCardCountPayload[];
     debit_cards_count_by_deposit_account_id?: Record<ID, ActiveDebitCardCountByUserIdPayload>;
-    user_groups?: UserGroupPayload[];
 }
 export interface ActiveChargeCardCountPayload {
     business_physical_credit_card_count: number;

package/lib/zeniAPI.js

@@ -82,6 +82,8 @@ class ZeniAPIClient {
         return (0, rxjs_1.from)(promise);
     }
     postFormData(restEndPoint, formData, signal) {
+        // Use apiHeaders for auth headers, then remove Content-Type
+        // so the browser sets multipart/form-data with the correct boundary
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const { 'Content-Type': _contentType, ...headers } = this.apiHeaders();
         const promise = (0, cross_fetch_1.fetch)(restEndPoint, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.20.4",
+  "version": "4.20.6",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",
@@ -91,7 +91,7 @@
     "dayjs": "^1.10.7",
     "dayjs-business-time": "^1.0.4",
     "js-base64": "^3.6.0",
-    "lodash": "^4.18.1",
+    "lodash": "^4.17.23",
     "pusher-js": "^8.4.0",
     "redux": "^4.0.5",
     "redux-observable": "^1.2.0",
@@ -105,7 +105,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:typecheck": "echo 'Typechecking test files...' && time tsc -p tsconfig.typecheck.json",
     "test": "pnpm test:typecheck && vitest run --typecheck",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx --fix",
     "find-dead-code": "ts-prune | grep -v '(used in module)'",

package/lib/entity/userGroups/userGroupsPayload.d.ts

@@ -1,7 +0,0 @@
-import { UserGroup } from './userGroupsState';
-export interface UserGroupPayload {
-    id: string;
-    name: string;
-    user_ids?: string[] | null;
-}
-export declare function mapUserGroupPayloadToUserGroup(payload: UserGroupPayload): UserGroup;

package/lib/entity/userGroups/userGroupsPayload.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapUserGroupPayloadToUserGroup = mapUserGroupPayloadToUserGroup;
-function mapUserGroupPayloadToUserGroup(payload) {
-    return {
-        userGroupId: payload.id,
-        name: payload.name,
-        userIds: payload.user_ids ?? [],
-    };
-}

package/lib/entity/userGroups/userGroupsReducer.d.ts

@@ -1,8 +0,0 @@
-import { UserGroupPayload } from './userGroupsPayload';
-import { UserGroupsState } from './userGroupsState';
-export declare const initialState: UserGroupsState;
-export declare const updateAllUserGroups: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    userGroups: UserGroupPayload[];
-}, "userGroups/updateAllUserGroups">, removeUserGroup: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "userGroups/removeUserGroup">, clearAllUserGroups: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"userGroups/clearAllUserGroups">;
-declare const _default: import("redux").Reducer<UserGroupsState>;
-export default _default;

package/lib/entity/userGroups/userGroupsReducer.js

@@ -1,29 +0,0 @@
-"use strict";
-var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearAllUserGroups = exports.removeUserGroup = exports.updateAllUserGroups = exports.initialState = void 0;
-const toolkit_1 = require("@reduxjs/toolkit");
-const userGroupsPayload_1 = require("./userGroupsPayload");
-exports.initialState = {
-    userGroupByUserGroupId: {},
-};
-const userGroups = (0, toolkit_1.createSlice)({
-    name: 'userGroups',
-    initialState: exports.initialState,
-    reducers: {
-        updateAllUserGroups(draft, action) {
-            action.payload.userGroups.forEach((payload) => {
-                const userGroup = (0, userGroupsPayload_1.mapUserGroupPayloadToUserGroup)(payload);
-                draft.userGroupByUserGroupId[userGroup.userGroupId] = userGroup;
-            });
-        },
-        removeUserGroup(draft, action) {
-            delete draft.userGroupByUserGroupId[action.payload];
-        },
-        clearAllUserGroups(draft) {
-            Object.assign(draft, exports.initialState);
-        },
-    },
-});
-_a = userGroups.actions, exports.updateAllUserGroups = _a.updateAllUserGroups, exports.removeUserGroup = _a.removeUserGroup, exports.clearAllUserGroups = _a.clearAllUserGroups;
-exports.default = userGroups.reducer;

package/lib/entity/userGroups/userGroupsSelector.d.ts

@@ -1,4 +0,0 @@
-import { ID } from '../../commonStateTypes/common';
-import { UserGroup, UserGroupsState } from './userGroupsState';
-export declare function getUserGroupsByUserGroupIds(userGroupsState: UserGroupsState, userGroupIds: ID[]): UserGroup[];
-export declare function getUserGroupByUserGroupId(userGroupsState: UserGroupsState, userGroupId: ID): UserGroup | undefined;

package/lib/entity/userGroups/userGroupsSelector.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserGroupsByUserGroupIds = getUserGroupsByUserGroupIds;
-exports.getUserGroupByUserGroupId = getUserGroupByUserGroupId;
-function getUserGroupsByUserGroupIds(userGroupsState, userGroupIds) {
-    return userGroupIds
-        .map((id) => getUserGroupByUserGroupId(userGroupsState, id))
-        .filter((value) => value != null);
-}
-function getUserGroupByUserGroupId(userGroupsState, userGroupId) {
-    return userGroupsState.userGroupByUserGroupId[userGroupId] ?? undefined;
-}

package/lib/entity/userGroups/userGroupsState.d.ts

@@ -1,9 +0,0 @@
-import { ID } from '../../commonStateTypes/common';
-export interface UserGroup {
-    name: string;
-    userGroupId: ID;
-    userIds: ID[];
-}
-export interface UserGroupsState {
-    userGroupByUserGroupId: Record<ID, UserGroup>;
-}

package/lib/entity/userGroups/userGroupsState.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/lib/esm/entity/userGroups/userGroupsPayload.js

@@ -1,7 +0,0 @@
-export function mapUserGroupPayloadToUserGroup(payload) {
-    return {
-        userGroupId: payload.id,
-        name: payload.name,
-        userIds: payload.user_ids ?? [],
-    };
-}

package/lib/esm/entity/userGroups/userGroupsReducer.js

@@ -1,25 +0,0 @@
-import { createSlice } from '@reduxjs/toolkit';
-import { mapUserGroupPayloadToUserGroup, } from './userGroupsPayload';
-export const initialState = {
-    userGroupByUserGroupId: {},
-};
-const userGroups = createSlice({
-    name: 'userGroups',
-    initialState,
-    reducers: {
-        updateAllUserGroups(draft, action) {
-            action.payload.userGroups.forEach((payload) => {
-                const userGroup = mapUserGroupPayloadToUserGroup(payload);
-                draft.userGroupByUserGroupId[userGroup.userGroupId] = userGroup;
-            });
-        },
-        removeUserGroup(draft, action) {
-            delete draft.userGroupByUserGroupId[action.payload];
-        },
-        clearAllUserGroups(draft) {
-            Object.assign(draft, initialState);
-        },
-    },
-});
-export const { updateAllUserGroups, removeUserGroup, clearAllUserGroups } = userGroups.actions;
-export default userGroups.reducer;

package/lib/esm/entity/userGroups/userGroupsSelector.js

@@ -1,8 +0,0 @@
-export function getUserGroupsByUserGroupIds(userGroupsState, userGroupIds) {
-    return userGroupIds
-        .map((id) => getUserGroupByUserGroupId(userGroupsState, id))
-        .filter((value) => value != null);
-}
-export function getUserGroupByUserGroupId(userGroupsState, userGroupId) {
-    return userGroupsState.userGroupByUserGroupId[userGroupId] ?? undefined;
-}