@zeniai/client-epic-state 5.2.22-betaAM3 → 5.2.22-betaAM5

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

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateActualMatchingUIState = exports.searchMatchTransactionsSuccess = exports.searchMatchTransactionsFailure = exports.searchMatchTransactions = exports.searchMatchAccrualsSuccess = exports.searchMatchAccrualsFailure = exports.searchMatchAccruals = exports.openMatchNewModal = exports.matchAndReverseAccrualsSuccess = exports.matchAndReverseAccrualsFailure = exports.matchAndReverseAccruals = exports.fetchActualMatchingSuccess = exports.fetchActualMatchingPage = exports.fetchActualMatchingFailure = exports.fetchActualMatching = exports.closeMatchNewModal = exports.clearMatchNewModal = exports.clearActualMatchingView = exports.initialState = exports.initialMatchModalState = exports.initialAccrualSearchState = exports.initialTransactionSearchState = void 0;
+exports.updateActualMatchingUIState = exports.searchMatchTransactionsSuccess = exports.searchMatchTransactionsFailure = exports.searchMatchTransactions = exports.searchMatchAccrualsSuccess = exports.searchMatchAccrualsFailure = exports.searchMatchAccruals = exports.openMatchNewModal = exports.matchAndReverseAccrualsSuccess = exports.matchAndReverseAccrualsFailure = exports.matchAndReverseAccruals = exports.fetchActualMatchingSuccess = exports.fetchActualMatchingPage = exports.fetchActualMatchingMatchSuccess = exports.fetchActualMatchingMatchFailure = exports.fetchActualMatchingMatch = exports.fetchActualMatchingFailure = exports.fetchActualMatching = exports.closeMatchNewModal = exports.clearMatchNewModal = exports.clearActualMatchingView = exports.initialState = exports.initialMatchModalState = exports.initialAccrualSearchState = exports.initialTransactionSearchState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const jeScheduleHelper_1 = require("../../../entity/jeSchedules/jeScheduleHelper");
@@ -24,18 +24,22 @@ exports.initialAccrualSearchState = {
 };
 exports.initialMatchModalState = {
     isOpen: false,
+    openedFromMatchId: undefined,
+    pinnedTransactionResults: [],
     transactionSearch: exports.initialTransactionSearchState,
     accrualSearch: exports.initialAccrualSearchState,
     confirmStatus: { fetchState: 'Not-Started', error: undefined },
 };
 exports.initialState = {
-    accrualKeysByPeriod: {},
+    matchIdsByPeriod: {},
     fetchState: 'Not-Started',
     error: undefined,
     refreshStatus: {
         fetchState: 'Not-Started',
         error: undefined,
     },
+    detailFetchStateByMatchId: {},
+    detailRefreshStatusByMatchId: {},
     uiState: {
         sortKey: 'date',
         sortOrder: 'descending',
@@ -55,6 +59,8 @@ function resetMatchModalSearches(draft) {
         error: undefined,
     };
     draft.matchModal.lastBatchResults = undefined;
+    draft.matchModal.openedFromMatchId = undefined;
+    draft.matchModal.pinnedTransactionResults = [];
 }
 const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
     name: 'expenseAutomationActualMatchingView',
@@ -94,9 +100,9 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
             },
         },
         fetchActualMatchingSuccess(draft, action) {
-            const { accruals, selectedPeriod, refreshViewInBackground } = action.payload;
+            const { matchIds, selectedPeriod, refreshViewInBackground } = action.payload;
             const periodId = (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod);
-            draft.accrualKeysByPeriod[periodId] = accruals.map((accrual) => (0, jeScheduleHelper_1.generateJEOneTimeAccrualKey)(accrual._id));
+            draft.matchIdsByPeriod[periodId] = matchIds;
             if (refreshViewInBackground) {
                 draft.refreshStatus = { fetchState: 'Completed', error: undefined };
             }
@@ -115,6 +121,56 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                 draft.error = status;
             }
         },
