@zeniai/client-epic-state 5.2.14 → 5.2.16

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

@@ -3,7 +3,9 @@ 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 { getJEScheduledTransactionByJEScheduleTransactionKey, } from '../../../entity/jeSchedules/jeSchedulesSelector';
+import { generateJEOneTimeAccrualKey } from '../../../entity/jeSchedules/jeScheduleHelper';
+import { getJEAccruedScheduleByJEScheduleKey, getJEOneTimeAccrualByKey, getJEScheduledTransactionByJEScheduleTransactionKey, } from '../../../entity/jeSchedules/jeSchedulesSelector';
+import { ALL_SCHEDULES_TYPES, } from '../../../entity/jeSchedules/jeSchedulesTypes';
 import { getCurrentTenant } from '../../../entity/tenant/tenantSelector';
 import { getAccountIdsForLabel, getAccountList, getNestedAccountListHierarchy, getUncategorizedAccounts, } from '../../accountList/accountListSelector';
 import { getClassList, getNestedClassListHierarchy, } from '../../classList/classListSelector';
@@ -11,8 +13,143 @@ import { getAccountsTypesForScheduleDetails } from '../../scheduleView/scheduleD
 import { filterNestedAccountHierarchyById } from '../../scheduleView/scheduleDetailView/scheduleDetailSelector';
 import { getAccountLabelForScheduleType, getAccountsTypesForScheduleList, } from '../../scheduleView/scheduleListView/scheduleListHelper';
 import { getAllSteps } from './getAllStepsHelper';
+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;
+// everything else is already on the books or in a transient claim.
+const ONE_TIME_ACCRUAL_REVIEW_STATUSES = [
+    'draft',
+];
+/**
+ * `posting_blocked` is written by the posting Cron when a JE fails to post. It is an internal
+ * failure state with no human action attached, so it is dropped here rather than hidden at render
+ * time — filtering in the view would leave the group counts and KPI totals counting rows nobody
+ * can see. The expense-automation endpoint applies no status filter on the close-period path, so
+ * these rows do arrive.
+ */
+export function isRenderableOneTimeAccrual(accrual) {
+    return (accrual.accrualStatus !== 'posting_blocked' &&
+        // Terminal states the user has already decided. The GET list excludes both server-side, so
+        // these only appear in the window between an ignore/revert response being written back and the
+        // background refresh landing -- during which an ignored row would otherwise sit in Pending
+        // Review offering a Post button. Dropped here rather than at render time so group counts and
+        // KPI totals do not count rows nobody can see.
+        accrual.accrualStatus !== 'reverted' &&
+        !accrual.isIgnored);
+}
+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;
+}
+/** The row's own Amount, so callers can read its currency and not just its value. */
+function getScheduleAmountObject(schedule) {
+    if (isOneTimeAccrualRow(schedule)) {
+        return schedule.estimatedAmount;
+    }
+    if (isAccruedScheduleRow(schedule)) {
+        return schedule.recurringAmount;
+    }
+    return schedule.baseTransaction.amount;
+}
+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();
@@ -23,7 +160,9 @@ function getJEScheduleSortAccessor(sortKey) {
         case 'depCategory':
             return (s) => s.jeCredit.account?.accountName?.toLowerCase();
         case 'scheduleCategory':
-            return (s) => s.baseTransaction.account?.accountName?.toLowerCase();
+            return (s) => isAccruedScheduleRow(s)
+                ? undefined
+                : s.baseTransaction.account?.accountName?.toLowerCase();
         case 'startMonth':
             return (s) => s.startDate?.valueOf();
         case 'type':
@@ -51,11 +190,13 @@ function getJEScheduleSortAccessor(sortKey) {
                 return s.balanceAsOfToday?.amount ?? null;
             };
         case 'totalAmount':
-            return (s) => s.baseTransaction.amount.amount;
+            return (s) => getScheduleAmount(s);
         case 'transactionDate':
-            return (s) => s.baseTransaction.date.valueOf();
+            return (s) => s.createTime?.valueOf();
         case 'memo':
-            return (s) => s.baseTransaction.memo?.toLowerCase();
+            return (s) => isAccruedScheduleRow(s)
+                ? s.memo.toLowerCase()
+                : s.baseTransaction.memo?.toLowerCase();
         default:
             return (s) => s.startDate?.valueOf();
     }
