@zeniai/client-epic-state 5.2.35-beta5MM → 5.2.35-beta7MM

package/lib/view/expenseAutomationView/expenseAutomationViewReducer.d.ts

@@ -2,9 +2,10 @@ import { ID } from '../../commonStateTypes/common';
 import { MonthYearPeriod } from '../../commonStateTypes/timePeriod';
 import { ExpenseAutomationViewState } from './expenseAutomationViewState';
 export declare const initialState: ExpenseAutomationViewState;
-export declare const fetchAllExpenseAutomationTabs: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: boolean | undefined, refreshViewInBackground?: boolean | undefined], {
+export declare const fetchAllExpenseAutomationTabs: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: boolean | undefined, refreshViewInBackground?: boolean | undefined, isAccrualEnabled?: boolean | undefined], {
     cacheOverride: boolean;
     refreshViewInBackground: boolean;
+    isAccrualEnabled: boolean;
 }, "expenseAutomationView/fetchAllExpenseAutomationTabs", never, never>, updateCurrentSelectedPeriod: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tenantId: string, newSelectedPeriod: MonthYearPeriod], {
     newSelectedPeriod: MonthYearPeriod;
     tenantId: string;

package/lib/view/expenseAutomationView/expenseAutomationViewReducer.js

@@ -23,11 +23,12 @@ const expenseAutomationView = (0, toolkit_1.createSlice)({
             reducer() {
                 //do nothing
             },
-            prepare(cacheOverride = false, refreshViewInBackground = false) {
+            prepare(cacheOverride = false, refreshViewInBackground = false, isAccrualEnabled = false) {
                 return {
                     payload: {
                         cacheOverride,
                         refreshViewInBackground,
+                        isAccrualEnabled,
                     },
                 };
             },

package/lib/view/expenseAutomationView/reducers/actualMatchingViewReducer.d.ts

@@ -7,7 +7,7 @@ export declare const initialTransactionSearchState: ActualMatchingTransactionSea
 export declare const initialAccrualSearchState: ActualMatchingAccrualSearchState;
 export declare const initialMatchModalState: ActualMatchingMatchModalState;
 export declare const initialState: ActualMatchingViewState;
-export declare const clearActualMatchingView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationActualMatchingView/clearActualMatchingView">, clearMatchNewModal: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationActualMatchingView/clearMatchNewModal">, closeMatchNewModal: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationActualMatchingView/closeMatchNewModal">, fetchActualMatching: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[period: TimePeriod, refreshViewInBackground?: any], {
+export declare const ackCloseMatchAfterUndo: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationActualMatchingView/ackCloseMatchAfterUndo">, clearActualMatchingView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationActualMatchingView/clearActualMatchingView">, clearMatchNewModal: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationActualMatchingView/clearMatchNewModal">, closeMatchNewModal: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationActualMatchingView/closeMatchNewModal">, fetchActualMatching: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[period: TimePeriod, refreshViewInBackground?: any], {
     period: TimePeriod;
     refreshViewInBackground: any;
 }, "expenseAutomationActualMatchingView/fetchActualMatching", never, never>, fetchActualMatchingFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{

package/lib/view/expenseAutomationView/reducers/actualMatchingViewReducer.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateActualMatchingUIState = exports.undoReversalAccrualsSuccess = exports.undoReversalAccrualsFailure = exports.undoReversalAccruals = exports.searchMatchTransactionsSuccess = exports.searchMatchTransactionsFailure = exports.searchMatchTransactions = exports.searchMatchAccrualsSuccess = exports.searchMatchAccrualsFailure = exports.searchMatchAccruals = exports.openMatchNewModal = exports.matchAndReverseAccrualsSuccess = exports.matchAndReverseAccrualsFailure = exports.matchAndReverseAccruals = exports.fetchActualMatchingSuccess = exports.fetchActualMatchingPage = exports.fetchActualMatchingMatchSuccess = exports.fetchActualMatchingMatchFailure = exports.fetchActualMatchingMatch = exports.fetchActualMatchingFailure = exports.fetchActualMatching = exports.closeMatchNewModal = exports.clearMatchNewModal = exports.clearActualMatchingView = exports.initialState = exports.initialMatchModalState = exports.initialAccrualSearchState = exports.initialTransactionSearchState = void 0;
+exports.updateActualMatchingUIState = exports.undoReversalAccrualsSuccess = exports.undoReversalAccrualsFailure = exports.undoReversalAccruals = exports.searchMatchTransactionsSuccess = exports.searchMatchTransactionsFailure = exports.searchMatchTransactions = exports.searchMatchAccrualsSuccess = exports.searchMatchAccrualsFailure = exports.searchMatchAccruals = exports.openMatchNewModal = exports.matchAndReverseAccrualsSuccess = exports.matchAndReverseAccrualsFailure = exports.matchAndReverseAccruals = exports.fetchActualMatchingSuccess = exports.fetchActualMatchingPage = exports.fetchActualMatchingMatchSuccess = exports.fetchActualMatchingMatchFailure = exports.fetchActualMatchingMatch = exports.fetchActualMatchingFailure = exports.fetchActualMatching = exports.closeMatchNewModal = exports.clearMatchNewModal = exports.clearActualMatchingView = exports.ackCloseMatchAfterUndo = exports.initialState = exports.initialMatchModalState = exports.initialAccrualSearchState = exports.initialTransactionSearchState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const jeScheduleHelper_1 = require("../../../entity/jeSchedules/jeScheduleHelper");
@@ -49,7 +49,7 @@ exports.initialState = {
     },
     matchModal: exports.initialMatchModalState,
     undoReversalStatusByMatchId: {},
-    lastUndoResultsByMatchId: {},
+    closeMatchAfterUndo: false,
     lastMatchResultsByMatchId: {},
     hasValidState() {
         return this.fetchState == 'Completed';
@@ -367,12 +367,17 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                     fetchState: 'Completed',
                     error: undefined,
                 };
-                draft.lastUndoResultsByMatchId[matchId] = results;
+                draft.closeMatchAfterUndo =
+                    results.length > 0 &&
+                        results.every((result) => result.status === 'undone');
             },
             prepare(matchId, results) {
                 return { payload: { matchId, results } };
             },
         },
+        ackCloseMatchAfterUndo(draft) {
+            draft.closeMatchAfterUndo = false;
+        },
         undoReversalAccrualsFailure(draft, action) {
             draft.undoReversalStatusByMatchId[action.payload.matchId] = {
                 fetchState: 'Error',
@@ -389,5 +394,5 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
         });
     },
 });
