@zeniai/client-epic-state 5.1.85-betaRD3 → 5.1.86

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

@@ -2,16 +2,9 @@ import { createSlice } from '@reduxjs/toolkit';
 import { geNestedAccountIDHierarchyForReport } from '../../../commonStateTypes/accountView/getNestedAccountIDHierarchyForReport';
 import { toMonthYearPeriodId, } from '../../../commonStateTypes/timePeriod';
 import { mapAccountBasePayloadToAccountBase, mapAccountMetadataPayloadToAccountMetadata, } from '../../../entity/account/accountPayload';
-import { generateJEOneTimeAccrualKey } from '../../../entity/jeSchedules/jeScheduleHelper';
-import { getJEScheduleKey, getJEScheduleTransactionDetailKeyPayload, } from '../../../entity/jeSchedules/jeSchedulesPayload';
+import { 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: [],
@@ -43,34 +36,16 @@ 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 = {
-    jeScheduleTransactionKeysByPeriodAndTab: {},
-    jeScheduleAccruedKeysByPeriodAndTab: {},
-    jeScheduleOneTimeAccrualKeysByPeriodAndTab: {},
-    failedJeScheduleTransactionKeysByPeriodAndTab: {},
+    jeScheduleTransactionKeysByPeriod: {},
+    failedJeScheduleTransactionKeysByPeriod: {},
     postStatusById: {},
     ignoreStatusById: {},
     jeScheduleLocalDataById: {},
     uiState: {
-        createdGroupCollapsed: false,
-        pendingGroupCollapsed: false,
-        scrollPosition: { scrollTop: 0, scrollLeft: undefined },
         searchString: '',
-        selectedJETypeFilter: null,
-        selectedPageTab: 'schedules',
+        scrollPosition: { scrollTop: 0, scrollLeft: undefined },
+        selectedMainTab: 'pending_review',
         sortKey: 'transactionDate',
         sortOrder: 'descending',
         totalCount: 0,
@@ -81,13 +56,6 @@ export const initialState = {
         error: undefined,
     },
     accountSettings: accountSettingsInitialState,
-    newSchedule: {
-        newScheduleState: newScheduleInitialState,
-        saveStatus: { fetchState: 'Not-Started', error: undefined },
-        searchTransactions: searchTransactionsInitialState,
-        fetchState: 'Not-Started',
-        error: undefined,
-    },
     fetchState: 'Not-Started',
     error: undefined,
     hasValidState() {
@@ -132,12 +100,9 @@ const expenseAutomationJESchedulesView = createSlice({
             },
         },
         fetchJeSchedulesSuccess(draft, action) {
-            const { jeSchedules, selectedPeriod, selectedPageTab, failedJeSchedules, accruedJeSchedules, oneTimeAccruals, refreshViewInBackground, } = action.payload;
-            const periodTabKey = getJESchedulePeriodTabKey(selectedPageTab, toMonthYearPeriodId(selectedPeriod));
+            const { jeSchedules, selectedPeriod, failedJeSchedules, refreshViewInBackground, } = action.payload;
             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 };
@@ -146,28 +111,19 @@ const expenseAutomationJESchedulesView = createSlice({
                 draft.fetchState = 'Completed';
                 draft.error = undefined;
             }
-            draft.jeScheduleTransactionKeysByPeriodAndTab[periodTabKey] =
-                jeScheduleTransactionKeys;
-            draft.jeScheduleAccruedKeysByPeriodAndTab[periodTabKey] =
-                jeScheduleAccruedKeys;
-            draft.jeScheduleOneTimeAccrualKeysByPeriodAndTab[periodTabKey] =
-                jeScheduleOneTimeAccrualKeys;
-            draft.failedJeScheduleTransactionKeysByPeriodAndTab[periodTabKey] =
-                failedJeScheduleTransactionKeys;
+            draft.jeScheduleTransactionKeysByPeriod[toMonthYearPeriodId(selectedPeriod)] = jeScheduleTransactionKeys;
+            draft.failedJeScheduleTransactionKeysByPeriod[toMonthYearPeriodId(selectedPeriod)] = failedJeScheduleTransactionKeys;
         },
         fetchJeSchedulesFailure(draft, action) {
-            const { status, selectedPeriod, selectedPageTab } = action.payload;
-            const periodTabKey = getJESchedulePeriodTabKey(selectedPageTab, toMonthYearPeriodId(selectedPeriod));
+            const { status, selectedPeriod } = action.payload;
             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] = [];
             }
+            draft.jeScheduleTransactionKeysByPeriod[toMonthYearPeriodId(selectedPeriod)] = [];
         },
         retryJeSchedule(draft, action) {
             const { scheduledJournalEntryID } = action.payload;
@@ -255,18 +211,17 @@ const expenseAutomationJESchedulesView = createSlice({
             };
         },
         updateJeScheduleTransactionKeys: {
-            prepare(jeScheduleKeys, selectedPeriod, selectedPageTab) {
+            prepare(jeScheduleKeys, selectedPeriod) {
                 return {
                     payload: {
                         jeScheduleKeys: jeScheduleKeys,
                         selectedPeriod: selectedPeriod,
-                        selectedPageTab: selectedPageTab,
                     },
                 };
             },
             reducer(draft, action) {
-                const { selectedPeriod, selectedPageTab, jeScheduleKeys } = action.payload;
-                draft.jeScheduleTransactionKeysByPeriodAndTab[getJESchedulePeriodTabKey(selectedPageTab, toMonthYearPeriodId(selectedPeriod))] = jeScheduleKeys;
+                const { selectedPeriod, jeScheduleKeys } = action.payload;
+                draft.jeScheduleTransactionKeysByPeriod[toMonthYearPeriodId(selectedPeriod)] = jeScheduleKeys;
             },
         },
         removeJeScheduleTransactionKey: {
@@ -279,10 +234,12 @@ const expenseAutomationJESchedulesView = createSlice({
                 };
             },
             reducer(draft, action) {
-                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);
+                const { selectedPeriod, jeScheduleKey } = action.payload;
+                const prevData = [
+                    ...(draft.jeScheduleTransactionKeysByPeriod[toMonthYearPeriodId(selectedPeriod)] ?? []),
+                ];
+                const filteredKeys = prevData.filter((jeKey) => jeKey !== jeScheduleKey);
+                draft.jeScheduleTransactionKeysByPeriod[toMonthYearPeriodId(selectedPeriod)] = filteredKeys;
             },
         },
         removeFailedJeScheduleTransactionKey: {
@@ -295,8 +252,12 @@ const expenseAutomationJESchedulesView = createSlice({
                 };
             },
             reducer(draft, action) {
-                const { failedJeScheduleKey } = action.payload;
-                removeKeyFromEveryTabSlot(draft.failedJeScheduleTransactionKeysByPeriodAndTab, failedJeScheduleKey);
+                const { selectedPeriod, failedJeScheduleKey } = action.payload;
+                const prevData = [
+                    ...(draft.failedJeScheduleTransactionKeysByPeriod[toMonthYearPeriodId(selectedPeriod)] ?? []),
+                ];
+                const filteredKeys = prevData.filter((jeKey) => jeKey !== failedJeScheduleKey);
+                draft.failedJeScheduleTransactionKeysByPeriod[toMonthYearPeriodId(selectedPeriod)] = filteredKeys;
             },
         },
         initializeJeScheduleLocalData: {
@@ -408,91 +369,6 @@ const expenseAutomationJESchedulesView = createSlice({
         clearJeAccountSettingsLocalData(draft) {
             draft.accountSettings.localData = accountSettingsInitialState.localData;
         },
-        initializeNewSchedule: {
-            prepare({ scheduleType, }) {
-                return { payload: { scheduleType } };
-            },
-            reducer() {
-                // Purely an epic-trigger action — the epic fans out the account/class
-                // list fetches plus resetNewScheduleLocalData.
-            },
-        },
-        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,
-            };
-        },
         updateJESchedulesUIState(draft, action) {
             if (action.payload.sortKey != null) {
                 draft.uiState.sortKey = action.payload.sortKey;
@@ -506,21 +382,10 @@ const expenseAutomationJESchedulesView = createSlice({
             if (action.payload.scrollPosition != null) {
                 draft.uiState.scrollPosition = action.payload.scrollPosition;
             }
-            if (action.payload.selectedPageTab != null) {
-                draft.uiState.selectedPageTab = action.payload.selectedPageTab;
+            if (action.payload.selectedMainTab != null) {
+                draft.uiState.selectedMainTab = action.payload.selectedMainTab;
             }
         },
-        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);
         },
@@ -531,7 +396,7 @@ const expenseAutomationJESchedulesView = createSlice({
         });
     },
 });
-export const { clearExpenseAutomationJESchedulesView, clearJeAccountSettingsLocalData, clearJeScheduleLocalData, clearSearchTransactionsForNewSchedule, fetchAccountSettingsListForAccountTypes, fetchJeSchedules, fetchJeSchedulesFailure, fetchJeSchedulesPage, fetchJeSchedulesSuccess, fetchRecommendationForAccountSettings, ignoreRecommendedJeSchedule, ignoreRecommendedJeScheduleFailure, ignoreRecommendedJeScheduleSuccess, initializeAccountSettingsView, initializeJeScheduleLocalData, initializeNewSchedule, removeFailedJeScheduleTransactionKey, removeJeScheduleLocalDataById, 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 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 default expenseAutomationJESchedulesView.reducer;
 const doUpdateRecommendationForAccountSettings = (draft, payload) => {
     const { prepaidExpensesRecommendations, fixedAssetsRecommendations, accruedExpensesRecommendations, } = mapAccountTypeRecommendationPayloadToAccountRecommendationByType(payload);

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

@@ -3,8 +3,7 @@ import orderBy from 'lodash/orderBy';
 import { reduceAnyFetchState } from '../../../commonStateTypes/reduceFetchState';
 import { LAST_SCHEDULE_DAY_OF_MONTH, toMonthYearPeriodId, } from '../../../commonStateTypes/timePeriod';
 import { getAccountIdsForTypes } from '../../../entity/account/accountSelector';
-import { getJEAccruedScheduleByJEScheduleKey, getJEOneTimeAccrualByKey, getJEScheduledTransactionByJEScheduleTransactionKey, } from '../../../entity/jeSchedules/jeSchedulesSelector';
-import { ALL_SCHEDULES_TYPES, } from '../../../entity/jeSchedules/jeSchedulesTypes';
+import { getJEScheduledTransactionByJEScheduleTransactionKey, } from '../../../entity/jeSchedules/jeSchedulesSelector';
 import { getCurrentTenant } from '../../../entity/tenant/tenantSelector';
 import { getAccountIdsForLabel, getAccountList, getNestedAccountListHierarchy, getUncategorizedAccounts, } from '../../accountList/accountListSelector';
 import { getClassList, getNestedClassListHierarchy, } from '../../classList/classListSelector';
@@ -12,118 +11,8 @@ import { getAccountsTypesForScheduleDetails } from '../../scheduleView/scheduleD
 import { filterNestedAccountHierarchyById } from '../../scheduleView/scheduleDetailView/scheduleDetailSelector';
 import { getAccountLabelForScheduleType, getAccountsTypesForScheduleList, } from '../../scheduleView/scheduleListView/scheduleListHelper';
 import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes';
-import { ALL_JE_PAGE_TABS, getJESchedulePeriodTabKey, } from '../types/jeSchedulesViewState';
 import { getJEAccountSettingsView } from './jeAccountSettingsViewSelector';
-import { getNewScheduleView } from './jeNewScheduleViewSelector';
-// Matches the AI-automation user addresses webc's schedule list row already
-// checks (JEScheduleReadOnlyListRow/JEScheduleDraftListRow "Method" column,
-// strings.ts aiBotEmail/botEmail) to determine whether a schedule was
-// created by the AI accountant vs. a human.
-const AI_BOT_EMAIL = 'ai@zeni.ai';
-const BOT_EMAIL = 'bot@zeni.ai';
-// A one-time accrual has no jeScheduleType of its own — it is not a JE schedule. It is still an
-// accrued expense, so it counts and filters under that type on the page's type tabs.
-const ONE_TIME_ACCRUAL_SCHEDULE_TYPE = 'accrued_expenses';
-// Which of the two list buckets an accrual belongs in. `draft` still needs a human to post it and
-// `posting_blocked` needs attention, so both are review work; everything else is already on the
-// books or in a transient claim.
-const ONE_TIME_ACCRUAL_REVIEW_STATUSES = [
-    'draft',
-    'posting_blocked',
-];
-export function getJEScheduleRowType(schedule) {
-    return isOneTimeAccrualRow(schedule)
-        ? ONE_TIME_ACCRUAL_SCHEDULE_TYPE
-        : schedule.jeScheduleType;
-}
-export function isPendingReviewRow(schedule) {
-    return isOneTimeAccrualRow(schedule)
-        ? ONE_TIME_ACCRUAL_REVIEW_STATUSES.includes(schedule.accrualStatus)
-        : schedule.status.code === 'draft';
-}
-// Belongs on the Existing Schedules tab. For an accrual the endpoint has already filtered to
-// posted, so this only has to agree with that rather than re-derive it.
-export function isExistingTabRow(schedule) {
-    return isOneTimeAccrualRow(schedule)
-        ? schedule.accrualStatus === 'posted'
-        : schedule.status.code === 'ongoing';
-}
-// Exported (rather than kept as a closure inside the selector) so it can be
-// unit-tested directly — confidenceScore is a separate, more narrowly
-// populated field that can be null on a schedule the bot user created,
-// which previously caused these schedules to display as "AI Accountant" in
-// the list but count under "Manual" in the KPI summary.
-export const isAiAccountantSchedule = (schedule) => {
-    // A one-time accrual records who made it as `origin`, which is authoritative — no email
-    // sniffing needed, and the JE bot is often absent from the user entity entirely.
-    if (isOneTimeAccrualRow(schedule)) {
-        return schedule.origin === 'agent';
-    }
-    return (schedule.createdByUser?.email === AI_BOT_EMAIL ||
-        schedule.createdByUser?.email === BOT_EMAIL);
-};
-// Accrued schedules are structurally distinct — no baseTransaction, carrying recurringAmount and
-// memo in its place — so anything reading baseTransaction has to branch on this first.
-//
-// Discriminates on jeAccruedScheduleKey, which only JEAccruedSchedule carries. jeScheduleType
-// cannot be used: it is a data field present on BOTH row shapes, so an accrued-typed row that
-// arrived through the prepaid/fixed DTO (failed_je_postings, legacy fetches) would be
-// misclassified and then crash on recurringAmount / jeAccruedScheduleKey.
-export function isAccruedScheduleRow(schedule) {
-    return 'jeAccruedScheduleKey' in schedule;
-}
-// Same structural approach as isAccruedScheduleRow, and for the same reason: jeOneTimeAccrualKey
-// exists only on this shape. Note the two guards are NOT interchangeable — a one-time accrual is
-// not an accrued *schedule*, and routing it into the accrued branch would read recurringAmount,
-// render postedCount/lifecycleTotal as a lifecycle and startDate–endDate as a period, none of
-// which it has.
-export function isOneTimeAccrualRow(schedule) {
-    return 'jeOneTimeAccrualKey' in schedule;
-}
-function getScheduleAmount(schedule) {
-    if (isOneTimeAccrualRow(schedule)) {
-        return schedule.estimatedAmount.amount;
-    }
-    if (isAccruedScheduleRow(schedule)) {
-        return schedule.recurringAmount.amount;
-    }
-    return schedule.baseTransaction.amount.amount;
-}
-// A one-time accrual shares almost no sortable field with a schedule, so it gets its own accessor
-// rather than a guard on each of the dozen cases below. Keys with no meaning for a single-month
-// accrual -- amortizationPeriod, remainingMonths, runningBalance, jePostingDate, scheduleCategory --
-// deliberately fall through to undefined, which sorts them together at one end.
-function getOneTimeAccrualSortValue(accrual, sortKey) {
-    switch (sortKey) {
-        case 'vendor':
-            return accrual.vendorName.toLowerCase();
-        case 'category':
-            return accrual.jeDebitAccountName?.toLowerCase();
-        case 'class':
-            return accrual.jeDebitAccountingClassName?.toLowerCase();
-        case 'depCategory':
-            return accrual.jeCreditAccountName?.toLowerCase();
-        case 'type':
-            return ONE_TIME_ACCRUAL_SCHEDULE_TYPE;
-        case 'totalAmount':
-            return accrual.estimatedAmount.amount;
-        case 'transactionDate':
-            return accrual.postingDate?.valueOf();
-        case 'memo':
-            return accrual.memo.toLowerCase();
-        case 'startMonth':
-            return accrual.serviceMonth;
-        default:
-            return undefined;
-    }
-}
 function getJEScheduleSortAccessor(sortKey) {
-    const scheduleAccessor = getScheduleRowSortAccessor(sortKey);
-    return (schedule) => isOneTimeAccrualRow(schedule)
-        ? getOneTimeAccrualSortValue(schedule, sortKey)
-        : scheduleAccessor(schedule);
-}
-function getScheduleRowSortAccessor(sortKey) {
     switch (sortKey) {
         case 'vendor':
             return (s) => s.vendor.name?.toLowerCase();
@@ -134,9 +23,7 @@ function getScheduleRowSortAccessor(sortKey) {
         case 'depCategory':
             return (s) => s.jeCredit.account?.accountName?.toLowerCase();
         case 'scheduleCategory':
-            return (s) => isAccruedScheduleRow(s)
-                ? undefined
-                : s.baseTransaction.account?.accountName?.toLowerCase();
+            return (s) => s.baseTransaction.account?.accountName?.toLowerCase();
         case 'startMonth':
             return (s) => s.startDate?.valueOf();
         case 'type':
@@ -164,13 +51,11 @@ function getScheduleRowSortAccessor(sortKey) {
                 return s.balanceAsOfToday?.amount ?? null;
             };
         case 'totalAmount':
-            return (s) => getScheduleAmount(s);
+            return (s) => s.baseTransaction.amount.amount;
         case 'transactionDate':
-            return (s) => s.createTime?.valueOf();
+            return (s) => s.baseTransaction.date.valueOf();
         case 'memo':
-            return (s) => isAccruedScheduleRow(s)
-                ? s.memo.toLowerCase()
-                : s.baseTransaction.memo?.toLowerCase();
+            return (s) => s.baseTransaction.memo?.toLowerCase();
         default:
             return (s) => s.startDate?.valueOf();
     }
@@ -182,15 +67,9 @@ function sortJEScheduledTransactions(transactions, sortKey, sortOrder) {
 export function getExpenseAutomationJESchedulesView(state) {
     const jeScheduledTransaction = [];
     const failedJeScheduledTransaction = [];
-    const accruedSchedules = [];
-    const oneTimeAccruals = [];
     const { accountState, accountListState, classState, classListState, expenseAutomationJESchedulesViewState, expenseAutomationViewState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
-    const { jeScheduleTransactionKeysByPeriodAndTab, jeScheduleAccruedKeysByPeriodAndTab, jeScheduleOneTimeAccrualKeysByPeriodAndTab, failedJeScheduleTransactionKeysByPeriodAndTab, jeScheduleLocalDataById, postStatusById, ignoreStatusById, uiState, error, fetchState, refreshStatus, newSchedule, } = expenseAutomationJESchedulesViewState;
+    const { jeScheduleTransactionKeysByPeriod, failedJeScheduleTransactionKeysByPeriod, jeScheduleLocalDataById, postStatusById, ignoreStatusById, uiState, error, fetchState, refreshStatus, } = expenseAutomationJESchedulesViewState;
     const accountSettingsView = getJEAccountSettingsView(state);
-    const newScheduleView = newSchedule.selectedDetailScheduleType === 'fixed_assets' ||
-        newSchedule.selectedDetailScheduleType === 'prepaid_expenses'
-        ? getNewScheduleView(state, newSchedule.selectedDetailScheduleType)
-        : undefined;
     const currentTenant = getCurrentTenant(state);
     const { selectedPeriodByTenantId } = expenseAutomationViewState;
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
@@ -218,48 +97,27 @@ export function getExpenseAutomationJESchedulesView(state) {
     const filteredDepAccountListNestedAccountHierarchy = filterNestedAccountHierarchyById(depAccountListNestedAccountHierarchy, filteredDepAccounts.map((account) => account.accountId));
     const classListNestedAccountHierarchy = getNestedClassListHierarchy(classListState);
     const monthYearPeriodId = selectedPeriod != null ? toMonthYearPeriodId(selectedPeriod) : null;
-    const selectedPeriodTabKey = monthYearPeriodId != null
-        ? getJESchedulePeriodTabKey(uiState.selectedPageTab, monthYearPeriodId)
+    const jeScheduleTransactionKeysForSelectedPeriod = monthYearPeriodId != null
+        ? jeScheduleTransactionKeysByPeriod[monthYearPeriodId]
         : null;
-    const jeScheduleTransactionKeysForSelectedTab = selectedPeriodTabKey != null
-        ? jeScheduleTransactionKeysByPeriodAndTab[selectedPeriodTabKey]
-        : undefined;
-    const failedJeScheduleTransactionKeysForSelectedTab = selectedPeriodTabKey != null
-        ? failedJeScheduleTransactionKeysByPeriodAndTab[selectedPeriodTabKey]
-        : undefined;
-    // Distinguishes "this tab has never been fetched for this period" from "fetched and genuinely
-    // empty". Without it the page cannot tell a first visit from a real empty state, and renders an
-    // empty table where it should render a skeleton.
-    const hasLoadedForSelectedTab = jeScheduleTransactionKeysForSelectedTab != null;
-    const jeScheduleTransactionKeys = jeScheduleTransactionKeysForSelectedTab ?? [];
-    const failedJeScheduleTransactionKeys = failedJeScheduleTransactionKeysForSelectedTab ?? [];
-    const jeScheduleAccruedKeys = (selectedPeriodTabKey != null
-        ? jeScheduleAccruedKeysByPeriodAndTab[selectedPeriodTabKey]
-        : undefined) ?? [];
-    const jeScheduleOneTimeAccrualKeys = (selectedPeriodTabKey != null
-        ? jeScheduleOneTimeAccrualKeysByPeriodAndTab[selectedPeriodTabKey]
-        : undefined) ?? [];
-    jeScheduleOneTimeAccrualKeys.forEach((jeOneTimeAccrualKey) => {
-        const accrual = getJEOneTimeAccrualByKey(jeOneTimeAccrualKey, state.jeSchedulesState);
-        if (accrual != null) {
-            oneTimeAccruals.push(accrual);
-        }
-    });
+    const failedJeScheduleTransactionKeysForSelectedPeriod = monthYearPeriodId != null
+        ? failedJeScheduleTransactionKeysByPeriod[monthYearPeriodId]
+        : null;
+    const jeScheduleTransactionKeys = jeScheduleTransactionKeysForSelectedPeriod ?? [];
+    const failedJeScheduleTransactionKeys = failedJeScheduleTransactionKeysForSelectedPeriod ?? [];
     jeScheduleTransactionKeys.forEach((jeScheduleKey) => {
         const jeScheduleDetails = getJEScheduledTransactionByJEScheduleTransactionKey(jeScheduleKey, state);
         jeScheduledTransaction.push(jeScheduleDetails);
     });
-    jeScheduleAccruedKeys.forEach((jeAccruedScheduleKey) => {
-        const accruedScheduleDetails = getJEAccruedScheduleByJEScheduleKey(jeAccruedScheduleKey, state);
-        if (accruedScheduleDetails != null) {
-            accruedSchedules.push(accruedScheduleDetails);
-        }
-    });
     failedJeScheduleTransactionKeys.forEach((jeScheduleKey) => {
         const jeScheduleDetails = getJEScheduledTransactionByJEScheduleTransactionKey(jeScheduleKey, state);
         failedJeScheduledTransaction.push(jeScheduleDetails);
     });
-    const { sortKey, sortOrder, selectedJETypeFilter } = uiState;
+    const { sortKey, sortOrder } = uiState;
+    const draftSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft'), sortKey, sortOrder);
+    const ongoingSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'ongoing'), sortKey, sortOrder);
+    const completedSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'completed' ||
+        schedule.status.code === 'marked_as_completed'), sortKey, sortOrder);
     const unsortedResolveSchedules = [];
     failedJeScheduledTransaction.forEach((schedule) => {
         schedule.scheduledJournalEntry.forEach((journalEntry) => {
@@ -271,87 +129,10 @@ export function getExpenseAutomationJESchedulesView(state) {
     });
     const resolveSchedules = sortJEScheduledTransactions(unsortedResolveSchedules, sortKey, sortOrder);
     const validResolveForPending = unsortedResolveSchedules.filter((r) => jeScheduleLocalDataById[r.scheduledJournalEntry.scheduledJournalEntryID] != null);
-    const matchesTypeFilter = (schedule) => selectedJETypeFilter == null ||
-        getJEScheduleRowType(schedule) === selectedJETypeFilter;
-    const isCreatedStatus = (schedule) => {
-        // An accrual is "created" once it is not review work: posted, reversing, reversed, or in a
-        // transient posting claim.
-        if (isOneTimeAccrualRow(schedule)) {
-            return !isPendingReviewRow(schedule);
-        }
-        return (schedule.status.code === 'ongoing' ||
-            schedule.status.code === 'completed' ||
-            schedule.status.code === 'marked_as_completed');
-    };
-    const allScheduleRows = [
-        ...jeScheduledTransaction,
-        ...accruedSchedules,
-        ...oneTimeAccruals,
-    ];
     const pendingReviewSchedules = sortJEScheduledTransactions([
-        ...allScheduleRows.filter((schedule) => isPendingReviewRow(schedule) && matchesTypeFilter(schedule)),
+        ...jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft'),
         ...validResolveForPending,
     ], sortKey, sortOrder);
-    const createdSchedules = sortJEScheduledTransactions(allScheduleRows.filter((schedule) => isCreatedStatus(schedule) && matchesTypeFilter(schedule)), sortKey, sortOrder);
-    // KPI summary — derived from unfiltered schedules so counts are always accurate
-    const allSchedules = allScheduleRows;
-    const sumAmount = (schedules) => schedules.reduce((total, schedule) => total + (getScheduleAmount(schedule) ?? 0), 0);
-    const pendingReviewTotal = sumAmount(pendingReviewSchedules);
-    const createdTotal = sumAmount(createdSchedules);
-    const aiAccountantSchedules = allSchedules.filter(isAiAccountantSchedule);
-    const manualSchedules = allSchedules.filter((schedule) => !isAiAccountantSchedule(schedule));
-    const pendingUnfiltered = allSchedules.filter((schedule) => isPendingReviewRow(schedule));
-    const kpiSummary = {
-        aiAccountant: {
-            count: aiAccountantSchedules.length,
-            amount: sumAmount(aiAccountantSchedules),
-        },
-        manual: {
-            count: manualSchedules.length,
-            amount: sumAmount(manualSchedules),
-        },
-        needsReview: {
-            count: pendingUnfiltered.length,
-            amount: sumAmount(pendingUnfiltered),
-        },
-        total: {
-            count: allSchedules.length,
-            amount: sumAmount(allSchedules),
-        },
-    };
-    // Each tab's badge counts from that tab's own bucket. A tab that has not been fetched yet
-    // reports undefined rather than 0, so the UI can hide the badge instead of asserting "none".
-    const scheduleCountsByTab = {};
-    ALL_JE_PAGE_TABS.forEach((pageTab) => {
-        const periodTabKey = monthYearPeriodId != null
-            ? getJESchedulePeriodTabKey(pageTab, monthYearPeriodId)
-            : null;
-        const transactionKeys = periodTabKey != null
-            ? jeScheduleTransactionKeysByPeriodAndTab[periodTabKey]
-            : undefined;
-        if (transactionKeys == null) {
-            return;
-        }
-        const accruedKeys = (periodTabKey != null
-            ? jeScheduleAccruedKeysByPeriodAndTab[periodTabKey]
-            : undefined) ?? [];
-        const oneTimeAccrualKeys = (periodTabKey != null
-            ? jeScheduleOneTimeAccrualKeysByPeriodAndTab[periodTabKey]
-            : undefined) ?? [];
-        const rowsForTab = [
-            ...transactionKeys.map((transactionKey) => getJEScheduledTransactionByJEScheduleTransactionKey(transactionKey, state)),
-            ...accruedKeys
-                .map((accruedKey) => getJEAccruedScheduleByJEScheduleKey(accruedKey, state))
-                .filter((accruedRow) => accruedRow != null),
-            ...oneTimeAccrualKeys
-                .map((accrualKey) => getJEOneTimeAccrualByKey(accrualKey, state.jeSchedulesState))
-                .filter((accrualRow) => accrualRow != null),
-        ];
-        scheduleCountsByTab[pageTab] =
-            pageTab === 'existing_schedules'
-                ? rowsForTab.filter((row) => isExistingTabRow(row)).length
-                : rowsForTab.filter((row) => isPendingReviewRow(row) || isCreatedStatus(row)).length;
-    });
     const allSteps = monthYearPeriodId != null
         ? getAllSteps(monthEndCloseChecksState, monthYearPeriodId, currentTenant.tenantId)
         : [];
@@ -364,20 +145,6 @@ export function getExpenseAutomationJESchedulesView(state) {
         { fetchState, error },
         monthEndFetchState,
     ]);
-    const countByType = (schedules) => {
-        const counts = ALL_SCHEDULES_TYPES.reduce((acc, type) => ({ ...acc, [type]: 0 }), {});
-        schedules.forEach((schedule) => {
-            const scheduleType = getJEScheduleRowType(schedule);
-            if (scheduleType != null) {
-                counts[scheduleType] += 1;
-            }
-        });
-        return counts;
-    };
-    const jeScheduleTypeCounts = {
-        active: countByType(allSchedules.filter((schedule) => isPendingReviewRow(schedule) || isCreatedStatus(schedule))),
-        ongoing: countByType(allSchedules.filter((schedule) => isExistingTabRow(schedule))),
-    };
     return {
         uncategorizedAccounts,
         allDepreciationAccountList: filteredDepAccounts,
@@ -386,17 +153,12 @@ export function getExpenseAutomationJESchedulesView(state) {
         allAccountList: filteredAccounts,
         accountListNestedAccountHierarchy,
         allClassList: allClasses,
-        createdSchedules,
-        createdTotal,
-        hasLoadedForSelectedTab,
-        jeScheduleTypeCounts,
-        scheduleCountsByTab,
-        kpiSummary,
+        completedSchedules,
+        draftSchedules,
+        ongoingSchedules,
         pendingReviewSchedules,
-        pendingReviewTotal,
         resolveSchedules: resolveSchedules,
         accountSettingsView,
-        newScheduleView,
         postStatusById: postStatusById,
         ignoreStatusById: ignoreStatusById,
         fetchState: reducedFetchStatus.fetchState,