+        fetchActualMatchingMatch: {
+            prepare(matchId, refreshViewInBackground = false) {
+                return { payload: { matchId, refreshViewInBackground } };
+            },
+            reducer(draft, action) {
+                const { matchId, refreshViewInBackground } = action.payload;
+                if (refreshViewInBackground) {
+                    draft.detailRefreshStatusByMatchId[matchId] = {
+                        fetchState: 'In-Progress',
+                        error: undefined,
+                    };
+                }
+                else {
+                    draft.detailFetchStateByMatchId[matchId] = {
+                        fetchState: 'In-Progress',
+                        error: undefined,
+                    };
+                }
+            },
+        },
+        fetchActualMatchingMatchSuccess(draft, action) {
+            const { matchId, refreshViewInBackground } = action.payload;
+            if (refreshViewInBackground) {
+                draft.detailRefreshStatusByMatchId[matchId] = {
+                    fetchState: 'Completed',
+                    error: undefined,
+                };
+            }
+            else {
+                draft.detailFetchStateByMatchId[matchId] = {
+                    fetchState: 'Completed',
+                    error: undefined,
+                };
+            }
+        },
+        fetchActualMatchingMatchFailure(draft, action) {
+            const { matchId, refreshViewInBackground, status } = action.payload;
+            if (refreshViewInBackground) {
+                draft.detailRefreshStatusByMatchId[matchId] = {
+                    fetchState: 'Error',
+                    error: status,
+                };
+            }
+            else {
+                draft.detailFetchStateByMatchId[matchId] = {
+                    fetchState: 'Error',
+                    error: status,
+                };
+            }
+        },
         updateActualMatchingUIState(draft, action) {
             if (action.payload.sortKey != null) {
                 draft.uiState.sortKey = action.payload.sortKey;
@@ -129,8 +185,20 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                 draft.uiState.scrollPosition = action.payload.scrollPosition;
             }
         },
-        openMatchNewModal(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';
+                }
+            },
         },
         closeMatchNewModal(draft) {
             draft.matchModal.isOpen = false;
@@ -156,8 +224,15 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                     draft.matchModal.transactionSearch.error = undefined;
                 }
             },
-            prepare({ query, pageToken }) {
-                return { payload: { query, pageToken: pageToken ?? undefined } };
+            prepare({ query, pageToken, transactionType, transactionIntegrationId, }) {
+                return {
+                    payload: {
+                        query,
+                        pageToken: pageToken ?? undefined,
+                        transactionType,
+                        transactionIntegrationId,
+                    },
+                };
             },
         },
         searchMatchTransactionsSuccess(draft, action) {
@@ -175,6 +250,10 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
             }
             else {
                 draft.matchModal.transactionSearch.results = results;
+                if (draft.matchModal.openedFromMatchId != null &&
+                    draft.matchModal.pinnedTransactionResults.length === 0) {
+                    draft.matchModal.pinnedTransactionResults = results;
+                }
             }
             draft.matchModal.transactionSearch.nextPageToken = nextPageToken;
             draft.matchModal.transactionSearch.isLoadingMore = false;
@@ -260,5 +339,5 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
         });
     },
 });
