@zeniai/client-epic-state 5.2.70 → 5.2.72

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.ackCloseMatchAfterUndo = 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.ignoreActualMatchingSuggestionSuccess = exports.ignoreActualMatchingSuggestionFailure = exports.ignoreActualMatchingSuggestion = exports.fetchActualMatchingSuccess = exports.fetchActualMatchingPage = exports.fetchActualMatchingMatchSuccess = exports.fetchActualMatchingMatchFailure = exports.fetchActualMatchingMatch = exports.fetchActualMatchingFailure = exports.fetchActualMatching = exports.closeMatchNewModal = exports.clearMatchNewModal = exports.clearActualMatchingView = exports.ackCloseMatchAfterUndo = exports.ackCloseMatchAfterIgnore = 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");
@@ -26,9 +26,6 @@ exports.initialAccrualSearchState = {
 };
 exports.initialMatchModalState = {
     isOpen: false,
-    openedFromMatchId: undefined,
-    didPinPrefillTransactions: false,
-    pinnedTransactionResults: [],
     transactionSearch: exports.initialTransactionSearchState,
     accrualSearch: exports.initialAccrualSearchState,
     confirmStatus: { fetchState: 'Not-Started', error: undefined },
@@ -48,16 +45,28 @@ exports.initialState = {
         sortOrder: 'descending',
         searchString: '',
         scrollPosition: { scrollTop: 0, scrollLeft: undefined },
+        statusFilter: 'all',
     },
     matchModal: exports.initialMatchModalState,
     undoReversalStatusByMatchId: {},
-    closeMatchAfterUndo: false,
+    ignoreStatusByMatchId: {},
+    confirmStatusByMatchId: {},
+    closeMatchAfterUndoMatchIds: [],
+    closeMatchAfterIgnoreMatchIds: [],
     lastMatchResultsByMatchId: {},
     lastUndoResultsByMatchId: {},
     hasValidState() {
         return this.fetchState == 'Completed';
     },
 };
+function enqueueCloseMatchId(ids, matchId) {
+    if (!ids.includes(matchId)) {
+        ids.push(matchId);
+    }
+}
+function dropCloseMatchId(ids, matchId) {
+    return ids.filter((id) => id !== matchId);
+}
 function pruneLastMatchResultsForUndone(draft, matchId, results) {
     const undoneIds = new Set(results
         .filter((result) => result.status === 'undone')
@@ -100,9 +109,6 @@ function resetMatchModalSearches(draft) {
         error: undefined,
     };
     draft.matchModal.lastBatchResults = undefined;
-    draft.matchModal.openedFromMatchId = undefined;
-    draft.matchModal.didPinPrefillTransactions = false;
-    draft.matchModal.pinnedTransactionResults = [];
 }
 const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
     name: 'expenseAutomationActualMatchingView',
@@ -243,21 +249,13 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
             if (action.payload.scrollPosition != null) {
                 draft.uiState.scrollPosition = action.payload.scrollPosition;
             }
+            if (action.payload.statusFilter != null) {
+                draft.uiState.statusFilter = action.payload.statusFilter;
+            }
         },
-        openMatchNewModal: {
-            prepare(matchId) {
-                return { payload: { matchId } };
-            },
-            reducer(draft, action) {
-                resetMatchModalSearches(draft);
-                draft.matchModal.isOpen = true;
-                const matchId = action.payload.matchId;
-                draft.matchModal.openedFromMatchId =
-                    matchId != null && matchId !== '' ? matchId : undefined;
-                if (draft.matchModal.openedFromMatchId != null) {
-                    draft.matchModal.accrualSearch.fetchState = 'Completed';
-                }
-            },
+        openMatchNewModal(draft) {
+            resetMatchModalSearches(draft);
+            draft.matchModal.isOpen = true;
         },
         // Dismiss (Cancel / overlay). Store reset matches `clearMatchNewModal`;
         // the actions stay distinct so confirm-success vs user-dismiss stay observable.
@@ -312,11 +310,6 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
             }
             else {
                 draft.matchModal.transactionSearch.results = results;
-                if (draft.matchModal.openedFromMatchId != null &&
-                    !draft.matchModal.didPinPrefillTransactions) {
-                    draft.matchModal.didPinPrefillTransactions = true;
-                    draft.matchModal.pinnedTransactionResults = results;
-                }
             }
             draft.matchModal.transactionSearch.nextPageToken = nextPageToken;
             draft.matchModal.transactionSearch.isLoadingMore = false;