-_a = expenseAutomationActualMatchingView.actions, exports.clearActualMatchingView = _a.clearActualMatchingView, exports.clearMatchNewModal = _a.clearMatchNewModal, exports.closeMatchNewModal = _a.closeMatchNewModal, exports.fetchActualMatching = _a.fetchActualMatching, exports.fetchActualMatchingFailure = _a.fetchActualMatchingFailure, exports.fetchActualMatchingMatch = _a.fetchActualMatchingMatch, exports.fetchActualMatchingMatchFailure = _a.fetchActualMatchingMatchFailure, exports.fetchActualMatchingMatchSuccess = _a.fetchActualMatchingMatchSuccess, exports.fetchActualMatchingPage = _a.fetchActualMatchingPage, exports.fetchActualMatchingSuccess = _a.fetchActualMatchingSuccess, exports.matchAndReverseAccruals = _a.matchAndReverseAccruals, exports.matchAndReverseAccrualsFailure = _a.matchAndReverseAccrualsFailure, exports.matchAndReverseAccrualsSuccess = _a.matchAndReverseAccrualsSuccess, exports.openMatchNewModal = _a.openMatchNewModal, exports.searchMatchAccruals = _a.searchMatchAccruals, exports.searchMatchAccrualsFailure = _a.searchMatchAccrualsFailure, exports.searchMatchAccrualsSuccess = _a.searchMatchAccrualsSuccess, exports.searchMatchTransactions = _a.searchMatchTransactions, exports.searchMatchTransactionsFailure = _a.searchMatchTransactionsFailure, exports.searchMatchTransactionsSuccess = _a.searchMatchTransactionsSuccess, exports.undoReversalAccruals = _a.undoReversalAccruals, exports.undoReversalAccrualsFailure = _a.undoReversalAccrualsFailure, exports.undoReversalAccrualsSuccess = _a.undoReversalAccrualsSuccess, exports.updateActualMatchingUIState = _a.updateActualMatchingUIState;
+_a = expenseAutomationActualMatchingView.actions, exports.ackCloseMatchAfterUndo = _a.ackCloseMatchAfterUndo, exports.clearActualMatchingView = _a.clearActualMatchingView, exports.clearMatchNewModal = _a.clearMatchNewModal, exports.closeMatchNewModal = _a.closeMatchNewModal, exports.fetchActualMatching = _a.fetchActualMatching, exports.fetchActualMatchingFailure = _a.fetchActualMatchingFailure, exports.fetchActualMatchingMatch = _a.fetchActualMatchingMatch, exports.fetchActualMatchingMatchFailure = _a.fetchActualMatchingMatchFailure, exports.fetchActualMatchingMatchSuccess = _a.fetchActualMatchingMatchSuccess, exports.fetchActualMatchingPage = _a.fetchActualMatchingPage, exports.fetchActualMatchingSuccess = _a.fetchActualMatchingSuccess, exports.matchAndReverseAccruals = _a.matchAndReverseAccruals, exports.matchAndReverseAccrualsFailure = _a.matchAndReverseAccrualsFailure, exports.matchAndReverseAccrualsSuccess = _a.matchAndReverseAccrualsSuccess, exports.openMatchNewModal = _a.openMatchNewModal, exports.searchMatchAccruals = _a.searchMatchAccruals, exports.searchMatchAccrualsFailure = _a.searchMatchAccrualsFailure, exports.searchMatchAccrualsSuccess = _a.searchMatchAccrualsSuccess, exports.searchMatchTransactions = _a.searchMatchTransactions, exports.searchMatchTransactionsFailure = _a.searchMatchTransactionsFailure, exports.searchMatchTransactionsSuccess = _a.searchMatchTransactionsSuccess, exports.undoReversalAccruals = _a.undoReversalAccruals, exports.undoReversalAccrualsFailure = _a.undoReversalAccrualsFailure, exports.undoReversalAccrualsSuccess = _a.undoReversalAccrualsSuccess, exports.updateActualMatchingUIState = _a.updateActualMatchingUIState;
 exports.default = expenseAutomationActualMatchingView.reducer;

