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

package/lib/esm/view/expenseAutomationView/epics/common/fetchAllExpenseAutomationTabsEpic.js

@@ -3,7 +3,6 @@ import { filter, switchMap } from 'rxjs/operators';
 import { convertToPeriod, toAbsoluteDay, toMonthYearPeriodId, } from '../../../../commonStateTypes/timePeriod';
 import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
 import { fetchAllExpenseAutomationTabs } from '../../expenseAutomationViewReducer';
-import { fetchActualMatchingPage } from '../../reducers/actualMatchingViewReducer';
 import { fetchFluxAnalysisView } from '../../reducers/fluxAnalysisViewReducer';
 import { fetchJeSchedulesPage } from '../../reducers/jeSchedulesViewReducer';
 import { fetchMissingReceipts } from '../../reducers/missingReceiptsViewReducer';
@@ -11,7 +10,7 @@ import { fetchReconciliation } from '../../reducers/reconciliationViewReducer';
 import { fetchTransactionCategorizationView } from '../../reducers/transactionsViewReducer';
 import { getJESchedulePeriodTabKey } from '../../types/jeSchedulesViewState';
 export const fetchAllExpenseAutomationTabsEpic = (actions$, state$) => actions$.pipe(filter(fetchAllExpenseAutomationTabs.match), switchMap((action) => {
-    const { cacheOverride, refreshViewInBackground } = action.payload;
+    const { cacheOverride, refreshViewInBackground, isAccrualEnabled } = action.payload;
     const state = state$.value;
     const { monthEndCloseChecksState } = state;
     const { monthEndCloseChecksByTenantId } = monthEndCloseChecksState;
@@ -32,14 +31,11 @@ export const fetchAllExpenseAutomationTabsEpic = (actions$, state$) => actions$.
     }
     if (cacheOverride === true) {
         const actions = [];
-        const selectedPageTab = state.expenseAutomationJESchedulesViewState.uiState.selectedPageTab;
         actions.push(fetchTransactionCategorizationView(selectedTransactionCategorizationTab, { start: timePeriodStart, end: timePeriodEnd }, cacheOverride, false, undefined, undefined, refreshViewInBackground, false), fetchMissingReceipts({ start: timePeriodStart, end: timePeriodEnd }, {
             amount: 75.0,
             currencyCode: 'USD',
             currencySymbol: '$',
-        }, cacheOverride, refreshViewInBackground), fetchFluxAnalysisView(selectedPeriod, cacheOverride, refreshViewInBackground, null), selectedPageTab === 'actual_matching'
-            ? fetchActualMatchingPage({ start: timePeriodStart, end: timePeriodEnd }, cacheOverride)
-            : fetchJeSchedulesPage({ start: timePeriodStart, end: timePeriodEnd }, cacheOverride));
+        }, cacheOverride, refreshViewInBackground), fetchFluxAnalysisView(selectedPeriod, cacheOverride, refreshViewInBackground, null), fetchJeSchedulesPage({ start: timePeriodStart, end: timePeriodEnd }, cacheOverride, isAccrualEnabled));
         if (reconciliationEnabled) {
             actions.push(fetchReconciliation(selectedPeriod, undefined, cacheOverride, refreshViewInBackground));
         }
@@ -66,7 +62,7 @@ export const fetchAllExpenseAutomationTabsEpic = (actions$, state$) => actions$.
         }
         // The two JE tabs cache separately, so only the tab actually being shown decides whether a
         // fetch is still needed. Actual Matching is a third tab on the same page with its own
