@zeniai/client-epic-state 5.2.39 → 5.2.41-beta1MM

package/lib/esm/view/expenseAutomationView/epics/jeSchedule/fetchJeSchedulePageEpic.js

@@ -2,24 +2,34 @@ import { concat, from } from 'rxjs';
 import { filter, mergeMap } from 'rxjs/operators';
 import { fetchAccountList } from '../../../accountList/accountListReducer';
 import { getAccountsTypesForScheduleEpics } from '../../../scheduleView/scheduleListView/scheduleListHelper';
+import { fetchActualMatchingPage } from '../../reducers/actualMatchingViewReducer';
 import { fetchJeSchedules, fetchJeSchedulesPage, initializeAccountSettingsView, } from '../../reducers/jeSchedulesViewReducer';
 export const fetchJeSchedulesPageEpic = (actions$, state$) => actions$.pipe(filter(fetchJeSchedulesPage.match), mergeMap((action) => {
     const jeSchedulePageActions = [];
     const { period, refreshViewInBackground } = action.payload;
+    const state = state$.value;
+    const { selectedPageTab } = state.expenseAutomationJESchedulesViewState.uiState;
     const accountType = getAccountsTypesForScheduleEpics();
-    const accountListState = state$.value.accountListState;
+    const accountListState = state.accountListState;
     if (accountListState.byReportId[accountType.accountListKey].fetchState ===
         'Not-Started') {
         // call this only if the account list for schedules is not fetched already
         jeSchedulePageActions.push(fetchAccountList(accountType.accountListKey, true, false, false, false, accountType.allowedAccountList));
     }
-    jeSchedulePageActions.push(fetchJeSchedules(period, refreshViewInBackground));
+    // AM is chrome on this page but a different endpoint. fetchJeSchedules with
+    // selectedPageTab === 'actual_matching' would hit /1.0/schedules and write a bogus cache slot.
+    if (selectedPageTab === 'actual_matching') {
+        jeSchedulePageActions.push(fetchActualMatchingPage(period, refreshViewInBackground));
+    }
+    else {
+        jeSchedulePageActions.push(fetchJeSchedules(period, refreshViewInBackground));
+    }
     // Only on the first page load. Account settings cannot change from a tab switch or a
     // refresh, and re-initializing puts accountSettingsView back to 'In-Progress' -- which the
     // page reads as "still loading" and answers with a full skeleton over rows it already has.
     // The action also resets localData, so re-dispatching it blindly would empty the settings
     // form until the refetch lands. Saving account settings still re-initializes explicitly.
-    if (!state$.value.expenseAutomationJESchedulesViewState.accountSettings
+    if (!state.expenseAutomationJESchedulesViewState.accountSettings
         .hasLoadedAccountSettings) {
         jeSchedulePageActions.push(initializeAccountSettingsView());
     }

package/lib/esm/view/expenseAutomationView/epics/jeSchedule/prefetchOtherJeSchedulesTabEpic.js

@@ -1,7 +1,8 @@
-import { EMPTY, of } from 'rxjs';
+import { EMPTY, from } from 'rxjs';
 import { filter, mergeMap } from 'rxjs/operators';
 import { toMonthYearPeriodId } from '../../../../commonStateTypes/timePeriod';
 import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
+import { fetchActualMatchingPage } from '../../reducers/actualMatchingViewReducer';
 import { fetchJeSchedules, fetchJeSchedulesPage, } from '../../reducers/jeSchedulesViewReducer';
 import { ALL_JE_PAGE_TABS, getJESchedulePeriodTabKey, } from '../../types/jeSchedulesViewState';
 /**
@@ -9,27 +10,51 @@ import { ALL_JE_PAGE_TABS, getJESchedulePeriodTabKey, } from '../../types/jeSche
  *
  * Listens for `fetchJeSchedulesPage` rather than `fetchJeSchedules` on purpose: the prefetch emits
  * `fetchJeSchedules`, so listening for that would make this epic feed itself.
+ *
+ * Review <-> Existing share `/1.0/schedules`. Actual Matching is a different endpoint; it is
+ * warmed with `fetchActualMatchingPage` when the page action carries `isAccrualEnabled`.
  */
 export const prefetchOtherJeSchedulesTabEpic = (actions$, state$) => actions$.pipe(filter(fetchJeSchedulesPage.match), mergeMap((action) => {
     const state = state$.value;
-    const { period } = action.payload;
+    const { period, isAccrualEnabled } = action.payload;
     const { selectedPageTab } = state.expenseAutomationJESchedulesViewState.uiState;
-    const otherPageTab = ALL_JE_PAGE_TABS.find((pageTab) => pageTab !== selectedPageTab);
-    if (otherPageTab == null) {
-        return EMPTY;
-    }
+    const actions = [];
+    // AM is chrome-only on ALL_JE_PAGE_TABS; warming it with fetchJeSchedules
+    // would hit the wrong endpoint. Warm every other JE tab, not just the first
+    // in ALL_JE_PAGE_TABS — from AM that first hit is always Review, and Existing
+    // would never prefetch.
+    const otherJeTabs = ALL_JE_PAGE_TABS.filter((pageTab) => pageTab !== selectedPageTab && pageTab !== 'actual_matching');
     const currentTenant = getCurrentTenant(state);
     const selectedPeriod = state.expenseAutomationViewState.selectedPeriodByTenantId[currentTenant.tenantId];
-    if (selectedPeriod == null) {
-        return EMPTY;
+    if (selectedPeriod != null) {
+        otherJeTabs.forEach((otherPageTab) => {
+            const otherPeriodTabKey = getJESchedulePeriodTabKey(otherPageTab, toMonthYearPeriodId(selectedPeriod));
+            const isOtherTabAlreadyLoaded = state.expenseAutomationJESchedulesViewState
+                .jeScheduleTransactionKeysByPeriodAndTab[otherPeriodTabKey] !=
+                null;
+            if (!isOtherTabAlreadyLoaded) {
+                actions.push(fetchJeSchedules(period, true, otherPageTab));
+            }
+        });
+    }
+    // GET /actual-matching is not Statsig-gated; CES has no Statsig. The screen
+    // passes is_accrual_enabled so disabled tenants do not pay for a list they
+    // cannot open. Visible AM is fetchJeSchedulesPageEpic's job.
+    if (isAccrualEnabled === true &&
+        selectedPageTab !== 'actual_matching') {
+        const periodId = toMonthYearPeriodId({
+            month: period.start.month,
+            year: period.start.year,
+        });
+        // `fetchState` is global across months. Skipping on In-Progress would drop
+        // October prefetch while September is still loading; September's success
+        // then marks the slice Completed and October looks loaded with no ids.
+        if (state.expenseAutomationActualMatchingViewState.matchIdsByPeriod[periodId] == null) {
+            actions.push(fetchActualMatchingPage(period, true));
+        }
     }
-    // Already warm for this period: without this check every tab switch would refetch the tab
-    // just left, since a switch also fires fetchJeSchedulesPage.
-    const otherPeriodTabKey = getJESchedulePeriodTabKey(otherPageTab, toMonthYearPeriodId(selectedPeriod));
-    const isOtherTabAlreadyLoaded = state.expenseAutomationJESchedulesViewState
-        .jeScheduleTransactionKeysByPeriodAndTab[otherPeriodTabKey] != null;
-    if (isOtherTabAlreadyLoaded) {
+    if (actions.length === 0) {
         return EMPTY;
     }
-    return of(fetchJeSchedules(period, true, otherPageTab));
+    return from(actions);
 }));

package/lib/esm/view/expenseAutomationView/epics/jeSchedule/switchJESchedulesTabEpic.js

@@ -1,23 +1,34 @@
 import { EMPTY, of } from 'rxjs';
 import { filter, mergeMap } from 'rxjs/operators';
-import { convertToPeriod, toAbsoluteDay, } from '../../../../commonStateTypes/timePeriod';
+import { convertToPeriod, toAbsoluteDay, toMonthYearPeriodId, } from '../../../../commonStateTypes/timePeriod';
 import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
 import { fetchJeSchedulesPage, updateJESchedulesUIState, } from '../../reducers/jeSchedulesViewReducer';
-export const switchJESchedulesTabEpic = (actions$, state$) => actions$.pipe(filter(updateJESchedulesUIState.match), filter((action) => action.payload.selectedPageTab != null), mergeMap(() => {
+import { getJESchedulePeriodTabKey } from '../../types/jeSchedulesViewState';
+export const switchJESchedulesTabEpic = (actions$, state$) => actions$.pipe(filter(updateJESchedulesUIState.match), filter((action) => action.payload.selectedPageTab != null), mergeMap((action) => {
     const state = state$.value;
-    const { fetchState, refreshStatus } = state.expenseAutomationJESchedulesViewState;
-    if (fetchState === 'In-Progress' ||
-        refreshStatus.fetchState === 'In-Progress') {
-        return EMPTY;
-    }
+    const nextTab = action.payload.selectedPageTab;
     const currentTenant = getCurrentTenant(state);
     const selectedPeriod = state.expenseAutomationViewState.selectedPeriodByTenantId[currentTenant.tenantId];
     // convertToPeriod destructures, so an unset period throws and takes this epic's subscription
     // down for the rest of the session -- every later tab switch would then stop refreshing. A
     // skipped refresh is the cheaper failure, as in refreshCurrentPage.
-    if (selectedPeriod == null) {
+    if (selectedPeriod == null || nextTab == null) {
         return EMPTY;
     }
+    const { fetchState, refreshStatus, jeScheduleTransactionKeysByPeriodAndTab } = state.expenseAutomationJESchedulesViewState;
+    // Review/Existing share `/1.0/schedules` but not a cache slot. A Review
+    // prefetch must not skip Existing when Existing has no keys yet — AM→Existing
+    // would sit on a skeleton with no request. Skip only when this tab is warm.
+    // AM is a different endpoint — never block it on JE In-Progress.
+    if (nextTab !== 'actual_matching') {
+        const slotKey = getJESchedulePeriodTabKey(nextTab, toMonthYearPeriodId(selectedPeriod));
+        const slotLoaded = jeScheduleTransactionKeysByPeriodAndTab[slotKey] != null;
+        if (slotLoaded &&
+            (fetchState === 'In-Progress' ||
+                refreshStatus.fetchState === 'In-Progress')) {
+            return EMPTY;
+        }
+    }
     const period = convertToPeriod(selectedPeriod);
     const timePeriodStart = toAbsoluteDay(period.start);
     const timePeriodEnd = toAbsoluteDay(period.end);

package/lib/esm/view/expenseAutomationView/expenseAutomationViewReducer.js

@@ -19,11 +19,12 @@ const expenseAutomationView = createSlice({
             reducer() {
                 //do nothing
             },
-            prepare(cacheOverride = false, refreshViewInBackground = false) {
+            prepare(cacheOverride = false, refreshViewInBackground = false, isAccrualEnabled = false) {
                 return {
                     payload: {
                         cacheOverride,
                         refreshViewInBackground,
+                        isAccrualEnabled,
                     },
                 };
             },

package/lib/esm/view/expenseAutomationView/expenseAutomationViewSelector.js

@@ -4,6 +4,7 @@ import { getMonthEndCloseChecksForATenantForSelectedPeriod } from '../../entity/
 import { getCurrentTenant, } from '../../entity/tenant/tenantSelector';
 import { getCompanyMonthEndReportSelectorView } from '../companyMonthEndReportView/companyMonthEndReportViewSelector';
 import { getMonthEndCloseChecksViewByTenantId, isMonthEndInsightDisabled, } from '../monthEndCloseChecksView/monthEndCloseChecksViewSelector';
+import { getExpenseAutomationActualMatchingView } from './selectors/actualMatchingViewSelector';
 import { getExpenseAutomationFluxAnalysisView } from './selectors/fluxAnalysisViewSelector';
 import { getAllSteps } from './selectors/getAllStepsHelper';
 import { getExpenseAutomationJESchedulesView } from './selectors/jeSchedulesViewSelector';
@@ -42,6 +43,8 @@ export function getExpenseAutomationView(state) {
     const reconciliation = getExpenseAutomationReconciliationView(state);
     const expenseAutomationTransactionsView = getExpenseAutomationTransactionView(state);
     const jeSchedules = getExpenseAutomationJESchedulesView(state);
+    // Top-level sibling of `jeSchedules`: see ExpenseAutomationViewSelector.
+    const actualMatching = getExpenseAutomationActualMatchingView(state);
     switch (currentSelectedView) {
         case 'reconciliation':
             currentSelectedViewFetchState = reconciliation.fetchStatus;
@@ -54,12 +57,23 @@ export function getExpenseAutomationView(state) {
                 fluxAnalysis.refreshStatus;
             break;
         case 'je_schedules':
-            currentSelectedViewFetchState = {
-                fetchState: jeSchedules.fetchState,
-                error: jeSchedules.error,
-            };
-            currentSelectedViewBackgroundRefreshFetchState =
-                jeSchedules.refreshStatus;
+            if (expenseAutomationJESchedulesViewState.uiState.selectedPageTab ===
+                'actual_matching') {
+                currentSelectedViewFetchState = {
+                    fetchState: actualMatching.fetchState,
+                    error: actualMatching.error,
+                };
+                currentSelectedViewBackgroundRefreshFetchState =
+                    actualMatching.refreshStatus;
+            }
+            else {
+                currentSelectedViewFetchState = {
+                    fetchState: jeSchedules.fetchState,
+                    error: jeSchedules.error,
+                };
+                currentSelectedViewBackgroundRefreshFetchState =
+                    jeSchedules.refreshStatus;
+            }
             break;
         case 'missing_receipts':
             currentSelectedViewFetchState = {
@@ -88,6 +102,9 @@ export function getExpenseAutomationView(state) {
             };
             break;
     }
+    // AM is optional (flag-off / background prefetch) and must not keep the
+    // page-level AND-complete fetchState stuck on Not-Started. Tab chrome uses
+    // currentSelectedViewFetchState, which already switches to AM when selected.
     const fetchStateVariables = [
         expenseAutomationMissingReceiptsViewState,
         expenseAutomationJESchedulesViewState,
@@ -176,6 +193,7 @@ export function getExpenseAutomationView(state) {
     ]);
     return {
         jeSchedules,
+        actualMatching,
         transactionView: expenseAutomationTransactionsView,
         missingReceipts,
         reconciliation,

package/lib/esm/view/expenseAutomationView/expenseAutomationViewState.js

@@ -1,5 +1,5 @@
-import { stringToUnion } from '../../commonStateTypes/stringToUnion';
-export const EXPENSE_AUTOMATION_VIEW_TYPES = [
+import { stringToUnion, stringToUnionStrict, } from '../../commonStateTypes/stringToUnion';
+const EXPENSE_AUTOMATION_VIEW_TYPES = [
     'transaction_categorization',
     'je_schedules',
     'reconciliation',
@@ -8,3 +8,5 @@ export const EXPENSE_AUTOMATION_VIEW_TYPES = [
     'month_end_insights',
 ];
 export const toExpenseAutomationViewType = (v) => stringToUnion(v, EXPENSE_AUTOMATION_VIEW_TYPES);
+/** Unlike `toExpenseAutomationViewType`, unknown strings return `undefined`. */
+export const toExpenseAutomationViewTypeStrict = (v) => stringToUnionStrict(v, EXPENSE_AUTOMATION_VIEW_TYPES);

package/lib/esm/view/expenseAutomationView/payload/actualMatchingPayload.js

@@ -0,0 +1,68 @@
+import { toString } from '../../../commonStateTypes/timePeriod';
+import { toMatchAndReverseResultStatus, toUndoReversalResultStatus, } from '../types/actualMatchingViewState';
+export function toServiceMonthFromPeriod(period) {
+    return toString(period.start).slice(0, 7);
+}
+function resolveMatchSearchAmount(payload) {
+    const raw = payload.total_amount ?? payload.amount;
+    if (typeof raw === 'number' && Number.isFinite(raw)) {
+        return raw;
+    }
+    if (typeof raw === 'string' && raw !== '') {
+        const parsed = Number(raw);
+        if (Number.isFinite(parsed)) {
+            return parsed;
+        }
+    }
+    return 0;
+}
+function resolveMatchSearchCurrencySymbol(payload, currencyCode, fallbackCurrency) {
+    if (payload.currency_symbol != null && payload.currency_symbol !== '') {
+        return payload.currency_symbol;
+    }
+    if (fallbackCurrency != null &&
+        currencyCode === fallbackCurrency.currencyCode) {
+        return fallbackCurrency.currencySymbol;
+    }
+    return currencyCode;
+}
+export function toActualMatchingTransactionSearchResult(payload, fallbackCurrency) {
+    const currencyCode = payload.currency_code != null && payload.currency_code !== ''
+        ? payload.currency_code
+        : fallbackCurrency?.currencyCode ?? '';
+    return {
+        transactionId: payload.transaction_id,
+        transactionIntegrationId: payload.transaction_integration_id,
+        transactionType: (payload.transaction_type || '').toLowerCase(),
+        lineId: payload.line_id,
+        vendorId: payload.vendor_id ?? undefined,
+        vendorName: payload.vendor_name ?? '',
+        amount: resolveMatchSearchAmount(payload),
+        transactionDate: payload.transaction_date,
+        accountId: payload.account_id ?? undefined,
+        accountName: payload.account_name ?? undefined,
+        accountDescription: payload.account_description ?? undefined,
+        accountingClassId: payload.accounting_class_id ?? undefined,
+        accountingClassName: payload.accounting_class_name ?? undefined,
+        currencyCode,
+        currencySymbol: resolveMatchSearchCurrencySymbol(payload, currencyCode, fallbackCurrency),
+        transactionMemo: payload.transaction_memo ?? undefined,
+        transactionDescription: payload.transaction_description ?? undefined,
+        transactionTypeName: payload.transaction_type_name ?? undefined,
+        syncToken: payload.sync_token == null ? '' : String(payload.sync_token),
+    };
+}
+export function toMatchAndReverseResult(payload) {
+    return {
+        accrualId: payload.accrual_id,
+        status: toMatchAndReverseResultStatus(payload.status),
+        reason: payload.reason ?? undefined,
+    };
+}
+export function toUndoReversalResult(payload) {
+    return {
+        accrualId: payload.accrual_id,
+        status: toUndoReversalResultStatus(payload.status),
+        reason: payload.reason ?? undefined,
+    };
+}