@@ -67,9 +208,15 @@ 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 { jeScheduleTransactionKeysByPeriod, failedJeScheduleTransactionKeysByPeriod, jeScheduleLocalDataById, postStatusById, ignoreStatusById, uiState, error, fetchState, refreshStatus, } = expenseAutomationJESchedulesViewState;
+    const { jeScheduleTransactionKeysByPeriodAndTab, jeScheduleAccruedKeysByPeriodAndTab, jeScheduleOneTimeAccrualKeysByPeriodAndTab, failedJeScheduleTransactionKeysByPeriodAndTab, jeScheduleLocalDataById, postStatusById, ignoreStatusById, revertStatusById, oneTimeAccrualActionStatusById, uiState, error, fetchState, refreshStatus, newSchedule, } = 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];
@@ -97,27 +244,48 @@ 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 jeScheduleTransactionKeysForSelectedPeriod = monthYearPeriodId != null
-        ? jeScheduleTransactionKeysByPeriod[monthYearPeriodId]
-        : null;
-    const failedJeScheduleTransactionKeysForSelectedPeriod = monthYearPeriodId != null
-        ? failedJeScheduleTransactionKeysByPeriod[monthYearPeriodId]
+    const selectedPeriodTabKey = monthYearPeriodId != null
+        ? getJESchedulePeriodTabKey(uiState.selectedPageTab, monthYearPeriodId)
         : null;
