@zeniai/client-epic-state 5.2.69-betaAK0 → 5.2.70

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: "no_activity" | "paused" | "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: "paused" | "no_activity" | "too_small" | "need_invoice" | "other_ignore", note?: string | undefined], {
     accrualId: string;
-    reason: "no_activity" | "paused" | "too_small" | "need_invoice" | "other_ignore";
+    reason: "paused" | "no_activity" | "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,15 +5,13 @@ 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 ActualMatchingJournalEntryIds = Pick<JEOneTimeAccrual, 'reversalTransactionId' | 'reversalTransactionIntegrationId' | 'transactionId' | 'transactionIntegrationId'>;
-export type ActualMatchingLeftoverAccrual = {
+export type ActualMatchingGroupedAccrual = {
     accrualId: ID;
     estimatedAmount?: Amount;
     jeDebitAccountName?: string;
     memo?: string;
     serviceMonth?: string;
 };
-export type ActualMatchingGroupedAccrual = ActualMatchingLeftoverAccrual & ActualMatchingJournalEntryIds;
 export interface ActualMatchingRow extends JEOneTimeAccrual {
     accruedAmount: Amount;
     actualAmount: Amount;
@@ -22,7 +20,7 @@ export interface ActualMatchingRow extends JEOneTimeAccrual {
     groupedAccrualIds?: ID[];
     groupedMembers?: ActualMatchingGroupedAccrual[];
     intendedAccrualIds?: ID[];
-    leftovers?: ActualMatchingLeftoverAccrual[];
+    leftovers?: ActualMatchingGroupedAccrual[];
     matchShape?: string;
     matchTier?: string;
     reversalDate?: ZeniDate;
@@ -45,9 +43,6 @@ export interface ActualMatchingKpiSummary {
         count: number;
         estimatedMinutesToClear: number;
     };
-    reversed: {
-        count: number;
-    };
     variance: {
         averagePercentPerMatch: number;
         netAmount: number;
@@ -72,30 +67,21 @@ export interface ActualMatchingMatchModalView {
         results: ActualMatchingTransactionSearchResult[];
     };
     lastBatchResults?: MatchAndReverseResult[];
-}
-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;
+    openedFromMatchId?: string;
+    prefill?: {
+        selectedAccrualIds: ID[];
+        actualAmount?: number;
+        consumedLineIds?: ID[];
+        matchedLineId?: string;
+        matchedTransactionId?: 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,12 +1,13 @@
 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, ActualMatchingMatchView, 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;
@@ -26,16 +27,12 @@ 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?: ActualMatchingMatchView;
+    match?: ActualMatchingMatch;
 }
 export declare function getExpenseAutomationActualMatchingMatchView(state: RootState, matchId: ActualMatchingMatchId): ExpenseAutomationActualMatchingMatchView;
-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 getCloseMatchAfterUndo(state: RootState): boolean;
 export declare function getExpenseAutomationActualMatchingView(state: RootState): ExpenseAutomationActualMatchingViewSelector;

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

@@ -16,11 +16,7 @@ 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");
@@ -28,6 +24,7 @@ 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) {
@@ -56,6 +53,27 @@ 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) {
@@ -116,18 +134,13 @@ 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,
@@ -233,7 +246,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 },
     };
 }
@@ -289,7 +301,6 @@ 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);
@@ -315,9 +326,6 @@ 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
@@ -330,66 +338,23 @@ function buildActualMatchingKpiSummary(rows, displayCurrencyCode) {
         },
     };
 }
-function toActualMatchingMatchView(match) {
+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: (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],
     };
 }
-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
-        .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;
+    return state.expenseAutomationActualMatchingViewState.closeMatchAfterUndo;
 }
 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 ? (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod) : undefined;
     const matchIds = monthYearPeriodId != null ? matchIdsByPeriod[monthYearPeriodId] : undefined;
