@zeniai/client-epic-state 5.2.14 → 5.2.16

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

@@ -2,9 +2,16 @@ import { createSlice } from '@reduxjs/toolkit';
 import { geNestedAccountIDHierarchyForReport } from '../../../commonStateTypes/accountView/getNestedAccountIDHierarchyForReport';
 import { toMonthYearPeriodId, } from '../../../commonStateTypes/timePeriod';
 import { mapAccountBasePayloadToAccountBase, mapAccountMetadataPayloadToAccountMetadata, } from '../../../entity/account/accountPayload';
-import { getJEScheduleTransactionDetailKeyPayload, } from '../../../entity/jeSchedules/jeSchedulesPayload';
+import { generateJEOneTimeAccrualKey } from '../../../entity/jeSchedules/jeScheduleHelper';
+import { getJEScheduleKey, getJEScheduleTransactionDetailKeyPayload, } from '../../../entity/jeSchedules/jeSchedulesPayload';
 import { clearAll } from '../../../rootActions';
 import { mapAccountTypeRecommendationPayloadToAccountRecommendationByType, } from '../../accountMappingView/accountTypeRecommendation/accountTypeRecommendationPayload';
+import { MIN_NEW_SCHEDULE_SEARCH_LENGTH, getJESchedulePeriodTabKey, } from '../types/jeSchedulesViewState';
+function removeKeyFromEveryTabSlot(keysByPeriodAndTab, keyToRemove) {
+    for (const periodTabKey of Object.keys(keysByPeriodAndTab)) {
+        keysByPeriodAndTab[periodTabKey] = keysByPeriodAndTab[periodTabKey].filter((jeScheduleKey) => jeScheduleKey !== keyToRemove);
+    }
+}
 export const accountSettingsInitialState = {
     localData: {
         selectedPrepaidExpensesAccountIds: [],
@@ -18,6 +25,7 @@ export const accountSettingsInitialState = {
         error: undefined,
         fetchState: 'Not-Started',
     },
+    hasLoadedAccountSettings: false,
     recommendationFetchState: {
         error: undefined,
         fetchState: 'Not-Started',
@@ -36,16 +44,37 @@ export const accountSettingsInitialState = {
     accruedExpensesNestedAccountListHierarchy: [],
     accruedExpensesRecommendations: [],
 };
+export const getBaseNewScheduleLocalData = (scheduleType) => ({
+    scheduleType,
+    jeScheduleDetails: [],
+});
+export const newScheduleInitialState = {
+    fixed_assets: getBaseNewScheduleLocalData('fixed_assets'),
+    prepaid_expenses: getBaseNewScheduleLocalData('prepaid_expenses'),
+};
+export const searchTransactionsInitialState = {
+    searchResults: [],
+    fetchState: 'Not-Started',
+    error: undefined,
+};
 export const initialState = {
-    jeScheduleTransactionKeysByPeriod: {},
-    failedJeScheduleTransactionKeysByPeriod: {},
+    jeScheduleTransactionKeysByPeriodAndTab: {},
+    jeScheduleAccruedKeysByPeriodAndTab: {},
+    jeScheduleOneTimeAccrualKeysByPeriodAndTab: {},
+    failedJeScheduleTransactionKeysByPeriodAndTab: {},
     postStatusById: {},
     ignoreStatusById: {},
+    revertStatusById: {},
     jeScheduleLocalDataById: {},
+    oneTimeAccrualActionStatusById: {},
+    oneTimeAccrualFetchStatusById: {},
     uiState: {
-        searchString: '',
+        createdGroupCollapsed: false,
+        pendingGroupCollapsed: false,
         scrollPosition: { scrollTop: 0, scrollLeft: undefined },
-        selectedMainTab: 'pending_review',
+        searchString: '',
+        selectedJETypeFilter: null,
+        selectedPageTab: 'schedules',
         sortKey: 'transactionDate',
         sortOrder: 'descending',
         totalCount: 0,
@@ -56,6 +85,14 @@ export const initialState = {
         error: undefined,
     },
     accountSettings: accountSettingsInitialState,
+    newSchedule: {
+        createOneTimeAccrualStatus: { fetchState: 'Not-Started', error: undefined },
+        newScheduleState: newScheduleInitialState,
+        saveStatus: { fetchState: 'Not-Started', error: undefined },
+        searchTransactions: searchTransactionsInitialState,
+        fetchState: 'Not-Started',
+        error: undefined,
+    },
     fetchState: 'Not-Started',
     error: undefined,
     hasValidState() {
@@ -100,9 +137,12 @@ const expenseAutomationJESchedulesView = createSlice({
             },
         },
         fetchJeSchedulesSuccess(draft, action) {
-            const { jeSchedules, selectedPeriod, failedJeSchedules, refreshViewInBackground, } = action.payload;
+            const { jeSchedules, selectedPeriod, selectedPageTab, failedJeSchedules, accruedJeSchedules, oneTimeAccruals, refreshViewInBackground, } = action.payload;
+            const periodTabKey = getJESchedulePeriodTabKey(selectedPageTab, toMonthYearPeriodId(selectedPeriod));
             const jeScheduleTransactionKeys = jeSchedules.map((schedules) => getJEScheduleTransactionDetailKeyPayload(schedules.base_transaction));
             const failedJeScheduleTransactionKeys = failedJeSchedules.map((schedules) => getJEScheduleTransactionDetailKeyPayload(schedules.base_transaction));
+            const jeScheduleAccruedKeys = accruedJeSchedules.map((schedule) => getJEScheduleKey(schedule));
+            const jeScheduleOneTimeAccrualKeys = oneTimeAccruals.map((accrual) => generateJEOneTimeAccrualKey(accrual._id));
             if (refreshViewInBackground === true &&
                 draft.refreshStatus.fetchState === 'In-Progress') {
                 draft.refreshStatus = { fetchState: 'Completed', error: undefined };
@@ -111,19 +151,31 @@ const expenseAutomationJESchedulesView = createSlice({
                 draft.fetchState = 'Completed';
                 draft.error = undefined;
             }
-            draft.jeScheduleTransactionKeysByPeriod[toMonthYearPeriodId(selectedPeriod)] = jeScheduleTransactionKeys;
-            draft.failedJeScheduleTransactionKeysByPeriod[toMonthYearPeriodId(selectedPeriod)] = failedJeScheduleTransactionKeys;
+            draft.jeScheduleTransactionKeysByPeriodAndTab[periodTabKey] =
+                jeScheduleTransactionKeys;
+            draft.jeScheduleAccruedKeysByPeriodAndTab[periodTabKey] =
+                jeScheduleAccruedKeys;
+            draft.jeScheduleOneTimeAccrualKeysByPeriodAndTab[periodTabKey] =
+                jeScheduleOneTimeAccrualKeys;
+            draft.failedJeScheduleTransactionKeysByPeriodAndTab[periodTabKey] =
+                failedJeScheduleTransactionKeys;
         },
         fetchJeSchedulesFailure(draft, action) {
-            const { status, selectedPeriod } = action.payload;
+            const { status, selectedPeriod, selectedPageTab } = action.payload;
+            const periodTabKey = getJESchedulePeriodTabKey(selectedPageTab, toMonthYearPeriodId(selectedPeriod));
             if (draft.refreshStatus.fetchState === 'In-Progress') {
                 draft.refreshStatus = { fetchState: 'Error', error: status };
             }
             else {
                 draft.fetchState = 'Error';
                 draft.error = status;
+                draft.jeScheduleTransactionKeysByPeriodAndTab[periodTabKey] = [];
+                draft.jeScheduleAccruedKeysByPeriodAndTab[periodTabKey] = [];
+                draft.jeScheduleOneTimeAccrualKeysByPeriodAndTab[periodTabKey] = [];
+                // Cleared with the rest: leaving it behind kept the previous fetch's resolve rows on an
+                // otherwise empty errored tab, which reads as "these are all the schedules there are".
+                draft.failedJeScheduleTransactionKeysByPeriodAndTab[periodTabKey] = [];
             }
-            draft.jeScheduleTransactionKeysByPeriod[toMonthYearPeriodId(selectedPeriod)] = [];
         },
         retryJeSchedule(draft, action) {
             const { scheduledJournalEntryID } = action.payload;
@@ -159,11 +211,13 @@ const expenseAutomationJESchedulesView = createSlice({
             };
         },
         ignoreRecommendedJeSchedule: {
-            prepare(jeScheduleTransactionKey, scheduleType) {
+            prepare(jeScheduleTransactionKey, scheduleType, reason, note) {
                 return {
                     payload: {
                         jeScheduleTransactionKey,
                         scheduleType,
+                        reason,
+                        note,
                     },
                 };
             },
@@ -179,6 +233,41 @@ const expenseAutomationJESchedulesView = createSlice({
                 };
             },
         },
+        revertJeSchedule: {
+            // jeScheduleTransactionKey is a JEScheduleKey for an accrued schedule, which has no base
+            // transaction to derive a transaction key from. It is only ever used as an opaque row
+            // identifier here -- for the row's spinner and for dropping the row from the list -- so one
+            // action serves both shapes rather than two near-identical ones.
+            prepare(jeScheduleId, jeScheduleTransactionKey, scheduleType, reason, note) {
+                return {
+                    payload: {
+                        jeScheduleId,
+                        jeScheduleTransactionKey,
+                        scheduleType,
+                        reason,
+                        note,
+                    },
+                };
+            },
+            reducer(draft, action) {
+                draft.revertStatusById[action.payload.jeScheduleTransactionKey] = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+        },
+        revertJeScheduleSuccess(draft, action) {
+            draft.revertStatusById[action.payload.jeScheduleTransactionKey] = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+        },
+        revertJeScheduleFailure(draft, action) {
+            draft.revertStatusById[action.payload.jeScheduleTransactionKey] = {
+                fetchState: 'Error',
+                error: action.payload.status,
+            };
+        },
         ignoreRecommendedJeScheduleSuccess: {
             reducer(draft, action) {
                 const { jeScheduleTransactionKey } = action.payload;
@@ -211,17 +300,18 @@ const expenseAutomationJESchedulesView = createSlice({
             };
         },
         updateJeScheduleTransactionKeys: {
-            prepare(jeScheduleKeys, selectedPeriod) {
+            prepare(jeScheduleKeys, selectedPeriod, selectedPageTab) {
                 return {
                     payload: {
                         jeScheduleKeys: jeScheduleKeys,
                         selectedPeriod: selectedPeriod,
+                        selectedPageTab: selectedPageTab,
                     },
                 };
             },
             reducer(draft, action) {
-                const { selectedPeriod, jeScheduleKeys } = action.payload;
-                draft.jeScheduleTransactionKeysByPeriod[toMonthYearPeriodId(selectedPeriod)] = jeScheduleKeys;
+                const { selectedPeriod, selectedPageTab, jeScheduleKeys } = action.payload;
+                draft.jeScheduleTransactionKeysByPeriodAndTab[getJESchedulePeriodTabKey(selectedPageTab, toMonthYearPeriodId(selectedPeriod))] = jeScheduleKeys;
             },
         },
         removeJeScheduleTransactionKey: {
@@ -234,12 +324,20 @@ const expenseAutomationJESchedulesView = createSlice({
                 };
             },
             reducer(draft, action) {
-                const { selectedPeriod, jeScheduleKey } = action.payload;
-                const prevData = [
-                    ...(draft.jeScheduleTransactionKeysByPeriod[toMonthYearPeriodId(selectedPeriod)] ?? []),
-                ];
-                const filteredKeys = prevData.filter((jeKey) => jeKey !== jeScheduleKey);
-                draft.jeScheduleTransactionKeysByPeriod[toMonthYearPeriodId(selectedPeriod)] = filteredKeys;
+                const { jeScheduleKey } = action.payload;
+                // Dropped from every tab's slot, not just the visible one: once a schedule is ignored or
+                // resolved it must not reappear when the user switches tabs and hits a cached list.
+                removeKeyFromEveryTabSlot(draft.jeScheduleTransactionKeysByPeriodAndTab, jeScheduleKey);
+            },
+        },
+        removeJeAccruedScheduleKey: {
+            prepare(jeAccruedScheduleKey) {
+                return { payload: { jeAccruedScheduleKey } };
+            },
+            reducer(draft, action) {
+                // Accrued keys live in their own per-tab map, so removeJeScheduleTransactionKey cannot drop
+                // them -- a reverted accrued schedule stayed on the list until the next fetch.
+                removeKeyFromEveryTabSlot(draft.jeScheduleAccruedKeysByPeriodAndTab, action.payload.jeAccruedScheduleKey);
             },
         },
         removeFailedJeScheduleTransactionKey: {
@@ -252,12 +350,8 @@ const expenseAutomationJESchedulesView = createSlice({
                 };
             },
             reducer(draft, action) {
-                const { selectedPeriod, failedJeScheduleKey } = action.payload;
-                const prevData = [
-                    ...(draft.failedJeScheduleTransactionKeysByPeriod[toMonthYearPeriodId(selectedPeriod)] ?? []),
-                ];
-                const filteredKeys = prevData.filter((jeKey) => jeKey !== failedJeScheduleKey);
-                draft.failedJeScheduleTransactionKeysByPeriod[toMonthYearPeriodId(selectedPeriod)] = filteredKeys;
+                const { failedJeScheduleKey } = action.payload;
+                removeKeyFromEveryTabSlot(draft.failedJeScheduleTransactionKeysByPeriodAndTab, failedJeScheduleKey);
             },
         },
         initializeJeScheduleLocalData: {
@@ -336,6 +430,9 @@ const expenseAutomationJESchedulesView = createSlice({
                 error: status,
                 fetchState: 'Error',
             };
+            // Set on failure too: a tenant whose account list errors must still reach the page rather
+            // than sit under a skeleton forever.
+            draft.accountSettings.hasLoadedAccountSettings = true;
         },
         updateAccountSettingsListForAccountTypes(draft, action) {
             doUpdateAccountSettingsListForAccountTypes(draft.accountSettings, action.payload.accountPayload);
@@ -369,6 +466,187 @@ const expenseAutomationJESchedulesView = createSlice({
         clearJeAccountSettingsLocalData(draft) {
             draft.accountSettings.localData = accountSettingsInitialState.localData;
         },
+        initializeNewSchedule: {
+            prepare({ scheduleType, shouldResetEnteredData = true, }) {
+                return { payload: { scheduleType, shouldResetEnteredData } };
+            },
+            reducer() {
+                // Purely an epic-trigger action — the epic fans out the account/class
+                // list fetches, and clears entered data only when asked to.
+            },
+        },
+        resetNewScheduleLocalData: {
+            prepare({ scheduleType, }) {
+                return { payload: { scheduleType } };
+            },
+            reducer(draft, action) {
+                const { scheduleType } = action.payload;
+                draft.newSchedule.newScheduleState[scheduleType] =
+                    getBaseNewScheduleLocalData(scheduleType);
+            },
+        },
+        updateNewScheduleLocalData(draft, action) {
+            const { scheduleType, localData } = action.payload;
+            draft.newSchedule.newScheduleState[scheduleType] = {
+                ...draft.newSchedule.newScheduleState[scheduleType],
+                ...localData,
+            };
+        },
+        searchTransactionsForNewSchedule: {
+            prepare({ query, scheduleType, }) {
+                return { payload: { query, scheduleType } };
+            },
+            reducer(draft, action) {
+                const trimmed = action.payload.query.trim();
+                // Cleared or too-short query: no API (see epic) — reset immediately.
+                if (trimmed.length < MIN_NEW_SCHEDULE_SEARCH_LENGTH) {
+                    draft.newSchedule.searchTransactions = searchTransactionsInitialState;
+                    return;
+                }
+                draft.newSchedule.searchTransactions = {
+                    ...draft.newSchedule.searchTransactions,
+                    searchString: action.payload.query,
+                    fetchState: 'In-Progress',
+                };
+            },
+        },
+        searchTransactionsForNewScheduleSuccess(draft, action) {
+            draft.newSchedule.searchTransactions = {
+                ...draft.newSchedule.searchTransactions,
+                searchResults: action.payload.searchResults,
+                fetchState: 'Completed',
+                error: undefined,
+            };
+        },
+        searchTransactionsForNewScheduleFailure(draft, action) {
+            draft.newSchedule.searchTransactions = {
+                ...draft.newSchedule.searchTransactions,
+                fetchState: 'Error',
+                error: action.payload.status,
+            };
+        },
+        clearSearchTransactionsForNewSchedule(draft) {
+            draft.newSchedule.searchTransactions = searchTransactionsInitialState;
+        },
+        saveNewSchedule: {
+            prepare({ scheduleType, }) {
+                return { payload: { scheduleType } };
+            },
+            reducer(draft) {
+                draft.newSchedule.saveStatus = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+        },
+        saveNewScheduleSuccess(draft) {
+            draft.newSchedule.saveStatus = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+        },
+        saveNewScheduleFailure(draft, action) {
+            draft.newSchedule.saveStatus = {
+                fetchState: 'Error',
+                error: action.payload.status,
+            };
+        },
+        createOneTimeAccrual: {
+            prepare(localData) {
+                return { payload: { localData } };
+            },
+            reducer(draft) {
+                draft.newSchedule.createOneTimeAccrualStatus = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+        },
+        createOneTimeAccrualSuccess(draft) {
+            draft.newSchedule.createOneTimeAccrualStatus = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+        },
+        createOneTimeAccrualFailure(draft, action) {
+            draft.newSchedule.createOneTimeAccrualStatus = {
+                fetchState: 'Error',
+                error: action.payload.status,
+            };
+        },
+        /**
+         * Promote applies the body and posts in one step, so it carries whatever the user edited on the
+         * detail page. `edits` is absent when nothing was changed -- the epic then falls back to the
+         * stored accrual, which is what the list's inline Post does.
+         */
+        promoteOneTimeAccrual: {
+            prepare(accrualId, amount, edits) {
+                return { payload: { accrualId, amount, edits } };
+            },
+            reducer(draft, action) {
+                draft.oneTimeAccrualActionStatusById[action.payload.accrualId] = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+        },
+        revertOneTimeAccrual: {
+            prepare(accrualId, reason, note) {
+                return { payload: { accrualId, reason, note } };
+            },
+            reducer(draft, action) {
+                draft.oneTimeAccrualActionStatusById[action.payload.accrualId] = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+        },
+        ignoreOneTimeAccrual: {
+            prepare(accrualId, reason, note) {
+                return { payload: { accrualId, reason, note } };
+            },
+            reducer(draft, action) {
+                draft.oneTimeAccrualActionStatusById[action.payload.accrualId] = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+        },
+        fetchOneTimeAccrual: {
+            prepare(accrualId) {
+                return { payload: { accrualId } };
+            },
+            reducer(draft, action) {
+                draft.oneTimeAccrualFetchStatusById[action.payload.accrualId] = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+        },
+        fetchOneTimeAccrualSuccess(draft, action) {
+            draft.oneTimeAccrualFetchStatusById[action.payload.accrualId] = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+        },
+        fetchOneTimeAccrualFailure(draft, action) {
+            draft.oneTimeAccrualFetchStatusById[action.payload.accrualId] = {
+                fetchState: 'Error',
+                error: action.payload.status,
+            };
+        },
+        oneTimeAccrualActionSuccess(draft, action) {
+            draft.oneTimeAccrualActionStatusById[action.payload.accrualId] = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+        },
+        oneTimeAccrualActionFailure(draft, action) {
+            draft.oneTimeAccrualActionStatusById[action.payload.accrualId] = {
+                fetchState: 'Error',
+                error: action.payload.status,
+            };
+        },
         updateJESchedulesUIState(draft, action) {
             if (action.payload.sortKey != null) {
                 draft.uiState.sortKey = action.payload.sortKey;
@@ -382,10 +660,21 @@ const expenseAutomationJESchedulesView = createSlice({
             if (action.payload.scrollPosition != null) {
                 draft.uiState.scrollPosition = action.payload.scrollPosition;
             }
-            if (action.payload.selectedMainTab != null) {
-                draft.uiState.selectedMainTab = action.payload.selectedMainTab;
+            if (action.payload.selectedPageTab != null) {
+                draft.uiState.selectedPageTab = action.payload.selectedPageTab;
             }
         },
+        updateJEScheduleTypeFilter(draft, action) {
+            draft.uiState.selectedJETypeFilter = action.payload;
+        },
+        toggleJEPendingGroupCollapsed(draft) {
+            draft.uiState.pendingGroupCollapsed =
+                !draft.uiState.pendingGroupCollapsed;
+        },
+        toggleJECreatedGroupCollapsed(draft) {
+            draft.uiState.createdGroupCollapsed =
+                !draft.uiState.createdGroupCollapsed;
+        },
         clearExpenseAutomationJESchedulesView(draft) {
             Object.assign(draft, initialState);
         },
@@ -396,7 +685,7 @@ const expenseAutomationJESchedulesView = createSlice({
         });
     },
 });
-export const { clearExpenseAutomationJESchedulesView, clearJeAccountSettingsLocalData, clearJeScheduleLocalData, fetchAccountSettingsListForAccountTypes, fetchJeSchedules, fetchJeSchedulesFailure, fetchJeSchedulesPage, fetchJeSchedulesSuccess, fetchRecommendationForAccountSettings, ignoreRecommendedJeSchedule, ignoreRecommendedJeScheduleFailure, ignoreRecommendedJeScheduleSuccess, initializeAccountSettingsView, initializeJeScheduleLocalData, removeFailedJeScheduleTransactionKey, removeJeScheduleLocalDataById, removeJeScheduleTransactionKey, retryJeSchedule, retryJeScheduleFailure, retryJeScheduleSuccess, saveAccountSettings, saveAccountSettingsFailure, saveAccountSettingsLocalData, saveAccountSettingsSuccess, updateAccountSettingsListForAccountTypes, updateAccountSettingsListForAccountTypesFailure, updateJESchedulesUIState, updateJeScheduleLocalDataById, updateJeScheduleTransactionKeys, updateRecommendationForAccountSettings, updateRecommendationForAccountSettingsFailure, } = expenseAutomationJESchedulesView.actions;
+export const { clearExpenseAutomationJESchedulesView, clearJeAccountSettingsLocalData, clearJeScheduleLocalData, clearSearchTransactionsForNewSchedule, createOneTimeAccrual, createOneTimeAccrualFailure, createOneTimeAccrualSuccess, ignoreOneTimeAccrual, oneTimeAccrualActionFailure, oneTimeAccrualActionSuccess, promoteOneTimeAccrual, revertJeSchedule, revertJeScheduleFailure, revertJeScheduleSuccess, revertOneTimeAccrual, fetchAccountSettingsListForAccountTypes, fetchJeSchedules, fetchJeSchedulesFailure, fetchJeSchedulesPage, fetchJeSchedulesSuccess, fetchOneTimeAccrual, fetchOneTimeAccrualFailure, fetchOneTimeAccrualSuccess, fetchRecommendationForAccountSettings, ignoreRecommendedJeSchedule, ignoreRecommendedJeScheduleFailure, ignoreRecommendedJeScheduleSuccess, initializeAccountSettingsView, initializeJeScheduleLocalData, initializeNewSchedule, removeFailedJeScheduleTransactionKey, removeJeScheduleLocalDataById, removeJeAccruedScheduleKey, removeJeScheduleTransactionKey, resetNewScheduleLocalData, retryJeSchedule, retryJeScheduleFailure, retryJeScheduleSuccess, saveAccountSettings, saveAccountSettingsFailure, saveAccountSettingsLocalData, saveAccountSettingsSuccess, saveNewSchedule, saveNewScheduleFailure, saveNewScheduleSuccess, searchTransactionsForNewSchedule, searchTransactionsForNewScheduleFailure, searchTransactionsForNewScheduleSuccess, toggleJECreatedGroupCollapsed, toggleJEPendingGroupCollapsed, updateAccountSettingsListForAccountTypes, updateAccountSettingsListForAccountTypesFailure, updateJESchedulesUIState, updateJEScheduleTypeFilter, updateJeScheduleLocalDataById, updateJeScheduleTransactionKeys, updateNewScheduleLocalData, updateRecommendationForAccountSettings, updateRecommendationForAccountSettingsFailure, } = expenseAutomationJESchedulesView.actions;
 export default expenseAutomationJESchedulesView.reducer;
 const doUpdateRecommendationForAccountSettings = (draft, payload) => {
     const { prepaidExpensesRecommendations, fixedAssetsRecommendations, accruedExpensesRecommendations, } = mapAccountTypeRecommendationPayloadToAccountRecommendationByType(payload);
@@ -464,4 +753,5 @@ const doUpdateAccountSettingsListForAccountTypes = (draft, accountPayloadList) =
         error: undefined,
         fetchState: 'Completed',
     };
+    draft.hasLoadedAccountSettings = true;
 };

package/lib/esm/view/expenseAutomationView/reducers/reconciliationViewReducer.js

@@ -502,6 +502,18 @@ const expenseAutomationReconciliationView = createSlice({
             // Drop sticky parse latch on discard so the drawer shows empty upload UI.
             accountRecon.statementParseInProgress = false;
         },
+        deleteCombinedStatement: (draft, action) => {
+            const { accountId, selectedPeriod } = action.payload;
+            const accountRecon = draft.accountReconciliationRecordsBySelectedPeriod[toMonthYearPeriodId(selectedPeriod)]?.reconciliationByAccountID[accountId];
+            if (accountRecon == null) {
+                return;
+            }
+            accountRecon.statementDeleteStatus = {
+                fetchState: 'In-Progress',
+                error: undefined,
+            };
+            accountRecon.statementParseInProgress = false;
+        },
         deleteAccountStatementSuccess: (draft, action) => {
             const { accountId, selectedPeriod } = action.payload;
             const accountRecon = draft.accountReconciliationRecordsBySelectedPeriod[toMonthYearPeriodId(selectedPeriod)]?.reconciliationByAccountID[accountId];
@@ -912,7 +924,7 @@ const expenseAutomationReconciliationView = createSlice({
     },
 });
 // Export actions
-export const { fetchReconciliation, fetchReconciliationFailure, fetchReconciliationSuccess, saveReconciliationDetail, saveReconciliationDetailFailure, updateSelectedAccountId, setConnectionInProgressForAccount, setStatementParseInProgress, setStatementProcessingDismissedToBackground, updateStatementProcessingBackgroundCompletedSteps, updateReconcileTabLocalData, updateReconcileTabListSortState, updateReconcileTabListScrollState, saveReconciliationDetailSuccess, updateSelectedTab, updateBalancesLocalData, initialiseLocalDataForSelectedAccountId, clearExpenseAutomationReconciliationView, updateSelectedDrawerAccountId, updateStatementProcessingFailed, updateReviewTabSortState, initializeReconciliationReviewTabLocalData, updateReviewTabLocalData, saveReconciliationReview, updateSaveReconciliationReviewFetchStatus, updateReconListScrollPosition, updateAccountReconciliationLocalData, deleteAccountStatement, deleteAccountStatementSuccess, deleteAccountStatementFailure, excludeAccountFromReconciliation, excludeAccountFromReconciliationSuccess, excludeAccountFromReconciliationFailure, includeAccountInReconciliation, includeAccountInReconciliationSuccess, includeAccountInReconciliationFailure, uploadAccountStatement, uploadAccountStatementSuccess, uploadAccountStatementFailure, parseStatement, parseCombinedStatement, parseStatementSuccess, parseStatementFailure, reparseStatement, reparseStatementSuccess, reparseStatementFailure, resetReparseStatementStatus, updateParsedStatementData, updateStatementUpdateLocalData, submitStatementUpdate, submitCombinedStatementUpdate, submitStatementUpdateSuccess, submitStatementUpdateFailure, clearStatementDateConflict, confirmStatementMapping, confirmStatementMappingSuccess, confirmStatementMappingFailure, updateStatementUploadChosen, updateNodeCollapseState, } = expenseAutomationReconciliationView.actions;
+export const { fetchReconciliation, fetchReconciliationFailure, fetchReconciliationSuccess, saveReconciliationDetail, saveReconciliationDetailFailure, updateSelectedAccountId, setConnectionInProgressForAccount, setStatementParseInProgress, setStatementProcessingDismissedToBackground, updateStatementProcessingBackgroundCompletedSteps, updateReconcileTabLocalData, updateReconcileTabListSortState, updateReconcileTabListScrollState, saveReconciliationDetailSuccess, updateSelectedTab, updateBalancesLocalData, initialiseLocalDataForSelectedAccountId, clearExpenseAutomationReconciliationView, updateSelectedDrawerAccountId, updateStatementProcessingFailed, updateReviewTabSortState, initializeReconciliationReviewTabLocalData, updateReviewTabLocalData, saveReconciliationReview, updateSaveReconciliationReviewFetchStatus, updateReconListScrollPosition, updateAccountReconciliationLocalData, deleteAccountStatement, deleteCombinedStatement, deleteAccountStatementSuccess, deleteAccountStatementFailure, excludeAccountFromReconciliation, excludeAccountFromReconciliationSuccess, excludeAccountFromReconciliationFailure, includeAccountInReconciliation, includeAccountInReconciliationSuccess, includeAccountInReconciliationFailure, uploadAccountStatement, uploadAccountStatementSuccess, uploadAccountStatementFailure, parseStatement, parseCombinedStatement, parseStatementSuccess, parseStatementFailure, reparseStatement, reparseStatementSuccess, reparseStatementFailure, resetReparseStatementStatus, updateParsedStatementData, updateStatementUpdateLocalData, submitStatementUpdate, submitCombinedStatementUpdate, submitStatementUpdateSuccess, submitStatementUpdateFailure, clearStatementDateConflict, confirmStatementMapping, confirmStatementMappingSuccess, confirmStatementMappingFailure, updateStatementUploadChosen, updateNodeCollapseState, } = expenseAutomationReconciliationView.actions;
 // Export reducer
 export default expenseAutomationReconciliationView.reducer;
 function isEntityStatementParsing(reconciliation) {
@@ -1039,7 +1051,13 @@ function updateAllReconciliation(draft, accounts, selectedPeriod, reconciliation
         accountReconciliationRecords.reconciliationByAccountID[reconciliation.account_id] = {
             accountId: reconciliation.account_id,
             reconciliationId: reconciliation.reconciliation_id ?? undefined,
-            transactionFetchState: { fetchState: 'Not-Started', error: undefined },
+            // Full list fetch does not load transactions; keep per-account detail
+            // fetch status so an in-flight/completed review load is not reset to
+            // Not-Started (review UI treats that as loading).
+            transactionFetchState: oldRecord?.transactionFetchState ?? {
+                fetchState: 'Not-Started',
+                error: undefined,
+            },
             refreshStatus: { fetchState: 'Not-Started', error: undefined },
             statementDeleteStatus: { fetchState: 'Not-Started', error: undefined },
             statementUploadStatus: preserveStatementUploadStatusAfterFetch(oldRecord),

package/lib/esm/view/expenseAutomationView/selectorTypes/jeNewScheduleViewSelectorTypes.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/view/expenseAutomationView/selectors/jeAccountSettingsViewSelector.js

@@ -22,6 +22,7 @@ export const getJEAccountSettingsView = createSelector((state) => state.expenseA
         fixedAssetsAccountHierarchy: jeAccountMappingState.fixedAssetsNestedAccountListHierarchy,
         accruedExpensesAccountHierarchy: jeAccountMappingState.accruedExpensesNestedAccountListHierarchy,
         fetchState: fetchState.fetchState,
+        hasLoaded: jeAccountMappingState.hasLoadedAccountSettings,
         saveState,
     };
 });

package/lib/esm/view/expenseAutomationView/selectors/jeNewScheduleViewSelector.js

@@ -0,0 +1,106 @@
+import { getAccountIdsForLabels, getAccountIdsForTypes, } from '../../../entity/account/accountSelector';
+import { getScheduleTransactionById } from '../../../entity/transaction/transactionSelector';
+import { getAccountIdsForLabel, getAccountList, getNestedAccountListHierarchy, } from '../../accountList/accountListSelector';
+import { getClassList, getNestedClassListHierarchy, } from '../../classList/classListSelector';
+import { getAccountsTypesForScheduleDetails } from '../../scheduleView/scheduleDetailView/scheduleDetailLocalDataHelper';
+import { filterNestedAccountHierarchyById } from '../../scheduleView/scheduleDetailView/scheduleDetailSelector';
+import { getAccountLabelForScheduleType, getAccountsTypesForScheduleEpics, } from '../../scheduleView/scheduleListView/scheduleListHelper';
+/**
+ * The Base Transaction search is shared across schedule types (one search
+ * box, not one per prepaid_expenses/fixed_assets) — split out from
+ * getNewScheduleView so a consumer can read it without supplying an
+ * otherwise-irrelevant scheduleType.
+ */
+export const getNewScheduleSearchTransactionsView = (state) => {
+    const { searchTransactions } = state.expenseAutomationJESchedulesViewState.newSchedule;
+    const searchTransactionsResults = searchTransactions.searchResults
+        .map((key) => getScheduleTransactionById(state.transactionState, key))
+        .filter((transaction) => transaction != null);
+    return {
+        searchTransactionsResults,
+        searchTransactionsFetchState: {
+            fetchState: searchTransactions.fetchState,
+            error: searchTransactions.error,
+        },
+        searchTransactionsString: searchTransactions.searchString,
+    };
+};
+const ACCRUED_EXPENSE_ACCOUNT_LABELS = ['accrued_expenses'];
+/**
+ * Account + class options and request status shared by both accrual creation forms — the one-time
+ * accrual and the recurring accrued schedule.
+ *
+ * getAccountsTypesForScheduleDetails('accrued_expenses') deliberately includes
+ * other_current_liabilities, because the accrued liability accounts live there —
+ * so the debit list has to subtract them back out, and the credit list keeps only
+ * them. Mirrors getScheduleAccruedDetailView, which is the form this one is
+ * modelled on.
+ */
+export const getNewAccrualAccountsView = (state) => {
+    const { accountState, accountListState, classState, classListState } = state;
+    const { newSchedule } = state.expenseAutomationJESchedulesViewState;
+    const accountType = getAccountsTypesForScheduleEpics();
+    const accrualAccountIds = getAccountIdsForTypes(accountState, getAccountsTypesForScheduleDetails('accrued_expenses'));
+    const accruedCategoryIds = getAccountIdsForLabels(accountState, ACCRUED_EXPENSE_ACCOUNT_LABELS);
+    const allAccountList = getAccountList(accountState, accountListState, accountType.accountListKey);
+    const nestedAccountHierarchy = getNestedAccountListHierarchy(accountListState, accountType.accountListKey);
+    const debitAccounts = allAccountList.accounts.filter((account) => accrualAccountIds.includes(account.accountId) &&
+        !accruedCategoryIds.includes(account.accountId));
+    const creditAccounts = allAccountList.accounts.filter((account) => accruedCategoryIds.includes(account.accountId));
+    const allClassList = getClassList(classState, classListState);
+    return {
+        accountListNestedAccountHierarchy: filterNestedAccountHierarchyById(nestedAccountHierarchy, debitAccounts.map((account) => account.accountId)),
+        accruedAccountListNestedAccountHierarchy: filterNestedAccountHierarchyById(nestedAccountHierarchy, creditAccounts.map((account) => account.accountId)),
+        allAccountList: debitAccounts,
+        allAccruedExpenseList: creditAccounts,
+        allClassList: allClassList.classes,
+        classListNestedAccountHierarchy: getNestedClassListHierarchy(classListState),
+        createStatus: newSchedule.createOneTimeAccrualStatus,
+        // The recurring accrued schedule saves through the accrued detail epics that the Vendor tab
+        // already uses, so its status is that slice's updateStatus rather than anything new here.
+        accruedScheduleSaveStatus: state.scheduleAccruedDetailState.updateStatus,
+    };
+};
+export const getNewScheduleView = (state, scheduleType) => {
+    const { accountState, accountListState, classState, classListState } = state;
+    const { newSchedule } = state.expenseAutomationJESchedulesViewState;
+    const searchTransactionsView = getNewScheduleSearchTransactionsView(state);
+    const accountType = getAccountsTypesForScheduleEpics();
+    const newScheduleAccountTypes = getAccountsTypesForScheduleDetails(scheduleType);
+    const newScheduleAccountIds = getAccountIdsForTypes(accountState, newScheduleAccountTypes);
+    const allAccountList = getAccountList(accountState, accountListState, accountType.accountListKey);
+    const filteredAccounts = allAccountList.accounts.filter((account) => newScheduleAccountIds.includes(account.accountId));
+    const accountListNestedAccountHierarchy = filterNestedAccountHierarchyById(getNestedAccountListHierarchy(accountListState, accountType.accountListKey), filteredAccounts.map((account) => account.accountId));
+    const allClassList = getClassList(classState, classListState);
+    const classListNestedAccountHierarchy = getNestedClassListHierarchy(classListState);
+    let allDepreciationAccountList;
+    let allDepreciationAccountListNestedAccountHierarchy;
+    if (scheduleType === 'fixed_assets') {
+        const depreciationCategoryIds = getAccountIdsForTypes(accountState, [
+            'fixed_assets',
+            'other_assets',
+        ]);
+        const accountLabel = getAccountLabelForScheduleType('fixed_assets');
+        const fixedAssetLabelAccountIds = accountLabel != null
+            ? getAccountIdsForLabel(accountListState, accountType.accountListKey, accountLabel)
+            : [];
+        allDepreciationAccountList = allAccountList.accounts.filter((account) => depreciationCategoryIds.includes(account.accountId) &&
+            !fixedAssetLabelAccountIds.includes(account.accountId));
+        allDepreciationAccountListNestedAccountHierarchy =
+            filterNestedAccountHierarchyById(getNestedAccountListHierarchy(accountListState, accountType.accountListKey), allDepreciationAccountList.map((account) => account.accountId));
+    }
+    return {
+        scheduleType,
+        accountListNestedAccountHierarchy,
+        allAccountList: filteredAccounts,
+        allClassList: allClassList.classes,
+        allDepreciationAccountList,
+        allDepreciationAccountListNestedAccountHierarchy,
+        classListNestedAccountHierarchy,
+        newScheduleLocalData: newSchedule.newScheduleState[scheduleType],
+        saveStatus: newSchedule.saveStatus,
+        ...searchTransactionsView,
+        fetchState: newSchedule.fetchState,
+        error: newSchedule.error,
+    };
+};