@zeniai/client-epic-state 5.2.61 → 5.2.62-beta0MM

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

@@ -16,15 +16,18 @@ 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 orderBy_1 = __importDefault(require("lodash/orderBy"));
+const toolkit_1 = require("@reduxjs/toolkit");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const actualMatchingSelector_1 = require("../../../entity/actualMatching/actualMatchingSelector");
 const jeScheduleHelper_1 = require("../../../entity/jeSchedules/jeScheduleHelper");
 const jeSchedulesSelector_1 = require("../../../entity/jeSchedules/jeSchedulesSelector");
 const tenantSelector_1 = require("../../../entity/tenant/tenantSelector");
 const zeniDayJS_1 = require("../../../zeniDayJS");
-const actualMatchingViewState_1 = require("../types/actualMatchingViewState");
 function getSelectedMonthYearForCurrentTenant(state) {
     const tenantId = (0, tenantSelector_1.getCurrentTenant)(state)?.tenantId;
     if (tenantId == null) {
@@ -53,27 +56,6 @@ function toMatchModalAccrual(member) {
         jeOneTimeAccrualKey: (0, jeScheduleHelper_1.generateJEOneTimeAccrualKey)(member.accrualId),
     };
 }
-function uniqueMatchModalAccruals(pinned, searched) {
-    const byId = new Map();
-    pinned.forEach((row) => byId.set(row.accrualId, row));
-    searched.forEach((row) => {
-        if (!byId.has(row.accrualId)) {
-            byId.set(row.accrualId, row);
-        }
-    });
-    return Array.from(byId.values());
-}
-function uniqueTransactionSearchResults(pinned, searched) {
-    const byKey = new Map();
-    pinned.forEach((row) => byKey.set((0, actualMatchingViewState_1.actualMatchingTransactionLineKey)(row.transactionType, row.transactionIntegrationId, row.lineId), row));
-    searched.forEach((row) => {
-        const key = (0, actualMatchingViewState_1.actualMatchingTransactionLineKey)(row.transactionType, row.transactionIntegrationId, row.lineId);
-        if (!byKey.has(key)) {
-            byKey.set(key, row);
-        }
-    });
-    return Array.from(byKey.values());
-}
 function parseActualMatchingMatchId(matchId) {
     const separator = matchId.indexOf(':');
     if (separator <= 0 || separator === matchId.length - 1) {
@@ -246,6 +228,7 @@ function emptyKpiSummary() {
         actualsReceived: { count: 0, expectedCount: 0, vendorsPending: 0 },
         autoReversed: { count: 0, percent: 0, clearedAmount: 0 },
         pendingReview: { count: 0, amount: 0, estimatedMinutesToClear: 0 },
+        reversed: { count: 0 },
         variance: { percent: 0, averagePercentPerMatch: 0, netAmount: 0 },
     };
 }
@@ -301,6 +284,7 @@ function buildActualMatchingKpiSummary(rows, displayCurrencyCode) {
     }
     const autoReversed = kpiRows.filter((row) => row.kind === 'auto_reversed');
     const pendingReview = kpiRows.filter((row) => row.kind === 'pending_review');
+    const reversed = kpiRows.filter((row) => isReversedMatchKind(row.kind));
     const receivedCount = kpiRows.length;
     const rowsWithActual = kpiRows.filter((row) => row.actualAmount?.amount != null);
     const accruedTotal = rowsWithActual.reduce((sum, row) => sum + (row.accruedAmount?.amount ?? row.estimatedAmount.amount), 0);
@@ -326,6 +310,9 @@ function buildActualMatchingKpiSummary(rows, displayCurrencyCode) {
             amount: sumRowAmounts(pendingReview, displayCurrencyCode),
             estimatedMinutesToClear: pendingReview.length * ESTIMATED_MINUTES_PER_PENDING_MATCH,
         },
+        reversed: {
+            count: reversed.length,
+        },
         variance: {
             percent: accruedTotal === 0
                 ? 0
@@ -338,23 +325,55 @@ function buildActualMatchingKpiSummary(rows, displayCurrencyCode) {
         },
     };
 }
-function getExpenseAutomationActualMatchingMatchView(state, matchId) {
-    const view = state.expenseAutomationActualMatchingViewState;
+function toActualMatchingMatchView(match) {
     return {
-        match: (0, actualMatchingSelector_1.getActualMatchingMatchById)(state.actualMatchingState, matchId),
-        detailFetchState: view.detailFetchStateByMatchId[matchId] ?? NOT_STARTED,
-        refreshStatus: view.detailRefreshStatusByMatchId[matchId] ?? NOT_STARTED,
-        undoReversalStatus: view.undoReversalStatusByMatchId[matchId] ?? NOT_STARTED,
-        lastMatchResults: view.lastMatchResultsByMatchId?.[matchId],
-        lastUndoResults: view.lastUndoResultsByMatchId?.[matchId],
+        ...match,
+        members: match.members.map(toMatchModalAccrual),
+        leftovers: match.leftovers == null
+            ? undefined
+            : match.leftovers.map(toMatchModalAccrual),
     };
 }
+const EMPTY_ACTUAL_MATCHING_ROWS = [];
+const matchViewSelectorById = new Map();
+function getExpenseAutomationActualMatchingMatchView(state, matchId) {
+    let selector = matchViewSelectorById.get(matchId);
+    if (selector == null) {
+        selector = (0, toolkit_1.createSelector)([
+            (root) => root.expenseAutomationActualMatchingViewState,
+            (root) => (0, actualMatchingSelector_1.getActualMatchingMatchById)(root.actualMatchingState, matchId),
+        ], (view, match) => ({
+            detailFetchState: view.detailFetchStateByMatchId[matchId] ?? NOT_STARTED,
+            ignoreStatus: view.ignoreStatusByMatchId[matchId] ?? NOT_STARTED,
+            lastMatchResults: view.lastMatchResultsByMatchId?.[matchId],
+            lastUndoResults: view.lastUndoResultsByMatchId?.[matchId],
+            match: match == null ? undefined : toActualMatchingMatchView(match),
+            refreshStatus: view.detailRefreshStatusByMatchId[matchId] ?? NOT_STARTED,
+            undoReversalStatus: view.undoReversalStatusByMatchId[matchId] ?? NOT_STARTED,
+        }));
+        matchViewSelectorById.set(matchId, selector);
+    }
+    return selector(state);
+}
 function getCloseMatchAfterUndo(state) {
-    return state.expenseAutomationActualMatchingViewState.closeMatchAfterUndo;
+    return state.expenseAutomationActualMatchingViewState.closeMatchAfterUndoMatchId;
+}
+function getCloseMatchAfterUndoMatchId(state) {
+    return getCloseMatchAfterUndo(state);
+}
+function getCloseMatchAfterIgnoreMatchId(state) {
+    return state.expenseAutomationActualMatchingViewState
+        .closeMatchAfterIgnoreMatchId;
+}
+function getActualMatchingMatchModalConfirmStatus(state, matchId) {
+    if (matchId != null && matchId !== '') {
+        return (state.expenseAutomationActualMatchingViewState.confirmStatusByMatchId[matchId] ?? NOT_STARTED);
+    }
+    return state.expenseAutomationActualMatchingViewState.matchModal.confirmStatus;
 }
 function getExpenseAutomationActualMatchingView(state) {
     const { expenseAutomationActualMatchingViewState } = state;
-    const { matchIdsByPeriod, fetchState, error, refreshStatus, uiState, matchModal, } = expenseAutomationActualMatchingViewState;
+    const { matchIdsByPeriod, fetchState, error, refreshStatus, uiState, matchModal, ignoreStatusByMatchId, undoReversalStatusByMatchId, } = expenseAutomationActualMatchingViewState;
     const selectedPeriod = getSelectedMonthYearForCurrentTenant(state);
     const monthYearPeriodId = selectedPeriod != null ? (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod) : undefined;
     const matchIds = monthYearPeriodId != null ? matchIdsByPeriod[monthYearPeriodId] : undefined;
@@ -364,38 +383,18 @@ function getExpenseAutomationActualMatchingView(state) {
         .filter((match) => match.members.length > 0)
         .map(toActualMatchingRow);
     const rows = allRows.filter((row) => matchesSearch(row, uiState.searchString));
-    const reversed = sortActualMatchingRows(rows.filter((row) => isReversedMatchKind(row.kind)), uiState);
-    const pendingReview = sortActualMatchingRows(rows.filter((row) => row.kind === 'pending_review'), uiState);
+    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 kpiSummary = buildActualMatchingKpiSummary(allRows, getTenantDisplayCurrency(state)?.currencyCode);
     const searchedAccruals = matchModal.accrualSearch.results
         .map((key) => (0, jeSchedulesSelector_1.getJEOneTimeAccrualByKey)(key, state.jeSchedulesState))
         .filter((accrual) => accrual != null);
-    const openedMatch = matchModal.openedFromMatchId != null
-        ? (0, actualMatchingSelector_1.getActualMatchingMatchById)(state.actualMatchingState, matchModal.openedFromMatchId)
-        : undefined;
-    const pinnedAccruals = [
-        ...(openedMatch?.members ?? []),
-        ...(openedMatch?.leftovers ?? []),
-    ].map(toMatchModalAccrual);
-    const firstMember = openedMatch?.members[0];
-    const cleared = firstMember?.cleared;
-    const suggestion = firstMember?.matchSuggestion;
-    const stamp = cleared ?? suggestion;
-    const consumedLineIds = cleared?.consumedLineIds;
-    const prefill = openedMatch == null
-        ? undefined
-        : {
-            selectedAccrualIds: [
-                ...openedMatch.members.map((member) => member.accrualId),
-                ...(openedMatch.leftovers ?? []).map((leftover) => leftover.accrualId),
-            ],
-            actualAmount: openedMatch.actualAmount.amount,
-            matchedTransactionId: stamp?.matchedTransactionId,
-            matchedLineId: cleared == null ? suggestion?.matchedLineId : undefined,
-            ...(consumedLineIds != null && consumedLineIds.length > 0
-                ? { consumedLineIds }
-                : {}),
-        };
     // `fetchState` is a flat slice field that survives a period switch. Until this
     // month's ids land, leftover Completed/Error is the previous month. Report
     // Not-Started so chrome matches Review's "cache slot missing" skeleton, not
@@ -413,16 +412,16 @@ function getExpenseAutomationActualMatchingView(state) {
         kpiSummary,
         uiState,
         refreshStatus,
+        ignoreStatusByMatchId,
+        undoReversalStatusByMatchId,
         hasLoadedForSelectedPeriod: matchIds != null,
         matchModal: {
             isOpen: matchModal.isOpen,
-            openedFromMatchId: matchModal.openedFromMatchId,
-            prefill,
             confirmStatus: matchModal.confirmStatus,
             lastBatchResults: matchModal.lastBatchResults,
             transactionSearch: {
                 query: matchModal.transactionSearch.query,
-                results: uniqueTransactionSearchResults(matchModal.pinnedTransactionResults, matchModal.transactionSearch.results),
+                results: matchModal.transactionSearch.results,
                 fetchState: {
                     fetchState: matchModal.transactionSearch.fetchState,
                     error: matchModal.transactionSearch.error,
@@ -432,7 +431,7 @@ function getExpenseAutomationActualMatchingView(state) {
             },
             accrualSearch: {
                 query: matchModal.accrualSearch.query,
-                results: uniqueMatchModalAccruals(pinnedAccruals, searchedAccruals),
+                results: searchedAccruals,
                 fetchState: {
                     fetchState: matchModal.accrualSearch.fetchState,
                     error: matchModal.accrualSearch.error,

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

@@ -5,6 +5,8 @@ import { ActualMatchingMatchId } from '../../../entity/actualMatching/actualMatc
 import { JEOneTimeAccrualKey } from '../../../entity/jeSchedules/jeSchedulesTypes';
 export declare const toActualMatchingSortKey: (v: string) => "type" | "date" | "vendor" | "category" | "class" | "amount" | "variance" | "lifecycle" | "service" | "accrued" | "actual";
 export type ActualMatchingSortKey = ReturnType<typeof toActualMatchingSortKey>;
+export declare const toActualMatchingStatusFilter: (v: string) => "pending_review" | "reversed" | "all";
+export type ActualMatchingStatusFilter = ReturnType<typeof toActualMatchingStatusFilter>;
 export declare const MATCH_TRANSACTION_SEARCH_PAGE_SIZE = 50;
 export declare const MATCH_ACCRUAL_SEARCH_LIMIT = 50;
 export declare const MATCH_SEARCH_DEBOUNCE_MS = 300;
@@ -18,6 +20,12 @@ export interface ActualMatchingViewUIState {
     searchString: string;
     sortKey: ActualMatchingSortKey;
     sortOrder: SortOrder;
+    /**
+     * List-only filter. `all` shows both groups; `pending_review` / `reversed`
+     * empty the other group (`reversed` includes auto and manual). KPI summary
+     * stays on the unfiltered period.
+     */
+    statusFilter: ActualMatchingStatusFilter;
 }
 /**
  * Sibling of Missing Receipts `MatchCandidate`. Confirm needs `lineId` and
@@ -69,6 +77,14 @@ export interface UndoReversalAccrualsParams {
     accrualIds: ID[];
     matchId: ActualMatchingMatchId;
 }
+export declare const toActualMatchingIgnoreReasonType: (v: string) => "other_ignore" | "already_handled" | "amount_off" | "wrong_period" | "wrong_bill";
+export type ActualMatchingIgnoreReasonType = ReturnType<typeof toActualMatchingIgnoreReasonType>;
+export declare const ALL_ACTUAL_MATCHING_IGNORE_REASONS: readonly ActualMatchingIgnoreReasonType[];
+export interface IgnoreActualMatchingSuggestionParams {
+    matchId: ActualMatchingMatchId;
+    reason: ActualMatchingIgnoreReasonType;
+    note?: string;
+}
 export interface ActualMatchingTransactionSearchState extends FetchStateAndError {
     isLoadingMore: boolean;
     nextPageToken: string | null;
@@ -84,18 +100,16 @@ export interface ActualMatchingAccrualSearchState extends FetchStateAndError {
 export interface ActualMatchingMatchModalState {
     accrualSearch: ActualMatchingAccrualSearchState;
     confirmStatus: FetchStateAndError;
-    didPinPrefillTransactions: boolean;
     isOpen: boolean;
-    pinnedTransactionResults: ActualMatchingTransactionSearchResult[];
     transactionSearch: ActualMatchingTransactionSearchState;
     lastBatchResults?: MatchAndReverseResult[];
-    openedFromMatchId?: ActualMatchingMatchId;
 }
 export declare function actualMatchingTransactionLineKey(transactionType: string, transactionIntegrationId: string, lineId: string): string;
 export interface ActualMatchingViewState extends FetchedState {
-    closeMatchAfterUndo: boolean;
+    confirmStatusByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
     detailFetchStateByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
     detailRefreshStatusByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
+    ignoreStatusByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
     lastMatchResultsByMatchId: Record<ActualMatchingMatchId, MatchAndReverseResult[]>;
     lastUndoResultsByMatchId: Record<ActualMatchingMatchId, UndoReversalResult[]>;
     matchIdsByPeriod: Record<MonthYearPeriodId, ActualMatchingMatchId[]>;
@@ -103,4 +117,6 @@ export interface ActualMatchingViewState extends FetchedState {
     refreshStatus: FetchStateAndError;
     uiState: ActualMatchingViewUIState;
     undoReversalStatusByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
+    closeMatchAfterIgnoreMatchId?: ActualMatchingMatchId;
+    closeMatchAfterUndoMatchId?: ActualMatchingMatchId;
 }

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.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.isMatchAndReverseCompleteStatus = isMatchAndReverseCompleteStatus;
 exports.actualMatchingTransactionLineKey = actualMatchingTransactionLineKey;
 const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
@@ -19,6 +19,13 @@ 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;
@@ -41,6 +48,16 @@ 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.2.61",
+  "version": "5.2.62-beta0MM",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",