@@ -369,21 +362,27 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
             draft.matchModal.accrualSearch.error = action.payload.error;
         },
         matchAndReverseAccruals: {
-            reducer(draft) {
-                draft.matchModal.confirmStatus = {
+            reducer(draft, action) {
+                const inProgress = {
                     fetchState: 'In-Progress',
                     error: undefined,
                 };
+                if (action.payload.forMatchModal === true) {
+                    draft.matchModal.confirmStatus = inProgress;
+                }
+                const matchId = `${action.payload.transactionType.toLowerCase()}:${action.payload.transactionIntegrationId}`;
+                draft.confirmStatusByMatchId[matchId] = inProgress;
             },
-            prepare(transactionId, transactionIntegrationId, transactionType, lineIds, transactionSyncToken, accrualIds) {
+            prepare(transactionId, transactionIntegrationId, transactionType, lineIds, transactionSyncToken, accrualIds, forMatchModal) {
                 return {
                     payload: {
+                        accrualIds,
+                        lineIds,
                         transactionId,
                         transactionIntegrationId,
-                        transactionType,
-                        lineIds,
                         transactionSyncToken,
-                        accrualIds,
+                        transactionType,
+                        forMatchModal,
                     },
                 };
             },
@@ -392,23 +391,33 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
             const { results } = action.payload;
             const allComplete = results.length > 0 &&
                 results.every((result) => (0, actualMatchingViewState_1.isMatchAndReverseCompleteStatus)(result.status));
-            draft.matchModal.confirmStatus = allComplete
+            const confirmStatus = allComplete
                 ? { fetchState: 'Completed', error: undefined }
                 : {
                     fetchState: 'Error',
                     error: (0, responsePayload_1.createZeniAPIStatus)('Partial match-and-reverse', 'Some accruals were not reversed'),
                 };
-            draft.matchModal.lastBatchResults = results;
+            if (action.payload.forMatchModal === true) {
+                draft.matchModal.confirmStatus = confirmStatus;
+                draft.matchModal.lastBatchResults = results;
+            }
             if (action.payload.matchId != null) {
+                draft.confirmStatusByMatchId[action.payload.matchId] = confirmStatus;
                 draft.lastMatchResultsByMatchId[action.payload.matchId] = results;
                 pruneLastUndoResultsForMatched(draft, action.payload.matchId, action.payload.results);
             }
         },
         matchAndReverseAccrualsFailure(draft, action) {
-            draft.matchModal.confirmStatus = {
+            const failed = {
                 fetchState: 'Error',
                 error: action.payload.status,
             };
+            if (action.payload.forMatchModal === true) {
+                draft.matchModal.confirmStatus = failed;
+            }
+            if (action.payload.matchId != null) {
+                draft.confirmStatusByMatchId[action.payload.matchId] = failed;
+            }
         },
         undoReversalAccruals: {
             reducer(draft, action) {
@@ -430,7 +439,12 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                 };
                 const allUndone = results.length > 0 &&
                     results.every((result) => result.status === 'undone');
-                draft.closeMatchAfterUndo = allUndone;
+                if (allUndone) {
+                    enqueueCloseMatchId(draft.closeMatchAfterUndoMatchIds, matchId);
+                }
+                else {
+                    draft.closeMatchAfterUndoMatchIds = dropCloseMatchId(draft.closeMatchAfterUndoMatchIds, matchId);
+                }
                 pruneLastMatchResultsForUndone(draft, matchId, results);
                 if (allUndone) {
                     delete draft.lastUndoResultsByMatchId[matchId];
@@ -444,7 +458,44 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
             },
         },
         ackCloseMatchAfterUndo(draft) {
-            draft.closeMatchAfterUndo = false;
+            draft.closeMatchAfterUndoMatchIds.shift();
+        },
+        ignoreActualMatchingSuggestion: {
+            prepare(matchId, reason, note) {
+                return { payload: { matchId, reason, note } };
+            },
+            reducer(draft, action) {
+                draft.ignoreStatusByMatchId[action.payload.matchId] = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+        },
+        ignoreActualMatchingSuggestionSuccess(draft, action) {
+            const { matchId } = action.payload;
+            draft.ignoreStatusByMatchId[matchId] = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+            enqueueCloseMatchId(draft.closeMatchAfterIgnoreMatchIds, matchId);
+            delete draft.lastMatchResultsByMatchId[matchId];
+            delete draft.lastUndoResultsByMatchId[matchId];
+            delete draft.detailFetchStateByMatchId[matchId];
+            delete draft.detailRefreshStatusByMatchId[matchId];
+            delete draft.undoReversalStatusByMatchId[matchId];
+            delete draft.confirmStatusByMatchId[matchId];
+            Object.keys(draft.matchIdsByPeriod).forEach((periodId) => {
+                draft.matchIdsByPeriod[periodId] = draft.matchIdsByPeriod[periodId].filter((id) => id !== matchId);
+            });
+        },
+        ignoreActualMatchingSuggestionFailure(draft, action) {
+            draft.ignoreStatusByMatchId[action.payload.matchId] = {
+                fetchState: 'Error',
+                error: action.payload.status,
+            };
+        },
+        ackCloseMatchAfterIgnore(draft) {
+            draft.closeMatchAfterIgnoreMatchIds.shift();
         },
         undoReversalAccrualsFailure(draft, action) {
             draft.undoReversalStatusByMatchId[action.payload.matchId] = {
@@ -462,5 +513,5 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
         });
     },
 });
-_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;
+_a = expenseAutomationActualMatchingView.actions, exports.ackCloseMatchAfterIgnore = _a.ackCloseMatchAfterIgnore, 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.ignoreActualMatchingSuggestion = _a.ignoreActualMatchingSuggestion, exports.ignoreActualMatchingSuggestionFailure = _a.ignoreActualMatchingSuggestionFailure, exports.ignoreActualMatchingSuggestionSuccess = _a.ignoreActualMatchingSuggestionSuccess, 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

@@ -16,9 +16,9 @@ export declare const clearExpenseAutomationJESchedulesView: import("@reduxjs/too
     localData: NewOneTimeAccrualLocalData;
 }, "expenseAutomationJESchedulesView/createOneTimeAccrual", never, never>, createOneTimeAccrualFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     status: ZeniAPIStatus;
-}, "expenseAutomationJESchedulesView/createOneTimeAccrualFailure">, createOneTimeAccrualSuccess: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationJESchedulesView/createOneTimeAccrualSuccess">, ignoreOneTimeAccrual: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[accrualId: string, reason: "paused" | "no_activity" | "too_small" | "need_invoice" | "other_ignore", note?: string | undefined], {
+}, "expenseAutomationJESchedulesView/createOneTimeAccrualFailure">, createOneTimeAccrualSuccess: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationJESchedulesView/createOneTimeAccrualSuccess">, ignoreOneTimeAccrual: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[accrualId: string, reason: "no_activity" | "paused" | "too_small" | "need_invoice" | "other_ignore", note?: string | undefined], {
     accrualId: string;