-    const jeScheduleTransactionKeys = jeScheduleTransactionKeysForSelectedPeriod ?? [];
-    const failedJeScheduleTransactionKeys = failedJeScheduleTransactionKeysForSelectedPeriod ?? [];
+    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 && isRenderableOneTimeAccrual(accrual)) {
+            oneTimeAccruals.push(accrual);
+        }
+    });
     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 } = 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 { sortKey, sortOrder, selectedJETypeFilter } = uiState;
     const unsortedResolveSchedules = [];
     failedJeScheduledTransaction.forEach((schedule) => {
         schedule.scheduledJournalEntry.forEach((journalEntry) => {
@@ -129,10 +297,103 @@ 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([
-        ...jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft'),
+        ...allScheduleRows.filter((schedule) => isPendingReviewRow(schedule) && matchesTypeFilter(schedule)),
         ...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);
+    /**
+     * The currency the tiles render in. Taken from the schedules themselves rather than assumed:
+     * every row on a tab shares a tenant currency, so the first one that states it is the answer.
+     */
+    const sumToAmount = (schedules) => {
+        const first = schedules[0];
+        const currency = first != null ? getScheduleAmountObject(first) : allScheduleAmountFallback;
+        return {
+            ...currency,
+            amount: sumAmount(schedules),
+        };
+    };
+    // An empty bucket still has to render a currency; borrow it from any row on the page.
+    const allScheduleAmountFallback = allScheduleRows.length > 0
+        ? getScheduleAmountObject(allScheduleRows[0])
+        : { amount: 0, currencyCode: '', currencySymbol: '' };
+    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: sumToAmount(aiAccountantSchedules),
+        },
+        manual: {
+            count: manualSchedules.length,
+            amount: sumToAmount(manualSchedules),
+        },
+        needsReview: {
+            count: pendingUnfiltered.length,
+            amount: sumToAmount(pendingUnfiltered),
+        },
+        total: {
+            count: allSchedules.length,
+            amount: sumToAmount(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 && isRenderableOneTimeAccrual(accrualRow)),
+        ];
+        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)
         : [];
@@ -145,6 +406,20 @@ 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,
@@ -153,14 +428,21 @@ export function getExpenseAutomationJESchedulesView(state) {
         allAccountList: filteredAccounts,
         accountListNestedAccountHierarchy,
         allClassList: allClasses,
-        completedSchedules,
-        draftSchedules,
-        ongoingSchedules,
+        createdSchedules,
+        createdTotal,
+        hasLoadedForSelectedTab,
+        jeScheduleTypeCounts,
+        scheduleCountsByTab,
+        kpiSummary,
         pendingReviewSchedules,
+        pendingReviewTotal,
         resolveSchedules: resolveSchedules,
         accountSettingsView,
+        newScheduleView,
         postStatusById: postStatusById,
         ignoreStatusById: ignoreStatusById,
+        revertStatusById: revertStatusById,
+        oneTimeAccrualActionStatusById: oneTimeAccrualActionStatusById,
         fetchState: reducedFetchStatus.fetchState,
         jeScheduleLocalDataById: jeScheduleLocalDataById,
         uiState: uiState,
@@ -169,3 +451,26 @@ export function getExpenseAutomationJESchedulesView(state) {
         completionStatus,
     };
 }
+/**
+ * One accrual plus the status of its promote / ignore request, for the detail screen.
+ *
+ * `accrual` is undefined on a cold load — a refresh or a shared link, where the list has never run
+ * — so the screen dispatches `fetchOneTimeAccrual` and waits on `detailFetchState`. The two states
+ * are separate on purpose: `actionFetchState` drives the row spinner and the post-revert navigation,
+ * and a page load must not look like an action that just finished.
+ */
+export function getExpenseAutomationJEOneTimeAccrualDetailView(state, accrualId) {
+    return {
+        accrual: getJEOneTimeAccrualByKey(generateJEOneTimeAccrualKey(accrualId), state.jeSchedulesState),
+        actionFetchState: state.expenseAutomationJESchedulesViewState
+            .oneTimeAccrualActionStatusById[accrualId] ?? {
+            fetchState: 'Not-Started',
+            error: undefined,
+        },
+        detailFetchState: state.expenseAutomationJESchedulesViewState
+            .oneTimeAccrualFetchStatusById[accrualId] ?? {
+            fetchState: 'Not-Started',
+            error: undefined,
+        },
+    };
+}

package/lib/esm/view/expenseAutomationView/types/jeSchedulesViewState.js

@@ -16,9 +16,8 @@ const JE_SCHEDULE_SORT_KEYS = [
     'memo',
 ];
 export const toJEScheduleSortKey = (v) => stringToUnion(v, JE_SCHEDULE_SORT_KEYS);
-const JE_SCHEDULE_MAIN_TABS = [
-    'pending_review',
-    'ongoing',
-    'completed',
-];
-export const toJEScheduleMainTab = (v) => stringToUnion(v, JE_SCHEDULE_MAIN_TABS);
+const JE_PAGE_TABS = ['schedules', 'existing_schedules'];
+export const toJEPageTab = (v) => stringToUnion(v, JE_PAGE_TABS);
+export const ALL_JE_PAGE_TABS = JE_PAGE_TABS;
+export const getJESchedulePeriodTabKey = (selectedPageTab, monthYearPeriodId) => `${selectedPageTab}_${monthYearPeriodId}`;
+export const MIN_NEW_SCHEDULE_SEARCH_LENGTH = 2;

package/lib/esm/view/scheduleView/scheduleListView/epics/fetchAccruedScheduleListEpic.js

@@ -30,7 +30,7 @@ export const fetchAccruedScheduleListEpic = (actions$, state$, zeniAPI) => actio
         je_schedule_type: scheduleType,
         sort_by: 'transaction_date',
         sort_order: 'desc',
-        filter: 'all',
+        filter: action.payload.statusFilter,
     };
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/schedules?query=${encodeURIComponent(JSON.stringify(queryParam))}`)

package/lib/esm/view/scheduleView/scheduleListView/epics/fetchDownloadSchedulesEpic.js

@@ -7,9 +7,14 @@ import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePay
 import { fetchDownloadSchedules, getState, updateDownloadScheduleFailure, updateDownloadScheduleSuccess, } from '../scheduleListReducer';
 import { getScheduleListKey } from '../scheduleListTypes';
 export const fetchDownloadSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchDownloadSchedules.match), mergeMap((action) => {
-    const { scheduleType, downloadCategories } = action.payload;
+    const { scheduleType, downloadCategories, statusFilter } = action.payload;
     const scheduleListState = state$.value.scheduleListState;
     // if parameters are provided, use those. else go to localdata
+    // Accrued is deliberately not served here. Its rows come back in a different shape, this
+    // epic writes them through updateJESchedules (the prepaid / fixed mapper), and
+    // doUpdateScheduleList never flips downloadState for accrued -- so a request would store the
+    // wrong data and then never report completion. Accrued downloads go through
+    // fetchAccruedScheduleList, which owns that shape end to end.
     let scheduleState;
     if (scheduleType !== 'accrued_expenses') {
         scheduleState = getState(scheduleListState, scheduleType);
@@ -34,7 +39,7 @@ export const fetchDownloadSchedulesEpic = (actions$, state$, zeniAPI) => actions
         base_txn_account_ids: downloadCategories,
         sort_by: 'transaction_date',
         sort_order: 'desc',
-        filter: 'all',
+        filter: statusFilter,
     };
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/schedules/download?query=${encodeURIComponent(JSON.stringify(queryParam))}`)

package/lib/esm/view/scheduleView/scheduleListView/scheduleListReducer.js

@@ -84,8 +84,8 @@ const scheduleListView = createSlice({
     reducers: {
         fetchDownloadSchedules: {
             reducer(draft, action) {
+                // Accrued is not downloaded through this action -- see fetchDownloadSchedulesEpic for why.
                 if (action.payload.scheduleType !== 'accrued_expenses') {
-                    //if condition added for type narrowing
                     const state = getState(draft, action.payload.scheduleType);
                     const selectedTimeframe = action.payload.timeframeAndCategory.selectedTimeframe;
                     const selectedCategoryId = action.payload.timeframeAndCategory.selectedCategoryId;
@@ -109,13 +109,14 @@ const scheduleListView = createSlice({
                     updateState(draft, action.payload.scheduleType, state);
                 }
             },
-            prepare(scheduleType, timeframeAndCategory, downloadCategories, cacheOverride = false) {
+            prepare(scheduleType, timeframeAndCategory, downloadCategories, statusFilter = 'all', cacheOverride = false) {
                 return {
                     payload: {
                         timeframeAndCategory,
                         scheduleType,
                         cacheOverride,
                         downloadCategories,
+                        statusFilter,
                     },
                 };
             },
@@ -151,12 +152,13 @@ const scheduleListView = createSlice({
                     updateState(draft, action.payload.scheduleType, state);
                 }
             },
-            prepare(scheduleType, timeframeAndCategory, cacheOverride = false) {
+            prepare(scheduleType, timeframeAndCategory, cacheOverride = false, statusFilter = 'all') {
                 return {
                     payload: {
                         timeframeAndCategory,
                         scheduleType,
                         cacheOverride,
+                        statusFilter,
                     },
                 };
             },

package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewSelector.js

@@ -7,7 +7,7 @@ import { getIsAccountingClassesEnabled } from '../../../../entity/tenant/tenantS
 import { getUserByUserId } from '../../../../entity/user/userSelector';
 import { getUserRoleByUserId } from '../../../../entity/userRole/userRoleSelector';
 export const getBillPaySetupApproverView = createSelector((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (billPaySetupApproverViewState, approvalRuleState, userState) => {
-    const { approvalRulesDeleteStatusById, approvalRuleIds, fetchState, error, listeningToPusherEvent, newApprovalRuleId, } = billPaySetupApproverViewState;
+    const { approvalRulesDeleteStatusById, approvalRuleIds, approverListState, fetchState, error, listeningToPusherEvent, newApprovalRuleId, } = billPaySetupApproverViewState;
     const deleteStateList = Object.values(approvalRulesDeleteStatusById);
     const approvalRules = getApprovalRulesByIds(approvalRuleState, approvalRuleIds);
     const allApprovalRules = approvalRules.map((approvalRule) => {
@@ -35,10 +35,15 @@ export const getBillPaySetupApproverView = createSelector((state) => state.billP
             name: 'Require Info',
             code: 'require_info',
         };
+    const activeApproverIds = new Set(approverListState.approverIds);
+    const referencedApproverIds = new Set(allApprovalRules.flatMap((approvalRule) => approvalRule.steps.flatMap((step) => step.actors.map((actor) => actor.userId))));
+    const inactiveApproverIds = Array.from(referencedApproverIds).filter((userId) => !activeApproverIds.has(userId));
     return {
         allApprovalRules,
         deleteStatus: reduceAnyFetchState(deleteStateList),
         approvalRulesStatus,
+        approverListFetchStatus: approverListState.fetchStatus,
+        inactiveApproverIds,
         fetchState,
         error,
         listeningToPusherEvent,
@@ -57,6 +62,19 @@ export const getBillPaySetupApproverUpdateDataView = createSelector((state) => s
         };
     })
         .filter((approver) => approver.user != null);
+    const activeApproverIds = new Set(approverIds);
+    const currentRuleSteps = billPaySetupApproverViewUpdateData?.data?.steps ?? [];
+    const inactiveActorUserIds = new Set(currentRuleSteps
+        .flatMap((step) => step.actors.map((actor) => actor.userId))
+        .filter((userId) => userId != null && !activeApproverIds.has(userId)));
+    const inactiveActorApprovers = Array.from(inactiveActorUserIds)
+        .map((userId) => {
+        return {
+            user: getUserByUserId(userState, userId),
+            role: getUserRoleByUserId(userRoleState, userId),
+        };
+    })
+        .filter((approver) => approver.user != null);
     const allAttributes = attributes;
     const filteredApprovers = cloneDeep(allApprovers);
     const filteredAttributes = cloneDeep(attributes);
@@ -90,6 +108,7 @@ export const getBillPaySetupApproverUpdateDataView = createSelector((state) => s
         allApprovalRules,
         allApprovers,
         filteredApprovers,
+        inactiveActorApprovers,
         allAttributes,
         filteredAttributes,
         billPaySetupApproverViewUpdateData,

package/lib/esm/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewSelector.js

@@ -7,7 +7,7 @@ import { getUserByUserId } from '../../../../entity/user/userSelector';
 import { getUserRoleByUserId } from '../../../../entity/userRole/userRoleSelector';
 export const getRemiSetupApproverView = (state, filterAdmins = true) => {
     const { remiSetupApproverViewState, approvalRuleState, userState } = state;
-    const { approvalRulesDeleteStatusById, approvalRuleIds, fetchState, error, listeningToPusherEvent, newApprovalRuleId, } = remiSetupApproverViewState;
+    const { approvalRulesDeleteStatusById, approvalRuleIds, approverListState, fetchState, error, listeningToPusherEvent, newApprovalRuleId, } = remiSetupApproverViewState;
     const deleteStateList = Object.values(approvalRulesDeleteStatusById);
     const approvalRules = getApprovalRulesByIds(approvalRuleState, approvalRuleIds);
     const allApprovalRules = approvalRules.map((approvalRule) => {
@@ -36,10 +36,15 @@ export const getRemiSetupApproverView = (state, filterAdmins = true) => {
             name: 'Require Info',
             code: 'require_info',
         };
+    const activeApproverIds = new Set(approverListState.approverIds);
+    const referencedApproverIds = new Set(allApprovalRules.flatMap((approvalRule) => approvalRule.steps.flatMap((step) => step.actors.map((actor) => actor.userId))));
+    const inactiveApproverIds = Array.from(referencedApproverIds).filter((userId) => !activeApproverIds.has(userId));
     return {
         allApprovalRules,
         deleteStatus: reduceAnyFetchState(deleteStateList),
         approvalRulesStatus,
+        approverListFetchStatus: approverListState.fetchStatus,
+        inactiveApproverIds,
         fetchState,
         error,
         listeningToPusherEvent,
@@ -74,6 +79,19 @@ export const getRemiSetupApproverUpdateDataView = createSelector((state) => stat
         };
     })
         .filter((approver) => approver.user != null);
+    const activeApproverIds = new Set(approverIds);
+    const currentRuleSteps = remiSetupApproverViewUpdateData?.data?.steps ?? [];
+    const inactiveActorUserIds = new Set(currentRuleSteps
+        .flatMap((step) => step.actors.map((actor) => actor.userId))
+        .filter((userId) => userId != null && !activeApproverIds.has(userId)));
+    const inactiveActorApprovers = Array.from(inactiveActorUserIds)
+        .map((userId) => {
+        return {
+            user: getUserByUserId(userState, userId),
+            role: getUserRoleByUserId(userRoleState, userId),
+        };
+    })
+        .filter((approver) => approver.user != null);
     const allAttributes = attributes;
     const filteredApprovers = cloneDeep(allApprovers);
     const filteredAttributes = cloneDeep(attributes);
@@ -108,6 +126,7 @@ export const getRemiSetupApproverUpdateDataView = createSelector((state) => stat
         allAttributes,
         filteredApprovers,
         filteredAttributes,
+        inactiveActorApprovers,
         allAccountingClasses,
         remiSetupApproverViewUpdateData,
         approversDetailsFetchStatus: reduceAllFetchState([