package/lib/view/expenseAutomationView/reducers/jeSchedulesViewReducer.d.ts

@@ -51,9 +51,10 @@ export declare const clearExpenseAutomationJESchedulesView: import("@reduxjs/too
     selectedPageTab: JEPageTab;
     selectedPeriod: MonthYearPeriod;
     status: ZeniAPIStatus;
-}, "expenseAutomationJESchedulesView/fetchJeSchedulesFailure">, fetchJeSchedulesPage: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[period: TimePeriod, refreshViewInBackground?: any], {
+}, "expenseAutomationJESchedulesView/fetchJeSchedulesFailure">, fetchJeSchedulesPage: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[period: TimePeriod, refreshViewInBackground?: any, isAccrualEnabled?: any], {
     period: TimePeriod;
     refreshViewInBackground: any;
+    isAccrualEnabled: any;
 }, "expenseAutomationJESchedulesView/fetchJeSchedulesPage", never, never>, fetchJeSchedulesSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     accruedJeSchedules: JEAccruedScheduledTransactionPayload[];
     failedJeSchedules: JEScheduledTransactionPayload[];

package/lib/view/expenseAutomationView/reducers/jeSchedulesViewReducer.js

@@ -111,11 +111,12 @@ const expenseAutomationJESchedulesView = (0, toolkit_1.createSlice)({
     initialState: exports.initialState,
     reducers: {
         fetchJeSchedulesPage: {
-            prepare(period, refreshViewInBackground = false) {
+            prepare(period, refreshViewInBackground = false, isAccrualEnabled = false) {
                 return {
                     payload: {
                         period,
                         refreshViewInBackground,
+                        isAccrualEnabled,
                     },
                 };
             },

package/lib/view/expenseAutomationView/selectors/actualMatchingViewSelector.d.ts

@@ -8,7 +8,7 @@ import { JEOneTimeAccrualMatchSuggestion } from '../../../entity/jeSchedules/jeS
 import { RootState } from '../../../rootStateTypes';
 import { ZeniDate } from '../../../zeniDayJS';
 import { ActualMatchingKpiSummary, ActualMatchingRow, ActualMatchingRowKind, ExpenseAutomationActualMatchingViewSelector } from '../selectorTypes/actualMatchingViewSelectorTypes';
-import { MatchAndReverseResult, UndoReversalResult } from '../types/actualMatchingViewState';
+import { MatchAndReverseResult } from '../types/actualMatchingViewState';
 export declare function getSelectedMonthYearForCurrentTenant(state: RootState): MonthYearPeriod | undefined;
 export declare function getTenantDisplayCurrency(state: RootState): DisplayCurrencyFallback | undefined;
 export declare function parseActualMatchingMatchId(matchId: string): {
@@ -30,8 +30,8 @@ export interface ExpenseAutomationActualMatchingMatchView {
     refreshStatus: FetchStateAndError;
     undoReversalStatus: FetchStateAndError;
     lastMatchResults?: MatchAndReverseResult[];
-    lastUndoResults?: UndoReversalResult[];
     match?: ActualMatchingMatch;
 }
 export declare function getExpenseAutomationActualMatchingMatchView(state: RootState, matchId: ActualMatchingMatchId): ExpenseAutomationActualMatchingMatchView;
+export declare function getCloseMatchAfterUndo(state: RootState): boolean;
 export declare function getExpenseAutomationActualMatchingView(state: RootState): ExpenseAutomationActualMatchingViewSelector;

package/lib/view/expenseAutomationView/selectors/actualMatchingViewSelector.js

@@ -15,6 +15,7 @@ exports.getActualMatchingAmount = getActualMatchingAmount;
 exports.getActualMatchingReversalDate = getActualMatchingReversalDate;
 exports.buildActualMatchingKpiSummary = buildActualMatchingKpiSummary;
 exports.getExpenseAutomationActualMatchingMatchView = getExpenseAutomationActualMatchingMatchView;
+exports.getCloseMatchAfterUndo = getCloseMatchAfterUndo;
 exports.getExpenseAutomationActualMatchingView = getExpenseAutomationActualMatchingView;
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
@@ -331,10 +332,12 @@ function getExpenseAutomationActualMatchingMatchView(state, matchId) {
         detailFetchState: view.detailFetchStateByMatchId[matchId] ?? NOT_STARTED,
         refreshStatus: view.detailRefreshStatusByMatchId[matchId] ?? NOT_STARTED,
         undoReversalStatus: view.undoReversalStatusByMatchId[matchId] ?? NOT_STARTED,
-        lastUndoResults: view.lastUndoResultsByMatchId[matchId],
         lastMatchResults: view.lastMatchResultsByMatchId?.[matchId],
     };
 }
+function getCloseMatchAfterUndo(state) {
+    return state.expenseAutomationActualMatchingViewState.closeMatchAfterUndo;
+}
 function getExpenseAutomationActualMatchingView(state) {
     const { expenseAutomationActualMatchingViewState } = state;
     const { matchIdsByPeriod, fetchState, error, refreshStatus, uiState, matchModal, } = expenseAutomationActualMatchingViewState;

package/lib/view/expenseAutomationView/types/actualMatchingViewState.d.ts

@@ -91,10 +91,10 @@ export interface ActualMatchingMatchModalState {
 }
 export declare function actualMatchingTransactionLineKey(transactionType: string, transactionIntegrationId: string, lineId: string): string;
 export interface ActualMatchingViewState extends FetchedState {
+    closeMatchAfterUndo: boolean;
     detailFetchStateByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
     detailRefreshStatusByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
     lastMatchResultsByMatchId: Record<ActualMatchingMatchId, MatchAndReverseResult[]>;
-    lastUndoResultsByMatchId: Record<ActualMatchingMatchId, UndoReversalResult[]>;
     matchIdsByPeriod: Record<MonthYearPeriodId, ActualMatchingMatchId[]>;
     matchModal: ActualMatchingMatchModalState;
     refreshStatus: FetchStateAndError;

package/package.json

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