@zeniai/client-epic-state 5.2.22-betaAM1 → 5.2.22-betaRD0

package/lib/reducer.d.ts

@@ -65,7 +65,6 @@ declare const reducers: import("redux").Reducer<import("redux").CombinedState<{
     entityAutoCompleteState: import("./view/autoComplete/entityAutoCompleteState").EntityAutoCompleteState;
     entityRecommendationState: import("./view/recommendation/recommendationState").EntityRecommendationState;
     expenseAutomationFluxAnalysisViewState: import("./view/expenseAutomationView/types/fluxAnalysisViewState").FluxAnalysisViewState;
-    expenseAutomationActualMatchingViewState: import("./view/expenseAutomationView/types/actualMatchingViewState").ActualMatchingViewState;
     expenseAutomationJESchedulesViewState: import("./view/expenseAutomationView/types/jeSchedulesViewState").JESchedulesViewState;
     expenseAutomationMissingReceiptsViewState: import(".").ExpenseAutomationMissingReceiptsViewState;
     expenseAutomationReconciliationViewState: import("./view/expenseAutomationView/types/reconciliationViewState").ReconciliationViewState;

package/lib/reducer.js

@@ -155,7 +155,6 @@ const creditAgentViewReducer_1 = __importStar(require("./view/creditAgentView/cr
 const dashboardReducer_1 = __importStar(require("./view/dashboard/dashboardReducer"));
 const dashboardLayoutReducer_1 = __importStar(require("./view/dashboardLayout/dashboardLayoutReducer"));
 const expenseAutomationViewReducer_1 = __importStar(require("./view/expenseAutomationView/expenseAutomationViewReducer"));
-const actualMatchingViewReducer_1 = __importStar(require("./view/expenseAutomationView/reducers/actualMatchingViewReducer"));
 const fluxAnalysisViewReducer_1 = __importStar(require("./view/expenseAutomationView/reducers/fluxAnalysisViewReducer"));
 const jeSchedulesViewReducer_1 = __importStar(require("./view/expenseAutomationView/reducers/jeSchedulesViewReducer"));
 const missingReceiptsViewReducer_1 = __importStar(require("./view/expenseAutomationView/reducers/missingReceiptsViewReducer"));
@@ -469,7 +468,6 @@ const initialViewsState = {
     entityAutoCompleteState: entityAutoCompleteReducer_1.initialState,
     entityRecommendationState: recommendationReducer_1.initialState,
     expenseAutomationFluxAnalysisViewState: fluxAnalysisViewReducer_1.initialState,
-    expenseAutomationActualMatchingViewState: actualMatchingViewReducer_1.initialState,
     expenseAutomationJESchedulesViewState: jeSchedulesViewReducer_1.initialState,
     expenseAutomationMissingReceiptsViewState: missingReceiptsViewReducer_1.initialState,
     expenseAutomationReconciliationViewState: reconciliationViewReducer_1.initialState,
@@ -764,7 +762,6 @@ const viewReducers = {
     entityAutoCompleteState: entityAutoCompleteReducer_1.default,
     entityRecommendationState: recommendationReducer_1.default,
     expenseAutomationFluxAnalysisViewState: fluxAnalysisViewReducer_1.default,
-    expenseAutomationActualMatchingViewState: actualMatchingViewReducer_1.default,
     expenseAutomationJESchedulesViewState: jeSchedulesViewReducer_1.default,
     expenseAutomationMissingReceiptsViewState: missingReceiptsViewReducer_1.default,
     expenseAutomationReconciliationViewState: reconciliationViewReducer_1.default,

package/lib/rootStateTypes.d.ts

@@ -114,7 +114,6 @@ import { CreditAgentViewState } from './view/creditAgentView/creditAgentViewStat
 import { DashboardState } from './view/dashboard/dashboardState';
 import { DashboardLayoutState } from './view/dashboardLayout/dashboardLayoutState';
 import { ExpenseAutomationViewState } from './view/expenseAutomationView/expenseAutomationViewState';
-import { ActualMatchingViewState as ExpenseAutomationActualMatchingViewState } from './view/expenseAutomationView/types/actualMatchingViewState';
 import { FluxAnalysisViewState as ExpenseAutomationFluxAnalysisViewState } from './view/expenseAutomationView/types/fluxAnalysisViewState';
 import { JESchedulesViewState as ExpenseAutomationJESchedulesViewState } from './view/expenseAutomationView/types/jeSchedulesViewState';
 import { MissingReceiptsViewState as ExpenseAutomationMissingReceiptsViewState } from './view/expenseAutomationView/types/missingReceiptsViewState';
@@ -430,7 +429,6 @@ export type ViewsState = {
     editRemiDetailViewState: EditRemiDetailViewState;
     entityAutoCompleteState: EntityAutoCompleteState;
     entityRecommendationState: EntityRecommendationState;
-    expenseAutomationActualMatchingViewState: ExpenseAutomationActualMatchingViewState;
     expenseAutomationFluxAnalysisViewState: ExpenseAutomationFluxAnalysisViewState;
     expenseAutomationJESchedulesViewState: ExpenseAutomationJESchedulesViewState;
     expenseAutomationMissingReceiptsViewState: ExpenseAutomationMissingReceiptsViewState;

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");
@@ -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));
         if (reconciliationEnabled) {
             actions.push((0, reconciliationViewReducer_1.fetchReconciliation)(selectedPeriod, undefined, cacheOverride, refreshViewInBackground));
         }
@@ -68,29 +64,16 @@ const fetchAllExpenseAutomationTabsEpic = (actions$, state$) => actions$.pipe((0
             fetchActions.push((0, fluxAnalysisViewReducer_1.fetchFluxAnalysisView)(selectedPeriod, cacheOverride, refreshViewInBackground, null));
         }
         // 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.
-        const selectedPageTab = state.expenseAutomationJESchedulesViewState.uiState.selectedPageTab;
-        if (selectedPageTab === 'actual_matching') {
-            const actualMatchingPeriodKeys = state.expenseAutomationActualMatchingViewState.accrualKeysByPeriod[monthYearPeriodId];
-            if (state.expenseAutomationActualMatchingViewState.fetchState !==
-                'In-Progress' &&
-                (!state.expenseAutomationActualMatchingViewState.hasValidState() ||
-                    actualMatchingPeriodKeys == null)) {
-                fetchActions.push((0, actualMatchingViewReducer_1.fetchActualMatchingPage)({ start: timePeriodStart, end: timePeriodEnd }, cacheOverride));
-            }
-        }
-        else {
-            const jeSchedulesPeriodTabKey = (0, jeSchedulesViewState_1.getJESchedulePeriodTabKey)(selectedPageTab, monthYearPeriodId);
-            if (state.expenseAutomationJESchedulesViewState.fetchState !==
-                'In-Progress' &&
-                (!state.expenseAutomationJESchedulesViewState.hasValidState() ||
-                    state.expenseAutomationJESchedulesViewState
-                        .jeScheduleTransactionKeysByPeriodAndTab[jeSchedulesPeriodTabKey] == null ||
-                    state.expenseAutomationJESchedulesViewState
-                        .failedJeScheduleTransactionKeysByPeriodAndTab[jeSchedulesPeriodTabKey] == null)) {
-                fetchActions.push((0, jeSchedulesViewReducer_1.fetchJeSchedulesPage)({ start: timePeriodStart, end: timePeriodEnd }, cacheOverride));
-            }
+        // fetch is still needed.
+        const jeSchedulesPeriodTabKey = (0, jeSchedulesViewState_1.getJESchedulePeriodTabKey)(state.expenseAutomationJESchedulesViewState.uiState.selectedPageTab, monthYearPeriodId);
+        if (state.expenseAutomationJESchedulesViewState.fetchState !==
+            'In-Progress' &&
+            (!state.expenseAutomationJESchedulesViewState.hasValidState() ||
+                state.expenseAutomationJESchedulesViewState
+                    .jeScheduleTransactionKeysByPeriodAndTab[jeSchedulesPeriodTabKey] == null ||
+                state.expenseAutomationJESchedulesViewState
+                    .failedJeScheduleTransactionKeysByPeriodAndTab[jeSchedulesPeriodTabKey] == null)) {
+            fetchActions.push((0, jeSchedulesViewReducer_1.fetchJeSchedulesPage)({ start: timePeriodStart, end: timePeriodEnd }, cacheOverride));
         }
         if (state.expenseAutomationReconciliationViewState.fetchState !==
             'In-Progress' &&

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/fetchJeSchedulesEpic.d.ts

@@ -1,8 +1,8 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { updateAccruedJESchedules, updateAccruedJESchedulesDetails, updateJEOneTimeAccruals, updateJESchedules, updateJESchedulesDetails } from '../../../../entity/jeSchedules/jeSchedulesReducer';
-import { RootState } from '../../../../rootStateTypes';
 import { clearAll } from '../../../../rootActions';
+import { RootState } from '../../../../rootStateTypes';
 import { ZeniAPI } from '../../../../zeniAPI';
 import { fetchJeSchedules, fetchJeSchedulesFailure, fetchJeSchedulesSuccess, initializeJeScheduleLocalData } from '../../reducers/jeSchedulesViewReducer';
 export type ActionType = ReturnType<typeof clearAll> | ReturnType<typeof fetchJeSchedules> | ReturnType<typeof fetchJeSchedulesFailure> | ReturnType<typeof fetchJeSchedulesSuccess> | ReturnType<typeof initializeJeScheduleLocalData> | ReturnType<typeof updateAccruedJESchedules> | ReturnType<typeof updateAccruedJESchedulesDetails> | ReturnType<typeof updateJEOneTimeAccruals> | ReturnType<typeof updateJESchedules> | ReturnType<typeof updateJESchedulesDetails>;

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

@@ -10,6 +10,7 @@ const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const responsePayload_1 = require("../../../../responsePayload");
 const rootActions_1 = require("../../../../rootActions");
 const zeniDayJS_1 = require("../../../../zeniDayJS");
+const jeSchedulesPayload_1 = require("../../payload/jeSchedulesPayload");
 const jeSchedulesViewReducer_1 = require("../../reducers/jeSchedulesViewReducer");
 const fetchJeSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(jeSchedulesViewReducer_1.fetchJeSchedules.match), (0, operators_1.mergeMap)((action) => {
     const state = state$.value;
@@ -17,21 +18,58 @@ const fetchJeSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, op
     const { period, refreshViewInBackground } = action.payload;
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
-    const { selectedPageTab } = state.expenseAutomationJESchedulesViewState.uiState;
+    // The prefetch names the tab it is warming; everything else means the visible one. Reading
+    // this from state unconditionally would make the prefetch fetch the visible tab's window and
+    // then overwrite its cache with the result.
+    const selectedPageTab = action.payload.selectedPageTab ??
+        state.expenseAutomationJESchedulesViewState.uiState.selectedPageTab;
     const isClosePeriodTab = selectedPageTab === 'schedules';
     const existingEndDate = (0, timePeriod_2.toAbsoluteDay)((0, zeniDayJS_1.date)((0, timePeriod_2.toString)(period.start))
         .subtract(1, 'month')
         .endOf('month')
         .format(timePeriod_1.DEFAULT_DATE_FORMAT));
+    // Existing Schedules looks at months already closed, so it stops at the previous month end;
+    // Review Schedules is closing the selected month and runs to its end.
+    const endDate = isClosePeriodTab || existingEndDate == null
+        ? (0, timePeriod_2.toString)(period.end)
+        : (0, timePeriod_2.toString)(existingEndDate);
+    // Accrued rows are windowed on the schedule's own start_date rather than a transaction date,
+    // so they get their own bounds. Review wants the month being closed; Existing wants the year
+    // up to endDate, snapped to the 1st — the same window the server used to compute for itself.
+    const accruedStartDate = isClosePeriodTab
+        ? (0, timePeriod_2.toString)(period.start)
+        : (0, zeniDayJS_1.date)(endDate)
+            .subtract(1, 'year')
+            .startOf('month')
+            .format(timePeriod_1.DEFAULT_DATE_FORMAT);
     const queryParam = {
-        start_date: (0, timePeriod_2.toString)(period.start),
-        end_date: isClosePeriodTab || existingEndDate == null
-            ? (0, timePeriod_2.toString)(period.end)
-            : (0, timePeriod_2.toString)(existingEndDate),
+        base_transaction_end_date: endDate,
+        end_date: endDate,
+        accrued_start_date: accruedStartDate,
+        accrued_end_date: endDate,
         include_accrued: true,
         ...(isClosePeriodTab
-            ? { close_period_start_date: (0, timePeriod_2.toString)(period.start) }
-            : {}),
+            ? {
+                // Both types share the close month, so one bound covers them. Existing sends none,
+                // which is what keeps the differing server defaults — a year back for prepaid, five
+                // for fixed assets.
+                base_transaction_start_date: (0, timePeriod_2.toString)(period.start),
+                close_period_start_date: (0, timePeriod_2.toString)(period.start),
+                one_time_accrual_service_month: (0, zeniDayJS_1.date)((0, timePeriod_2.toString)(period.start)).format(jeSchedulesPayload_1.SERVICE_MONTH_FORMAT),
+                // Empty means no status filter: the month being closed is reviewed whatever state
+                // each accrual is in.
+                one_time_accrual_statuses: [],
+                filter_failed_je_postings_by_date: true,
+            }
+            : {
+                one_time_accrual_service_month_start: (0, zeniDayJS_1.date)(accruedStartDate).format(jeSchedulesPayload_1.SERVICE_MONTH_FORMAT),
+                one_time_accrual_service_month_end: (0, zeniDayJS_1.date)(endDate).format(jeSchedulesPayload_1.SERVICE_MONTH_FORMAT),
+                // Existing lists what actually reached the books.
+                one_time_accrual_statuses: ['posted'],
+                // A failed posting from an earlier month still needs to surface here, so this list
+                // is deliberately not windowed.
+                filter_failed_je_postings_by_date: false,
+            }),
     };
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/expenses_automation/je_schedules?query=${encodeURIComponent(JSON.stringify(queryParam))}`)

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

@@ -5,8 +5,8 @@ import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
 import { RootState } from '../../../../reducer';
 import { clearAll } from '../../../../rootActions';
 import { ZeniAPI } from '../../../../zeniAPI';
-import { fetchJeSchedules, ignoreOneTimeAccrual, oneTimeAccrualActionFailure, oneTimeAccrualActionSuccess, promoteOneTimeAccrual, revertOneTimeAccrual } from '../../reducers/jeSchedulesViewReducer';
-export type ActionType = ReturnType<typeof clearAll> | ReturnType<typeof promoteOneTimeAccrual> | ReturnType<typeof revertOneTimeAccrual> | ReturnType<typeof ignoreOneTimeAccrual> | ReturnType<typeof oneTimeAccrualActionSuccess> | ReturnType<typeof oneTimeAccrualActionFailure> | ReturnType<typeof updateJEOneTimeAccruals> | ReturnType<typeof fetchJeSchedules> | ReturnType<typeof openSnackbar>;
+import { fetchJeSchedules, ignoreOneTimeAccrual, oneTimeAccrualActionFailure, oneTimeAccrualActionSuccess, promoteOneTimeAccrual, removeJeOneTimeAccrualLocalData, revertOneTimeAccrual } from '../../reducers/jeSchedulesViewReducer';
+export type ActionType = ReturnType<typeof clearAll> | ReturnType<typeof promoteOneTimeAccrual> | ReturnType<typeof removeJeOneTimeAccrualLocalData> | ReturnType<typeof revertOneTimeAccrual> | ReturnType<typeof ignoreOneTimeAccrual> | ReturnType<typeof oneTimeAccrualActionSuccess> | ReturnType<typeof oneTimeAccrualActionFailure> | ReturnType<typeof updateJEOneTimeAccruals> | ReturnType<typeof fetchJeSchedules> | ReturnType<typeof openSnackbar>;
 export declare const promoteOneTimeAccrualEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
 export declare const ignoreOneTimeAccrualEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
 export declare const revertOneTimeAccrualEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -9,8 +9,8 @@ const jeSchedulesReducer_1 = require("../../../../entity/jeSchedules/jeSchedules
 const jeSchedulesSelector_1 = require("../../../../entity/jeSchedules/jeSchedulesSelector");
 const snackbarReducer_1 = require("../../../../entity/snackbar/snackbarReducer");
 const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
-const rootActions_1 = require("../../../../rootActions");
 const responsePayload_1 = require("../../../../responsePayload");
+const rootActions_1 = require("../../../../rootActions");
 const jeSchedulesViewReducer_1 = require("../../reducers/jeSchedulesViewReducer");
 /**
  * The page the accrual came from, so a promoted or ignored row lands in the right bucket. Guarded
@@ -53,8 +53,11 @@ messageSection, accrualId, message, status) {
 }
 const promoteOneTimeAccrualEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(jeSchedulesViewReducer_1.promoteOneTimeAccrual.match), (0, operators_1.mergeMap)((action) => {
     const state = state$.value;
-    const { accrualId, amount, edits } = action.payload;
+    const { accrualId, amount } = action.payload;
     const accrual = (0, jeSchedulesSelector_1.getJEOneTimeAccrualByKey)((0, jeScheduleHelper_1.generateJEOneTimeAccrualKey)(accrualId), state.jeSchedulesState);
+    // The detail form writes what the user changed here as they change it. The list's inline
+    // Post has no form, so it finds nothing and every value below falls back to the stored draft.
+    const edits = state.expenseAutomationJESchedulesViewState.oneTimeAccrualLocalDataById[accrualId];
     // An edited value wins; anything untouched falls back to the stored draft, which is what the
     // list's inline Post sends.
     const debitAccountId = edits?.jeDebitAccountId ?? accrual?.jeDebitAccountId;
@@ -68,8 +71,7 @@ const promoteOneTimeAccrualEpic = (actions$, state$, zeniAPI) => actions$.pipe((
     // that never happens.
     // Untouched falls back to the stored policy, so posting without editing cannot silently
     // flip a scheduled reversal to on-bill-match.
-    const reverseNextMonth = edits?.reverseNextMonth ??
-        accrual?.reversalPolicy === 'scheduled_date';
+    const reverseNextMonth = edits?.reverseNextMonth ?? accrual?.reversalPolicy === 'scheduled_date';
     const expectedReversalDate = edits?.expectedReversalDate ?? accrual?.expectedReversalDate;
     const debitClassId = edits?.jeDebitAccountingClassId ?? accrual?.jeDebitAccountingClassId;
     const debitClassName = edits?.jeDebitAccountingClassName ??
@@ -79,7 +81,9 @@ const promoteOneTimeAccrualEpic = (actions$, state$, zeniAPI) => actions$.pipe((
         memo: edits?.memo ?? accrual?.memo ?? '',
         je_debit_account_id: debitAccountId,
         je_credit_account_id: creditAccountId,
-        ...(debitClassId != null ? { je_debit_accounting_class_id: debitClassId } : {}),
+        ...(debitClassId != null
+            ? { je_debit_accounting_class_id: debitClassId }
+            : {}),
         ...(debitClassName != null
             ? { je_debit_accounting_class_name: debitClassName }
             : {}),
@@ -99,6 +103,9 @@ const promoteOneTimeAccrualEpic = (actions$, state$, zeniAPI) => actions$.pipe((
             return (0, rxjs_1.from)([
                 (0, jeSchedulesReducer_1.updateJEOneTimeAccruals)([response.data.accrual]),
                 (0, jeSchedulesViewReducer_1.oneTimeAccrualActionSuccess)({ accrualId }),
+                // The edits are now on the server copy; leaving them would re-apply them to a
+                // later promote of the same accrual.
+                (0, jeSchedulesViewReducer_1.removeJeOneTimeAccrualLocalData)({ accrualId }),
                 (0, snackbarReducer_1.openSnackbar)({
                     messageSection: 'save_schedule',
                     messageText: 'success',

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

@@ -0,0 +1,12 @@
+import { ActionsObservable, StateObservable } from 'redux-observable';
+import { Observable } from 'rxjs';
+import { RootState } from '../../../../rootStateTypes';
+import { fetchJeSchedules, fetchJeSchedulesPage } from '../../reducers/jeSchedulesViewReducer';
+export type ActionType = 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.
+ */
+export declare const prefetchOtherJeSchedulesTabEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

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

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prefetchOtherJeSchedulesTabEpic = void 0;
+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 jeSchedulesViewReducer_1 = require("../../reducers/jeSchedulesViewReducer");
+const jeSchedulesViewState_1 = require("../../types/jeSchedulesViewState");
+/**
+ * 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.
+ */
+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 { selectedPageTab } = state.expenseAutomationJESchedulesViewState.uiState;
+    const otherPageTab = jeSchedulesViewState_1.ALL_JE_PAGE_TABS.find((pageTab) => pageTab !== selectedPageTab);
+    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;
+    }
+    // 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) {
+        return rxjs_1.EMPTY;
+    }
+    return (0, rxjs_1.of)((0, jeSchedulesViewReducer_1.fetchJeSchedules)(period, true, otherPageTab));
+}));
+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/expenseAutomationViewSelector.js

@@ -7,7 +7,6 @@ const monthEndCloseChecksSelector_1 = require("../../entity/monthEndCloseChecks/
 const tenantSelector_1 = require("../../entity/tenant/tenantSelector");
 const companyMonthEndReportViewSelector_1 = require("../companyMonthEndReportView/companyMonthEndReportViewSelector");
 const monthEndCloseChecksViewSelector_1 = require("../monthEndCloseChecksView/monthEndCloseChecksViewSelector");
-const actualMatchingViewSelector_1 = require("./selectors/actualMatchingViewSelector");
 const fluxAnalysisViewSelector_1 = require("./selectors/fluxAnalysisViewSelector");
 const getAllStepsHelper_1 = require("./selectors/getAllStepsHelper");
 const jeSchedulesViewSelector_1 = require("./selectors/jeSchedulesViewSelector");
@@ -25,7 +24,7 @@ const isPreviousStepDisabled = (selectedTransactionCategorizationTab, allSteps,
     return allSteps[stepIndex - 1].isDisabled;
 };
 function getExpenseAutomationView(state) {
-    const { expenseAutomationViewState, tenantState, expenseAutomationMissingReceiptsViewState, expenseAutomationJESchedulesViewState, expenseAutomationActualMatchingViewState, expenseAutomationTransactionsViewState, expenseAutomationReconciliationViewState, monthEndCloseChecksState, companyState, } = state;
+    const { expenseAutomationViewState, tenantState, expenseAutomationMissingReceiptsViewState, expenseAutomationJESchedulesViewState, expenseAutomationTransactionsViewState, expenseAutomationReconciliationViewState, monthEndCloseChecksState, companyState, } = state;
     const { loggedInUser, currentTenantId } = tenantState;
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
     const { currentSelectedView, selectedPeriodByTenantId } = expenseAutomationViewState;
@@ -46,7 +45,6 @@ function getExpenseAutomationView(state) {
     const reconciliation = (0, reconciliationViewSelector_1.getExpenseAutomationReconciliationView)(state);
     const expenseAutomationTransactionsView = (0, transactionCategorizationSelector_1.getExpenseAutomationTransactionView)(state);
     const jeSchedules = (0, jeSchedulesViewSelector_1.getExpenseAutomationJESchedulesView)(state);
-    const actualMatching = (0, actualMatchingViewSelector_1.getExpenseAutomationActualMatchingView)(state);
     switch (currentSelectedView) {
         case 'reconciliation':
             currentSelectedViewFetchState = reconciliation.fetchStatus;
@@ -59,23 +57,12 @@ function getExpenseAutomationView(state) {
                 fluxAnalysis.refreshStatus;
             break;
         case 'je_schedules':
-            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;
-            }
+            currentSelectedViewFetchState = {
+                fetchState: jeSchedules.fetchState,
+                error: jeSchedules.error,
+            };
+            currentSelectedViewBackgroundRefreshFetchState =
+                jeSchedules.refreshStatus;
             break;
         case 'missing_receipts':
             currentSelectedViewFetchState = {
@@ -107,7 +94,6 @@ function getExpenseAutomationView(state) {
     const fetchStateVariables = [
         expenseAutomationMissingReceiptsViewState,
         expenseAutomationJESchedulesViewState,
-        expenseAutomationActualMatchingViewState,
         expenseAutomationTransactionsView,
         expenseAutomationReconciliationViewState,
     ];
@@ -193,7 +179,6 @@ function getExpenseAutomationView(state) {
     ]);
     return {
         jeSchedules,
-        actualMatching,
         transactionView: expenseAutomationTransactionsView,
         missingReceipts,
         reconciliation,

package/lib/view/expenseAutomationView/payload/jeSchedulesPayload.d.ts

@@ -7,11 +7,51 @@ import { RootState } from '../../../rootStateTypes';
 import { ZeniDate } from '../../../zeniDayJS';
 import { JESchedulePayload, SaveJESchedulePayload } from '../../scheduleView/scheduleDetailView/scheduleDetailPayload';
 import { JEScheduleLocalData, NewOneTimeAccrualLocalData } from '../types/jeSchedulesViewState';
+/**
+ * The query this endpoint accepts. Every field names the thing it filters, because three
+ * different fields are involved and which one applies depends on the row type:
+ *
+ * - prepaid / fixed assets -> the base transaction's date
+ * - accrued schedules      -> the schedule's own start_date, i.e. its first posting date
+ * - one-time accruals      -> service_month, a 'YYYY-MM' string
+ *
+ * Omitting a bound means "use the server default", and the defaults differ per type -- which is
+ * why the Existing tab omits `base_transaction_start_date` rather than sending one value for both.
+ */
 export interface ExpenseAutomationJESchedulesQueryPayload {
+    accrued_end_date: string;
+    accrued_start_date: string;
+    base_transaction_end_date: string;
+    /**
+     * The same value as `base_transaction_end_date`, sent for the rollout window.
+     *
+     * An older server reads only `end_date` and has never heard of
+     * `base_transaction_end_date`; without this it falls back to `date.today()`, which silently
+     * widens the Existing tab and breaks any month other than the current one. Remove alongside
+     * `include_accrued`.
+     */
     end_date: string;
+    /**
+     * Sent while the backend rollout completes.
+     *
+     * The server ignores it now and always returns accrued rows. An older server does not: it reads
+     * this flag and omits `accrued_je_schedules` and `one_time_accruals` without it. Dropping it here
+     * would mean a new bundle against a not-yet-deployed (or rolled-back) backend silently loses
+     * every accrued row. Remove once the backend change is released everywhere.
+     */
     include_accrued: boolean;
-    start_date: string;
+    base_transaction_start_date?: string;
+    /**
+     * Deprecated, sent for the same rollout reason as `include_accrued`. On an older server its
+     * presence is what selects the close-period behaviour; on the current one the explicit fields
+     * above take precedence and this is only a fallback.
+     */
     close_period_start_date?: string;
+    filter_failed_je_postings_by_date?: boolean;
+    one_time_accrual_service_month?: string;
+    one_time_accrual_service_month_end?: string;
+    one_time_accrual_service_month_start?: string;
+    one_time_accrual_statuses?: string[];
 }
 interface ExpenseAutomationJESchedulesPayload {
     failed_je_postings: {
@@ -24,8 +64,21 @@ interface ExpenseAutomationJESchedulesPayload {
         scheduled_journal_entries?: ScheduledJournalEntryPayload[];
     };
     one_time_accruals?: JEOneTimeAccrualPayload[];
+    query?: {
+        accrued_end_date: string;
+        accrued_start_date: string;
+        base_transaction_end_date: string;
+        filter_failed_je_postings_by_date: boolean;
+        fixed_assets_start_date: string;
+        prepaid_start_date: string;
+        one_time_accrual_service_month?: string;
+        one_time_accrual_service_month_end?: string;
+        one_time_accrual_service_month_start?: string;
+        one_time_accrual_statuses?: string[];
+    };
 }
 export type ExpenseAutomationJESchedulesResponse = ZeniAPIResponse<ExpenseAutomationJESchedulesPayload>;
+export declare const SERVICE_MONTH_FORMAT = "YYYY-MM";
 export interface CreateOneTimeAccrualPayload {
     amount: number;
     je_credit_account_id: ID;

package/lib/view/expenseAutomationView/payload/jeSchedulesPayload.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.preparePayloadForRetryPosting = exports.prepareIgnoreSchedulePayload = exports.getExpectedReversalDate = exports.prepareCreateOneTimeAccrualPayload = void 0;
+exports.preparePayloadForRetryPosting = exports.prepareIgnoreSchedulePayload = exports.getExpectedReversalDate = exports.prepareCreateOneTimeAccrualPayload = exports.SERVICE_MONTH_FORMAT = void 0;
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const classListSelector_1 = require("../../classList/classListSelector");
 const scheduleDetailPayload_1 = require("../../scheduleView/scheduleDetailView/scheduleDetailPayload");
 const BALANCE_SHEET_CLASS_LABEL = 'balance_sheet';
-const SERVICE_MONTH_FORMAT = 'YYYY-MM';
+exports.SERVICE_MONTH_FORMAT = 'YYYY-MM';
 /**
  * The credit line is the accrued liability, which always sits on the balance sheet — the
  * recurring accrued path resolves the same class the same way (see
@@ -27,7 +27,7 @@ const prepareCreateOneTimeAccrualPayload = (state, localData) => {
     return {
         vendor_id: localData.vendorId,
         vendor_name: localData.vendorName,
-        service_month: localData.serviceMonth.format(SERVICE_MONTH_FORMAT),
+        service_month: localData.serviceMonth.format(exports.SERVICE_MONTH_FORMAT),
         amount: localData.amount,
         memo: localData.memo,
         je_debit_account_id: localData.debitAccountId,