@zeniai/client-epic-state 5.2.35-beta4MM → 5.2.35-beta6MM

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

@@ -19,6 +19,8 @@ export interface ActualMatchingRow extends JEOneTimeAccrual {
     matchId: string;
     groupedAccrualIds?: ID[];
     groupedMembers?: ActualMatchingGroupedAccrual[];
+    intendedAccrualIds?: ID[];
+    leftovers?: ActualMatchingGroupedAccrual[];
     matchShape?: string;
     matchTier?: string;
     reversalDate?: ZeniDate;
@@ -69,6 +71,7 @@ export interface ActualMatchingMatchModalView {
     prefill?: {
         selectedAccrualIds: ID[];
         actualAmount?: number;
+        consumedLineIds?: ID[];
         matchedLineId?: string;
         matchedTransactionId?: string;
     };

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

@@ -8,7 +8,7 @@ import { JEOneTimeAccrualMatchSuggestion } from '../../../entity/jeSchedules/jeS
 import { RootState } from '../../../rootStateTypes';
 import { ZeniDate } from '../../../zeniDayJS';
 import { ActualMatchingKpiSummary, ActualMatchingRow, ActualMatchingRowKind, ExpenseAutomationActualMatchingViewSelector } from '../selectorTypes/actualMatchingViewSelectorTypes';
-import { MatchAndReverseResult, UndoReversalResult } from '../types/actualMatchingViewState';
+import { MatchAndReverseResult } from '../types/actualMatchingViewState';
 export declare function getSelectedMonthYearForCurrentTenant(state: RootState): MonthYearPeriod | undefined;
 export declare function getTenantDisplayCurrency(state: RootState): DisplayCurrencyFallback | undefined;
 export declare function parseActualMatchingMatchId(matchId: string): {
@@ -30,8 +30,8 @@ export interface ExpenseAutomationActualMatchingMatchView {
     refreshStatus: FetchStateAndError;
     undoReversalStatus: FetchStateAndError;
     lastMatchResults?: MatchAndReverseResult[];
-    lastUndoResults?: UndoReversalResult[];
     match?: ActualMatchingMatch;
 }
 export declare function getExpenseAutomationActualMatchingMatchView(state: RootState, matchId: ActualMatchingMatchId): ExpenseAutomationActualMatchingMatchView;
+export declare function getCloseMatchAfterUndo(state: RootState): boolean;
 export declare function getExpenseAutomationActualMatchingView(state: RootState): ExpenseAutomationActualMatchingViewSelector;

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

@@ -15,6 +15,7 @@ exports.getActualMatchingAmount = getActualMatchingAmount;
 exports.getActualMatchingReversalDate = getActualMatchingReversalDate;
 exports.buildActualMatchingKpiSummary = buildActualMatchingKpiSummary;
 exports.getExpenseAutomationActualMatchingMatchView = getExpenseAutomationActualMatchingMatchView;
+exports.getCloseMatchAfterUndo = getCloseMatchAfterUndo;
 exports.getExpenseAutomationActualMatchingView = getExpenseAutomationActualMatchingView;
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
@@ -128,12 +129,32 @@ function collectGroupedMembers(members) {
         serviceMonth: member.serviceMonth,
     }));
 }