-_a = expenseAutomationActualMatchingView.actions, exports.clearActualMatchingView = _a.clearActualMatchingView, exports.clearMatchNewModal = _a.clearMatchNewModal, exports.closeMatchNewModal = _a.closeMatchNewModal, exports.fetchActualMatching = _a.fetchActualMatching, exports.fetchActualMatchingFailure = _a.fetchActualMatchingFailure, exports.fetchActualMatchingPage = _a.fetchActualMatchingPage, exports.fetchActualMatchingSuccess = _a.fetchActualMatchingSuccess, exports.matchAndReverseAccruals = _a.matchAndReverseAccruals, exports.matchAndReverseAccrualsFailure = _a.matchAndReverseAccrualsFailure, exports.matchAndReverseAccrualsSuccess = _a.matchAndReverseAccrualsSuccess, exports.openMatchNewModal = _a.openMatchNewModal, exports.searchMatchAccruals = _a.searchMatchAccruals, exports.searchMatchAccrualsFailure = _a.searchMatchAccrualsFailure, exports.searchMatchAccrualsSuccess = _a.searchMatchAccrualsSuccess, exports.searchMatchTransactions = _a.searchMatchTransactions, exports.searchMatchTransactionsFailure = _a.searchMatchTransactionsFailure, exports.searchMatchTransactionsSuccess = _a.searchMatchTransactionsSuccess, exports.updateActualMatchingUIState = _a.updateActualMatchingUIState;
+_a = expenseAutomationActualMatchingView.actions, exports.clearActualMatchingView = _a.clearActualMatchingView, exports.clearMatchNewModal = _a.clearMatchNewModal, exports.closeMatchNewModal = _a.closeMatchNewModal, exports.fetchActualMatching = _a.fetchActualMatching, exports.fetchActualMatchingFailure = _a.fetchActualMatchingFailure, exports.fetchActualMatchingMatch = _a.fetchActualMatchingMatch, exports.fetchActualMatchingMatchFailure = _a.fetchActualMatchingMatchFailure, exports.fetchActualMatchingMatchSuccess = _a.fetchActualMatchingMatchSuccess, exports.fetchActualMatchingPage = _a.fetchActualMatchingPage, exports.fetchActualMatchingSuccess = _a.fetchActualMatchingSuccess, exports.matchAndReverseAccruals = _a.matchAndReverseAccruals, exports.matchAndReverseAccrualsFailure = _a.matchAndReverseAccrualsFailure, exports.matchAndReverseAccrualsSuccess = _a.matchAndReverseAccrualsSuccess, exports.openMatchNewModal = _a.openMatchNewModal, exports.searchMatchAccruals = _a.searchMatchAccruals, exports.searchMatchAccrualsFailure = _a.searchMatchAccrualsFailure, exports.searchMatchAccrualsSuccess = _a.searchMatchAccrualsSuccess, exports.searchMatchTransactions = _a.searchMatchTransactions, exports.searchMatchTransactionsFailure = _a.searchMatchTransactionsFailure, exports.searchMatchTransactionsSuccess = _a.searchMatchTransactionsSuccess, exports.updateActualMatchingUIState = _a.updateActualMatchingUIState;
 exports.default = expenseAutomationActualMatchingView.reducer;

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

@@ -1,13 +1,29 @@
+import { Amount } from '../../../commonStateTypes/amount';
 import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
 import { JEOneTimeAccrual } from '../../../entity/jeSchedules/jeSchedulesSelector';
 import { ZeniDate } from '../../../zeniDayJS';
 import { ActualMatchingTransactionSearchResult, ActualMatchingViewUIState, MatchAndReverseResult } from '../types/actualMatchingViewState';
 export type ActualMatchingRowKind = 'auto_reversed' | 'pending_review' | 'manually_reversed';
