@zeniai/client-epic-state 5.2.35-beta0MM → 5.2.35-beta10MM

package/lib/view/expenseAutomationView/epics/actualMatching/fetchActualMatchingMatchEpic.js

@@ -7,14 +7,15 @@ const actualMatchingReducer_1 = require("../../../../entity/actualMatching/actua
 const responsePayload_1 = require("../../../../responsePayload");
 const rootActions_1 = require("../../../../rootActions");
 const actualMatchingViewReducer_1 = require("../../reducers/actualMatchingViewReducer");
-const fetchActualMatchingMatchEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(actualMatchingViewReducer_1.fetchActualMatchingMatch.match), (0, operators_1.mergeMap)((action) => {
+const actualMatchingViewSelector_1 = require("../../selectors/actualMatchingViewSelector");
+const fetchActualMatchingMatchEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(actualMatchingViewReducer_1.fetchActualMatchingMatch.match), (0, operators_1.mergeMap)((action) => {
     const { matchId, refreshViewInBackground } = action.payload;
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals/actual-matching/${encodeURIComponent(matchId)}`)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             return (0, rxjs_1.from)([
-                (0, actualMatchingReducer_1.updateActualMatchingMatches)([response.data]),
+                (0, actualMatchingReducer_1.updateActualMatchingMatches)([response.data], (0, actualMatchingViewSelector_1.getTenantDisplayCurrency)(state$.value)),
                 (0, actualMatchingViewReducer_1.fetchActualMatchingMatchSuccess)({
                     matchId,
                     refreshViewInBackground,

package/lib/view/expenseAutomationView/epics/actualMatching/matchAndReverseAccrualsEpic.d.ts

@@ -1,8 +1,9 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
+import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
 import { clearAll } from '../../../../rootActions';
 import { RootState } from '../../../../rootStateTypes';
 import { ZeniAPI } from '../../../../zeniAPI';
 import { clearMatchNewModal, fetchActualMatching, matchAndReverseAccruals, matchAndReverseAccrualsFailure, matchAndReverseAccrualsSuccess } from '../../reducers/actualMatchingViewReducer';
-export type ActionType = ReturnType<typeof clearAll> | ReturnType<typeof clearMatchNewModal> | ReturnType<typeof fetchActualMatching> | ReturnType<typeof matchAndReverseAccruals> | ReturnType<typeof matchAndReverseAccrualsFailure> | ReturnType<typeof matchAndReverseAccrualsSuccess>;
+export type ActionType = ReturnType<typeof clearAll> | ReturnType<typeof clearMatchNewModal> | ReturnType<typeof fetchActualMatching> | ReturnType<typeof matchAndReverseAccruals> | ReturnType<typeof matchAndReverseAccrualsFailure> | ReturnType<typeof matchAndReverseAccrualsSuccess> | ReturnType<typeof openSnackbar>;
 export declare const matchAndReverseAccrualsEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/expenseAutomationView/epics/actualMatching/matchAndReverseAccrualsEpic.js

@@ -3,54 +3,109 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.matchAndReverseAccrualsEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
-const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
+const actualMatchingSelector_1 = require("../../../../entity/actualMatching/actualMatchingSelector");
+const snackbarReducer_1 = require("../../../../entity/snackbar/snackbarReducer");
 const responsePayload_1 = require("../../../../responsePayload");
 const rootActions_1 = require("../../../../rootActions");
 const actualMatchingPayload_1 = require("../../payload/actualMatchingPayload");
 const actualMatchingViewReducer_1 = require("../../reducers/actualMatchingViewReducer");
-function refreshActualMatchingList(state) {
-    const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
-    const selectedMonthYear = state.expenseAutomationViewState.selectedPeriodByTenantId[currentTenant?.tenantId ?? ''];
-    if (selectedMonthYear == null) {
-        return [];
+const refreshActualMatchingList_1 = require("./refreshActualMatchingList");
+function isMatchCompleteStatus(status) {
+    return status === 'reversed' || status === 'noop';
+}
+function isMatchFailedStatus(status) {
+    return (status === 'conflict' || status === 'claim_lost' || status === 'error');
+}
+function matchAndReverseSnackbar(results, vendorName) {
+    const reversedCount = results.filter((result) => result.status === 'reversed').length;
+    const failedCount = results.filter((result) => isMatchFailedStatus(result.status)).length;
+    const variables = [
+        { variableName: '_count_', variableValue: String(reversedCount) },
+        { variableName: '_vendor_name_', variableValue: vendorName },
+    ];
+    if (results.length === 0 || (reversedCount === 0 && failedCount > 0)) {
+        return (0, snackbarReducer_1.openSnackbar)({
+            messageSection: 'actual_matching_match_and_reverse',
+            messageText: 'failed',
+            type: 'error',
+            variables,
+        });
     }
-    const period = (0, timePeriod_1.convertToPeriod)(selectedMonthYear);
-    const start = (0, timePeriod_1.toAbsoluteDay)(period.start);
-    const end = (0, timePeriod_1.toAbsoluteDay)(period.end);
-    if (start == null || end == null) {
-        return [];
+    if (reversedCount > 0 && failedCount === 0) {
+        return (0, snackbarReducer_1.openSnackbar)({
+            messageSection: 'actual_matching_match_and_reverse',
+            messageText: 'success',
+            type: 'success',
+            variables,
+        });
     }
-    return [(0, actualMatchingViewReducer_1.fetchActualMatching)({ start, end }, true)];
+    if (reversedCount > 0 && failedCount > 0) {
+        return (0, snackbarReducer_1.openSnackbar)({
+            messageSection: 'actual_matching_match_and_reverse',
+            messageText: 'notification',
+            type: 'warning',
+            variables,
+        });
+    }
+    return null;
+}
+function matchAndReverseHttpFailSnackbar(vendorName) {
+    return (0, snackbarReducer_1.openSnackbar)({
+        messageSection: 'actual_matching_match_and_reverse',
+        messageText: 'failed',
+        type: 'error',
+        variables: [
+            { variableName: '_count_', variableValue: '0' },
+            { variableName: '_vendor_name_', variableValue: vendorName },
+        ],
+    });
 }
-const matchAndReverseAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(actualMatchingViewReducer_1.matchAndReverseAccruals.match), (0, operators_1.mergeMap)((action) => {
-    const { transactionId, transactionIntegrationId, transactionType, lineId, accrualIds, transactionSyncToken, } = action.payload;
+function matchVendorName(state, matchId) {
+    return (0, actualMatchingSelector_1.getActualMatchingMatchById)(state.actualMatchingState, matchId)?.vendorName ?? '';
+}
+const matchAndReverseAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(actualMatchingViewReducer_1.matchAndReverseAccruals.match), 
+// Posts reversing JEs; drop duplicate clicks while a request is in flight.
+(0, operators_1.exhaustMap)((action) => {
+    const { transactionId, transactionIntegrationId, transactionType, lineIds, accrualIds, transactionSyncToken, } = action.payload;
     const body = {
         transaction_id: transactionId,
         transaction_integration_id: transactionIntegrationId,
         transaction_type: transactionType,
-        line_id: lineId,
+        line_ids: lineIds,
         transaction_sync_token: transactionSyncToken,
         accrual_ids: accrualIds,
     };
+    // Key leftover results and snackbar vendor to the confirmed bill, not the
+    // row Match New was opened from (user can pick a different txn).
+    const matchId = `${transactionType.toLowerCase()}:${transactionIntegrationId}`;
+    const vendorName = matchVendorName(state$.value, matchId);
     return zeniAPI
         .postAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals/match-and-reverse`, body)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             const results = response.data.results.map(actualMatchingPayload_1.toMatchAndReverseResult);
             const successActions = [
-                (0, actualMatchingViewReducer_1.matchAndReverseAccrualsSuccess)({ results }),
+                (0, actualMatchingViewReducer_1.matchAndReverseAccrualsSuccess)({ matchId, results }),
             ];
-            const anyReversed = results.some((result) => result.status === 'reversed');
-            if (anyReversed) {
-                successActions.push(...refreshActualMatchingList(state$.value), (0, actualMatchingViewReducer_1.clearMatchNewModal)());
+            const occupancyChanged = results.some((result) => isMatchCompleteStatus(result.status));
+            const allComplete = results.length > 0 &&
+                results.every((result) => isMatchCompleteStatus(result.status));
+            if (occupancyChanged) {
+                successActions.push(...(0, refreshActualMatchingList_1.refreshActualMatchingList)(state$.value));
+            }
+            const snackbar = matchAndReverseSnackbar(results, vendorName);
+            if (snackbar != null) {
+                successActions.push(snackbar);
+            }
+            if (allComplete) {
+                successActions.push((0, actualMatchingViewReducer_1.clearMatchNewModal)());
             }
             return (0, rxjs_1.from)(successActions);
         }
-        return (0, rxjs_1.of)((0, actualMatchingViewReducer_1.matchAndReverseAccrualsFailure)({ status: response.status }));
+        return (0, rxjs_1.of)((0, actualMatchingViewReducer_1.matchAndReverseAccrualsFailure)({ status: response.status }), matchAndReverseHttpFailSnackbar(vendorName));
     }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, actualMatchingViewReducer_1.matchAndReverseAccrualsFailure)({
         status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Match and reverse accruals REST API call errored out' +
             JSON.stringify(error)),
-    }))), (0, operators_1.takeUntil)(actions$.pipe((0, operators_1.filter)(rootActions_1.clearAll.match))));
+    }), matchAndReverseHttpFailSnackbar(vendorName))), (0, operators_1.takeUntil)(actions$.pipe((0, operators_1.filter)(rootActions_1.clearAll.match))));
 }));
 exports.matchAndReverseAccrualsEpic = matchAndReverseAccrualsEpic;

