@zeniai/client-epic-state 5.2.69 → 5.2.70

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

@@ -22,6 +22,9 @@ export const initialAccrualSearchState = {
 };
 export const initialMatchModalState = {
     isOpen: false,
+    openedFromMatchId: undefined,
+    didPinPrefillTransactions: false,
+    pinnedTransactionResults: [],
     transactionSearch: initialTransactionSearchState,
     accrualSearch: initialAccrualSearchState,
     confirmStatus: { fetchState: 'Not-Started', error: undefined },
@@ -41,28 +44,16 @@ export const initialState = {
         sortOrder: 'descending',
         searchString: '',
         scrollPosition: { scrollTop: 0, scrollLeft: undefined },
-        statusFilter: 'all',
     },
     matchModal: initialMatchModalState,
     undoReversalStatusByMatchId: {},
-    ignoreStatusByMatchId: {},
-    confirmStatusByMatchId: {},
-    closeMatchAfterUndoMatchIds: [],
-    closeMatchAfterIgnoreMatchIds: [],
+    closeMatchAfterUndo: false,
     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')
@@ -105,6 +96,9 @@ function resetMatchModalSearches(draft) {
         error: undefined,
     };
     draft.matchModal.lastBatchResults = undefined;
+    draft.matchModal.openedFromMatchId = undefined;
+    draft.matchModal.didPinPrefillTransactions = false;
+    draft.matchModal.pinnedTransactionResults = [];
 }
 const expenseAutomationActualMatchingView = createSlice({
     name: 'expenseAutomationActualMatchingView',
@@ -245,13 +239,21 @@ const expenseAutomationActualMatchingView = createSlice({
             if (action.payload.scrollPosition != null) {
                 draft.uiState.scrollPosition = action.payload.scrollPosition;
             }
-            if (action.payload.statusFilter != null) {
-                draft.uiState.statusFilter = action.payload.statusFilter;
-            }
         },
-        openMatchNewModal(draft) {
-            resetMatchModalSearches(draft);
-            draft.matchModal.isOpen = true;
+        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';
+                }
+            },
         },
         // Dismiss (Cancel / overlay). Store reset matches `clearMatchNewModal`;
         // the actions stay distinct so confirm-success vs user-dismiss stay observable.
@@ -306,6 +308,11 @@ const expenseAutomationActualMatchingView = 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;
@@ -358,27 +365,21 @@ const expenseAutomationActualMatchingView = createSlice({
             draft.matchModal.accrualSearch.error = action.payload.error;
         },
         matchAndReverseAccruals: {
-            reducer(draft, action) {
-                const inProgress = {
+            reducer(draft) {
+                draft.matchModal.confirmStatus = {
                     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, forMatchModal) {
+            prepare(transactionId, transactionIntegrationId, transactionType, lineIds, transactionSyncToken, accrualIds) {
                 return {
                     payload: {
-                        accrualIds,
-                        lineIds,
                         transactionId,
                         transactionIntegrationId,
-                        transactionSyncToken,
                         transactionType,
-                        forMatchModal,
+                        lineIds,
+                        transactionSyncToken,
+                        accrualIds,
                     },
                 };
             },
@@ -387,33 +388,23 @@ const expenseAutomationActualMatchingView = createSlice({
             const { results } = action.payload;
             const allComplete = results.length > 0 &&
                 results.every((result) => isMatchAndReverseCompleteStatus(result.status));
-            const confirmStatus = allComplete
+            draft.matchModal.confirmStatus = allComplete
                 ? { fetchState: 'Completed', error: undefined }
                 : {
                     fetchState: 'Error',
                     error: createZeniAPIStatus('Partial match-and-reverse', 'Some accruals were not reversed'),
                 };
-            if (action.payload.forMatchModal === true) {
-                draft.matchModal.confirmStatus = confirmStatus;
-                draft.matchModal.lastBatchResults = results;
-            }
+            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) {
-            const failed = {
+            draft.matchModal.confirmStatus = {
                 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) {
@@ -435,12 +426,7 @@ const expenseAutomationActualMatchingView = createSlice({
                 };
                 const allUndone = results.length > 0 &&
                     results.every((result) => result.status === 'undone');
-                if (allUndone) {
-                    enqueueCloseMatchId(draft.closeMatchAfterUndoMatchIds, matchId);
-                }
-                else {
-                    draft.closeMatchAfterUndoMatchIds = dropCloseMatchId(draft.closeMatchAfterUndoMatchIds, matchId);
-                }
+                draft.closeMatchAfterUndo = allUndone;
                 pruneLastMatchResultsForUndone(draft, matchId, results);
                 if (allUndone) {
                     delete draft.lastUndoResultsByMatchId[matchId];
@@ -454,44 +440,7 @@ const expenseAutomationActualMatchingView = createSlice({
             },
         },
         ackCloseMatchAfterUndo(draft) {
-            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();
+            draft.closeMatchAfterUndo = false;
         },
         undoReversalAccrualsFailure(draft, action) {
             draft.undoReversalStatusByMatchId[action.payload.matchId] = {
@@ -509,5 +458,5 @@ const expenseAutomationActualMatchingView = createSlice({
         });
     },
 });
-export const { ackCloseMatchAfterIgnore, ackCloseMatchAfterUndo, clearActualMatchingView, clearMatchNewModal, closeMatchNewModal, fetchActualMatching, fetchActualMatchingFailure, fetchActualMatchingMatch, fetchActualMatchingMatchFailure, fetchActualMatchingMatchSuccess, fetchActualMatchingPage, fetchActualMatchingSuccess, ignoreActualMatchingSuggestion, ignoreActualMatchingSuggestionFailure, ignoreActualMatchingSuggestionSuccess, matchAndReverseAccruals, matchAndReverseAccrualsFailure, matchAndReverseAccrualsSuccess, openMatchNewModal, searchMatchAccruals, searchMatchAccrualsFailure, searchMatchAccrualsSuccess, searchMatchTransactions, searchMatchTransactionsFailure, searchMatchTransactionsSuccess, undoReversalAccruals, undoReversalAccrualsFailure, undoReversalAccrualsSuccess, updateActualMatchingUIState, } = expenseAutomationActualMatchingView.actions;
+export const { ackCloseMatchAfterUndo, clearActualMatchingView, clearMatchNewModal, closeMatchNewModal, fetchActualMatching, fetchActualMatchingFailure, fetchActualMatchingMatch, fetchActualMatchingMatchFailure, fetchActualMatchingMatchSuccess, fetchActualMatchingPage, fetchActualMatchingSuccess, matchAndReverseAccruals, matchAndReverseAccrualsFailure, matchAndReverseAccrualsSuccess, openMatchNewModal, searchMatchAccruals, searchMatchAccrualsFailure, searchMatchAccrualsSuccess, searchMatchTransactions, searchMatchTransactionsFailure, searchMatchTransactionsSuccess, undoReversalAccruals, undoReversalAccrualsFailure, undoReversalAccrualsSuccess, updateActualMatchingUIState, } = expenseAutomationActualMatchingView.actions;
 export default expenseAutomationActualMatchingView.reducer;

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

@@ -1,11 +1,11 @@
 import orderBy from 'lodash/orderBy';
-import { createSelector } from '@reduxjs/toolkit';
 import { toMonthYearPeriodId, } from '../../../commonStateTypes/timePeriod';
 import { getActualMatchingMatchById } from '../../../entity/actualMatching/actualMatchingSelector';
 import { generateJEOneTimeAccrualKey } from '../../../entity/jeSchedules/jeScheduleHelper';
 import { getJEOneTimeAccrualByKey, } from '../../../entity/jeSchedules/jeSchedulesSelector';
 import { getCurrentTenant } from '../../../entity/tenant/tenantSelector';
 import { date } from '../../../zeniDayJS';
+import { actualMatchingTransactionLineKey, } from '../types/actualMatchingViewState';
 export function getSelectedMonthYearForCurrentTenant(state) {
     const tenantId = getCurrentTenant(state)?.tenantId;
     if (tenantId == null) {
@@ -34,6 +34,27 @@ function toMatchModalAccrual(member) {
         jeOneTimeAccrualKey: 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(actualMatchingTransactionLineKey(row.transactionType, row.transactionIntegrationId, row.lineId), row));
+    searched.forEach((row) => {
+        const key = actualMatchingTransactionLineKey(row.transactionType, row.transactionIntegrationId, row.lineId);
+        if (!byKey.has(key)) {
+            byKey.set(key, row);
+        }
+    });
+    return Array.from(byKey.values());
+}
 export function parseActualMatchingMatchId(matchId) {
     const separator = matchId.indexOf(':');
     if (separator <= 0 || separator === matchId.length - 1) {
@@ -206,7 +227,6 @@ 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 },
     };
 }
@@ -262,7 +282,6 @@ export 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);
@@ -288,9 +307,6 @@ export 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
@@ -303,61 +319,23 @@ export function buildActualMatchingKpiSummary(rows, displayCurrencyCode) {
         },
     };
 }
-function toActualMatchingMatchView(match) {
+export function getExpenseAutomationActualMatchingMatchView(state, matchId) {
+    const view = state.expenseAutomationActualMatchingViewState;
     return {
-        ...match,
-        members: match.members.map(toMatchModalAccrual),
-        leftovers: match.leftovers == null
-            ? undefined
-            : match.leftovers.map(toMatchModalAccrual),
+        match: 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],
     };
 }
-const EMPTY_ACTUAL_MATCHING_ROWS = [];
-const matchViewSelectorById = new Map();
-export function getExpenseAutomationActualMatchingMatchView(state, matchId) {
-    let selector = matchViewSelectorById.get(matchId);
-    if (selector == null) {
-        selector = 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) => 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);
-}
 export function getCloseMatchAfterUndo(state) {
-    return state.expenseAutomationActualMatchingViewState
-        .closeMatchAfterUndoMatchIds[0];
-}
-export function getCloseMatchAfterUndoMatchId(state) {
-    return getCloseMatchAfterUndo(state);
-}
-export function getCloseMatchAfterIgnoreMatchId(state) {
-    return state.expenseAutomationActualMatchingViewState
-        .closeMatchAfterIgnoreMatchIds[0];
-}
-export function getActualMatchingMatchModalConfirmStatus(state, matchId) {
-    if (matchId != null && matchId !== '') {
-        return (state.expenseAutomationActualMatchingViewState.confirmStatusByMatchId[matchId] ?? NOT_STARTED);
-    }
-    return state.expenseAutomationActualMatchingViewState.matchModal.confirmStatus;
+    return state.expenseAutomationActualMatchingViewState.closeMatchAfterUndo;
 }
 export function getExpenseAutomationActualMatchingView(state) {
     const { expenseAutomationActualMatchingViewState } = state;
-    const { matchIdsByPeriod, fetchState, error, refreshStatus, uiState, matchModal, ignoreStatusByMatchId, undoReversalStatusByMatchId, } = expenseAutomationActualMatchingViewState;
+    const { matchIdsByPeriod, fetchState, error, refreshStatus, uiState, matchModal, } = expenseAutomationActualMatchingViewState;
     const selectedPeriod = getSelectedMonthYearForCurrentTenant(state);
     const monthYearPeriodId = selectedPeriod != null ? toMonthYearPeriodId(selectedPeriod) : undefined;
     const matchIds = monthYearPeriodId != null ? matchIdsByPeriod[monthYearPeriodId] : undefined;
@@ -367,18 +345,38 @@ export function getExpenseAutomationActualMatchingView(state) {
         .filter((match) => match.members.length > 0)
         .map(toActualMatchingRow);
     const rows = allRows.filter((row) => matchesSearch(row, uiState.searchString));
-    const includePendingReview = uiState.statusFilter !== 'reversed';
-    const includeReversed = uiState.statusFilter !== 'pending_review';
-    const reversed = includeReversed
-        ? sortActualMatchingRows(rows.filter((row) => isReversedMatchKind(row.kind)), uiState)
-        : EMPTY_ACTUAL_MATCHING_ROWS;
-    const pendingReview = includePendingReview
-        ? sortActualMatchingRows(rows.filter((row) => row.kind === 'pending_review'), uiState)
-        : EMPTY_ACTUAL_MATCHING_ROWS;
+    const reversed = sortActualMatchingRows(rows.filter((row) => isReversedMatchKind(row.kind)), uiState);
+    const pendingReview = sortActualMatchingRows(rows.filter((row) => row.kind === 'pending_review'), uiState);
     const kpiSummary = buildActualMatchingKpiSummary(allRows, getTenantDisplayCurrency(state)?.currencyCode);
     const searchedAccruals = matchModal.accrualSearch.results
         .map((key) => getJEOneTimeAccrualByKey(key, state.jeSchedulesState))
         .filter((accrual) => accrual != null);
+    const openedMatch = matchModal.openedFromMatchId != null
+        ? 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
@@ -396,16 +394,16 @@ export 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: matchModal.transactionSearch.results,
+                results: uniqueTransactionSearchResults(matchModal.pinnedTransactionResults, matchModal.transactionSearch.results),
                 fetchState: {
                     fetchState: matchModal.transactionSearch.fetchState,
                     error: matchModal.transactionSearch.error,
@@ -415,7 +413,7 @@ export function getExpenseAutomationActualMatchingView(state) {
             },
             accrualSearch: {
                 query: matchModal.accrualSearch.query,
-                results: searchedAccruals,
+                results: uniqueMatchModalAccruals(pinnedAccruals, searchedAccruals),
                 fetchState: {
                     fetchState: matchModal.accrualSearch.fetchState,
                     error: matchModal.accrualSearch.error,

package/lib/esm/view/expenseAutomationView/types/actualMatchingViewState.js

@@ -13,12 +13,6 @@ const ACTUAL_MATCHING_SORT_KEYS = [
     'variance',
 ];
 export const toActualMatchingSortKey = (v) => stringToUnion(v, ACTUAL_MATCHING_SORT_KEYS);
-const ACTUAL_MATCHING_STATUS_FILTERS = [
-    'all',
-    'pending_review',
-    'reversed',
-];
-export const toActualMatchingStatusFilter = (v) => stringToUnion(v, ACTUAL_MATCHING_STATUS_FILTERS);
 export const MATCH_TRANSACTION_SEARCH_PAGE_SIZE = 50;
 export const MATCH_ACCRUAL_SEARCH_LIMIT = 50;
 export const MATCH_SEARCH_DEBOUNCE_MS = 300;
@@ -39,15 +33,6 @@ const UNDO_REVERSAL_RESULT_STATUSES = [
     'error',
 ];
 export const toUndoReversalResultStatus = (v) => stringToUnion(v, UNDO_REVERSAL_RESULT_STATUSES);
-const ACTUAL_MATCHING_IGNORE_REASONS = [
-    'wrong_bill',
-    'wrong_period',
-    'amount_off',
-    'already_handled',
-    'other_ignore',
-];
-export const toActualMatchingIgnoreReasonType = (v) => stringToUnion(v, ACTUAL_MATCHING_IGNORE_REASONS);
-export const ALL_ACTUAL_MATCHING_IGNORE_REASONS = ACTUAL_MATCHING_IGNORE_REASONS;
 export function actualMatchingTransactionLineKey(transactionType, transactionIntegrationId, lineId) {
     return `${transactionType}:${transactionIntegrationId}:${lineId}`;
 }

package/lib/esm/view/invoicing/createInvoice/createInvoiceEpic.js

@@ -6,8 +6,7 @@ import { updateInvoices } from '../../../entity/invoicing/invoice/invoiceReducer
 import { apiErrorSnackbarVariables } from '../../../entity/snackbar/snackbarApiError';
 import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
-import { invalidateInvoicingCustomerDetail } from '../editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer';
-import { addInvoiceToList, invalidateInvoiceListForCustomer, } from '../invoiceList/invoiceListReducer';
+import { addInvoiceToList } from '../invoiceList/invoiceListReducer';
 import { createInvoice, createInvoiceFailure, createInvoiceSuccess, } from './createInvoiceReducer';
 export const createInvoiceEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(createInvoice.match), mergeMap((action) => {
     const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/invoices`;
@@ -24,13 +23,6 @@ export const createInvoiceEpic = (actions$, _state$, zeniAPI) => actions$.pipe(f
                     id: response.data.id,
                     status: response.data.status,
                 }),
-                // The customer's page caches their invoices and totals.
-                invalidateInvoicingCustomerDetail({
-                    id: response.data.customer_id,
-                }),
-                invalidateInvoiceListForCustomer({
-                    customerId: response.data.customer_id,
-                }),
                 createInvoiceSuccess({ invoiceId: response.data.id }),
                 openSnackbar({
                     messageSection: 'invoicing_invoice_saved',

package/lib/esm/view/invoicing/createInvoice/createInvoiceSelector.js

@@ -1,5 +1,5 @@
 import { getAddressByAddressId } from '../../../entity/address/addressSelector';
-import { invoicingPricePointDisplayAmount } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogSelector';
+import { invoicingPricePointDisplayAmount } from '../../../entity/invoicing/plan/planSelector';
 import { getInvoicingCatalogListView, getInvoicingCatalogPrices, } from '../invoicingCatalogListView/invoicingCatalogListViewSelector';
 import { invoicingFieldHelpForGroup } from '../invoicingConfigView/invoicingConfigViewSelector';
 import { getInvoicingCustomerListView } from '../invoicingCustomerListView/invoicingCustomerListViewSelector';

package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewSelector.js

@@ -1,6 +1,6 @@
 import { createSelector } from '@reduxjs/toolkit';
 import { reduceAllFetchState } from '../../../commonStateTypes/reduceFetchState';
-import { getInvoicingCatalogItemById, getInvoicingCatalogItemsByIds, } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogSelector';
+import { getInvoicingPlanById, getInvoicingPlansByIds, } from '../../../entity/invoicing/plan/planSelector';
 import { getInvoicingConfigView, invoicingFieldHelpForGroup, } from '../invoicingConfigView/invoicingConfigViewSelector';
 import { getInvoicingFormDraftLocalData, isInvoicingFormDraftPending, } from '../invoicingFormDraft';
 import { INVOICING_DEFAULT_INCOME_ACCOUNT_TYPES, INVOICING_INCOME_ACCOUNT_MAPPING_SLOT, NO_INVOICING_ACCOUNT_HIERARCHY, NO_INVOICING_ACCOUNT_IDS, NO_INVOICING_CLASS_HIERARCHY, getInvoicingQboAccountOptions, getInvoicingQboView, invoicingQboAccountIdsForMappingSlot, isInvoicingAccountingPickerDataLoading, isInvoicingQboConnected, } from '../invoicingQboView/invoicingQboViewSelector';
@@ -36,7 +36,7 @@ const buildApplicableCatalogItemOptions = (plans) => {
  * Kept referentially stable across unrelated dispatches; the form view filters
  * out the item being edited (see `getInvoicingCatalogItemFormView`).
  */
-export const getInvoicingApplicableCatalogItemOptions = createSelector((state) => state.invoicingCatalogState, (state) => state.invoicingCatalogListViewState, (catalogState, listViewState) => buildApplicableCatalogItemOptions(getInvoicingCatalogItemsByIds(catalogState, [
+export const getInvoicingApplicableCatalogItemOptions = createSelector((state) => state.invoicingPlanState, (state) => state.invoicingCatalogListViewState, (planState, listViewState) => buildApplicableCatalogItemOptions(getInvoicingPlansByIds(planState, [
     ...listViewState.planIds,
     ...listViewState.productIds,
 ])));
@@ -61,9 +61,7 @@ const getInvoicingCatalogIncomeAccountIds = createSelector([
     : NO_INVOICING_ACCOUNT_IDS);
 export const getInvoicingCatalogItemFormView = (state, id) => {
     const { editDraftById, error, fetchState, newItemDraft, savedItemId, savedKind, } = state.editInvoicingCatalogItemDetailViewState;
-    const plan = id != null
-        ? getInvoicingCatalogItemById(state.invoicingCatalogState, id)
-        : undefined;
+    const plan = id != null ? getInvoicingPlanById(state.invoicingPlanState, id) : undefined;
     const kind = plan != null ? 'plan' : undefined;
     // No entity fallback: the draft is the one source of form values, seeded from
     // the record by `seedInvoicingCatalogItemFormDraftEpic` when the detail load

package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/fetchInvoicingCatalogItemDetailEpic.js

@@ -1,6 +1,6 @@
 import { of } from 'rxjs';
 import { catchError, filter, switchMap } from 'rxjs/operators';
-import { updateInvoicingCatalogItems } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
+import { updateInvoicingPlans } from '../../../entity/invoicing/plan/planReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { fetchInvoicingCatalogItemDetail, updateInvoicingCatalogItemDetail, updateInvoicingCatalogItemDetailFailure, } from './editInvoicingCatalogItemDetailViewReducer';
 export const fetchInvoicingCatalogItemDetailEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchInvoicingCatalogItemDetail.match), switchMap((action) => {
@@ -9,7 +9,7 @@ export const fetchInvoicingCatalogItemDetailEpic = (actions$, _state$, zeniAPI)
     return zeniAPI.getJSON(apiUrl).pipe(switchMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
             return [
-                updateInvoicingCatalogItems([response.data], 'merge'),
+                updateInvoicingPlans([response.data], 'merge'),
                 updateInvoicingCatalogItemDetail({ id: response.data.id, kind }),
             ];
         }

package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/runInvoicingCatalogPlanActionEpic.js

@@ -1,6 +1,6 @@
 import { of } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
-import { updateInvoicingCatalogItems } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
+import { updateInvoicingPlans } from '../../../entity/invoicing/plan/planReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { runInvoicingCatalogPlanAction, runInvoicingCatalogPlanActionFailure, runInvoicingCatalogPlanActionSuccess, } from './editInvoicingCatalogItemDetailViewReducer';
 export const runInvoicingCatalogPlanActionEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(runInvoicingCatalogPlanAction.match), mergeMap((action) => {
@@ -12,7 +12,7 @@ export const runInvoicingCatalogPlanActionEpic = (actions$, _state$, zeniAPI) =>
         .pipe(mergeMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
             return [
-                updateInvoicingCatalogItems([response.data], 'merge'),
+                updateInvoicingPlans([response.data], 'merge'),
                 runInvoicingCatalogPlanActionSuccess({ id }),
             ];
         }

package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/runInvoicingCatalogProductActionEpic.js

@@ -1,6 +1,7 @@
 import { of } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
-import { mergeInvoicingCatalogPricePoint } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
+import { mergeInvoicingPlanSubFamily } from '../../../entity/invoicing/plan/planReducer';
+import { updateInvoicingProducts } from '../../../entity/invoicing/product/productReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { runInvoicingCatalogProductAction, runInvoicingCatalogProductActionFailure, runInvoicingCatalogProductActionSuccess, } from './editInvoicingCatalogItemDetailViewReducer';
 export const runInvoicingCatalogProductActionEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(runInvoicingCatalogProductAction.match), mergeMap((action) => {
@@ -15,10 +16,9 @@ export const runInvoicingCatalogProductActionEpic = (actions$, _state$, zeniAPI)
         .pipe(mergeMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
             return [
+                updateInvoicingProducts([response.data], 'merge'),
                 ...(parentItemId != null
-                    ? [
-                        mergeInvoicingCatalogPricePoint(parentItemId, response.data),
-                    ]
+                    ? [mergeInvoicingPlanSubFamily(parentItemId, response.data)]
                     : []),
                 runInvoicingCatalogProductActionSuccess({ id: stateKey }),
             ];

package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/saveInvoicingCatalogItemEpic.js

@@ -1,6 +1,7 @@
 import { forkJoin, from } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
-import { mergeInvoicingCatalogPricePoint, updateInvoicingCatalogItems, } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
+import { mergeInvoicingPlanSubFamily, updateInvoicingPlans, } from '../../../entity/invoicing/plan/planReducer';
+import { updateInvoicingProducts } from '../../../entity/invoicing/product/productReducer';
 import { apiErrorSnackbarVariables } from '../../../entity/snackbar/snackbarApiError';
 import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
@@ -50,8 +51,11 @@ export const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actio
                 }
                 const savedProducts = productResponses.flatMap((productResponse) => productResponse.data != null ? [productResponse.data] : []);
                 const resultActions = [
-                    updateInvoicingCatalogItems([savedItem], 'merge'),
-                    ...savedProducts.map((product) => mergeInvoicingCatalogPricePoint(savedItem.id, product)),
+                    updateInvoicingPlans([savedItem], 'merge'),
+                    ...(savedProducts.length > 0
+                        ? [updateInvoicingProducts(savedProducts, 'merge')]
+                        : []),
+                    ...savedProducts.map((product) => mergeInvoicingPlanSubFamily(savedItem.id, product)),
                     submitInvoicingCatalogItemFormSuccess({
                         itemId: savedItem.id,
                         kind: 'plan',

package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/seedInvoicingCatalogItemFormDraftEpic.js

@@ -1,6 +1,6 @@
 import { EMPTY, of } from 'rxjs';
 import { filter, mergeMap, withLatestFrom } from 'rxjs/operators';
-import { getInvoicingCatalogItemById } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogSelector';
+import { getInvoicingPlanById } from '../../../entity/invoicing/plan/planSelector';
 import { fetchInvoicingCatalogItemDetailPage, seedInvoicingCatalogItemFormDraft, updateInvoicingCatalogItemDetail, } from './editInvoicingCatalogItemDetailViewReducer';
 import { entityToInvoicingCatalogItemFormLocalData } from './invoicingCatalogItemFormHelper';
 /**
@@ -34,7 +34,7 @@ export const seedInvoicingCatalogItemFormDraftEpic = (actions$, state$) => actio
     }
     // Nothing to seed from on a cold open; the detail response triggers this
     // again once it lands.
-    const plan = getInvoicingCatalogItemById(state.invoicingCatalogState, id);
+    const plan = getInvoicingPlanById(state.invoicingPlanState, id);
     if (plan == null) {
         return EMPTY;
     }