-    reason: "paused" | "no_activity" | "too_small" | "need_invoice" | "other_ignore";
+    reason: "no_activity" | "paused" | "too_small" | "need_invoice" | "other_ignore";
     note: string | undefined;
 }, "expenseAutomationJESchedulesView/ignoreOneTimeAccrual", never, never>, oneTimeAccrualActionFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     accrualId: ID;

package/lib/view/expenseAutomationView/selectorTypes/actualMatchingViewSelectorTypes.d.ts

@@ -5,13 +5,15 @@ import { JEOneTimeAccrual } from '../../../entity/jeSchedules/jeSchedulesSelecto
 import { ZeniDate } from '../../../zeniDayJS';
 import { ActualMatchingTransactionSearchResult, ActualMatchingViewUIState, MatchAndReverseResult } from '../types/actualMatchingViewState';
 export type ActualMatchingRowKind = 'auto_reversed' | 'pending_review' | 'manually_reversed';
-export type ActualMatchingGroupedAccrual = {
+export type ActualMatchingJournalEntryIds = Pick<JEOneTimeAccrual, 'reversalTransactionId' | 'reversalTransactionIntegrationId' | 'transactionId' | 'transactionIntegrationId'>;
+export type ActualMatchingLeftoverAccrual = {
     accrualId: ID;
     estimatedAmount?: Amount;
     jeDebitAccountName?: string;
     memo?: string;
     serviceMonth?: string;
 };
+export type ActualMatchingGroupedAccrual = ActualMatchingLeftoverAccrual & ActualMatchingJournalEntryIds;
 export interface ActualMatchingRow extends JEOneTimeAccrual {
     accruedAmount: Amount;
     actualAmount: Amount;
@@ -20,7 +22,7 @@ export interface ActualMatchingRow extends JEOneTimeAccrual {
     groupedAccrualIds?: ID[];
     groupedMembers?: ActualMatchingGroupedAccrual[];
     intendedAccrualIds?: ID[];
-    leftovers?: ActualMatchingGroupedAccrual[];
+    leftovers?: ActualMatchingLeftoverAccrual[];
     matchShape?: string;
     matchTier?: string;
     reversalDate?: ZeniDate;
@@ -43,6 +45,9 @@ export interface ActualMatchingKpiSummary {
         count: number;
         estimatedMinutesToClear: number;
     };
+    reversed: {
+        count: number;
+    };
     variance: {
         averagePercentPerMatch: number;
         netAmount: number;
@@ -67,21 +72,30 @@ export interface ActualMatchingMatchModalView {
         results: ActualMatchingTransactionSearchResult[];
     };
     lastBatchResults?: MatchAndReverseResult[];
-    openedFromMatchId?: string;
-    prefill?: {
-        selectedAccrualIds: ID[];
-        actualAmount?: number;
-        consumedLineIds?: ID[];
-        matchedLineId?: string;
-        matchedTransactionId?: string;
-    };
+}
+export interface ActualMatchingMatchView {
+    accruedAmount: Amount;
+    actualAmount: Amount;
+    kind: ActualMatchingRowKind;
+    matchId: string;
+    members: JEOneTimeAccrual[];
+    transactionIntegrationId: ID;
+    transactionType: string;
+    leftovers?: JEOneTimeAccrual[];
+    matchShape?: string;
+    matchTier?: string;
+    transactionDate?: string;
+    vendorId?: ID;
+    vendorName?: string;
 }
 export interface ExpenseAutomationActualMatchingViewSelector extends SelectorView {
     hasLoadedForSelectedPeriod: boolean;
+    ignoreStatusByMatchId: Record<string, FetchStateAndError>;
     kpiSummary: ActualMatchingKpiSummary;
     matchModal: ActualMatchingMatchModalView;
     pendingReview: ActualMatchingRow[];
     refreshStatus: FetchStateAndError;
     reversed: ActualMatchingRow[];
     uiState: ActualMatchingViewUIState;
+    undoReversalStatusByMatchId: Record<string, FetchStateAndError>;
 }

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

@@ -1,13 +1,12 @@
 import { FetchStateAndError } from '../../../commonStateTypes/common';
 import { MonthYearPeriod } from '../../../commonStateTypes/timePeriod';
 import { DisplayCurrencyFallback } from '../../../entity/actualMatching/actualMatchingPayload';
-import { ActualMatchingMatch } from '../../../entity/actualMatching/actualMatchingState';
 import { ActualMatchingMatchId } from '../../../entity/actualMatching/actualMatchingTypes';
 import { JEOneTimeAccrual } from '../../../entity/jeSchedules/jeSchedulesSelector';
 import { JEOneTimeAccrualMatchSuggestion } from '../../../entity/jeSchedules/jeSchedulesState';
 import { RootState } from '../../../rootStateTypes';
 import { ZeniDate } from '../../../zeniDayJS';
-import { ActualMatchingKpiSummary, ActualMatchingRow, ActualMatchingRowKind, ExpenseAutomationActualMatchingViewSelector } from '../selectorTypes/actualMatchingViewSelectorTypes';
+import { ActualMatchingKpiSummary, ActualMatchingMatchView, ActualMatchingRow, ActualMatchingRowKind, ExpenseAutomationActualMatchingViewSelector } from '../selectorTypes/actualMatchingViewSelectorTypes';
 import { MatchAndReverseResult, UndoReversalResult } from '../types/actualMatchingViewState';
 export declare function getSelectedMonthYearForCurrentTenant(state: RootState): MonthYearPeriod | undefined;
 export declare function getTenantDisplayCurrency(state: RootState): DisplayCurrencyFallback | undefined;
@@ -27,12 +26,16 @@ export declare function getActualMatchingReversalDate(accrual: JEOneTimeAccrual,
 export declare function buildActualMatchingKpiSummary(rows: ActualMatchingRow[], displayCurrencyCode?: string): ActualMatchingKpiSummary;
 export interface ExpenseAutomationActualMatchingMatchView {
     detailFetchState: FetchStateAndError;
+    ignoreStatus: FetchStateAndError;
     refreshStatus: FetchStateAndError;
     undoReversalStatus: FetchStateAndError;
     lastMatchResults?: MatchAndReverseResult[];
     lastUndoResults?: UndoReversalResult[];
-    match?: ActualMatchingMatch;
+    match?: ActualMatchingMatchView;
 }
 export declare function getExpenseAutomationActualMatchingMatchView(state: RootState, matchId: ActualMatchingMatchId): ExpenseAutomationActualMatchingMatchView;
-export declare function getCloseMatchAfterUndo(state: RootState): boolean;
+export declare function getCloseMatchAfterUndo(state: RootState): ActualMatchingMatchId | undefined;
+export declare function getCloseMatchAfterUndoMatchId(state: RootState): ActualMatchingMatchId | undefined;
+export declare function getCloseMatchAfterIgnoreMatchId(state: RootState): ActualMatchingMatchId | undefined;
+export declare function getActualMatchingMatchModalConfirmStatus(state: RootState, matchId?: ActualMatchingMatchId): FetchStateAndError;
 export declare function getExpenseAutomationActualMatchingView(state: RootState): ExpenseAutomationActualMatchingViewSelector;

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

@@ -16,7 +16,11 @@ exports.getActualMatchingReversalDate = getActualMatchingReversalDate;
 exports.buildActualMatchingKpiSummary = buildActualMatchingKpiSummary;
 exports.getExpenseAutomationActualMatchingMatchView = getExpenseAutomationActualMatchingMatchView;
 exports.getCloseMatchAfterUndo = getCloseMatchAfterUndo;
+exports.getCloseMatchAfterUndoMatchId = getCloseMatchAfterUndoMatchId;
+exports.getCloseMatchAfterIgnoreMatchId = getCloseMatchAfterIgnoreMatchId;
+exports.getActualMatchingMatchModalConfirmStatus = getActualMatchingMatchModalConfirmStatus;
 exports.getExpenseAutomationActualMatchingView = getExpenseAutomationActualMatchingView;
+const toolkit_1 = require("@reduxjs/toolkit");
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const actualMatchingSelector_1 = require("../../../entity/actualMatching/actualMatchingSelector");
@@ -24,7 +28,6 @@ const jeScheduleHelper_1 = require("../../../entity/jeSchedules/jeScheduleHelper
 const jeSchedulesSelector_1 = require("../../../entity/jeSchedules/jeSchedulesSelector");
 const tenantSelector_1 = require("../../../entity/tenant/tenantSelector");
 const zeniDayJS_1 = require("../../../zeniDayJS");
-const actualMatchingViewState_1 = require("../types/actualMatchingViewState");
 function getSelectedMonthYearForCurrentTenant(state) {
     const tenantId = (0, tenantSelector_1.getCurrentTenant)(state)?.tenantId;
     if (tenantId == null) {
@@ -53,27 +56,6 @@ function toMatchModalAccrual(member) {
         jeOneTimeAccrualKey: (0, jeScheduleHelper_1.generateJEOneTimeAccrualKey)(member.accrualId),
     };
 }
-function uniqueMatchModalAccruals(pinned, searched) {
-    const byId = new Map();
-    pinned.forEach((row) => byId.set(row.accrualId, row));
-    searched.forEach((row) => {
-        if (!byId.has(row.accrualId)) {
-            byId.set(row.accrualId, row);
-        }
-    });
-    return Array.from(byId.values());
-}
-function uniqueTransactionSearchResults(pinned, searched) {
-    const byKey = new Map();
-    pinned.forEach((row) => byKey.set((0, actualMatchingViewState_1.actualMatchingTransactionLineKey)(row.transactionType, row.transactionIntegrationId, row.lineId), row));
-    searched.forEach((row) => {
-        const key = (0, actualMatchingViewState_1.actualMatchingTransactionLineKey)(row.transactionType, row.transactionIntegrationId, row.lineId);
-        if (!byKey.has(key)) {
-            byKey.set(key, row);
-        }
-    });
-    return Array.from(byKey.values());
-}
 function parseActualMatchingMatchId(matchId) {
     const separator = matchId.indexOf(':');
     if (separator <= 0 || separator === matchId.length - 1) {
@@ -134,13 +116,18 @@ function collectGroupedMembers(members) {
         estimatedAmount: member.estimatedAmount,
         jeDebitAccountName: member.jeDebitAccountName,
         memo: member.memo,
+        reversalTransactionId: member.reversalTransactionId,
+        reversalTransactionIntegrationId: member.reversalTransactionIntegrationId,
         serviceMonth: member.serviceMonth,
+        transactionId: member.transactionId,
+        transactionIntegrationId: member.transactionIntegrationId,
     }));
 }
 function collectLeftoverMembers(leftovers) {
     if (leftovers == null || leftovers.length === 0) {
         return undefined;
     }
+    // Leftover accruals did not post, so they have no journal-entry ids to open.
     return leftovers.map((member) => ({
         accrualId: member.accrualId,
         estimatedAmount: member.estimatedAmount,
@@ -246,6 +233,7 @@ function emptyKpiSummary() {
         actualsReceived: { count: 0, expectedCount: 0, vendorsPending: 0 },
         autoReversed: { count: 0, percent: 0, clearedAmount: 0 },
         pendingReview: { count: 0, amount: 0, estimatedMinutesToClear: 0 },
+        reversed: { count: 0 },
         variance: { percent: 0, averagePercentPerMatch: 0, netAmount: 0 },
     };
 }
@@ -301,6 +289,7 @@ function buildActualMatchingKpiSummary(rows, displayCurrencyCode) {
     }
     const autoReversed = kpiRows.filter((row) => row.kind === 'auto_reversed');
     const pendingReview = kpiRows.filter((row) => row.kind === 'pending_review');
+    const reversed = kpiRows.filter((row) => isReversedMatchKind(row.kind));
     const receivedCount = kpiRows.length;
     const rowsWithActual = kpiRows.filter((row) => row.actualAmount?.amount != null);
     const accruedTotal = rowsWithActual.reduce((sum, row) => sum + (row.accruedAmount?.amount ?? row.estimatedAmount.amount), 0);
@@ -326,6 +315,9 @@ function buildActualMatchingKpiSummary(rows, displayCurrencyCode) {
             amount: sumRowAmounts(pendingReview, displayCurrencyCode),
             estimatedMinutesToClear: pendingReview.length * ESTIMATED_MINUTES_PER_PENDING_MATCH,
         },
+        reversed: {
+            count: reversed.length,
+        },
         variance: {
             percent: accruedTotal === 0
                 ? 0
@@ -338,23 +330,66 @@ function buildActualMatchingKpiSummary(rows, displayCurrencyCode) {
         },
     };
 }
-function getExpenseAutomationActualMatchingMatchView(state, matchId) {
-    const view = state.expenseAutomationActualMatchingViewState;
+function toActualMatchingMatchView(match) {
     return {
-        match: (0, actualMatchingSelector_1.getActualMatchingMatchById)(state.actualMatchingState, matchId),
-        detailFetchState: view.detailFetchStateByMatchId[matchId] ?? NOT_STARTED,
-        refreshStatus: view.detailRefreshStatusByMatchId[matchId] ?? NOT_STARTED,
-        undoReversalStatus: view.undoReversalStatusByMatchId[matchId] ?? NOT_STARTED,
-        lastMatchResults: view.lastMatchResultsByMatchId?.[matchId],
-        lastUndoResults: view.lastUndoResultsByMatchId?.[matchId],
+        ...match,
+        members: match.members.map(toMatchModalAccrual),
+        leftovers: match.leftovers == null
+            ? undefined
+            : match.leftovers.map(toMatchModalAccrual),
     };
 }
+const matchViewSelectorById = new Map();
+function getExpenseAutomationActualMatchingMatchView(state, matchId) {
+    let selector = matchViewSelectorById.get(matchId);
+    if (selector == null) {
+        selector = (0, toolkit_1.createSelector)([
+            (root) => root.expenseAutomationActualMatchingViewState
+                .detailFetchStateByMatchId[matchId] ?? NOT_STARTED,
+            (root) => root.expenseAutomationActualMatchingViewState.ignoreStatusByMatchId[matchId] ?? NOT_STARTED,
+            (root) => root.expenseAutomationActualMatchingViewState
+                .lastMatchResultsByMatchId?.[matchId],
+            (root) => root.expenseAutomationActualMatchingViewState
+                .lastUndoResultsByMatchId?.[matchId],
+            (root) => root.expenseAutomationActualMatchingViewState
+                .detailRefreshStatusByMatchId[matchId] ?? NOT_STARTED,
+            (root) => root.expenseAutomationActualMatchingViewState
+                .undoReversalStatusByMatchId[matchId] ?? NOT_STARTED,
+            (root) => (0, actualMatchingSelector_1.getActualMatchingMatchById)(root.actualMatchingState, matchId),
+        ], (detailFetchState, ignoreStatus, lastMatchResults, lastUndoResults, refreshStatus, undoReversalStatus, match) => ({
+            detailFetchState,
+            ignoreStatus,
+            lastMatchResults,
+            lastUndoResults,
+            match: match == null ? undefined : toActualMatchingMatchView(match),
+            refreshStatus,
+            undoReversalStatus,
+        }));
+        matchViewSelectorById.set(matchId, selector);
+    }
+    return selector(state);
+}
 function getCloseMatchAfterUndo(state) {
-    return state.expenseAutomationActualMatchingViewState.closeMatchAfterUndo;
+    return state.expenseAutomationActualMatchingViewState
+        .closeMatchAfterUndoMatchIds[0];
+}
+function getCloseMatchAfterUndoMatchId(state) {
+    return getCloseMatchAfterUndo(state);
+}
+function getCloseMatchAfterIgnoreMatchId(state) {
+    return state.expenseAutomationActualMatchingViewState
+        .closeMatchAfterIgnoreMatchIds[0];
+}
+function getActualMatchingMatchModalConfirmStatus(state, matchId) {
+    if (matchId != null && matchId !== '') {
+        return (state.expenseAutomationActualMatchingViewState.confirmStatusByMatchId[matchId] ?? NOT_STARTED);
+    }
+    return state.expenseAutomationActualMatchingViewState.matchModal
+        .confirmStatus;
 }
 function getExpenseAutomationActualMatchingView(state) {
     const { expenseAutomationActualMatchingViewState } = state;
-    const { matchIdsByPeriod, fetchState, error, refreshStatus, uiState, matchModal, } = expenseAutomationActualMatchingViewState;
+    const { matchIdsByPeriod, fetchState, error, refreshStatus, uiState, matchModal, ignoreStatusByMatchId, undoReversalStatusByMatchId, } = expenseAutomationActualMatchingViewState;
     const selectedPeriod = getSelectedMonthYearForCurrentTenant(state);
     const monthYearPeriodId = selectedPeriod != null ? (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod) : undefined;
     const matchIds = monthYearPeriodId != null ? matchIdsByPeriod[monthYearPeriodId] : undefined;
@@ -370,32 +405,6 @@ function getExpenseAutomationActualMatchingView(state) {
     const searchedAccruals = matchModal.accrualSearch.results
         .map((key) => (0, jeSchedulesSelector_1.getJEOneTimeAccrualByKey)(key, state.jeSchedulesState))
         .filter((accrual) => accrual != null);
-    const openedMatch = matchModal.openedFromMatchId != null
-        ? (0, actualMatchingSelector_1.getActualMatchingMatchById)(state.actualMatchingState, matchModal.openedFromMatchId)
-        : undefined;
-    const pinnedAccruals = [
-        ...(openedMatch?.members ?? []),
-        ...(openedMatch?.leftovers ?? []),
-    ].map(toMatchModalAccrual);
-    const firstMember = openedMatch?.members[0];
-    const cleared = firstMember?.cleared;
-    const suggestion = firstMember?.matchSuggestion;
-    const stamp = cleared ?? suggestion;
-    const consumedLineIds = cleared?.consumedLineIds;
-    const prefill = openedMatch == null
-        ? undefined
-        : {
-            selectedAccrualIds: [
-                ...openedMatch.members.map((member) => member.accrualId),
-                ...(openedMatch.leftovers ?? []).map((leftover) => leftover.accrualId),
-            ],
-            actualAmount: openedMatch.actualAmount.amount,
-            matchedTransactionId: stamp?.matchedTransactionId,
-            matchedLineId: cleared == null ? suggestion?.matchedLineId : undefined,
-            ...(consumedLineIds != null && consumedLineIds.length > 0
-                ? { consumedLineIds }
-                : {}),
-        };
     // `fetchState` is a flat slice field that survives a period switch. Until this
     // month's ids land, leftover Completed/Error is the previous month. Report
     // Not-Started so chrome matches Review's "cache slot missing" skeleton, not
@@ -413,16 +422,16 @@ function getExpenseAutomationActualMatchingView(state) {
         kpiSummary,
         uiState,
         refreshStatus,
+        ignoreStatusByMatchId,
+        undoReversalStatusByMatchId,
         hasLoadedForSelectedPeriod: matchIds != null,
         matchModal: {
             isOpen: matchModal.isOpen,
-            openedFromMatchId: matchModal.openedFromMatchId,
-            prefill,
             confirmStatus: matchModal.confirmStatus,
             lastBatchResults: matchModal.lastBatchResults,
             transactionSearch: {
                 query: matchModal.transactionSearch.query,
-                results: uniqueTransactionSearchResults(matchModal.pinnedTransactionResults, matchModal.transactionSearch.results),
+                results: matchModal.transactionSearch.results,
                 fetchState: {
                     fetchState: matchModal.transactionSearch.fetchState,
                     error: matchModal.transactionSearch.error,
@@ -432,7 +441,7 @@ function getExpenseAutomationActualMatchingView(state) {
             },
             accrualSearch: {
                 query: matchModal.accrualSearch.query,
-                results: uniqueMatchModalAccruals(pinnedAccruals, searchedAccruals),
+                results: searchedAccruals,
                 fetchState: {
                     fetchState: matchModal.accrualSearch.fetchState,
                     error: matchModal.accrualSearch.error,

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

@@ -5,6 +5,8 @@ import { ActualMatchingMatchId } from '../../../entity/actualMatching/actualMatc
 import { JEOneTimeAccrualKey } from '../../../entity/jeSchedules/jeSchedulesTypes';
 export declare const toActualMatchingSortKey: (v: string) => "type" | "date" | "vendor" | "category" | "class" | "amount" | "variance" | "lifecycle" | "service" | "accrued" | "actual";
 export type ActualMatchingSortKey = ReturnType<typeof toActualMatchingSortKey>;
+export declare const toActualMatchingStatusFilter: (v: string) => "pending_review" | "reversed" | "all";
+export type ActualMatchingStatusFilter = ReturnType<typeof toActualMatchingStatusFilter>;
 export declare const MATCH_TRANSACTION_SEARCH_PAGE_SIZE = 50;
 export declare const MATCH_ACCRUAL_SEARCH_LIMIT = 50;
 export declare const MATCH_SEARCH_DEBOUNCE_MS = 300;
@@ -18,6 +20,11 @@ export interface ActualMatchingViewUIState {
     searchString: string;
     sortKey: ActualMatchingSortKey;
     sortOrder: SortOrder;
+    /**
+     * Unused by the list: Pending review and Reversed always render as separate
+     * tables. Kept so persisted UI state and older clients still hydrate.
+     */
+    statusFilter: ActualMatchingStatusFilter;
 }
 /**
  * Sibling of Missing Receipts `MatchCandidate`. Confirm needs `lineId` and
@@ -69,6 +76,14 @@ export interface UndoReversalAccrualsParams {
     accrualIds: ID[];
     matchId: ActualMatchingMatchId;
 }
+export declare const toActualMatchingIgnoreReasonType: (v: string) => "other_ignore" | "already_handled" | "amount_off" | "wrong_period" | "wrong_bill";
+export type ActualMatchingIgnoreReasonType = ReturnType<typeof toActualMatchingIgnoreReasonType>;
+export declare const ALL_ACTUAL_MATCHING_IGNORE_REASONS: readonly ActualMatchingIgnoreReasonType[];
+export interface IgnoreActualMatchingSuggestionParams {
+    matchId: ActualMatchingMatchId;
+    reason: ActualMatchingIgnoreReasonType;
+    note?: string;
+}
 export interface ActualMatchingTransactionSearchState extends FetchStateAndError {
     isLoadingMore: boolean;
     nextPageToken: string | null;
@@ -84,18 +99,18 @@ export interface ActualMatchingAccrualSearchState extends FetchStateAndError {
 export interface ActualMatchingMatchModalState {
     accrualSearch: ActualMatchingAccrualSearchState;
     confirmStatus: FetchStateAndError;
-    didPinPrefillTransactions: boolean;
     isOpen: boolean;
-    pinnedTransactionResults: ActualMatchingTransactionSearchResult[];
     transactionSearch: ActualMatchingTransactionSearchState;
     lastBatchResults?: MatchAndReverseResult[];
-    openedFromMatchId?: ActualMatchingMatchId;
 }
 export declare function actualMatchingTransactionLineKey(transactionType: string, transactionIntegrationId: string, lineId: string): string;
 export interface ActualMatchingViewState extends FetchedState {
-    closeMatchAfterUndo: boolean;
+    closeMatchAfterIgnoreMatchIds: ActualMatchingMatchId[];
+    closeMatchAfterUndoMatchIds: ActualMatchingMatchId[];
+    confirmStatusByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
     detailFetchStateByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
     detailRefreshStatusByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
+    ignoreStatusByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
     lastMatchResultsByMatchId: Record<ActualMatchingMatchId, MatchAndReverseResult[]>;
     lastUndoResultsByMatchId: Record<ActualMatchingMatchId, UndoReversalResult[]>;
     matchIdsByPeriod: Record<MonthYearPeriodId, ActualMatchingMatchId[]>;