package/lib/view/expenseAutomationView/epics/actualMatching/refreshActualMatchingList.d.ts

@@ -0,0 +1,3 @@
+import { RootState } from '../../../../rootStateTypes';
+import { fetchActualMatching } from '../../reducers/actualMatchingViewReducer';
+export declare function refreshActualMatchingList(state: RootState): ReturnType<typeof fetchActualMatching>[];

package/lib/view/expenseAutomationView/epics/actualMatching/refreshActualMatchingList.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.refreshActualMatchingList = refreshActualMatchingList;
+const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
+const actualMatchingViewReducer_1 = require("../../reducers/actualMatchingViewReducer");
+const actualMatchingViewSelector_1 = require("../../selectors/actualMatchingViewSelector");
+function refreshActualMatchingList(state) {
+    const selectedMonthYear = (0, actualMatchingViewSelector_1.getSelectedMonthYearForCurrentTenant)(state);
+    if (selectedMonthYear == null) {
+        return [];
+    }
+    const period = (0, timePeriod_1.convertToPeriod)(selectedMonthYear);
+    const start = (0, timePeriod_1.toAbsoluteDay)(period.start);
+    const end = (0, timePeriod_1.toAbsoluteDay)(period.end);
+    if (start == null || end == null) {
+        return [];
+    }
+    return [(0, actualMatchingViewReducer_1.fetchActualMatching)({ start, end }, true)];
+}

