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

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

@@ -1,11 +1,12 @@
 "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");
 const rootActions_1 = require("../../../rootActions");
+const actualMatchingViewState_1 = require("../types/actualMatchingViewState");
 exports.initialTransactionSearchState = {
     query: '',
     results: [],
@@ -25,6 +26,7 @@ exports.initialAccrualSearchState = {
 exports.initialMatchModalState = {
     isOpen: false,
     openedFromMatchId: undefined,
+    didPinPrefillTransactions: false,
     pinnedTransactionResults: [],
     transactionSearch: exports.initialTransactionSearchState,
     accrualSearch: exports.initialAccrualSearchState,
@@ -47,11 +49,48 @@ exports.initialState = {
         scrollPosition: { scrollTop: 0, scrollLeft: undefined },
     },
     matchModal: exports.initialMatchModalState,
-    undoReversalStatus: { fetchState: 'Not-Started', error: undefined },
+    undoReversalStatusByMatchId: {},
+    closeMatchAfterUndo: false,
+    lastMatchResultsByMatchId: {},
+    lastUndoResultsByMatchId: {},
     hasValidState() {
         return this.fetchState == 'Completed';
     },
 };
+function pruneLastMatchResultsForUndone(draft, matchId, results) {
+    const undoneIds = new Set(results
+        .filter((result) => result.status === 'undone')
+        .map((result) => result.accrualId));
+    if (undoneIds.size === 0) {
+        return;
+    }
+    const existing = draft.lastMatchResultsByMatchId[matchId];
+    if (existing == null) {
+        return;
+    }
+    const kept = existing.filter((result) => !undoneIds.has(result.accrualId));
+    if (kept.length === 0) {
+        delete draft.lastMatchResultsByMatchId[matchId];
+        return;
+    }
+    draft.lastMatchResultsByMatchId[matchId] = kept;
+}
+function pruneLastUndoResultsForMatched(draft, matchId, results) {
+    const matchedIds = new Set(results.map((result) => result.accrualId));
+    if (matchedIds.size === 0) {
+        return;
+    }
+    const existing = draft.lastUndoResultsByMatchId[matchId];
+    if (existing == null) {
+        return;
+    }
+    const kept = existing.filter((result) => !matchedIds.has(result.accrualId));
+    if (kept.length === 0) {
+        delete draft.lastUndoResultsByMatchId[matchId];
+        return;
+    }
+    draft.lastUndoResultsByMatchId[matchId] = kept;
+}
 function resetMatchModalSearches(draft) {
     draft.matchModal.transactionSearch = exports.initialTransactionSearchState;
     draft.matchModal.accrualSearch = exports.initialAccrualSearchState;
@@ -61,6 +100,7 @@ function resetMatchModalSearches(draft) {
     };
     draft.matchModal.lastBatchResults = undefined;
     draft.matchModal.openedFromMatchId = undefined;
+    draft.matchModal.didPinPrefillTransactions = false;
     draft.matchModal.pinnedTransactionResults = [];
 }
 const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
@@ -85,6 +125,9 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                 const { refreshViewInBackground } = action.payload;
                 if (refreshViewInBackground) {
                     draft.refreshStatus = { fetchState: 'In-Progress', error: undefined };
+                    if (draft.fetchState === 'Not-Started') {
+                        draft.fetchState = 'In-Progress';
+                    }
                 }
                 else {
                     draft.fetchState = 'In-Progress';
@@ -106,6 +149,10 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
             draft.matchIdsByPeriod[periodId] = matchIds;
             if (refreshViewInBackground) {
                 draft.refreshStatus = { fetchState: 'Completed', error: undefined };
+                if (draft.fetchState !== 'Completed') {
+                    draft.fetchState = 'Completed';
+                    draft.error = undefined;
+                }
             }
             else {
                 draft.fetchState = 'Completed';
@@ -116,6 +163,10 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
             const { status, refreshViewInBackground } = action.payload;
             if (refreshViewInBackground) {
                 draft.refreshStatus = { fetchState: 'Error', error: status };
+                if (draft.fetchState !== 'Completed') {
+                    draft.fetchState = 'Error';
+                    draft.error = status;
+                }
             }
             else {
                 draft.fetchState = 'Error';
@@ -201,10 +252,13 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                 }
             },
         },
+        // Dismiss (Cancel / overlay). Store reset matches `clearMatchNewModal`;
+        // the actions stay distinct so confirm-success vs user-dismiss stay observable.
         closeMatchNewModal(draft) {
             draft.matchModal.isOpen = false;
             resetMatchModalSearches(draft);
         },
+        // Confirm-success / host reset. Same slice write as close; different action type.
         clearMatchNewModal(draft) {
             draft.matchModal.isOpen = false;
             resetMatchModalSearches(draft);
@@ -225,7 +279,7 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                     draft.matchModal.transactionSearch.error = undefined;
                 }
             },
-            prepare({ query, pageToken, transactionType, transactionIntegrationId, }) {
+            prepare(query, pageToken, transactionType, transactionIntegrationId) {
                 return {
                     payload: {
                         query,
@@ -244,7 +298,7 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                     ...results,
                 ];
                 const byKey = new Map(merged.map((result) => [
-                    `${result.transactionId}:${result.lineId}`,
+                    (0, actualMatchingViewState_1.actualMatchingTransactionLineKey)(result.transactionType, result.transactionIntegrationId, result.lineId),
                     result,
                 ]));
                 draft.matchModal.transactionSearch.results = Array.from(byKey.values());
@@ -252,7 +306,8 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
             else {
                 draft.matchModal.transactionSearch.results = results;
                 if (draft.matchModal.openedFromMatchId != null &&
-                    draft.matchModal.pinnedTransactionResults.length === 0) {
+                    !draft.matchModal.didPinPrefillTransactions) {
+                    draft.matchModal.didPinPrefillTransactions = true;
                     draft.matchModal.pinnedTransactionResults = results;
                 }
             }
@@ -282,7 +337,7 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                     draft.matchModal.accrualSearch.error = undefined;
                 }
             },
-            prepare({ query, pageToken }) {
+            prepare(query, pageToken) {
                 return { payload: { query, pageToken: pageToken ?? undefined } };
             },
         },
@@ -313,8 +368,17 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                     error: undefined,
                 };
             },