+export type ActualMatchingGroupedAccrual = {
+    accrualId: ID;
+    estimatedAmount?: Amount;
+    jeDebitAccountName?: string;
+    memo?: string;
+    serviceMonth?: string;
+};
 export interface ActualMatchingRow extends JEOneTimeAccrual {
+    accruedAmount: Amount;
+    actualAmount: Amount;
     kind: ActualMatchingRowKind;
+    matchId: string;
     groupedAccrualIds?: ID[];
+    groupedMembers?: ActualMatchingGroupedAccrual[];
+    matchShape?: string;
+    matchTier?: string;
     reversalDate?: ZeniDate;
+    transactionDate?: string;
+    transactionType?: string;
 }
 export interface ActualMatchingKpiSummary {
     ai: {
@@ -47,14 +63,20 @@ export interface ActualMatchingMatchModalView {
         results: ActualMatchingTransactionSearchResult[];
     };
     lastBatchResults?: MatchAndReverseResult[];
+    openedFromMatchId?: string;
+    prefill?: {
+        selectedAccrualIds: ID[];
+        actualAmount?: number;
+        matchedLineId?: string;
+        matchedTransactionId?: string;
+    };
 }
 export interface ExpenseAutomationActualMatchingViewSelector extends SelectorView {
-    autoReversed: ActualMatchingRow[];
     hasLoadedForSelectedPeriod: boolean;
     kpiSummary: ActualMatchingKpiSummary;
-    manuallyReversed: ActualMatchingRow[];
     matchModal: ActualMatchingMatchModalView;
     pendingReview: ActualMatchingRow[];
     refreshStatus: FetchStateAndError;
+    reversed: ActualMatchingRow[];
     uiState: ActualMatchingViewUIState;
 }

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

@@ -1,11 +1,25 @@
+import { FetchStateAndError } from '../../../commonStateTypes/common';
+import { ActualMatchingMatch } from '../../../entity/actualMatching/actualMatchingState';
+import { ActualMatchingMatchId } from '../../../entity/actualMatching/actualMatchingTypes';
 import { JEOneTimeAccrual } from '../../../entity/jeSchedules/jeSchedulesSelector';
 import { RootState } from '../../../rootStateTypes';
 import { ZeniDate } from '../../../zeniDayJS';
-import { ExpenseAutomationActualMatchingViewSelector } from '../selectorTypes/actualMatchingViewSelectorTypes';
+import { ActualMatchingRow, ActualMatchingRowKind, ExpenseAutomationActualMatchingViewSelector } from '../selectorTypes/actualMatchingViewSelectorTypes';
+export declare function parseActualMatchingMatchId(matchId: string): {
+    transactionIntegrationId: string;
+    transactionType: string;
+} | null;
 export declare function isAutoReversedAccrual(accrual: JEOneTimeAccrual): boolean;
 export declare function isManuallyReversedAccrual(accrual: JEOneTimeAccrual): boolean;
 export declare function isPendingReviewAccrual(accrual: JEOneTimeAccrual): boolean;
+export declare function isReversedMatchKind(kind: ActualMatchingRowKind): boolean;
 export declare function getClearedMatchedAmount(accrual: JEOneTimeAccrual): number | undefined;
-export declare function getActualMatchingAmount(accrual: JEOneTimeAccrual): number;
+export declare function getActualMatchingAmount(row: ActualMatchingRow): number;
 export declare function getActualMatchingReversalDate(accrual: JEOneTimeAccrual): ZeniDate | undefined;
+export interface ExpenseAutomationActualMatchingMatchView {
+    detailFetchState: FetchStateAndError;
+    refreshStatus: FetchStateAndError;
+    match?: ActualMatchingMatch;
+}
+export declare function getExpenseAutomationActualMatchingMatchView(state: RootState, matchId: ActualMatchingMatchId): ExpenseAutomationActualMatchingMatchView;
 export declare function getExpenseAutomationActualMatchingView(state: RootState): ExpenseAutomationActualMatchingViewSelector;

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

@@ -3,17 +3,66 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseActualMatchingMatchId = parseActualMatchingMatchId;
 exports.isAutoReversedAccrual = isAutoReversedAccrual;
 exports.isManuallyReversedAccrual = isManuallyReversedAccrual;
 exports.isPendingReviewAccrual = isPendingReviewAccrual;
+exports.isReversedMatchKind = isReversedMatchKind;
 exports.getClearedMatchedAmount = getClearedMatchedAmount;
 exports.getActualMatchingAmount = getActualMatchingAmount;
 exports.getActualMatchingReversalDate = getActualMatchingReversalDate;
+exports.getExpenseAutomationActualMatchingMatchView = getExpenseAutomationActualMatchingMatchView;
 exports.getExpenseAutomationActualMatchingView = getExpenseAutomationActualMatchingView;
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
 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");
+function toMatchModalAccrual(member) {
+    if ('jeOneTimeAccrualKey' in member && member.jeOneTimeAccrualKey != null) {
+        return member;
+    }
+    return {
+        ...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(`${row.transactionId}:${row.lineId}`, row));
+    searched.forEach((row) => {
+        const key = `${row.transactionId}:${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) {
+        return null;
+    }
+    return {
+        transactionType: matchId.slice(0, separator).toLowerCase(),
+        transactionIntegrationId: matchId.slice(separator + 1),
+    };
+}
+const NOT_STARTED = {
+    fetchState: 'Not-Started',
+    error: undefined,
+};
 function isAutoReversedAccrual(accrual) {
     return (accrual.accrualStatus === 'reversed' &&
         accrual.reversalTrigger === 'bill_match');
@@ -29,18 +78,14 @@ function isPendingReviewAccrual(accrual) {
     const resolution = accrual.matchSuggestion.resolution;
     return resolution == null || resolution.length === 0;
 }
+function isReversedMatchKind(kind) {
+    return kind === 'auto_reversed' || kind === 'manually_reversed';
+}
 function getClearedMatchedAmount(accrual) {
     return accrual.cleared?.matchedAmount?.amount;
 }
-function getActualMatchingAmount(accrual) {
-    if (isPendingReviewAccrual(accrual)) {
-        return (accrual.matchSuggestion?.matchedAmount?.amount ??
-            accrual.estimatedAmount.amount);
-    }
-    if (isAutoReversedAccrual(accrual) || isManuallyReversedAccrual(accrual)) {
-        return getClearedMatchedAmount(accrual) ?? accrual.estimatedAmount.amount;
-    }
-    return accrual.estimatedAmount.amount;
+function getActualMatchingAmount(row) {
+    return row.actualAmount?.amount ?? row.estimatedAmount.amount;
 }
 function getActualMatchingReversalDate(accrual) {
     if (isPendingReviewAccrual(accrual)) {
@@ -48,83 +93,60 @@ function getActualMatchingReversalDate(accrual) {
     }
     return accrual.cleared?.matchedTransactionDate;
 }
-function getActualMatchingBillCollapseKey(accrual) {
-    const stamp = isPendingReviewAccrual(accrual)
-        ? accrual.matchSuggestion
-        : accrual.cleared;
-    const txnId = stamp?.matchedTransactionId;
-    if (txnId != null && txnId !== '') {
-        return `txn:${txnId}`;
+function collectGroupedMembers(members) {
+    if (members.length <= 1) {
+        return undefined;
     }
-    const integrationId = stamp?.matchedTransactionIntegrationId;
-    if (integrationId != null && integrationId !== '') {
-        return `int:${integrationId}`;
-    }
-    const ids = accrual.cleared?.accrualIds;
-    if (ids != null && ids.length > 1) {
-        return `cleared:${[...ids].sort().join(',')}`;
-    }
-    return `accrual:${accrual.accrualId}`;
+    return members.map((member) => ({
+        accrualId: member.accrualId,
+        estimatedAmount: member.estimatedAmount,
+        jeDebitAccountName: member.jeDebitAccountName,
+        memo: member.memo,
+        serviceMonth: member.serviceMonth,
+    }));
 }
-function collectGroupedAccrualIds(members) {
-    const stampIds = members[0]?.cleared?.accrualIds;
-    const memberIds = members.map((member) => member.accrualId);
-    if (stampIds != null && stampIds.length >= memberIds.length) {
-        return stampIds;
+function toActualMatchingRow(match) {
+    const firstMember = match.members[0];
+    if (firstMember == null) {
+        throw new Error('Actual matching row requires at least one member');
     }
-    const seen = new Set();
-    const grouped = [];
-    for (const id of [...(stampIds ?? []), ...memberIds]) {
-        if (!seen.has(id)) {
-            seen.add(id);
-            grouped.push(id);
-        }
-    }
-    return grouped;
-}
-function toActualMatchingRow(accrual, kind, groupedAccrualIds) {
+    const first = toMatchModalAccrual(firstMember);
     return {
-        ...accrual,
-        kind,
-        groupedAccrualIds,
-        reversalDate: getActualMatchingReversalDate(accrual),
+        ...first,
+        matchId: match.matchId,
+        kind: match.kind,
+        accruedAmount: match.accruedAmount,
+        actualAmount: match.actualAmount,
+        matchTier: match.matchTier,
+        matchShape: match.matchShape,
+        transactionType: match.transactionType,
+        transactionDate: match.transactionDate,
+        groupedAccrualIds: match.members.map((member) => member.accrualId),
+        groupedMembers: collectGroupedMembers(match.members),
+        reversalDate: getActualMatchingReversalDate(first),
+        vendorName: match.vendorName !== '' ? match.vendorName : first.vendorName,
+        estimatedAmount: match.accruedAmount,
     };
 }
-function collapseActualMatchingRows(accruals, kind) {
-    const groups = new Map();
-    for (const accrual of accruals) {
-        const key = getActualMatchingBillCollapseKey(accrual);
-        const members = groups.get(key);
-        if (members != null) {
-            members.push(accrual);
-        }
-        else {
-            groups.set(key, [accrual]);
-        }
-    }
-    const rows = [];
-    for (const members of groups.values()) {
-        rows.push(toActualMatchingRow(members[0], kind, collectGroupedAccrualIds(members)));
-    }
-    return rows;
-}
-function sumCollapsedActualMatchingAmounts(rows) {
-    return rows.reduce((sum, row) => sum + getActualMatchingAmount(row), 0);
-}
-function matchesSearch(accrual, searchString) {
+function matchesSearch(row, searchString) {
     const trimmed = searchString.trim().toLowerCase();
     if (trimmed.length === 0) {
         return true;
     }
-    return (accrual.vendorName.toLowerCase().includes(trimmed) ||
-        accrual.memo.toLowerCase().includes(trimmed));
+    if (row.vendorName.toLowerCase().includes(trimmed)) {
+        return true;
+    }
+    if (row.memo.toLowerCase().includes(trimmed)) {
+        return true;
+    }
+    return (row.groupedMembers ?? []).some((member) => (member.memo ?? '').toLowerCase().includes(trimmed));
 }
 function getActualMatchingSortValue(row, sortKey) {
     switch (sortKey) {
         case 'vendor':
             return row.vendorName.toLowerCase();
         case 'date':
-            return row.reversalDate?.valueOf();
+            return row.reversalDate?.valueOf() ?? row.transactionDate;
         case 'amount':
             return getActualMatchingAmount(row);
         case 'category':
@@ -132,10 +154,23 @@ function getActualMatchingSortValue(row, sortKey) {
         case 'class':
             return row.jeDebitAccountingClassName?.toLowerCase();
         case 'type':
-            return (row.cleared?.matchedTransactionType ??
-                row.matchSuggestion?.matchedTransactionType)?.toLowerCase();
+            return row.transactionType?.toLowerCase();
         case 'lifecycle':
             return row.kind;
+        case 'service':
+            return row.serviceMonth;
+        case 'accrued':
+            return row.accruedAmount?.amount ?? row.estimatedAmount.amount;
+        case 'actual':
+            return row.actualAmount?.amount;
+        case 'variance': {
+            const accrued = row.accruedAmount?.amount ?? row.estimatedAmount.amount;
+            const actual = row.actualAmount?.amount;
+            if (actual == null || accrued === 0) {
+                return undefined;
+            }
+            return ((actual - accrued) / Math.abs(accrued)) * 100;
+        }
         default:
             return undefined;
     }
@@ -153,37 +188,50 @@ function emptyKpiSummary() {
         manual: { count: 0 },
     };
 }
+function sumRowAmounts(rows) {
+    return rows.reduce((sum, row) => sum + getActualMatchingAmount(row), 0);
+}
+function getExpenseAutomationActualMatchingMatchView(state, matchId) {
+    const view = state.expenseAutomationActualMatchingViewState;
+    return {
+        match: (0, actualMatchingSelector_1.getActualMatchingMatchById)(matchId, state.actualMatchingState),
+        detailFetchState: view.detailFetchStateByMatchId[matchId] ?? NOT_STARTED,
+        refreshStatus: view.detailRefreshStatusByMatchId[matchId] ?? NOT_STARTED,
+    };
+}
 function getExpenseAutomationActualMatchingView(state) {
     const { expenseAutomationActualMatchingViewState, expenseAutomationViewState } = state;
-    const { accrualKeysByPeriod, fetchState, error, refreshStatus, uiState, matchModal, } = expenseAutomationActualMatchingViewState;
+    const { matchIdsByPeriod, fetchState, error, refreshStatus, uiState, matchModal, } = expenseAutomationActualMatchingViewState;
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
     const selectedPeriod = expenseAutomationViewState.selectedPeriodByTenantId[currentTenant.tenantId];
     const monthYearPeriodId = selectedPeriod != null ? (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod) : undefined;
-    const accrualKeys = monthYearPeriodId != null
-        ? accrualKeysByPeriod[monthYearPeriodId]
+    const matchIds = monthYearPeriodId != null
+        ? matchIdsByPeriod[monthYearPeriodId]
         : undefined;
-    const accruals = (accrualKeys ?? [])
-        .map((key) => (0, jeSchedulesSelector_1.getJEOneTimeAccrualByKey)(key, state.jeSchedulesState))
-        .filter((accrual) => accrual != null);
-    const filtered = accruals.filter((accrual) => matchesSearch(accrual, uiState.searchString));
-    const autoReversed = sortActualMatchingRows(collapseActualMatchingRows(filtered.filter(isAutoReversedAccrual), 'auto_reversed'), uiState);
-    const pendingReview = sortActualMatchingRows(collapseActualMatchingRows(filtered.filter(isPendingReviewAccrual), 'pending_review'), uiState);
-    const manuallyReversed = sortActualMatchingRows(collapseActualMatchingRows(filtered.filter(isManuallyReversedAccrual), 'manually_reversed'), uiState);
-    const listedRows = [...autoReversed, ...pendingReview, ...manuallyReversed];
+    const rows = (matchIds ?? [])
+        .map((matchId) => (0, actualMatchingSelector_1.getActualMatchingMatchById)(matchId, state.actualMatchingState))
+        .filter((match) => match != null)
+        .filter((match) => match.members.length > 0)
+        .map(toActualMatchingRow)
+        .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 autoReversedForKpi = reversed.filter((row) => row.kind === 'auto_reversed');
+    const listedRows = [...reversed, ...pendingReview];
     const kpiSummary = listedRows.length === 0
         ? emptyKpiSummary()
         : {
             autoReversed: {
-                count: autoReversed.length,
-                amount: sumCollapsedActualMatchingAmounts(autoReversed),
+                count: autoReversedForKpi.length,
+                amount: sumRowAmounts(autoReversedForKpi),
             },
             pendingReview: {
                 count: pendingReview.length,
-                amount: sumCollapsedActualMatchingAmounts(pendingReview),
+                amount: sumRowAmounts(pendingReview),
             },
             totalThisClose: {
                 count: listedRows.length,
-                amount: sumCollapsedActualMatchingAmounts(listedRows),
+                amount: sumRowAmounts(listedRows),
             },
             ai: {
                 count: listedRows.filter((row) => row.origin === 'agent').length,
@@ -192,26 +240,40 @@ function getExpenseAutomationActualMatchingView(state) {
                 count: listedRows.filter((row) => row.origin === 'human').length,
             },
         };
-    const accrualSearchResults = matchModal.accrualSearch.results
+    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)(matchModal.openedFromMatchId, state.actualMatchingState)
+        : undefined;
+    const pinnedAccruals = (openedMatch?.members ?? []).map(toMatchModalAccrual);
+    const firstSuggestion = openedMatch?.members[0]?.matchSuggestion;
+    const prefill = openedMatch == null
+        ? undefined
+        : {
+            selectedAccrualIds: openedMatch.members.map((member) => member.accrualId),
+            actualAmount: openedMatch.actualAmount.amount,
+            matchedLineId: firstSuggestion?.matchedLineId,
+            matchedTransactionId: firstSuggestion?.matchedTransactionId,
+        };
     return {
         fetchState,
         error,
-        autoReversed,
+        reversed,
         pendingReview,
-        manuallyReversed,
         kpiSummary,
         uiState,
         refreshStatus,
-        hasLoadedForSelectedPeriod: accrualKeys != null,
+        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,
@@ -221,7 +283,7 @@ function getExpenseAutomationActualMatchingView(state) {
             },
             accrualSearch: {
                 query: matchModal.accrualSearch.query,
-                results: accrualSearchResults,
+                results: uniqueMatchModalAccruals(pinnedAccruals, searchedAccruals),
                 fetchState: {
                     fetchState: matchModal.accrualSearch.fetchState,
                     error: matchModal.accrualSearch.error,

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

@@ -1,8 +1,9 @@
 import { FetchStateAndError, FetchedState, ID } from '../../../commonStateTypes/common';
 import { SortOrder } from '../../../commonStateTypes/selectorTypes/sortOrderTypes';
 import { MonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
+import { ActualMatchingMatchId } from '../../../entity/actualMatching/actualMatchingTypes';
 import { JEOneTimeAccrualKey } from '../../../entity/jeSchedules/jeSchedulesTypes';
-export declare const toActualMatchingSortKey: (v: string) => "type" | "date" | "vendor" | "category" | "class" | "amount" | "lifecycle";
+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 MATCH_TRANSACTION_SEARCH_PAGE_SIZE = 50;
 export declare const MATCH_ACCRUAL_SEARCH_LIMIT = 50;
@@ -70,11 +71,15 @@ export interface ActualMatchingMatchModalState {
     accrualSearch: ActualMatchingAccrualSearchState;
     confirmStatus: FetchStateAndError;
     isOpen: boolean;
+    pinnedTransactionResults: ActualMatchingTransactionSearchResult[];
     transactionSearch: ActualMatchingTransactionSearchState;
     lastBatchResults?: MatchAndReverseResult[];
+    openedFromMatchId?: ActualMatchingMatchId;
 }
 export interface ActualMatchingViewState extends FetchedState {
-    accrualKeysByPeriod: Record<MonthYearPeriodId, JEOneTimeAccrualKey[]>;
+    detailFetchStateByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
+    detailRefreshStatusByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
+    matchIdsByPeriod: Record<MonthYearPeriodId, ActualMatchingMatchId[]>;
     matchModal: ActualMatchingMatchModalState;
     refreshStatus: FetchStateAndError;
     uiState: ActualMatchingViewUIState;

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

@@ -10,6 +10,10 @@ const ACTUAL_MATCHING_SORT_KEYS = [
     'class',
     'type',
     'lifecycle',
+    'service',
+    'accrued',
+    'actual',
+    'variance',
 ];
 const toActualMatchingSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, ACTUAL_MATCHING_SORT_KEYS);
 exports.toActualMatchingSortKey = toActualMatchingSortKey;

package/package.json

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