package/lib/view/expenseAutomationView/epics/actualMatching/searchMatchAccrualsEpic.d.ts

@@ -1,8 +1,9 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { updateJEOneTimeAccruals } from '../../../../entity/jeSchedules/jeSchedulesReducer';
+import { clearAll } from '../../../../rootActions';
 import { RootState } from '../../../../rootStateTypes';
 import { ZeniAPI } from '../../../../zeniAPI';
 import { searchMatchAccruals, searchMatchAccrualsFailure, searchMatchAccrualsSuccess } from '../../reducers/actualMatchingViewReducer';
-export type ActionType = ReturnType<typeof searchMatchAccruals> | ReturnType<typeof searchMatchAccrualsFailure> | ReturnType<typeof searchMatchAccrualsSuccess> | ReturnType<typeof updateJEOneTimeAccruals>;
-export declare const searchMatchAccrualsEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
+export type ActionType = ReturnType<typeof clearAll> | ReturnType<typeof searchMatchAccruals> | ReturnType<typeof searchMatchAccrualsFailure> | ReturnType<typeof searchMatchAccrualsSuccess> | ReturnType<typeof updateJEOneTimeAccruals>;
+export declare const searchMatchAccrualsEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/expenseAutomationView/epics/actualMatching/searchMatchAccrualsEpic.js

@@ -3,11 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchMatchAccrualsEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
+const actualMatchingPayload_1 = require("../../../../entity/actualMatching/actualMatchingPayload");
 const jeSchedulesReducer_1 = require("../../../../entity/jeSchedules/jeSchedulesReducer");
 const responsePayload_1 = require("../../../../responsePayload");
+const rootActions_1 = require("../../../../rootActions");
 const actualMatchingViewReducer_1 = require("../../reducers/actualMatchingViewReducer");
+const actualMatchingViewSelector_1 = require("../../selectors/actualMatchingViewSelector");
 const actualMatchingViewState_1 = require("../../types/actualMatchingViewState");
-const searchMatchAccrualsEpic = (actions$, _state$, zeniAPI) => {
+const searchMatchAccrualsEpic = (actions$, state$, zeniAPI) => {
     const searchActions$ = actions$.pipe((0, operators_1.filter)(actualMatchingViewReducer_1.searchMatchAccruals.match));
     const pagination$ = searchActions$.pipe((0, operators_1.filter)((action) => action.payload.pageToken != null));
     const newSearchDebounced$ = searchActions$.pipe((0, operators_1.filter)((action) => action.payload.pageToken == null), (0, operators_1.debounceTime)(actualMatchingViewState_1.MATCH_SEARCH_DEBOUNCE_MS));
@@ -25,14 +28,18 @@ const searchMatchAccrualsEpic = (actions$, _state$, zeniAPI) => {
                 const nextOffset = offset + accruals.length;
                 const total = response.data.total ?? nextOffset;
                 const nextPageToken = nextOffset < total ? String(nextOffset) : null;
+                // toJEOneTimeAccrual still defaults a missing code to USD. Stamp
+                // tenant currency first, same as list members.
+                const fallbackCurrencyCode = (0, actualMatchingViewSelector_1.getTenantDisplayCurrency)(state$.value)?.currencyCode ?? '';
+                const stampedAccruals = accruals.map((accrual) => (0, actualMatchingPayload_1.withInheritedAccrualCurrency)(accrual, fallbackCurrencyCode));
                 const actionsOut = [];
-                if (accruals.length > 0) {
-                    actionsOut.push((0, jeSchedulesReducer_1.updateJEOneTimeAccruals)(accruals));
+                if (stampedAccruals.length > 0) {
+                    actionsOut.push((0, jeSchedulesReducer_1.updateJEOneTimeAccruals)(stampedAccruals));
                 }
                 actionsOut.push((0, actualMatchingViewReducer_1.searchMatchAccrualsSuccess)({
                     append,
                     nextPageToken,
-                    results: accruals,
+                    results: stampedAccruals,
                 }));
                 return (0, rxjs_1.from)(actionsOut);
             }
@@ -42,7 +49,10 @@ const searchMatchAccrualsEpic = (actions$, _state$, zeniAPI) => {
         }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, actualMatchingViewReducer_1.searchMatchAccrualsFailure)({
             error: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Search match accruals REST API call errored out' +
                 JSON.stringify(error)),
-        }))));
+        }))), 
+        // On the HTTP stream only. Wrapping the outer merge would complete
+        // the epic on the first `clearAll` and drop later searches.
+        (0, operators_1.takeUntil)(actions$.pipe((0, operators_1.filter)(rootActions_1.clearAll.match))));
     }));
 };
 exports.searchMatchAccrualsEpic = searchMatchAccrualsEpic;