-            prepare(params) {
-                return { payload: params };
+            prepare(transactionId, transactionIntegrationId, transactionType, lineIds, transactionSyncToken, accrualIds) {
+                return {
+                    payload: {
+                        transactionId,
+                        transactionIntegrationId,
+                        transactionType,
+                        lineIds,
+                        transactionSyncToken,
+                        accrualIds,
+                    },
+                };
             },
         },
         matchAndReverseAccrualsSuccess(draft, action) {
@@ -323,6 +387,11 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                 error: undefined,
             };
             draft.matchModal.lastBatchResults = action.payload.results;
+            if (action.payload.matchId != null) {
+                draft.lastMatchResultsByMatchId[action.payload.matchId] =
+                    action.payload.results;
+                pruneLastUndoResultsForMatched(draft, action.payload.matchId, action.payload.results);
+            }
         },
         matchAndReverseAccrualsFailure(draft, action) {
             draft.matchModal.confirmStatus = {
@@ -331,25 +400,43 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
             };
         },
         undoReversalAccruals: {
-            reducer(draft) {
-                draft.undoReversalStatus = {
+            reducer(draft, action) {
+                draft.undoReversalStatusByMatchId[action.payload.matchId] = {
                     fetchState: 'In-Progress',
                     error: undefined,
                 };
             },
-            prepare(params) {
-                return { payload: params };
+            prepare(matchId, accrualIds) {
+                return { payload: { matchId, accrualIds } };
             },
         },
-        undoReversalAccrualsSuccess(draft, action) {
-            draft.undoReversalStatus = {
-                fetchState: 'Completed',
-                error: undefined,
-            };
-            void action;
+        undoReversalAccrualsSuccess: {
+            reducer(draft, action) {
+                const { matchId, results } = action.payload;
+                draft.undoReversalStatusByMatchId[matchId] = {
+                    fetchState: 'Completed',
+                    error: undefined,
+                };
+                const allUndone = results.length > 0 &&
+                    results.every((result) => result.status === 'undone');
+                draft.closeMatchAfterUndo = allUndone;
+                pruneLastMatchResultsForUndone(draft, matchId, results);
+                if (allUndone) {
+                    delete draft.lastUndoResultsByMatchId[matchId];
+                }
+                else {
+                    draft.lastUndoResultsByMatchId[matchId] = results;
+                }
+            },
+            prepare(matchId, results) {
+                return { payload: { matchId, results } };
+            },
+        },
+        ackCloseMatchAfterUndo(draft) {
+            draft.closeMatchAfterUndo = false;
         },
         undoReversalAccrualsFailure(draft, action) {
-            draft.undoReversalStatus = {
+            draft.undoReversalStatusByMatchId[action.payload.matchId] = {
                 fetchState: 'Error',
                 error: action.payload.status,
             };
@@ -364,5 +451,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/selectorTypes/actualMatchingViewSelectorTypes.d.ts

@@ -19,6 +19,8 @@ export interface ActualMatchingRow extends JEOneTimeAccrual {
     matchId: string;
     groupedAccrualIds?: ID[];
     groupedMembers?: ActualMatchingGroupedAccrual[];
+    intendedAccrualIds?: ID[];
+    leftovers?: ActualMatchingGroupedAccrual[];
     matchShape?: string;
     matchTier?: string;
     reversalDate?: ZeniDate;
@@ -26,23 +28,25 @@ export interface ActualMatchingRow extends JEOneTimeAccrual {
     transactionType?: string;
 }
 export interface ActualMatchingKpiSummary {
-    ai: {
+    actualsReceived: {
         count: number;
+        expectedCount: number;
+        vendorsPending: number;
     };
     autoReversed: {
-        amount: number;
-        count: number;
-    };
-    manual: {
+        clearedAmount: number;
         count: number;
+        percent: number;
     };
     pendingReview: {
         amount: number;
         count: number;
+        estimatedMinutesToClear: number;
     };
-    totalThisClose: {
-        amount: number;
-        count: number;
+    variance: {
+        averagePercentPerMatch: number;
+        netAmount: number;
+        percent: number;
     };
 }
 export interface ActualMatchingMatchModalView {
@@ -67,6 +71,7 @@ export interface ActualMatchingMatchModalView {
     prefill?: {
         selectedAccrualIds: ID[];
         actualAmount?: number;
+        consumedLineIds?: ID[];
         matchedLineId?: string;
         matchedTransactionId?: string;
     };
@@ -79,5 +84,4 @@ export interface ExpenseAutomationActualMatchingViewSelector extends SelectorVie
     refreshStatus: FetchStateAndError;
     reversed: ActualMatchingRow[];
     uiState: ActualMatchingViewUIState;
-    undoReversalStatus?: FetchStateAndError;
 }

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

@@ -22,6 +22,15 @@ export interface ExpenseAutomationStepDetails {
     title: string;
 }
 export interface ExpenseAutomationViewSelector extends SelectorView {
+    /**
+     * Sibling of `jeSchedules`, not nested under it. The Journal Entries navbar
+     * hosts Actual Matching (`selectedPageTab === 'actual_matching'`), but AM is
+     * a different GET, entity map (`byMatchId`), and period cache
+     * (`matchIdsByPeriod`) than Review / Existing. Nesting it on `jeSchedules`
+     * would hide a second store inside the schedules selector. Chrome coupling
+     * stays `jeSchedules.uiState.selectedPageTab`; AM rows, Match New, and undo
+     * live here.
+     */
     actualMatching: ExpenseAutomationActualMatchingViewSelector;
     allSteps: ExpenseAutomationStepDetails[];
     completionStatus: CompletionStatusType;

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

@@ -1,11 +1,16 @@
 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 { ActualMatchingRow, ActualMatchingRowKind, ExpenseAutomationActualMatchingViewSelector } from '../selectorTypes/actualMatchingViewSelectorTypes';
+import { ActualMatchingKpiSummary, 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;
 export declare function parseActualMatchingMatchId(matchId: string): {
     transactionIntegrationId: string;
     transactionType: string;
@@ -18,12 +23,16 @@ export declare function isPendingReviewAccrual(accrual: JEOneTimeAccrual): accru
 export declare function isReversedMatchKind(kind: ActualMatchingRowKind): boolean;
 export declare function getClearedMatchedAmount(accrual: JEOneTimeAccrual): number | undefined;
 export declare function getActualMatchingAmount(row: ActualMatchingRow): number;
-export declare function getActualMatchingReversalDate(accrual: JEOneTimeAccrual): ZeniDate | undefined;
+export declare function getActualMatchingReversalDate(accrual: JEOneTimeAccrual, matchTransactionDate?: string): ZeniDate | undefined;
+export declare function buildActualMatchingKpiSummary(rows: ActualMatchingRow[], displayCurrencyCode?: string): ActualMatchingKpiSummary;
 export interface ExpenseAutomationActualMatchingMatchView {
     detailFetchState: FetchStateAndError;
     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;