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

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

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSelectedMonthYearForCurrentTenant = getSelectedMonthYearForCurrentTenant;
+exports.getTenantDisplayCurrency = getTenantDisplayCurrency;
 exports.parseActualMatchingMatchId = parseActualMatchingMatchId;
 exports.isAutoReversedAccrual = isAutoReversedAccrual;
 exports.isManuallyReversedAccrual = isManuallyReversedAccrual;
@@ -21,6 +22,7 @@ const actualMatchingSelector_1 = require("../../../entity/actualMatching/actualM
 const jeScheduleHelper_1 = require("../../../entity/jeSchedules/jeScheduleHelper");
 const jeSchedulesSelector_1 = require("../../../entity/jeSchedules/jeSchedulesSelector");
 const tenantSelector_1 = require("../../../entity/tenant/tenantSelector");
+const actualMatchingViewState_1 = require("../types/actualMatchingViewState");
 function getSelectedMonthYearForCurrentTenant(state) {
     const tenantId = (0, tenantSelector_1.getCurrentTenant)(state)?.tenantId;
     if (tenantId == null) {
@@ -28,6 +30,18 @@ function getSelectedMonthYearForCurrentTenant(state) {
     }
     return state.expenseAutomationViewState.selectedPeriodByTenantId[tenantId];
 }
+function getTenantDisplayCurrency(state) {
+    const locale = (0, tenantSelector_1.getCurrentTenant)(state)?.company?.companyLocaleInfo;
+    if (locale?.currencyCode == null || locale.currencyCode === '') {
+        return undefined;
+    }
+    return {
+        currencyCode: locale.currencyCode,
+        currencySymbol: locale.currencySymbol != null && locale.currencySymbol !== ''
+            ? locale.currencySymbol
+            : locale.currencyCode,
+    };
+}
 function toMatchModalAccrual(member) {
     if ('jeOneTimeAccrualKey' in member && member.jeOneTimeAccrualKey != null) {
         return member;
@@ -49,9 +63,9 @@ function uniqueMatchModalAccruals(pinned, searched) {
 }
 function uniqueTransactionSearchResults(pinned, searched) {
     const byKey = new Map();
-    pinned.forEach((row) => byKey.set(`${row.transactionId}:${row.lineId}`, row));
+    pinned.forEach((row) => byKey.set((0, actualMatchingViewState_1.actualMatchingTransactionLineKey)(row.transactionType, row.transactionIntegrationId, row.lineId), row));
     searched.forEach((row) => {
-        const key = `${row.transactionId}:${row.lineId}`;
+        const key = (0, actualMatchingViewState_1.actualMatchingTransactionLineKey)(row.transactionType, row.transactionIntegrationId, row.lineId);
         if (!byKey.has(key)) {
             byKey.set(key, row);
         }
@@ -133,7 +147,9 @@ function toActualMatchingRow(match) {
         groupedAccrualIds: match.members.map((member) => member.accrualId),
         groupedMembers: collectGroupedMembers(match.members),
         reversalDate: getActualMatchingReversalDate(first),
-        vendorName: match.vendorName !== '' ? match.vendorName : first.vendorName,
+        vendorName: match.vendorName != null && match.vendorName !== ''
+            ? match.vendorName
+            : first.vendorName,
         estimatedAmount: match.accruedAmount,
     };
 }
@@ -142,10 +158,10 @@ function matchesSearch(row, searchString) {
     if (trimmed.length === 0) {
         return true;
     }
-    if (row.vendorName.toLowerCase().includes(trimmed)) {
+    if ((row.vendorName ?? '').toLowerCase().includes(trimmed)) {
         return true;
     }
-    if (row.memo.toLowerCase().includes(trimmed)) {
+    if ((row.memo ?? '').toLowerCase().includes(trimmed)) {
         return true;
     }
     return (row.groupedMembers ?? []).some((member) => (member.memo ?? '').toLowerCase().includes(trimmed));
@@ -153,7 +169,7 @@ function matchesSearch(row, searchString) {
 function getActualMatchingSortValue(row, sortKey) {
     switch (sortKey) {
         case 'vendor':
-            return row.vendorName.toLowerCase();
+            return (row.vendorName ?? '').toLowerCase();
         case 'date':
             return row.reversalDate?.valueOf() ?? row.transactionDate;
         case 'amount':
@@ -197,8 +213,14 @@ function emptyKpiSummary() {
         variance: { percent: 0, averagePercentPerMatch: 0, netAmount: 0 },
     };
 }
-function sumRowAmounts(rows) {
-    return rows.reduce((sum, row) => sum + getActualMatchingAmount(row), 0);
+function sumRowAmounts(rows, displayCurrencyCode) {
+    return rows.reduce((sum, row) => {
+        if (displayCurrencyCode != null &&
+            row.accruedAmount.currencyCode !== displayCurrencyCode) {
+            return sum;
+        }
+        return sum + getActualMatchingAmount(row);
+    }, 0);
 }
 function uniqueVendorCount(rows) {
     const ids = new Set();
@@ -207,7 +229,7 @@ function uniqueVendorCount(rows) {
             ids.add(row.vendorId);
             return;
         }
-        if (row.vendorName !== '') {
+        if (row.vendorName != null && row.vendorName !== '') {
             ids.add(row.vendorName);
         }
     });
@@ -219,19 +241,35 @@ function rowVariancePercent(row) {
     if (actual == null || accrued === 0) {
         return undefined;
     }
-    return ((actual - accrued) / accrued) * 100;
+    return ((actual - accrued) / Math.abs(accrued)) * 100;
 }
-function buildActualMatchingKpiSummary(rows) {
+function buildActualMatchingKpiSummary(rows, displayCurrencyCode) {
     if (rows.length === 0) {
         return emptyKpiSummary();
     }
     const autoReversed = rows.filter((row) => row.kind === 'auto_reversed');
     const pendingReview = rows.filter((row) => row.kind === 'pending_review');
     const receivedCount = rows.length;
-    const rowsWithActual = rows.filter((row) => row.actualAmount?.amount != null);
+    const rowsWithActual = rows.filter((row) => {
+        if (row.actualAmount?.amount == null) {
+            return false;
+        }
+        if (displayCurrencyCode == null) {
+            return true;
+        }
+        const rowCurrency = row.accruedAmount?.currencyCode ?? row.estimatedAmount.currencyCode;
+        return rowCurrency === displayCurrencyCode;
+    });
     const accruedTotal = rowsWithActual.reduce((sum, row) => sum + (row.accruedAmount?.amount ?? row.estimatedAmount.amount), 0);
     const actualTotal = rowsWithActual.reduce((sum, row) => sum + (row.actualAmount?.amount ?? 0), 0);
     const variancePercents = rows
+        .filter((row) => {
+        if (displayCurrencyCode == null) {
+            return true;
+        }
+        const rowCurrency = row.accruedAmount?.currencyCode ?? row.estimatedAmount.currencyCode;
+        return rowCurrency === displayCurrencyCode;
+    })
         .map(rowVariancePercent)
         .filter((percent) => percent != null);
     return {
@@ -245,17 +283,17 @@ function buildActualMatchingKpiSummary(rows) {
         autoReversed: {
             count: autoReversed.length,
             percent: Math.round((autoReversed.length / receivedCount) * 100),
-            clearedAmount: sumRowAmounts(autoReversed),
+            clearedAmount: sumRowAmounts(autoReversed, displayCurrencyCode),
         },
         pendingReview: {
             count: pendingReview.length,
-            amount: sumRowAmounts(pendingReview),
+            amount: sumRowAmounts(pendingReview, displayCurrencyCode),
             estimatedMinutesToClear: pendingReview.length * ESTIMATED_MINUTES_PER_PENDING_MATCH,
         },
         variance: {
             percent: accruedTotal === 0
                 ? 0
-                : ((actualTotal - accruedTotal) / accruedTotal) * 100,
+                : ((actualTotal - accruedTotal) / Math.abs(accruedTotal)) * 100,
             averagePercentPerMatch: variancePercents.length === 0
                 ? 0
                 : variancePercents.reduce((sum, percent) => sum + percent, 0) /
@@ -270,12 +308,14 @@ function getExpenseAutomationActualMatchingMatchView(state, matchId) {
         match: (0, actualMatchingSelector_1.getActualMatchingMatchById)(state.actualMatchingState, matchId),
         detailFetchState: view.detailFetchStateByMatchId[matchId] ?? NOT_STARTED,
         refreshStatus: view.detailRefreshStatusByMatchId[matchId] ?? NOT_STARTED,
-        undoReversalStatus: view.undoReversalStatus ?? NOT_STARTED,
+        undoReversalStatus: view.undoReversalStatusByMatchId[matchId] ?? NOT_STARTED,
+        lastUndoResults: view.lastUndoResultsByMatchId[matchId],
+        lastMatchResults: view.lastMatchResultsByMatchId?.[matchId],
     };
 }
 function getExpenseAutomationActualMatchingView(state) {
     const { expenseAutomationActualMatchingViewState } = state;
-    const { matchIdsByPeriod, fetchState, error, refreshStatus, uiState, matchModal, undoReversalStatus, } = 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;
@@ -287,19 +327,25 @@ function getExpenseAutomationActualMatchingView(state) {
     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 kpiSummary = buildActualMatchingKpiSummary(allRows);
+    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 ?? []).map(toMatchModalAccrual);
+    const pinnedAccruals = [
+        ...(openedMatch?.members ?? []),
+        ...(openedMatch?.leftovers ?? []),
+    ].map(toMatchModalAccrual);
     const firstSuggestion = openedMatch?.members[0]?.matchSuggestion;
     const prefill = openedMatch == null
         ? undefined
         : {
-            selectedAccrualIds: openedMatch.members.map((member) => member.accrualId),
+            selectedAccrualIds: [
+                ...openedMatch.members.map((member) => member.accrualId),
+                ...(openedMatch.leftovers ?? []).map((leftover) => leftover.accrualId),
+            ],
             actualAmount: openedMatch.actualAmount.amount,
             matchedLineId: firstSuggestion?.matchedLineId,
             matchedTransactionId: firstSuggestion?.matchedTransactionId,
@@ -313,7 +359,6 @@ function getExpenseAutomationActualMatchingView(state) {
         uiState,
         refreshStatus,
         hasLoadedForSelectedPeriod: matchIds != null,
-        undoReversalStatus,
         matchModal: {
             isOpen: matchModal.isOpen,
             openedFromMatchId: matchModal.openedFromMatchId,

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

@@ -66,6 +66,7 @@ export interface UndoReversalResult {
 }
 export interface UndoReversalAccrualsParams {
     accrualIds: ID[];
+    matchId: ActualMatchingMatchId;
 }
 export interface ActualMatchingTransactionSearchState extends FetchStateAndError {
     isLoadingMore: boolean;
@@ -88,12 +89,15 @@ export interface ActualMatchingMatchModalState {
     lastBatchResults?: MatchAndReverseResult[];
     openedFromMatchId?: ActualMatchingMatchId;
 }
+export declare function actualMatchingTransactionLineKey(transactionType: string, transactionIntegrationId: string, lineId: string): string;
 export interface ActualMatchingViewState extends FetchedState {
     detailFetchStateByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
     detailRefreshStatusByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
+    lastMatchResultsByMatchId: Record<ActualMatchingMatchId, MatchAndReverseResult[]>;
+    lastUndoResultsByMatchId: Record<ActualMatchingMatchId, UndoReversalResult[]>;
     matchIdsByPeriod: Record<MonthYearPeriodId, ActualMatchingMatchId[]>;
     matchModal: ActualMatchingMatchModalState;
     refreshStatus: FetchStateAndError;
     uiState: ActualMatchingViewUIState;
-    undoReversalStatus: FetchStateAndError;
+    undoReversalStatusByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
 }

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

@@ -1,6 +1,7 @@
 "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.actualMatchingTransactionLineKey = actualMatchingTransactionLineKey;
 const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
 const ACTUAL_MATCHING_SORT_KEYS = [
     'vendor',
@@ -36,3 +37,6 @@ const UNDO_REVERSAL_RESULT_STATUSES = [
 ];
 const toUndoReversalResultStatus = (v) => (0, stringToUnion_1.stringToUnion)(v, UNDO_REVERSAL_RESULT_STATUSES);
 exports.toUndoReversalResultStatus = toUndoReversalResultStatus;
+function actualMatchingTransactionLineKey(transactionType, transactionIntegrationId, lineId) {
+    return `${transactionType}:${transactionIntegrationId}:${lineId}`;
+}

package/package.json

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