package/lib/view/expenseAutomationView/epics/actualMatching/searchMatchTransactionsEpic.js

@@ -5,6 +5,7 @@ const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const actualMatchingSelector_1 = require("../../../../entity/actualMatching/actualMatchingSelector");
 const responsePayload_1 = require("../../../../responsePayload");
+const rootActions_1 = require("../../../../rootActions");
 const actualMatchingPayload_1 = require("../../payload/actualMatchingPayload");
 const actualMatchingViewReducer_1 = require("../../reducers/actualMatchingViewReducer");
 const actualMatchingViewSelector_1 = require("../../selectors/actualMatchingViewSelector");
@@ -14,8 +15,8 @@ const searchMatchTransactionsEpic = (actions$, state$, zeniAPI) => {
         const matchId = action.payload.matchId;
         if (matchId == null || matchId === '') {
             return (0, rxjs_1.from)([
-                (0, actualMatchingViewReducer_1.searchMatchTransactions)({ query: '' }),
-                (0, actualMatchingViewReducer_1.searchMatchAccruals)({ query: '' }),
+                (0, actualMatchingViewReducer_1.searchMatchTransactions)(''),
+                (0, actualMatchingViewReducer_1.searchMatchAccruals)(''),
             ]);
         }
         const match = (0, actualMatchingSelector_1.getActualMatchingMatchById)(state$.value.actualMatchingState, matchId);
@@ -28,11 +29,7 @@ const searchMatchTransactionsEpic = (actions$, state$, zeniAPI) => {
             ? match.transactionIntegrationId
             : parsed?.transactionIntegrationId;
         return (0, rxjs_1.from)([
-            (0, actualMatchingViewReducer_1.searchMatchTransactions)({
-                query: '',
-                transactionType,
-                transactionIntegrationId,
-            }),
+            (0, actualMatchingViewReducer_1.searchMatchTransactions)('', undefined, transactionType, transactionIntegrationId),
         ]);
     }));
     const searchActions$ = actions$.pipe((0, operators_1.filter)(actualMatchingViewReducer_1.searchMatchTransactions.match));
@@ -57,7 +54,8 @@ const searchMatchTransactionsEpic = (actions$, state$, zeniAPI) => {
             if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
                 const { transactions, next_page_token } = response.data;
                 const append = pageToken != null;
-                const results = transactions.map(actualMatchingPayload_1.toActualMatchingTransactionSearchResult);
+                const fallbackCurrency = (0, actualMatchingViewSelector_1.getTenantDisplayCurrency)(state$.value);
+                const results = transactions.map((transaction) => (0, actualMatchingPayload_1.toActualMatchingTransactionSearchResult)(transaction, fallbackCurrency));
                 return (0, rxjs_1.of)((0, actualMatchingViewReducer_1.searchMatchTransactionsSuccess)({
                     append,
                     nextPageToken: next_page_token ?? null,
@@ -70,7 +68,10 @@ const searchMatchTransactionsEpic = (actions$, state$, zeniAPI) => {
         }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, actualMatchingViewReducer_1.searchMatchTransactionsFailure)({
             error: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Search match transactions REST API call errored out' +
                 JSON.stringify(error)),
-        }))));
+        }))), 
+        // On the HTTP stream only. Wrapping `merge(openModal$, search$)`
+        // would complete the epic on the first `clearAll` and drop later searches.
+        (0, operators_1.takeUntil)(actions$.pipe((0, operators_1.filter)(rootActions_1.clearAll.match))));
     }));
     return (0, rxjs_1.merge)(openModal$, search$);
 };

package/lib/view/expenseAutomationView/epics/actualMatching/undoReversalAccrualsEpic.d.ts

@@ -1,8 +1,9 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
+import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
 import { clearAll } from '../../../../rootActions';
 import { RootState } from '../../../../rootStateTypes';
 import { ZeniAPI } from '../../../../zeniAPI';
 import { fetchActualMatching, fetchActualMatchingMatch, undoReversalAccruals, undoReversalAccrualsFailure, undoReversalAccrualsSuccess } from '../../reducers/actualMatchingViewReducer';
-export type ActionType = ReturnType<typeof clearAll> | ReturnType<typeof fetchActualMatching> | ReturnType<typeof fetchActualMatchingMatch> | ReturnType<typeof undoReversalAccruals> | ReturnType<typeof undoReversalAccrualsFailure> | ReturnType<typeof undoReversalAccrualsSuccess>;
+export type ActionType = ReturnType<typeof clearAll> | ReturnType<typeof fetchActualMatching> | ReturnType<typeof fetchActualMatchingMatch> | ReturnType<typeof openSnackbar> | ReturnType<typeof undoReversalAccruals> | ReturnType<typeof undoReversalAccrualsFailure> | ReturnType<typeof undoReversalAccrualsSuccess>;
 export declare const undoReversalAccrualsEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/expenseAutomationView/epics/actualMatching/undoReversalAccrualsEpic.js

@@ -3,54 +3,78 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.undoReversalAccrualsEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
-const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
+const actualMatchingSelector_1 = require("../../../../entity/actualMatching/actualMatchingSelector");
+const snackbarReducer_1 = require("../../../../entity/snackbar/snackbarReducer");
 const responsePayload_1 = require("../../../../responsePayload");
 const rootActions_1 = require("../../../../rootActions");
 const actualMatchingPayload_1 = require("../../payload/actualMatchingPayload");
 const actualMatchingViewReducer_1 = require("../../reducers/actualMatchingViewReducer");