-        // endpoint and cache slot.
+        // endpoint; fetchJeSchedulesPage carries isAccrualEnabled so the prefetch epic can warm AM.
         const selectedPageTab = state.expenseAutomationJESchedulesViewState.uiState.selectedPageTab;
         if (selectedPageTab === 'actual_matching') {
             const actualMatchingPeriodKeys = state.expenseAutomationActualMatchingViewState.matchIdsByPeriod[monthYearPeriodId];
@@ -74,7 +70,7 @@ export const fetchAllExpenseAutomationTabsEpic = (actions$, state$) => actions$.
                 'In-Progress' &&
                 (!state.expenseAutomationActualMatchingViewState.hasValidState() ||
                     actualMatchingPeriodKeys == null)) {
-                fetchActions.push(fetchActualMatchingPage({ start: timePeriodStart, end: timePeriodEnd }, cacheOverride));
+                fetchActions.push(fetchJeSchedulesPage({ start: timePeriodStart, end: timePeriodEnd }, cacheOverride, isAccrualEnabled));
             }
         }
         else {
@@ -86,7 +82,7 @@ export const fetchAllExpenseAutomationTabsEpic = (actions$, state$) => actions$.
                         .jeScheduleTransactionKeysByPeriodAndTab[jeSchedulesPeriodTabKey] == null ||
                     state.expenseAutomationJESchedulesViewState
                         .failedJeScheduleTransactionKeysByPeriodAndTab[jeSchedulesPeriodTabKey] == null)) {
-                fetchActions.push(fetchJeSchedulesPage({ start: timePeriodStart, end: timePeriodEnd }, cacheOverride));
+                fetchActions.push(fetchJeSchedulesPage({ start: timePeriodStart, end: timePeriodEnd }, cacheOverride, isAccrualEnabled));
             }
         }
         if (state.expenseAutomationReconciliationViewState.fetchState !==

package/lib/esm/view/expenseAutomationView/epics/common/refreshExpenseAutomationCurrentTabEpic.js

@@ -4,7 +4,6 @@ import { convertToPeriod, toAbsoluteDay, } from '../../../../commonStateTypes/ti
 import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
 import { fetchCompanyMonthEndReportTemplates, fetchCompanyMonthEndReportView, } from '../../../companyMonthEndReportView/companyMonthEndReportViewReducer';
 import { refreshExpenseAutomationCurrentTab } from '../../expenseAutomationViewReducer';
-import { fetchActualMatchingPage } from '../../reducers/actualMatchingViewReducer';
 import { fetchFluxAnalysisView } from '../../reducers/fluxAnalysisViewReducer';
 import { fetchJeSchedulesPage } from '../../reducers/jeSchedulesViewReducer';
 import { fetchMissingReceipts } from '../../reducers/missingReceiptsViewReducer';
@@ -39,17 +38,10 @@ export const refreshExpenseAutomationCurrentTabEpic = (actions$, state$) => acti
             return from([
                 fetchFluxAnalysisView(selectedPeriod, true, true, null),
             ]);
-        case 'je_schedules': {
-            const selectedPageTab = state.expenseAutomationJESchedulesViewState.uiState.selectedPageTab;
-            if (selectedPageTab === 'actual_matching') {
-                return from([
-                    fetchActualMatchingPage({ start: timePeriodStart, end: timePeriodEnd }, true),
-                ]);
-            }
+        case 'je_schedules':
             return from([
                 fetchJeSchedulesPage({ start: timePeriodStart, end: timePeriodEnd }, true),
             ]);
-        }
         case 'month_end_insights':
             return from([
                 fetchCompanyMonthEndReportView(true, companyId, currentTenant.tenantId, period.end, true),

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,29 +10,47 @@ 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;
-    // Actual Matching has its own CES slice and API; warming it with fetchJeSchedules
-    // would prefetch the wrong endpoint. Only Review <-> Existing share that fetch.
+    const actions = [];
+    // AM is chrome-only on ALL_JE_PAGE_TABS; warming it with fetchJeSchedules
+    // would hit the wrong endpoint.
     const otherPageTab = ALL_JE_PAGE_TABS.find((pageTab) => pageTab !== selectedPageTab && pageTab !== 'actual_matching');
-    if (otherPageTab == null) {
-        return EMPTY;
-    }
     const currentTenant = getCurrentTenant(state);
     const selectedPeriod = state.expenseAutomationViewState.selectedPeriodByTenantId[currentTenant.tenantId];
-    if (selectedPeriod == null) {
-        return EMPTY;
+    if (otherPageTab != null && selectedPeriod != null) {
+        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,
+        });
+        const actualMatching = state.expenseAutomationActualMatchingViewState;
+        const amAlreadyLoading = actualMatching.fetchState === 'In-Progress' ||
+            actualMatching.refreshStatus.fetchState === 'In-Progress';
+        if (!amAlreadyLoading &&
+            actualMatching.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

@@ -2,7 +2,6 @@ import { EMPTY, of } from 'rxjs';
 import { filter, mergeMap } from 'rxjs/operators';
 import { convertToPeriod, toAbsoluteDay, } from '../../../../commonStateTypes/timePeriod';
 import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
-import { fetchActualMatchingPage } from '../../reducers/actualMatchingViewReducer';
 import { fetchJeSchedulesPage, updateJESchedulesUIState, } from '../../reducers/jeSchedulesViewReducer';
 export const switchJESchedulesTabEpic = (actions$, state$) => actions$.pipe(filter(updateJESchedulesUIState.match), filter((action) => action.payload.selectedPageTab != null), mergeMap(() => {
     const state = state$.value;
@@ -25,9 +24,5 @@ export const switchJESchedulesTabEpic = (actions$, state$) => actions$.pipe(filt
     if (timePeriodStart == null || timePeriodEnd == null) {
         return EMPTY;
     }
-    const { selectedPageTab } = state.expenseAutomationJESchedulesViewState.uiState;
-    if (selectedPageTab === 'actual_matching') {
-        return of(fetchActualMatchingPage({ start: timePeriodStart, end: timePeriodEnd }, true));
-    }
     return of(fetchJeSchedulesPage({ start: timePeriodStart, end: timePeriodEnd }, true));
 }));

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/reducers/jeSchedulesViewReducer.js

@@ -105,11 +105,12 @@ const expenseAutomationJESchedulesView = createSlice({
     initialState,
     reducers: {
         fetchJeSchedulesPage: {
-            prepare(period, refreshViewInBackground = false) {
+            prepare(period, refreshViewInBackground = false, isAccrualEnabled = false) {
                 return {
                     payload: {
                         period,
                         refreshViewInBackground,
+                        isAccrualEnabled,
                     },
                 };
             },

package/lib/view/expenseAutomationView/epics/common/fetchAllExpenseAutomationTabsEpic.d.ts

@@ -3,11 +3,10 @@ import { Observable } from 'rxjs';
 import { RootState } from '../../../../rootStateTypes';
 import { fetchMonthEndCloseChecks } from '../../../monthEndCloseChecksView/monthEndCloseChecksViewReducer';
 import { fetchAllExpenseAutomationTabs } from '../../expenseAutomationViewReducer';
-import { fetchActualMatchingPage } from '../../reducers/actualMatchingViewReducer';
 import { fetchFluxAnalysisView } from '../../reducers/fluxAnalysisViewReducer';
 import { fetchJeSchedulesPage } from '../../reducers/jeSchedulesViewReducer';
 import { fetchMissingReceipts } from '../../reducers/missingReceiptsViewReducer';
 import { fetchReconciliation } from '../../reducers/reconciliationViewReducer';
 import { fetchTransactionCategorizationView } from '../../reducers/transactionsViewReducer';
-export type ActionType = ReturnType<typeof fetchAllExpenseAutomationTabs> | ReturnType<typeof fetchActualMatchingPage> | ReturnType<typeof fetchMissingReceipts> | ReturnType<typeof fetchMonthEndCloseChecks> | ReturnType<typeof fetchFluxAnalysisView> | ReturnType<typeof fetchJeSchedulesPage> | ReturnType<typeof fetchReconciliation> | ReturnType<typeof fetchTransactionCategorizationView>;
+export type ActionType = ReturnType<typeof fetchAllExpenseAutomationTabs> | ReturnType<typeof fetchMissingReceipts> | ReturnType<typeof fetchMonthEndCloseChecks> | ReturnType<typeof fetchFluxAnalysisView> | ReturnType<typeof fetchJeSchedulesPage> | ReturnType<typeof fetchReconciliation> | ReturnType<typeof fetchTransactionCategorizationView>;
 export declare const fetchAllExpenseAutomationTabsEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

package/lib/view/expenseAutomationView/epics/common/fetchAllExpenseAutomationTabsEpic.js

@@ -6,7 +6,6 @@ const operators_1 = require("rxjs/operators");
 const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
 const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const expenseAutomationViewReducer_1 = require("../../expenseAutomationViewReducer");
-const actualMatchingViewReducer_1 = require("../../reducers/actualMatchingViewReducer");
 const fluxAnalysisViewReducer_1 = require("../../reducers/fluxAnalysisViewReducer");
 const jeSchedulesViewReducer_1 = require("../../reducers/jeSchedulesViewReducer");
 const missingReceiptsViewReducer_1 = require("../../reducers/missingReceiptsViewReducer");
@@ -14,7 +13,7 @@ const reconciliationViewReducer_1 = require("../../reducers/reconciliationViewRe
 const transactionsViewReducer_1 = require("../../reducers/transactionsViewReducer");
 const jeSchedulesViewState_1 = require("../../types/jeSchedulesViewState");
 const fetchAllExpenseAutomationTabsEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(expenseAutomationViewReducer_1.fetchAllExpenseAutomationTabs.match), (0, operators_1.switchMap)((action) => {
-    const { cacheOverride, refreshViewInBackground } = action.payload;
+    const { cacheOverride, refreshViewInBackground, isAccrualEnabled } = action.payload;
     const state = state$.value;
     const { monthEndCloseChecksState } = state;
     const { monthEndCloseChecksByTenantId } = monthEndCloseChecksState;
@@ -35,14 +34,11 @@ const fetchAllExpenseAutomationTabsEpic = (actions$, state$) => actions$.pipe((0
     }
     if (cacheOverride === true) {
         const actions = [];
-        const selectedPageTab = state.expenseAutomationJESchedulesViewState.uiState.selectedPageTab;
         actions.push((0, transactionsViewReducer_1.fetchTransactionCategorizationView)(selectedTransactionCategorizationTab, { start: timePeriodStart, end: timePeriodEnd }, cacheOverride, false, undefined, undefined, refreshViewInBackground, false), (0, missingReceiptsViewReducer_1.fetchMissingReceipts)({ start: timePeriodStart, end: timePeriodEnd }, {
             amount: 75.0,
             currencyCode: 'USD',
             currencySymbol: '$',
-        }, cacheOverride, refreshViewInBackground), (0, fluxAnalysisViewReducer_1.fetchFluxAnalysisView)(selectedPeriod, cacheOverride, refreshViewInBackground, null), selectedPageTab === 'actual_matching'
-            ? (0, actualMatchingViewReducer_1.fetchActualMatchingPage)({ start: timePeriodStart, end: timePeriodEnd }, cacheOverride)
-            : (0, jeSchedulesViewReducer_1.fetchJeSchedulesPage)({ start: timePeriodStart, end: timePeriodEnd }, cacheOverride));
+        }, cacheOverride, refreshViewInBackground), (0, fluxAnalysisViewReducer_1.fetchFluxAnalysisView)(selectedPeriod, cacheOverride, refreshViewInBackground, null), (0, jeSchedulesViewReducer_1.fetchJeSchedulesPage)({ start: timePeriodStart, end: timePeriodEnd }, cacheOverride, isAccrualEnabled));
         if (reconciliationEnabled) {
             actions.push((0, reconciliationViewReducer_1.fetchReconciliation)(selectedPeriod, undefined, cacheOverride, refreshViewInBackground));
         }
@@ -69,7 +65,7 @@ const fetchAllExpenseAutomationTabsEpic = (actions$, state$) => actions$.pipe((0
         }
         // The two JE tabs cache separately, so only the tab actually being shown decides whether a
         // fetch is still needed. Actual Matching is a third tab on the same page with its own
-        // endpoint and cache slot.
+        // endpoint; fetchJeSchedulesPage carries isAccrualEnabled so the prefetch epic can warm AM.
         const selectedPageTab = state.expenseAutomationJESchedulesViewState.uiState.selectedPageTab;
         if (selectedPageTab === 'actual_matching') {
             const actualMatchingPeriodKeys = state.expenseAutomationActualMatchingViewState.matchIdsByPeriod[monthYearPeriodId];
@@ -77,7 +73,7 @@ const fetchAllExpenseAutomationTabsEpic = (actions$, state$) => actions$.pipe((0
                 'In-Progress' &&
                 (!state.expenseAutomationActualMatchingViewState.hasValidState() ||
                     actualMatchingPeriodKeys == null)) {
-                fetchActions.push((0, actualMatchingViewReducer_1.fetchActualMatchingPage)({ start: timePeriodStart, end: timePeriodEnd }, cacheOverride));
+                fetchActions.push((0, jeSchedulesViewReducer_1.fetchJeSchedulesPage)({ start: timePeriodStart, end: timePeriodEnd }, cacheOverride, isAccrualEnabled));
             }
         }
         else {
@@ -89,7 +85,7 @@ const fetchAllExpenseAutomationTabsEpic = (actions$, state$) => actions$.pipe((0
                         .jeScheduleTransactionKeysByPeriodAndTab[jeSchedulesPeriodTabKey] == null ||
                     state.expenseAutomationJESchedulesViewState
                         .failedJeScheduleTransactionKeysByPeriodAndTab[jeSchedulesPeriodTabKey] == null)) {
-                fetchActions.push((0, jeSchedulesViewReducer_1.fetchJeSchedulesPage)({ start: timePeriodStart, end: timePeriodEnd }, cacheOverride));
+                fetchActions.push((0, jeSchedulesViewReducer_1.fetchJeSchedulesPage)({ start: timePeriodStart, end: timePeriodEnd }, cacheOverride, isAccrualEnabled));
             }
         }
         if (state.expenseAutomationReconciliationViewState.fetchState !==

package/lib/view/expenseAutomationView/epics/common/refreshExpenseAutomationCurrentTabEpic.d.ts

@@ -4,11 +4,10 @@ import { RootState } from '../../../../rootStateTypes';
 import { fetchCompanyMonthEndReportTemplates, fetchCompanyMonthEndReportView } from '../../../companyMonthEndReportView/companyMonthEndReportViewReducer';
 import { fetchMonthEndCloseChecks } from '../../../monthEndCloseChecksView/monthEndCloseChecksViewReducer';
 import { refreshExpenseAutomationCurrentTab } from '../../expenseAutomationViewReducer';
-import { fetchActualMatchingPage } from '../../reducers/actualMatchingViewReducer';
 import { fetchFluxAnalysisView } from '../../reducers/fluxAnalysisViewReducer';
 import { fetchJeSchedulesPage } from '../../reducers/jeSchedulesViewReducer';
 import { fetchMissingReceipts } from '../../reducers/missingReceiptsViewReducer';
 import { fetchReconciliation } from '../../reducers/reconciliationViewReducer';
 import { fetchTransactionCategorizationView } from '../../reducers/transactionsViewReducer';
-export type ActionType = ReturnType<typeof refreshExpenseAutomationCurrentTab> | ReturnType<typeof fetchActualMatchingPage> | ReturnType<typeof fetchCompanyMonthEndReportView> | ReturnType<typeof fetchCompanyMonthEndReportTemplates> | ReturnType<typeof fetchMissingReceipts> | ReturnType<typeof fetchMonthEndCloseChecks> | ReturnType<typeof fetchFluxAnalysisView> | ReturnType<typeof fetchReconciliation> | ReturnType<typeof fetchJeSchedulesPage> | ReturnType<typeof fetchTransactionCategorizationView>;
+export type ActionType = ReturnType<typeof refreshExpenseAutomationCurrentTab> | ReturnType<typeof fetchCompanyMonthEndReportView> | ReturnType<typeof fetchCompanyMonthEndReportTemplates> | ReturnType<typeof fetchMissingReceipts> | ReturnType<typeof fetchMonthEndCloseChecks> | ReturnType<typeof fetchFluxAnalysisView> | ReturnType<typeof fetchReconciliation> | ReturnType<typeof fetchJeSchedulesPage> | ReturnType<typeof fetchTransactionCategorizationView>;
 export declare const refreshExpenseAutomationCurrentTabEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

package/lib/view/expenseAutomationView/epics/common/refreshExpenseAutomationCurrentTabEpic.js

@@ -7,7 +7,6 @@ const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
 const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const companyMonthEndReportViewReducer_1 = require("../../../companyMonthEndReportView/companyMonthEndReportViewReducer");
 const expenseAutomationViewReducer_1 = require("../../expenseAutomationViewReducer");
-const actualMatchingViewReducer_1 = require("../../reducers/actualMatchingViewReducer");
 const fluxAnalysisViewReducer_1 = require("../../reducers/fluxAnalysisViewReducer");
 const jeSchedulesViewReducer_1 = require("../../reducers/jeSchedulesViewReducer");
 const missingReceiptsViewReducer_1 = require("../../reducers/missingReceiptsViewReducer");
@@ -42,17 +41,10 @@ const refreshExpenseAutomationCurrentTabEpic = (actions$, state$) => actions$.pi
             return (0, rxjs_1.from)([
                 (0, fluxAnalysisViewReducer_1.fetchFluxAnalysisView)(selectedPeriod, true, true, null),
             ]);
-        case 'je_schedules': {
-            const selectedPageTab = state.expenseAutomationJESchedulesViewState.uiState.selectedPageTab;
-            if (selectedPageTab === 'actual_matching') {
-                return (0, rxjs_1.from)([
-                    (0, actualMatchingViewReducer_1.fetchActualMatchingPage)({ start: timePeriodStart, end: timePeriodEnd }, true),
-                ]);
-            }
+        case 'je_schedules':
             return (0, rxjs_1.from)([
                 (0, jeSchedulesViewReducer_1.fetchJeSchedulesPage)({ start: timePeriodStart, end: timePeriodEnd }, true),
             ]);
-        }
         case 'month_end_insights':
             return (0, rxjs_1.from)([
                 (0, companyMonthEndReportViewReducer_1.fetchCompanyMonthEndReportView)(true, companyId, currentTenant.tenantId, period.end, true),

package/lib/view/expenseAutomationView/epics/jeSchedule/fetchJeSchedulePageEpic.d.ts

@@ -2,6 +2,7 @@ import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { RootState } from '../../../../rootStateTypes';
 import { fetchAccountList } from '../../../accountList/accountListReducer';
+import { fetchActualMatchingPage } from '../../reducers/actualMatchingViewReducer';
 import { fetchJeSchedules, fetchJeSchedulesPage, initializeAccountSettingsView } from '../../reducers/jeSchedulesViewReducer';
-export type ActionType = ReturnType<typeof fetchAccountList> | ReturnType<typeof fetchJeSchedules> | ReturnType<typeof fetchJeSchedulesPage> | ReturnType<typeof initializeAccountSettingsView>;
+export type ActionType = ReturnType<typeof fetchAccountList> | ReturnType<typeof fetchActualMatchingPage> | ReturnType<typeof fetchJeSchedules> | ReturnType<typeof fetchJeSchedulesPage> | ReturnType<typeof initializeAccountSettingsView>;
 export declare const fetchJeSchedulesPageEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

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

@@ -5,24 +5,34 @@ const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const accountListReducer_1 = require("../../../accountList/accountListReducer");
 const scheduleListHelper_1 = require("../../../scheduleView/scheduleListView/scheduleListHelper");
+const actualMatchingViewReducer_1 = require("../../reducers/actualMatchingViewReducer");
 const jeSchedulesViewReducer_1 = require("../../reducers/jeSchedulesViewReducer");
 const fetchJeSchedulesPageEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(jeSchedulesViewReducer_1.fetchJeSchedulesPage.match), (0, operators_1.mergeMap)((action) => {
     const jeSchedulePageActions = [];
     const { period, refreshViewInBackground } = action.payload;
+    const state = state$.value;
+    const { selectedPageTab } = state.expenseAutomationJESchedulesViewState.uiState;
     const accountType = (0, scheduleListHelper_1.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((0, accountListReducer_1.fetchAccountList)(accountType.accountListKey, true, false, false, false, accountType.allowedAccountList));
     }
-    jeSchedulePageActions.push((0, jeSchedulesViewReducer_1.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((0, actualMatchingViewReducer_1.fetchActualMatchingPage)(period, refreshViewInBackground));
+    }
+    else {
+        jeSchedulePageActions.push((0, jeSchedulesViewReducer_1.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((0, jeSchedulesViewReducer_1.initializeAccountSettingsView)());
     }

package/lib/view/expenseAutomationView/epics/jeSchedule/prefetchOtherJeSchedulesTabEpic.d.ts

@@ -1,12 +1,16 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { RootState } from '../../../../rootStateTypes';
+import { fetchActualMatchingPage } from '../../reducers/actualMatchingViewReducer';
 import { fetchJeSchedules, fetchJeSchedulesPage } from '../../reducers/jeSchedulesViewReducer';
-export type ActionType = ReturnType<typeof fetchJeSchedules> | ReturnType<typeof fetchJeSchedulesPage>;
+export type ActionType = ReturnType<typeof fetchActualMatchingPage> | ReturnType<typeof fetchJeSchedules> | ReturnType<typeof fetchJeSchedulesPage>;
 /**
  * Warms the tab the user is not looking at, so switching to it renders rows instead of a skeleton.
  *
  * 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 declare const prefetchOtherJeSchedulesTabEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

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

@@ -5,6 +5,7 @@ const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
 const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
+const actualMatchingViewReducer_1 = require("../../reducers/actualMatchingViewReducer");
 const jeSchedulesViewReducer_1 = require("../../reducers/jeSchedulesViewReducer");
 const jeSchedulesViewState_1 = require("../../types/jeSchedulesViewState");
 /**
@@ -12,30 +13,48 @@ const jeSchedulesViewState_1 = require("../../types/jeSchedulesViewState");
  *
  * 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`.
  */
 const prefetchOtherJeSchedulesTabEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(jeSchedulesViewReducer_1.fetchJeSchedulesPage.match), (0, operators_1.mergeMap)((action) => {
     const state = state$.value;
-    const { period } = action.payload;
+    const { period, isAccrualEnabled } = action.payload;
     const { selectedPageTab } = state.expenseAutomationJESchedulesViewState.uiState;
-    // Actual Matching has its own CES slice and API; warming it with fetchJeSchedules
-    // would prefetch the wrong endpoint. Only Review <-> Existing share that fetch.
+    const actions = [];
+    // AM is chrome-only on ALL_JE_PAGE_TABS; warming it with fetchJeSchedules
+    // would hit the wrong endpoint.
     const otherPageTab = jeSchedulesViewState_1.ALL_JE_PAGE_TABS.find((pageTab) => pageTab !== selectedPageTab && pageTab !== 'actual_matching');
-    if (otherPageTab == null) {
-        return rxjs_1.EMPTY;
-    }
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
     const selectedPeriod = state.expenseAutomationViewState.selectedPeriodByTenantId[currentTenant.tenantId];
-    if (selectedPeriod == null) {
-        return rxjs_1.EMPTY;
+    if (otherPageTab != null && selectedPeriod != null) {
+        const otherPeriodTabKey = (0, jeSchedulesViewState_1.getJESchedulePeriodTabKey)(otherPageTab, (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod));
+        const isOtherTabAlreadyLoaded = state.expenseAutomationJESchedulesViewState
+            .jeScheduleTransactionKeysByPeriodAndTab[otherPeriodTabKey] != null;
+        if (!isOtherTabAlreadyLoaded) {
+            actions.push((0, jeSchedulesViewReducer_1.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 = (0, timePeriod_1.toMonthYearPeriodId)({
+            month: period.start.month,
+            year: period.start.year,
+        });
+        const actualMatching = state.expenseAutomationActualMatchingViewState;
+        const amAlreadyLoading = actualMatching.fetchState === 'In-Progress' ||
+            actualMatching.refreshStatus.fetchState === 'In-Progress';
+        if (!amAlreadyLoading &&
+            actualMatching.matchIdsByPeriod[periodId] == null) {
+            actions.push((0, actualMatchingViewReducer_1.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 = (0, jeSchedulesViewState_1.getJESchedulePeriodTabKey)(otherPageTab, (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod));
-    const isOtherTabAlreadyLoaded = state.expenseAutomationJESchedulesViewState
-        .jeScheduleTransactionKeysByPeriodAndTab[otherPeriodTabKey] != null;
-    if (isOtherTabAlreadyLoaded) {
+    if (actions.length === 0) {
         return rxjs_1.EMPTY;
     }
-    return (0, rxjs_1.of)((0, jeSchedulesViewReducer_1.fetchJeSchedules)(period, true, otherPageTab));
+    return (0, rxjs_1.from)(actions);
 }));
 exports.prefetchOtherJeSchedulesTabEpic = prefetchOtherJeSchedulesTabEpic;

package/lib/view/expenseAutomationView/epics/jeSchedule/switchJESchedulesTabEpic.d.ts

@@ -1,7 +1,6 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { RootState } from '../../../../reducer';
-import { fetchActualMatchingPage } from '../../reducers/actualMatchingViewReducer';
 import { fetchJeSchedulesPage, updateJESchedulesUIState } from '../../reducers/jeSchedulesViewReducer';
-export type ActionType = ReturnType<typeof fetchActualMatchingPage> | ReturnType<typeof fetchJeSchedulesPage> | ReturnType<typeof updateJESchedulesUIState>;
+export type ActionType = ReturnType<typeof fetchJeSchedulesPage> | ReturnType<typeof updateJESchedulesUIState>;
 export declare const switchJESchedulesTabEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

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

@@ -5,7 +5,6 @@ const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
 const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
-const actualMatchingViewReducer_1 = require("../../reducers/actualMatchingViewReducer");
 const jeSchedulesViewReducer_1 = require("../../reducers/jeSchedulesViewReducer");
 const switchJESchedulesTabEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(jeSchedulesViewReducer_1.updateJESchedulesUIState.match), (0, operators_1.filter)((action) => action.payload.selectedPageTab != null), (0, operators_1.mergeMap)(() => {
     const state = state$.value;
@@ -28,10 +27,6 @@ const switchJESchedulesTabEpic = (actions$, state$) => actions$.pipe((0, operato
     if (timePeriodStart == null || timePeriodEnd == null) {
         return rxjs_1.EMPTY;
     }
-    const { selectedPageTab } = state.expenseAutomationJESchedulesViewState.uiState;
-    if (selectedPageTab === 'actual_matching') {
-        return (0, rxjs_1.of)((0, actualMatchingViewReducer_1.fetchActualMatchingPage)({ start: timePeriodStart, end: timePeriodEnd }, true));
-    }
     return (0, rxjs_1.of)((0, jeSchedulesViewReducer_1.fetchJeSchedulesPage)({ start: timePeriodStart, end: timePeriodEnd }, true));
 }));
 exports.switchJESchedulesTabEpic = switchJESchedulesTabEpic;

package/lib/view/expenseAutomationView/expenseAutomationViewReducer.d.ts

@@ -2,9 +2,10 @@ import { ID } from '../../commonStateTypes/common';
 import { MonthYearPeriod } from '../../commonStateTypes/timePeriod';
 import { ExpenseAutomationViewState } from './expenseAutomationViewState';
 export declare const initialState: ExpenseAutomationViewState;
-export declare const fetchAllExpenseAutomationTabs: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: boolean | undefined, refreshViewInBackground?: boolean | undefined], {
+export declare const fetchAllExpenseAutomationTabs: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: boolean | undefined, refreshViewInBackground?: boolean | undefined, isAccrualEnabled?: boolean | undefined], {
     cacheOverride: boolean;
     refreshViewInBackground: boolean;
+    isAccrualEnabled: boolean;
 }, "expenseAutomationView/fetchAllExpenseAutomationTabs", never, never>, updateCurrentSelectedPeriod: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tenantId: string, newSelectedPeriod: MonthYearPeriod], {
     newSelectedPeriod: MonthYearPeriod;
     tenantId: string;

package/lib/view/expenseAutomationView/expenseAutomationViewReducer.js

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

package/lib/view/expenseAutomationView/reducers/jeSchedulesViewReducer.d.ts

@@ -51,9 +51,10 @@ export declare const clearExpenseAutomationJESchedulesView: import("@reduxjs/too
     selectedPageTab: JEPageTab;
     selectedPeriod: MonthYearPeriod;
     status: ZeniAPIStatus;
-}, "expenseAutomationJESchedulesView/fetchJeSchedulesFailure">, fetchJeSchedulesPage: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[period: TimePeriod, refreshViewInBackground?: any], {
+}, "expenseAutomationJESchedulesView/fetchJeSchedulesFailure">, fetchJeSchedulesPage: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[period: TimePeriod, refreshViewInBackground?: any, isAccrualEnabled?: any], {
     period: TimePeriod;
     refreshViewInBackground: any;
+    isAccrualEnabled: any;
 }, "expenseAutomationJESchedulesView/fetchJeSchedulesPage", never, never>, fetchJeSchedulesSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     accruedJeSchedules: JEAccruedScheduledTransactionPayload[];
     failedJeSchedules: JEScheduledTransactionPayload[];

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

@@ -111,11 +111,12 @@ const expenseAutomationJESchedulesView = (0, toolkit_1.createSlice)({
     initialState: exports.initialState,
     reducers: {
         fetchJeSchedulesPage: {
-            prepare(period, refreshViewInBackground = false) {
+            prepare(period, refreshViewInBackground = false, isAccrualEnabled = false) {
                 return {
                     payload: {
                         period,
                         refreshViewInBackground,
+                        isAccrualEnabled,
                     },
                 };
             },

package/package.json

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