+function collectLeftoverMembers(leftovers) {
+    if (leftovers == null || leftovers.length === 0) {
+        return undefined;
+    }
+    return leftovers.map((member) => ({
+        accrualId: member.accrualId,
+        estimatedAmount: member.estimatedAmount,
+        jeDebitAccountName: member.jeDebitAccountName,
+        memo: member.memo,
+        serviceMonth: member.serviceMonth,
+    }));
+}
 function toActualMatchingRow(match) {
     const firstMember = match.members[0];
     if (firstMember == null) {
         throw new Error('Actual matching row requires at least one member');
     }
     const first = toMatchModalAccrual(firstMember);
+    const leftoverMembers = match.leftovers ?? [];
+    const fromCleared = firstMember.cleared?.intendedAccrualIds;
+    const intendedAccrualIds = fromCleared != null && fromCleared.length > 0
+        ? fromCleared
+        : [
+            ...match.members.map((member) => member.accrualId),
+            ...leftoverMembers.map((leftover) => leftover.accrualId),
+        ];
     return {
         ...first,
         matchId: match.matchId,
@@ -146,6 +167,8 @@ function toActualMatchingRow(match) {
         transactionDate: match.transactionDate,
         groupedAccrualIds: match.members.map((member) => member.accrualId),
         groupedMembers: collectGroupedMembers(match.members),
+        intendedAccrualIds,
+        leftovers: collectLeftoverMembers(match.leftovers),
         reversalDate: getActualMatchingReversalDate(first),
         vendorName: match.vendorName != null && match.vendorName !== ''
             ? match.vendorName
@@ -309,10 +332,12 @@ function getExpenseAutomationActualMatchingMatchView(state, matchId) {
         detailFetchState: view.detailFetchStateByMatchId[matchId] ?? NOT_STARTED,
         refreshStatus: view.detailRefreshStatusByMatchId[matchId] ?? NOT_STARTED,
         undoReversalStatus: view.undoReversalStatusByMatchId[matchId] ?? NOT_STARTED,
-        lastUndoResults: view.lastUndoResultsByMatchId[matchId],
         lastMatchResults: view.lastMatchResultsByMatchId?.[matchId],
     };
 }
+function getCloseMatchAfterUndo(state) {
+    return state.expenseAutomationActualMatchingViewState.closeMatchAfterUndo;
+}
 function getExpenseAutomationActualMatchingView(state) {
     const { expenseAutomationActualMatchingViewState } = state;
     const { matchIdsByPeriod, fetchState, error, refreshStatus, uiState, matchModal, } = expenseAutomationActualMatchingViewState;
@@ -338,7 +363,11 @@ function getExpenseAutomationActualMatchingView(state) {
         ...(openedMatch?.members ?? []),
         ...(openedMatch?.leftovers ?? []),
     ].map(toMatchModalAccrual);
-    const firstSuggestion = openedMatch?.members[0]?.matchSuggestion;
+    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
         : {
@@ -347,8 +376,11 @@ function getExpenseAutomationActualMatchingView(state) {
                 ...(openedMatch.leftovers ?? []).map((leftover) => leftover.accrualId),
             ],
             actualAmount: openedMatch.actualAmount.amount,
-            matchedLineId: firstSuggestion?.matchedLineId,
-            matchedTransactionId: firstSuggestion?.matchedTransactionId,
+            matchedTransactionId: stamp?.matchedTransactionId,
+            matchedLineId: cleared == null ? suggestion?.matchedLineId : undefined,
+            ...(consumedLineIds != null && consumedLineIds.length > 0
+                ? { consumedLineIds }
+                : {}),
         };
     return {
         fetchState,

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

@@ -51,7 +51,7 @@ export interface MatchAndReverseResult {
 }
 export interface MatchAndReverseAccrualsParams {
     accrualIds: ID[];
-    lineId: string;
+    lineIds: ID[];
     transactionId: ID;
     transactionIntegrationId: string;
     transactionSyncToken: string;
@@ -91,10 +91,10 @@ export interface ActualMatchingMatchModalState {
 }
 export declare function actualMatchingTransactionLineKey(transactionType: string, transactionIntegrationId: string, lineId: string): string;
 export interface ActualMatchingViewState extends FetchedState {
+    closeMatchAfterUndo: boolean;
     detailFetchStateByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
     detailRefreshStatusByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
     lastMatchResultsByMatchId: Record<ActualMatchingMatchId, MatchAndReverseResult[]>;
-    lastUndoResultsByMatchId: Record<ActualMatchingMatchId, UndoReversalResult[]>;
     matchIdsByPeriod: Record<MonthYearPeriodId, ActualMatchingMatchId[]>;
     matchModal: ActualMatchingMatchModalState;
     refreshStatus: FetchStateAndError;

package/package.json

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