-function refreshActualMatchingList(state) {
-    const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
-    const selectedMonthYear = state.expenseAutomationViewState.selectedPeriodByTenantId[currentTenant?.tenantId ?? ''];
-    if (selectedMonthYear == null) {
-        return [];
+const refreshActualMatchingList_1 = require("./refreshActualMatchingList");
+function undoReversalSnackbar(results, vendorName) {
+    const undoneCount = results.filter((result) => result.status === 'undone').length;
+    const failedCount = results.length - undoneCount;
+    const variables = [
+        { variableName: '_count_', variableValue: String(undoneCount) },
+        { variableName: '_vendor_name_', variableValue: vendorName },
+    ];
+    if (results.length > 0 && failedCount === 0) {
+        return (0, snackbarReducer_1.openSnackbar)({
+            messageSection: 'actual_matching_undo_reversal',
+            messageText: 'success',
+            type: 'success',
+            variables,
+        });
     }
-    const period = (0, timePeriod_1.convertToPeriod)(selectedMonthYear);
-    const start = (0, timePeriod_1.toAbsoluteDay)(period.start);
-    const end = (0, timePeriod_1.toAbsoluteDay)(period.end);
-    if (start == null || end == null) {
-        return [];
+    if (undoneCount > 0 && failedCount > 0) {
+        return (0, snackbarReducer_1.openSnackbar)({
+            messageSection: 'actual_matching_undo_reversal',
+            messageText: 'notification',
+            type: 'warning',
+            variables,
+        });
     }
-    return [(0, actualMatchingViewReducer_1.fetchActualMatching)({ start, end }, true)];
+    return (0, snackbarReducer_1.openSnackbar)({
+        messageSection: 'actual_matching_undo_reversal',
+        messageText: 'failed',
+        type: 'error',
+        variables,
+    });
 }
-function refreshOpenMatchDetails(state) {
-    const detailState = state.expenseAutomationActualMatchingViewState.detailFetchStateByMatchId;
-    return Object.keys(detailState)
-        .filter((matchId) => detailState[matchId]?.fetchState !== 'Not-Started')
-        .map((matchId) => (0, actualMatchingViewReducer_1.fetchActualMatchingMatch)(matchId, true));
+function matchVendorName(state, matchId) {
+    return ((0, actualMatchingSelector_1.getActualMatchingMatchById)(state.actualMatchingState, matchId)?.vendorName ??
+        '');
 }
-const undoReversalAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(actualMatchingViewReducer_1.undoReversalAccruals.match), (0, operators_1.mergeMap)((action) => {
+const undoReversalAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(actualMatchingViewReducer_1.undoReversalAccruals.match), 
+// Posts QBO deletes; drop duplicate clicks while the first request is in flight.
+(0, operators_1.exhaustMap)((action) => {
+    const { accrualIds, matchId } = action.payload;
     const body = {
-        accrual_ids: action.payload.accrualIds,
+        accrual_ids: accrualIds,
     };
+    const vendorName = matchVendorName(state$.value, matchId);
     return zeniAPI
         .postAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals/undo-reversal`, body)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             const results = response.data.results.map(actualMatchingPayload_1.toUndoReversalResult);
             const successActions = [
-                (0, actualMatchingViewReducer_1.undoReversalAccrualsSuccess)({ results }),
+                (0, actualMatchingViewReducer_1.undoReversalAccrualsSuccess)(matchId, results),
             ];
             const anyUndone = results.some((result) => result.status === 'undone');
             if (anyUndone) {
-                successActions.push(...refreshActualMatchingList(state$.value), ...refreshOpenMatchDetails(state$.value));
+                successActions.push(...(0, refreshActualMatchingList_1.refreshActualMatchingList)(state$.value), (0, actualMatchingViewReducer_1.fetchActualMatchingMatch)(matchId, true));
             }
+            successActions.push(undoReversalSnackbar(results, vendorName));
             return (0, rxjs_1.from)(successActions);
         }
-        return (0, rxjs_1.of)((0, actualMatchingViewReducer_1.undoReversalAccrualsFailure)({ status: response.status }));
+        return (0, rxjs_1.of)((0, actualMatchingViewReducer_1.undoReversalAccrualsFailure)({
+            matchId,
+            status: response.status,
+        }), undoReversalSnackbar([], vendorName));
     }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, actualMatchingViewReducer_1.undoReversalAccrualsFailure)({
+        matchId,
         status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Undo reversal accruals REST API call errored out' +
             JSON.stringify(error)),
-    }))), (0, operators_1.takeUntil)(actions$.pipe((0, operators_1.filter)(rootActions_1.clearAll.match))));
+    }), undoReversalSnackbar([], vendorName))), (0, operators_1.takeUntil)(actions$.pipe((0, operators_1.filter)(rootActions_1.clearAll.match))));
 }));
 exports.undoReversalAccrualsEpic = undoReversalAccrualsEpic;

package/lib/view/expenseAutomationView/epics/common/fetchAllExpenseAutomationTabsEpic.d.ts

@@ -3,11 +3,10 @@ import { Observable } from 'rxjs';
 import { RootState } from '../../../../rootStateTypes';
 import { fetchMonthEndCloseChecks } from '../../../monthEndCloseChecksView/monthEndCloseChecksViewReducer';
 import { fetchAllExpenseAutomationTabs } from '../../expenseAutomationViewReducer';
-import { fetchActualMatchingPage } from '../../reducers/actualMatchingViewReducer';
 import { fetchFluxAnalysisView } from '../../reducers/fluxAnalysisViewReducer';
 import { fetchJeSchedulesPage } from '../../reducers/jeSchedulesViewReducer';
 import { fetchMissingReceipts } from '../../reducers/missingReceiptsViewReducer';
 import { fetchReconciliation } from '../../reducers/reconciliationViewReducer';
 import { fetchTransactionCategorizationView } from '../../reducers/transactionsViewReducer';
-export type ActionType = ReturnType<typeof fetchAllExpenseAutomationTabs> | ReturnType<typeof fetchActualMatchingPage> | ReturnType<typeof fetchMissingReceipts> | ReturnType<typeof fetchMonthEndCloseChecks> | ReturnType<typeof fetchFluxAnalysisView> | ReturnType<typeof fetchJeSchedulesPage> | ReturnType<typeof fetchReconciliation> | ReturnType<typeof fetchTransactionCategorizationView>;
+export type ActionType = ReturnType<typeof fetchAllExpenseAutomationTabs> | ReturnType<typeof fetchMissingReceipts> | ReturnType<typeof fetchMonthEndCloseChecks> | ReturnType<typeof fetchFluxAnalysisView> | ReturnType<typeof fetchJeSchedulesPage> | ReturnType<typeof fetchReconciliation> | ReturnType<typeof fetchTransactionCategorizationView>;
 export declare const fetchAllExpenseAutomationTabsEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

package/lib/view/expenseAutomationView/epics/common/fetchAllExpenseAutomationTabsEpic.js

@@ -6,7 +6,6 @@ const operators_1 = require("rxjs/operators");
 const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
 const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const expenseAutomationViewReducer_1 = require("../../expenseAutomationViewReducer");
-const actualMatchingViewReducer_1 = require("../../reducers/actualMatchingViewReducer");
 const fluxAnalysisViewReducer_1 = require("../../reducers/fluxAnalysisViewReducer");
 const jeSchedulesViewReducer_1 = require("../../reducers/jeSchedulesViewReducer");
 const missingReceiptsViewReducer_1 = require("../../reducers/missingReceiptsViewReducer");
@@ -14,7 +13,7 @@ const reconciliationViewReducer_1 = require("../../reducers/reconciliationViewRe
 const transactionsViewReducer_1 = require("../../reducers/transactionsViewReducer");
 const jeSchedulesViewState_1 = require("../../types/jeSchedulesViewState");
 const fetchAllExpenseAutomationTabsEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(expenseAutomationViewReducer_1.fetchAllExpenseAutomationTabs.match), (0, operators_1.switchMap)((action) => {
-    const { cacheOverride, refreshViewInBackground } = action.payload;
+    const { cacheOverride, refreshViewInBackground, isAccrualEnabled } = action.payload;
     const state = state$.value;
     const { monthEndCloseChecksState } = state;
     const { monthEndCloseChecksByTenantId } = monthEndCloseChecksState;
@@ -35,14 +34,11 @@ const fetchAllExpenseAutomationTabsEpic = (actions$, state$) => actions$.pipe((0
     }
     if (cacheOverride === true) {
         const actions = [];
-        const selectedPageTab = state.expenseAutomationJESchedulesViewState.uiState.selectedPageTab;
         actions.push((0, transactionsViewReducer_1.fetchTransactionCategorizationView)(selectedTransactionCategorizationTab, { start: timePeriodStart, end: timePeriodEnd }, cacheOverride, false, undefined, undefined, refreshViewInBackground, false), (0, missingReceiptsViewReducer_1.fetchMissingReceipts)({ start: timePeriodStart, end: timePeriodEnd }, {
             amount: 75.0,
             currencyCode: 'USD',
             currencySymbol: '$',
-        }, cacheOverride, refreshViewInBackground), (0, fluxAnalysisViewReducer_1.fetchFluxAnalysisView)(selectedPeriod, cacheOverride, refreshViewInBackground, null), selectedPageTab === 'actual_matching'
-            ? (0, actualMatchingViewReducer_1.fetchActualMatchingPage)({ start: timePeriodStart, end: timePeriodEnd }, cacheOverride)
-            : (0, jeSchedulesViewReducer_1.fetchJeSchedulesPage)({ start: timePeriodStart, end: timePeriodEnd }, cacheOverride));
+        }, cacheOverride, refreshViewInBackground), (0, fluxAnalysisViewReducer_1.fetchFluxAnalysisView)(selectedPeriod, cacheOverride, refreshViewInBackground, null), (0, jeSchedulesViewReducer_1.fetchJeSchedulesPage)({ start: timePeriodStart, end: timePeriodEnd }, cacheOverride, isAccrualEnabled));
         if (reconciliationEnabled) {
             actions.push((0, reconciliationViewReducer_1.fetchReconciliation)(selectedPeriod, undefined, cacheOverride, refreshViewInBackground));
         }
@@ -69,7 +65,7 @@ const fetchAllExpenseAutomationTabsEpic = (actions$, state$) => actions$.pipe((0
         }
         // The two JE tabs cache separately, so only the tab actually being shown decides whether a
         // fetch is still needed. Actual Matching is a third tab on the same page with its own
-        // endpoint and cache slot.
+        // endpoint; fetchJeSchedulesPage carries isAccrualEnabled so the prefetch epic can warm AM.
         const selectedPageTab = state.expenseAutomationJESchedulesViewState.uiState.selectedPageTab;
         if (selectedPageTab === 'actual_matching') {
             const actualMatchingPeriodKeys = state.expenseAutomationActualMatchingViewState.matchIdsByPeriod[monthYearPeriodId];
@@ -77,7 +73,7 @@ const fetchAllExpenseAutomationTabsEpic = (actions$, state$) => actions$.pipe((0
                 'In-Progress' &&
                 (!state.expenseAutomationActualMatchingViewState.hasValidState() ||
                     actualMatchingPeriodKeys == null)) {
-                fetchActions.push((0, actualMatchingViewReducer_1.fetchActualMatchingPage)({ start: timePeriodStart, end: timePeriodEnd }, cacheOverride));
+                fetchActions.push((0, jeSchedulesViewReducer_1.fetchJeSchedulesPage)({ start: timePeriodStart, end: timePeriodEnd }, cacheOverride, isAccrualEnabled));
             }
         }
         else {
@@ -89,7 +85,7 @@ const fetchAllExpenseAutomationTabsEpic = (actions$, state$) => actions$.pipe((0
                         .jeScheduleTransactionKeysByPeriodAndTab[jeSchedulesPeriodTabKey] == null ||
                     state.expenseAutomationJESchedulesViewState
                         .failedJeScheduleTransactionKeysByPeriodAndTab[jeSchedulesPeriodTabKey] == null)) {
-                fetchActions.push((0, jeSchedulesViewReducer_1.fetchJeSchedulesPage)({ start: timePeriodStart, end: timePeriodEnd }, cacheOverride));
+                fetchActions.push((0, jeSchedulesViewReducer_1.fetchJeSchedulesPage)({ start: timePeriodStart, end: timePeriodEnd }, cacheOverride, isAccrualEnabled));
             }
         }
         if (state.expenseAutomationReconciliationViewState.fetchState !==

package/lib/view/expenseAutomationView/epics/common/refreshExpenseAutomationCurrentTabEpic.d.ts

@@ -4,11 +4,10 @@ import { RootState } from '../../../../rootStateTypes';
 import { fetchCompanyMonthEndReportTemplates, fetchCompanyMonthEndReportView } from '../../../companyMonthEndReportView/companyMonthEndReportViewReducer';
 import { fetchMonthEndCloseChecks } from '../../../monthEndCloseChecksView/monthEndCloseChecksViewReducer';
 import { refreshExpenseAutomationCurrentTab } from '../../expenseAutomationViewReducer';
-import { fetchActualMatchingPage } from '../../reducers/actualMatchingViewReducer';
 import { fetchFluxAnalysisView } from '../../reducers/fluxAnalysisViewReducer';
 import { fetchJeSchedulesPage } from '../../reducers/jeSchedulesViewReducer';
 import { fetchMissingReceipts } from '../../reducers/missingReceiptsViewReducer';
 import { fetchReconciliation } from '../../reducers/reconciliationViewReducer';
 import { fetchTransactionCategorizationView } from '../../reducers/transactionsViewReducer';
-export type ActionType = ReturnType<typeof refreshExpenseAutomationCurrentTab> | ReturnType<typeof fetchActualMatchingPage> | ReturnType<typeof fetchCompanyMonthEndReportView> | ReturnType<typeof fetchCompanyMonthEndReportTemplates> | ReturnType<typeof fetchMissingReceipts> | ReturnType<typeof fetchMonthEndCloseChecks> | ReturnType<typeof fetchFluxAnalysisView> | ReturnType<typeof fetchReconciliation> | ReturnType<typeof fetchJeSchedulesPage> | ReturnType<typeof fetchTransactionCategorizationView>;
+export type ActionType = ReturnType<typeof refreshExpenseAutomationCurrentTab> | ReturnType<typeof fetchCompanyMonthEndReportView> | ReturnType<typeof fetchCompanyMonthEndReportTemplates> | ReturnType<typeof fetchMissingReceipts> | ReturnType<typeof fetchMonthEndCloseChecks> | ReturnType<typeof fetchFluxAnalysisView> | ReturnType<typeof fetchReconciliation> | ReturnType<typeof fetchJeSchedulesPage> | ReturnType<typeof fetchTransactionCategorizationView>;
 export declare const refreshExpenseAutomationCurrentTabEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

package/lib/view/expenseAutomationView/epics/common/refreshExpenseAutomationCurrentTabEpic.js

@@ -7,7 +7,6 @@ const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
 const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const companyMonthEndReportViewReducer_1 = require("../../../companyMonthEndReportView/companyMonthEndReportViewReducer");
 const expenseAutomationViewReducer_1 = require("../../expenseAutomationViewReducer");
-const actualMatchingViewReducer_1 = require("../../reducers/actualMatchingViewReducer");
 const fluxAnalysisViewReducer_1 = require("../../reducers/fluxAnalysisViewReducer");
 const jeSchedulesViewReducer_1 = require("../../reducers/jeSchedulesViewReducer");
 const missingReceiptsViewReducer_1 = require("../../reducers/missingReceiptsViewReducer");
@@ -42,17 +41,10 @@ const refreshExpenseAutomationCurrentTabEpic = (actions$, state$) => actions$.pi
             return (0, rxjs_1.from)([
                 (0, fluxAnalysisViewReducer_1.fetchFluxAnalysisView)(selectedPeriod, true, true, null),
             ]);
-        case 'je_schedules': {
-            const selectedPageTab = state.expenseAutomationJESchedulesViewState.uiState.selectedPageTab;
-            if (selectedPageTab === 'actual_matching') {
-                return (0, rxjs_1.from)([
-                    (0, actualMatchingViewReducer_1.fetchActualMatchingPage)({ start: timePeriodStart, end: timePeriodEnd }, true),
-                ]);
-            }
+        case 'je_schedules':
             return (0, rxjs_1.from)([
                 (0, jeSchedulesViewReducer_1.fetchJeSchedulesPage)({ start: timePeriodStart, end: timePeriodEnd }, true),
             ]);
-        }
         case 'month_end_insights':
             return (0, rxjs_1.from)([
                 (0, companyMonthEndReportViewReducer_1.fetchCompanyMonthEndReportView)(true, companyId, currentTenant.tenantId, period.end, true),

package/lib/view/expenseAutomationView/epics/jeSchedule/fetchJeSchedulePageEpic.d.ts

@@ -2,6 +2,7 @@ import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { RootState } from '../../../../rootStateTypes';
 import { fetchAccountList } from '../../../accountList/accountListReducer';
+import { fetchActualMatchingPage } from '../../reducers/actualMatchingViewReducer';
 import { fetchJeSchedules, fetchJeSchedulesPage, initializeAccountSettingsView } from '../../reducers/jeSchedulesViewReducer';
-export type ActionType = ReturnType<typeof fetchAccountList> | ReturnType<typeof fetchJeSchedules> | ReturnType<typeof fetchJeSchedulesPage> | ReturnType<typeof initializeAccountSettingsView>;
+export type ActionType = ReturnType<typeof fetchAccountList> | ReturnType<typeof fetchActualMatchingPage> | ReturnType<typeof fetchJeSchedules> | ReturnType<typeof fetchJeSchedulesPage> | ReturnType<typeof initializeAccountSettingsView>;
 export declare const fetchJeSchedulesPageEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

package/lib/view/expenseAutomationView/epics/jeSchedule/fetchJeSchedulePageEpic.js

@@ -5,24 +5,34 @@ const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const accountListReducer_1 = require("../../../accountList/accountListReducer");
 const scheduleListHelper_1 = require("../../../scheduleView/scheduleListView/scheduleListHelper");
+const actualMatchingViewReducer_1 = require("../../reducers/actualMatchingViewReducer");
 const jeSchedulesViewReducer_1 = require("../../reducers/jeSchedulesViewReducer");
 const fetchJeSchedulesPageEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(jeSchedulesViewReducer_1.fetchJeSchedulesPage.match), (0, operators_1.mergeMap)((action) => {
     const jeSchedulePageActions = [];
     const { period, refreshViewInBackground } = action.payload;
+    const state = state$.value;
+    const { selectedPageTab } = state.expenseAutomationJESchedulesViewState.uiState;
     const accountType = (0, scheduleListHelper_1.getAccountsTypesForScheduleEpics)();
-    const accountListState = state$.value.accountListState;
+    const accountListState = state.accountListState;
     if (accountListState.byReportId[accountType.accountListKey].fetchState ===
         'Not-Started') {
         // call this only if the account list for schedules is not fetched already
         jeSchedulePageActions.push((0, accountListReducer_1.fetchAccountList)(accountType.accountListKey, true, false, false, false, accountType.allowedAccountList));
     }
-    jeSchedulePageActions.push((0, jeSchedulesViewReducer_1.fetchJeSchedules)(period, refreshViewInBackground));
+    // AM is chrome on this page but a different endpoint. fetchJeSchedules with
+    // selectedPageTab === 'actual_matching' would hit /1.0/schedules and write a bogus cache slot.
+    if (selectedPageTab === 'actual_matching') {
+        jeSchedulePageActions.push((0, actualMatchingViewReducer_1.fetchActualMatchingPage)(period, refreshViewInBackground));
+    }
+    else {
+        jeSchedulePageActions.push((0, jeSchedulesViewReducer_1.fetchJeSchedules)(period, refreshViewInBackground));
+    }
     // Only on the first page load. Account settings cannot change from a tab switch or a
     // refresh, and re-initializing puts accountSettingsView back to 'In-Progress' -- which the
     // page reads as "still loading" and answers with a full skeleton over rows it already has.
     // The action also resets localData, so re-dispatching it blindly would empty the settings
     // form until the refetch lands. Saving account settings still re-initializes explicitly.
-    if (!state$.value.expenseAutomationJESchedulesViewState.accountSettings
+    if (!state.expenseAutomationJESchedulesViewState.accountSettings
         .hasLoadedAccountSettings) {
         jeSchedulePageActions.push((0, jeSchedulesViewReducer_1.initializeAccountSettingsView)());
     }