@@ -405,6 +370,32 @@ 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
@@ -422,16 +413,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: matchModal.transactionSearch.results,
+                results: uniqueTransactionSearchResults(matchModal.pinnedTransactionResults, matchModal.transactionSearch.results),
                 fetchState: {
                     fetchState: matchModal.transactionSearch.fetchState,
                     error: matchModal.transactionSearch.error,
@@ -441,7 +432,7 @@ 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/view/expenseAutomationView/types/actualMatchingViewState.d.ts

@@ -5,8 +5,6 @@ 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;
@@ -20,11 +18,6 @@ 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
@@ -76,14 +69,6 @@ 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;
@@ -99,18 +84,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 {
-    closeMatchAfterIgnoreMatchIds: ActualMatchingMatchId[];
-    closeMatchAfterUndoMatchIds: ActualMatchingMatchId[];
-    confirmStatusByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
+    closeMatchAfterUndo: boolean;
     detailFetchStateByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
     detailRefreshStatusByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
-    ignoreStatusByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
     lastMatchResultsByMatchId: Record<ActualMatchingMatchId, MatchAndReverseResult[]>;
     lastUndoResultsByMatchId: Record<ActualMatchingMatchId, UndoReversalResult[]>;
     matchIdsByPeriod: Record<MonthYearPeriodId, ActualMatchingMatchId[]>;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ALL_ACTUAL_MATCHING_IGNORE_REASONS = exports.toActualMatchingIgnoreReasonType = exports.toUndoReversalResultStatus = exports.toMatchAndReverseResultStatus = exports.MATCH_SEARCH_DEBOUNCE_MS = exports.MATCH_ACCRUAL_SEARCH_LIMIT = exports.MATCH_TRANSACTION_SEARCH_PAGE_SIZE = exports.toActualMatchingStatusFilter = exports.toActualMatchingSortKey = void 0;
+exports.toUndoReversalResultStatus = exports.toMatchAndReverseResultStatus = exports.MATCH_SEARCH_DEBOUNCE_MS = exports.MATCH_ACCRUAL_SEARCH_LIMIT = exports.MATCH_TRANSACTION_SEARCH_PAGE_SIZE = exports.toActualMatchingSortKey = void 0;
 exports.isMatchAndReverseCompleteStatus = isMatchAndReverseCompleteStatus;
 exports.actualMatchingTransactionLineKey = actualMatchingTransactionLineKey;
 const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
@@ -19,13 +19,6 @@ const ACTUAL_MATCHING_SORT_KEYS = [
 ];
 const toActualMatchingSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, ACTUAL_MATCHING_SORT_KEYS);
 exports.toActualMatchingSortKey = toActualMatchingSortKey;
-const ACTUAL_MATCHING_STATUS_FILTERS = [
-    'all',
-    'pending_review',
-    'reversed',
-];
-const toActualMatchingStatusFilter = (v) => (0, stringToUnion_1.stringToUnion)(v, ACTUAL_MATCHING_STATUS_FILTERS);
-exports.toActualMatchingStatusFilter = toActualMatchingStatusFilter;
 exports.MATCH_TRANSACTION_SEARCH_PAGE_SIZE = 50;
 exports.MATCH_ACCRUAL_SEARCH_LIMIT = 50;
 exports.MATCH_SEARCH_DEBOUNCE_MS = 300;
@@ -48,16 +41,6 @@ const UNDO_REVERSAL_RESULT_STATUSES = [
 ];
 const toUndoReversalResultStatus = (v) => (0, stringToUnion_1.stringToUnion)(v, UNDO_REVERSAL_RESULT_STATUSES);
 exports.toUndoReversalResultStatus = toUndoReversalResultStatus;
-const ACTUAL_MATCHING_IGNORE_REASONS = [
-    'wrong_bill',
-    'wrong_period',
-    'amount_off',
-    'already_handled',
-    'other_ignore',
-];
-const toActualMatchingIgnoreReasonType = (v) => (0, stringToUnion_1.stringToUnion)(v, ACTUAL_MATCHING_IGNORE_REASONS);
-exports.toActualMatchingIgnoreReasonType = toActualMatchingIgnoreReasonType;
-exports.ALL_ACTUAL_MATCHING_IGNORE_REASONS = ACTUAL_MATCHING_IGNORE_REASONS;
 function actualMatchingTransactionLineKey(transactionType, transactionIntegrationId, lineId) {
     return `${transactionType}:${transactionIntegrationId}:${lineId}`;
 }

package/lib/view/invoicing/createInvoice/createInvoiceEpic.d.ts

@@ -5,8 +5,7 @@ import { updateInvoices } from '../../../entity/invoicing/invoice/invoiceReducer
 import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { RootState } from '../../../rootStateTypes';
 import { ZeniAPI } from '../../../zeniAPI';
-import { invalidateInvoicingCustomerDetail } from '../editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer';
-import { addInvoiceToList, invalidateInvoiceListForCustomer } from '../invoiceList/invoiceListReducer';
+import { addInvoiceToList } from '../invoiceList/invoiceListReducer';
 import { createInvoice, createInvoiceFailure, createInvoiceSuccess } from './createInvoiceReducer';
-export type ActionType = ReturnType<typeof createInvoice> | ReturnType<typeof createInvoiceSuccess> | ReturnType<typeof createInvoiceFailure> | ReturnType<typeof updateAddresses> | ReturnType<typeof updateInvoices> | ReturnType<typeof addInvoiceToList> | ReturnType<typeof invalidateInvoicingCustomerDetail> | ReturnType<typeof invalidateInvoiceListForCustomer> | ReturnType<typeof openSnackbar>;
+export type ActionType = ReturnType<typeof createInvoice> | ReturnType<typeof createInvoiceSuccess> | ReturnType<typeof createInvoiceFailure> | ReturnType<typeof updateAddresses> | ReturnType<typeof updateInvoices> | ReturnType<typeof addInvoiceToList> | ReturnType<typeof openSnackbar>;
 export declare const createInvoiceEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -9,7 +9,6 @@ const invoiceReducer_1 = require("../../../entity/invoicing/invoice/invoiceReduc
 const snackbarApiError_1 = require("../../../entity/snackbar/snackbarApiError");
 const snackbarReducer_1 = require("../../../entity/snackbar/snackbarReducer");
 const responsePayload_1 = require("../../../responsePayload");
-const editInvoicingCustomerDetailViewReducer_1 = require("../editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer");
 const invoiceListReducer_1 = require("../invoiceList/invoiceListReducer");
 const createInvoiceReducer_1 = require("./createInvoiceReducer");
 const createInvoiceEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(createInvoiceReducer_1.createInvoice.match), (0, operators_1.mergeMap)((action) => {
@@ -27,13 +26,6 @@ const createInvoiceEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, oper
                     id: response.data.id,
                     status: response.data.status,
                 }),
-                // The customer's page caches their invoices and totals.
-                (0, editInvoicingCustomerDetailViewReducer_1.invalidateInvoicingCustomerDetail)({
-                    id: response.data.customer_id,
-                }),
-                (0, invoiceListReducer_1.invalidateInvoiceListForCustomer)({
-                    customerId: response.data.customer_id,
-                }),
                 (0, createInvoiceReducer_1.createInvoiceSuccess)({ invoiceId: response.data.id }),
                 (0, snackbarReducer_1.openSnackbar)({
                     messageSection: 'invoicing_invoice_saved',

package/lib/view/invoicing/createInvoice/createInvoiceSelector.d.ts

@@ -1,8 +1,8 @@
 import { ID } from '../../../commonStateTypes/common';
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
 import { Address } from '../../../entity/address/addressState';
-import { InvoicingCatalogPricePoint } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogState';
 import { InvoicingFieldHelpByCode, InvoicingSettingsPayload } from '../../../entity/invoicing/invoicingCommonPayload';
+import { InvoicingProduct } from '../../../entity/invoicing/product/productState';
 import { RootState } from '../../../rootStateTypes';
 import { InvoicingCreateInvoiceFormLocalData } from './createInvoiceState';
 /**
@@ -38,7 +38,7 @@ export interface CreateInvoiceFormView extends SelectorView {
     fieldHelp: InvoicingFieldHelpByCode;
     localData: InvoicingCreateInvoiceFormLocalData;
     planNames: InvoicingPlanNameOption[];
-    products: InvoicingCatalogPricePoint[];
+    products: InvoicingProduct[];
     savedInvoiceId?: ID;
     settings?: InvoicingSettingsPayload;
 }

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCreateInvoiceFormView = void 0;
 const addressSelector_1 = require("../../../entity/address/addressSelector");
-const invoicingCatalogSelector_1 = require("../../../entity/invoicing/invoicingCatalog/invoicingCatalogSelector");
+const planSelector_1 = require("../../../entity/invoicing/plan/planSelector");
 const invoicingCatalogListViewSelector_1 = require("../invoicingCatalogListView/invoicingCatalogListViewSelector");
 const invoicingConfigViewSelector_1 = require("../invoicingConfigView/invoicingConfigViewSelector");
 const invoicingCustomerListViewSelector_1 = require("../invoicingCustomerListView/invoicingCustomerListViewSelector");
@@ -31,7 +31,7 @@ const hasPerUnitRate = (pricingModel) => pricingModel == null ||
  * `undefined` when there is no safe per-unit rate to prefill.
  */
 const planNamePrefillPrice = (pricePoint) => hasPerUnitRate(pricePoint.pricingModel)
-    ? (0, invoicingCatalogSelector_1.invoicingPricePointDisplayAmount)(pricePoint)?.amount
+    ? (0, planSelector_1.invoicingPricePointDisplayAmount)(pricePoint)?.amount
     : undefined;
 /**
  * Display name for a customer option: company, else the full name, else the

package/lib/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewPayload.d.ts

@@ -1,15 +1,16 @@
 import { AccountBase } from '../../../entity/account/accountState';
 import { ClassBase } from '../../../entity/class/classState';
-import { InvoicingAccountingDetailPayload, InvoicingCatalogItemPayload, InvoicingCatalogPricePointPayload } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogPayload';
+import { InvoicingPlanPayload } from '../../../entity/invoicing/plan/planPayload';
+import { InvoicingAccountingDetailPayload, InvoicingProductPayload } from '../../../entity/invoicing/product/productPayload';
 import { ZeniAPIResponse } from '../../../responsePayload';
 import { InvoicingCatalogItemFormLocalData } from './editInvoicingCatalogItemDetailViewState';
-export type SaveInvoicingCatalogItemResponse = ZeniAPIResponse<InvoicingCatalogItemPayload>;
+export type SaveInvoicingCatalogItemResponse = ZeniAPIResponse<InvoicingPlanPayload>;
 /**
- * The price-point half of a save body. `InvoicingCatalogPricePointPayload` is the shape
+ * The price-point half of a save body. `InvoicingProductPayload` is the shape
  * the service returns; a save differs in that a field is cleared by sending an
  * explicit `null`, since an absent key reads as "leave it alone".
  */
-export type InvoicingCatalogSubFamilySavePayload = Omit<Partial<InvoicingCatalogPricePointPayload>, 'accounting_detail' | 'description' | 'invoice_notes'> & {
+export type InvoicingCatalogSubFamilySavePayload = Omit<Partial<InvoicingProductPayload>, 'accounting_detail' | 'description' | 'invoice_notes'> & {
     accounting_detail?: InvoicingAccountingDetailPayload | null;
     description?: string | null;
     invoice_notes?: string | null;
@@ -24,7 +25,7 @@ export type InvoicingCatalogSubFamilySavePayload = Omit<Partial<InvoicingCatalog
  * by its own request instead; see
  * `localDataToCreateInvoicingCatalogProductPayloads`.
  */
-export type InvoicingCatalogItemSavePayload = Omit<Partial<InvoicingCatalogItemPayload>, 'sub_families'> & {
+export type InvoicingCatalogItemSavePayload = Omit<Partial<InvoicingPlanPayload>, 'sub_families'> & {
     sub_families?: InvoicingCatalogSubFamilySavePayload[];
 };
 /**
@@ -66,6 +67,6 @@ export declare const localDataToSaveInvoicingCatalogItemPayload: (localData: Inv
  * price point that does not exist yet to clear.
  */
 export declare const localDataToCreateInvoicingCatalogProductPayloads: (localData: InvoicingCatalogItemFormLocalData, itemId: string, lookup: InvoicingCatalogAccountingLookup) => InvoicingCatalogSubFamilySavePayload[];
-export type RunInvoicingCatalogPlanActionResponse = ZeniAPIResponse<InvoicingCatalogItemPayload>;
-export type RunInvoicingCatalogProductActionResponse = ZeniAPIResponse<InvoicingCatalogPricePointPayload>;
-export type InvoicingCatalogItemDetailResponse = ZeniAPIResponse<InvoicingCatalogItemPayload>;
+export type RunInvoicingCatalogPlanActionResponse = ZeniAPIResponse<InvoicingPlanPayload>;
+export type RunInvoicingCatalogProductActionResponse = ZeniAPIResponse<InvoicingProductPayload>;
+export type InvoicingCatalogItemDetailResponse = ZeniAPIResponse<InvoicingPlanPayload>;

package/lib/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewSelector.d.ts

@@ -2,8 +2,8 @@ import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accou
 import { NestedClassHierarchyForReport } from '../../../commonStateTypes/classesView/nestedClassID';
 import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
-import { InvoicingCatalogItem } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogState';
 import { InvoicingCatalogItemLifecycleAction, InvoicingCatalogLifecycleActionOption, InvoicingCatalogProductLifecycleAction, InvoicingFieldHelpByCode, InvoicingNamedOption, InvoicingNamedOptionsByKey } from '../../../entity/invoicing/invoicingCommonPayload';
+import { InvoicingPlan } from '../../../entity/invoicing/plan/planState';
 import { RootState } from '../../../rootStateTypes';
 import { InvoicingCatalogItemFormLocalData, InvoicingCatalogItemKind } from './editInvoicingCatalogItemDetailViewState';
 export declare const getEditInvoicingCatalogItemDetailViewState: (state: RootState) => FetchStateAndError;
@@ -103,7 +103,7 @@ export interface InvoicingCatalogItemFormView extends SelectorView {
      */
     catalogTierTypeOptionsByPricingModel?: InvoicingNamedOptionsByKey;
     kind?: InvoicingCatalogItemKind;
-    plan?: InvoicingCatalogItem;
+    plan?: InvoicingPlan;
     savedItemId?: ID;
     savedKind?: InvoicingCatalogItemKind;
 }

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInvoicingCatalogItemFormView = exports.getInvoicingApplicableCatalogItemOptions = exports.getSavedInvoicingCatalogItemKind = exports.getSavedInvoicingCatalogItemId = exports.getEditInvoicingCatalogItemDetailViewState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
-const invoicingCatalogSelector_1 = require("../../../entity/invoicing/invoicingCatalog/invoicingCatalogSelector");
+const planSelector_1 = require("../../../entity/invoicing/plan/planSelector");
 const invoicingConfigViewSelector_1 = require("../invoicingConfigView/invoicingConfigViewSelector");
 const invoicingFormDraft_1 = require("../invoicingFormDraft");
 const invoicingQboViewSelector_1 = require("../invoicingQboView/invoicingQboViewSelector");
@@ -42,7 +42,7 @@ const buildApplicableCatalogItemOptions = (plans) => {
  * Kept referentially stable across unrelated dispatches; the form view filters
  * out the item being edited (see `getInvoicingCatalogItemFormView`).
  */
-exports.getInvoicingApplicableCatalogItemOptions = (0, toolkit_1.createSelector)((state) => state.invoicingCatalogState, (state) => state.invoicingCatalogListViewState, (catalogState, listViewState) => buildApplicableCatalogItemOptions((0, invoicingCatalogSelector_1.getInvoicingCatalogItemsByIds)(catalogState, [
+exports.getInvoicingApplicableCatalogItemOptions = (0, toolkit_1.createSelector)((state) => state.invoicingPlanState, (state) => state.invoicingCatalogListViewState, (planState, listViewState) => buildApplicableCatalogItemOptions((0, planSelector_1.getInvoicingPlansByIds)(planState, [
     ...listViewState.planIds,
     ...listViewState.productIds,
 ])));
@@ -67,9 +67,7 @@ const getInvoicingCatalogIncomeAccountIds = (0, toolkit_1.createSelector)([
     : invoicingQboViewSelector_1.NO_INVOICING_ACCOUNT_IDS);
 const getInvoicingCatalogItemFormView = (state, id) => {
     const { editDraftById, error, fetchState, newItemDraft, savedItemId, savedKind, } = state.editInvoicingCatalogItemDetailViewState;
-    const plan = id != null
-        ? (0, invoicingCatalogSelector_1.getInvoicingCatalogItemById)(state.invoicingCatalogState, id)
-        : undefined;
+    const plan = id != null ? (0, planSelector_1.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/view/invoicing/editInvoicingCatalogItemDetailView/fetchInvoicingCatalogItemDetailEpic.d.ts

@@ -1,8 +1,8 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { updateInvoicingCatalogItems } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
+import { updateInvoicingPlans } from '../../../entity/invoicing/plan/planReducer';
 import { RootState } from '../../../rootStateTypes';
 import { ZeniAPI } from '../../../zeniAPI';
 import { fetchInvoicingCatalogItemDetail, updateInvoicingCatalogItemDetail, updateInvoicingCatalogItemDetailFailure } from './editInvoicingCatalogItemDetailViewReducer';
-export type ActionType = ReturnType<typeof fetchInvoicingCatalogItemDetail> | ReturnType<typeof updateInvoicingCatalogItemDetail> | ReturnType<typeof updateInvoicingCatalogItemDetailFailure> | ReturnType<typeof updateInvoicingCatalogItems>;
+export type ActionType = ReturnType<typeof fetchInvoicingCatalogItemDetail> | ReturnType<typeof updateInvoicingCatalogItemDetail> | ReturnType<typeof updateInvoicingCatalogItemDetailFailure> | ReturnType<typeof updateInvoicingPlans>;
 export declare const fetchInvoicingCatalogItemDetailEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;