@zeniai/client-epic-state 5.2.7-betaRD2 → 5.2.8-betaAK0

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

@@ -3,9 +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 { generateJEOneTimeAccrualKey } from '../../../entity/jeSchedules/jeScheduleHelper';
-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';
@@ -13,126 +11,8 @@ 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';
-}
-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();
@@ -143,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':
@@ -173,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();
     }
@@ -191,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, revertStatusById, oneTimeAccrualActionStatusById, 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];
@@ -227,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 && isRenderableOneTimeAccrual(accrual)) {
-            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) => {
@@ -280,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 && 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)
         : [];
@@ -373,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,
@@ -395,21 +153,14 @@ 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,
-        revertStatusById: revertStatusById,
-        oneTimeAccrualActionStatusById: oneTimeAccrualActionStatusById,
         fetchState: reducedFetchStatus.fetchState,
         jeScheduleLocalDataById: jeScheduleLocalDataById,
         uiState: uiState,
@@ -418,26 +169,3 @@ 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,8 +16,9 @@ const JE_SCHEDULE_SORT_KEYS = [
     'memo',
 ];
 export const toJEScheduleSortKey = (v) => stringToUnion(v, JE_SCHEDULE_SORT_KEYS);
-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;
+const JE_SCHEDULE_MAIN_TABS = [
+    'pending_review',
+    'ongoing',
+    'completed',
+];
+export const toJEScheduleMainTab = (v) => stringToUnion(v, JE_SCHEDULE_MAIN_TABS);

package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewPayload.js

@@ -1,3 +1,5 @@
+import { toAccountPayload } from '../../../entity/account/accountPayload';
+import { toClassBasePayload } from '../../../entity/class/classPayload';
 import { blankInvoicingCatalogSubFamily, isTieredCatalogPricingModel, } from './invoicingCatalogItemFormConfig';
 const CURRENCY_CODE = 'USD';
 const trimOrUndefined = (value) => value.trim() !== '' ? value.trim() : undefined;
@@ -7,20 +9,26 @@ const toProductCode = (value) => value
     .toLowerCase()
     .replace(/[^a-z0-9]+/g, '-')
     .replace(/^-|-$/g, '');
-const buildAccountingDetail = (subFamily) => {
+const buildAccountingDetail = (subFamily, lookup) => {
     const detail = {};
     if (subFamily.sku.trim() !== '') {
         detail.sku = subFamily.sku.trim();
     }
-    if (subFamily.accountingCode.trim() !== '') {
-        detail.accounting_code = subFamily.accountingCode.trim();
+    // The account and class travel as whole objects rather than bare codes, built
+    // by the same helpers the transaction and vendor payloads use. An id that no
+    // longer resolves is dropped: sending a code the service cannot expand is how
+    // a mapping silently lands on the wrong account.
+    const account = lookup.accountByQboId(subFamily.accountingCode.trim());
+    if (account != null) {
+        detail.account = toAccountPayload(account);
     }
-    if (subFamily.accountingCategory.trim() !== '') {
-        detail.accounting_category_1 = subFamily.accountingCategory.trim();
+    const accountingClass = lookup.classByQboId(subFamily.accountingCategory.trim());
+    if (accountingClass != null) {
+        detail.accounting_class = toClassBasePayload(accountingClass);
     }
     return Object.keys(detail).length > 0 ? detail : undefined;
 };
-const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues) => {
+const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues, lookup) => {
     const isAddon = localData.catalogType === 'addon';
     const tiered = isTieredCatalogPricingModel(subFamily.pricingModel);
     const name = subFamily.name.trim();
@@ -74,7 +82,7 @@ const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues) => {
             starting_unit: Number(tier.startingUnit) || 1,
         }));
     }
-    const accountingDetail = buildAccountingDetail(subFamily);
+    const accountingDetail = buildAccountingDetail(subFamily, lookup);
     if (accountingDetail != null) {
         payload.accounting_detail = accountingDetail;
     }
@@ -86,7 +94,7 @@ const DEFAULT_CATALOG_ITEM_UNIT = 'USD';
  * Build the parent catalog-item request body from the form draft. Creates omit
  * both parent and sub-family IDs; edits retain returned sub-family IDs.
  */
-export const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate) => {
+export const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate, lookup) => {
     const description = trimOrUndefined(localData.description);
     const productCode = trimOrUndefined(localData.productCode) ?? toProductCode(localData.name);
     const itemPayload = {
@@ -114,7 +122,7 @@ export const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate)
         ? localData.subFamilies
         : [blankInvoicingCatalogSubFamily()];
     itemPayload.sub_family_details = isCreate
-        ? subFamilies.map((subFamily) => buildSubFamilyPayload(localData, subFamily, false))
+        ? subFamilies.map((subFamily) => buildSubFamilyPayload(localData, subFamily, false, lookup))
         : subFamilies.map((subFamily) => {
             const priceCode = trimOrUndefined(subFamily.priceCode) ?? toProductCode(subFamily.name);
             const detail = {
@@ -124,6 +132,13 @@ export const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate)
                 price_code: priceCode,
                 show_description_in_invoices: subFamily.showDescriptionInInvoices,
             };
+            // Edits send a narrower body than creates, but the accounting mapping
+            // is editable on this form, so leaving it out dropped the account and
+            // class the user had just picked.
+            const accountingDetail = buildAccountingDetail(subFamily, lookup);
+            if (accountingDetail != null) {
+                detail.accounting_detail = accountingDetail;
+            }
             const id = trimOrUndefined(subFamily.id);
             return id != null ? { ...detail, id } : detail;
         });

package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewSelector.js

@@ -1,7 +1,7 @@
 import { createSelector } from '@reduxjs/toolkit';
 import { getInvoicingPlanById, getInvoicingPlansByIds, } from '../../../entity/invoicing/plan/planSelector';
 import { getInvoicingConfigView, invoicingFieldHelpForGroup, } from '../invoicingConfigView/invoicingConfigViewSelector';
-import { INVOICING_INCOME_ACCOUNT_TYPES, getInvoicingQboView, invoicingAccountHierarchyForTypes, isInvoicingQboConnected, } from '../invoicingQboView/invoicingQboViewSelector';
+import { INVOICING_INCOME_ACCOUNT_TYPES, getInvoicingQboView, invoicingAccountHierarchyForTypes, isInvoicingAccountingPickerDataLoading, isInvoicingQboConnected, } from '../invoicingQboView/invoicingQboViewSelector';
 import { INVOICING_CATALOG_APPLICABILITY_VALUES, INVOICING_CATALOG_PRICING_MODEL_VALUES, INVOICING_CATALOG_PRORATION_VALUES, INVOICING_CATALOG_TIER_TYPE_VALUES, entityToInvoicingCatalogItemFormLocalData, } from './invoicingCatalogItemFormConfig';
 export const getEditInvoicingCatalogItemDetailViewState = (state) => ({
     fetchState: state.editInvoicingCatalogItemDetailViewState.fetchState,
@@ -53,6 +53,7 @@ export const getInvoicingCatalogItemFormView = (state, id) => {
     const { billingPeriodUnitOptions, catalogItemTypeOptions, catalogTierTypeOptionsByPricingModel, catalogTrialEndActionOptions, catalogTrialUnitOptions, } = getInvoicingConfigView(state);
     return {
         fieldHelp: invoicingFieldHelpForGroup(state, 'catalog'),
+        isQboPickerDataLoading: isInvoicingAccountingPickerDataLoading(state),
         qboClassHierarchy: isQboConnected
             ? getInvoicingQboView(state).nestedClassHierarchy
             : [],

package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/saveInvoicingCatalogItemEpic.js

@@ -6,6 +6,7 @@ import { apiErrorSnackbarVariables } from '../../../entity/snackbar/snackbarApiE
 import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { addInvoicingCatalogItem } from '../invoicingCatalogListView/invoicingCatalogListViewReducer';
+import { invoicingQboAccountByQboId, invoicingQboClassByQboId, } from '../invoicingQboView/invoicingQboViewSelector';
 import { localDataToSaveInvoicingCatalogItemPayload, } from './editInvoicingCatalogItemDetailViewPayload';
 import { saveInvoicingCatalogItem, submitInvoicingCatalogItemForm, submitInvoicingCatalogItemFormFailure, submitInvoicingCatalogItemFormSuccess, } from './editInvoicingCatalogItemDetailViewReducer';
 export const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter((action) => submitInvoicingCatalogItemForm.match(action) ||
@@ -20,7 +21,11 @@ export const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actio
         const viewState = state$.value.editInvoicingCatalogItemDetailViewState;
         const localData = (id != null ? viewState.editDraftById[id] : viewState.newItemDraft) ??
             viewState.newItemDraft;
-        data = localDataToSaveInvoicingCatalogItemPayload(localData, id == null);
+        const state = state$.value;
+        data = localDataToSaveInvoicingCatalogItemPayload(localData, id == null, {
+            accountByQboId: (qboId) => invoicingQboAccountByQboId(state, qboId),
+            classByQboId: (qboId) => invoicingQboClassByQboId(state, qboId),
+        });
     }
     const baseUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0`;
     const path = id != null

package/lib/esm/view/invoicing/invoicingConfigView/invoicingConfigViewSelector.js

@@ -1,3 +1,4 @@
+import { isInvoicingQboConnected } from '../invoicingQboView/invoicingQboViewSelector';
 import { deriveInvoicingOnboardingStatus, } from './invoicingConfigViewPayload';
 export const getInvoicingConfigView = (state) => {
     const { acceptTermsFetchState, enableFetchState, ...configState } = state.invoicingConfigViewState;
@@ -14,6 +15,7 @@ export const getInvoicingOnboardingGateView = (state) => {
         acceptTermsState: acceptTermsFetchState,
         enableState: enableFetchState,
         fetchState,
+        isQboConnected: isInvoicingQboConnected(state),
         status: deriveInvoicingOnboardingStatus(state.invoicingConfigViewState.isInvoicingTosAccepted, state.invoicingConfigViewState.isInvoicingEnabled),
     };
 };

package/lib/esm/view/invoicing/invoicingQboView/epics/fetchInvoicingAccountingPickersEpic.js

@@ -9,12 +9,17 @@ import { INVOICING_ACCOUNT_LIST_KEY } from '../invoicingQboViewSelector';
 export const fetchInvoicingAccountingPickersEpic = (actions$, state$) => actions$.pipe(filter(fetchInvoicingAccountingPickers.match), withLatestFrom(state$), mergeMap(([, state]) => {
     const actions = [];
     const accountList = state.accountListState.byReportId[INVOICING_ACCOUNT_LIST_KEY];
-    if (accountList.hasValidState() === false &&
+    // `hasValidState` only reports that a fetch finished, not that it
+    // returned anything usable. The shared bucket can be Completed and empty
+    // because a screen that needs fewer accounts filled it first, which would
+    // leave the invoicing pickers empty with no request in flight to fix it.
+    const isAccountListUsable = accountList.hasValidState() && accountList.accountIds.length > 0;
+    if (isAccountListUsable === false &&
         accountList.fetchState !== 'In-Progress') {
-        // AP/AR accounts cannot back an invoicing mapping, so they are excluded
-        // here — which is why this uses invoicing's own bucket rather than the
-        // general `accountList` other screens fill without those exclusions.
-        actions.push(fetchAccountList(INVOICING_ACCOUNT_LIST_KEY, true, true, true));
+        // Same arguments the vendor and categorization screens pass, so this
+        // shares their cached list rather than replacing it with a narrower one.
+        // Invoicing narrows to income accounts when it builds its options.
+        actions.push(fetchAccountList(INVOICING_ACCOUNT_LIST_KEY, true));
     }
     const classList = state.classListState;
     if (classList.hasValidState() === false &&

package/lib/esm/view/invoicing/invoicingQboView/invoicingQboViewSelector.js

@@ -1,10 +1,34 @@
 import { getAccountList, getNestedAccountListHierarchy, } from '../../accountList/accountListSelector';
 import { getClassList, getNestedClassListHierarchy, } from '../../classList/classListSelector';
-// Its own bucket: invoicing needs the AP/AR exclusions that the vendor and
-// transaction screens sharing `accountList` do not pass.
-export const INVOICING_ACCOUNT_LIST_KEY = 'invoicingAccountList';
+// The shared bucket, fetched with the same arguments as the other consumers so
+// whichever screen loads first satisfies the rest. Invoicing narrows to income
+// accounts when it builds its options, so it does not need its own copy.
+export const INVOICING_ACCOUNT_LIST_KEY = 'accountList';
 /** Whether QBO is connected, without building the option lists to find out. */
 export const isInvoicingQboConnected = (state) => state.invoicingQboViewState.connection?.connected === true;
+/**
+ * Whether the accounting pickers are still waiting on their data. Only true when
+ * QBO is connected: a tenant without it has no pickers to populate, so the form
+ * must not sit behind a skeleton waiting for lists it will never show.
+ */
+export const isInvoicingAccountingPickerDataLoading = (state) => {
+    const isPending = (fetchState) => fetchState === 'Not-Started' || fetchState === 'In-Progress';
+    // The connection settles first and decides whether the lists are fetched at
+    // all, so it counts as loading too. Reporting "not loading" while it is in
+    // flight renders the form, then takes it away again the moment the tenant
+    // turns out to be connected.
+    if (isPending(getInvoicingQboConnectionFetchState(state).fetchState)) {
+        return true;
+    }
+    if (!isInvoicingQboConnected(state)) {
+        return false;
+    }
+    const accountList = state.accountListState.byReportId[INVOICING_ACCOUNT_LIST_KEY];
+    return (isPending(accountList.fetchState) ||
+        isPending(state.classListState.fetchState));
+};
+/** The QBO connection fetch on its own, without building the bundled view. */
+export const getInvoicingQboConnectionFetchState = (state) => state.invoicingQboViewState.connectionFetchState;
 /**
  * Account types that can back invoicing revenue. Named here so screens ask for
  * "income accounts" rather than repeating the accounting service's vocabulary.
@@ -13,6 +37,26 @@ export const INVOICING_INCOME_ACCOUNT_TYPES = [
     'income',
     'other_income',
 ];
+/**
+ * The account behind a picker value. The pickers submit the QuickBooks id, so
+ * that is what callers hold; the payload builders need the whole entity to send
+ * `toAccountPayload`, which is why the lookup lives here next to the options.
+ */
+export const invoicingQboAccountByQboId = (state, qboId) => {
+    if (qboId == null || qboId === '') {
+        return undefined;
+    }
+    const { accounts } = getAccountList(state.accountState, state.accountListState, INVOICING_ACCOUNT_LIST_KEY);
+    return accounts.find((account) => String(account.qboId) === qboId);
+};
+/** The class behind a picker value, for the same reason as the account above. */
+export const invoicingQboClassByQboId = (state, qboId) => {
+    if (qboId == null || qboId === '') {
+        return undefined;
+    }
+    const { classes } = getClassList(state.classState, state.classListState);
+    return classes.find((accountingClass) => String(accountingClass.qboId) === qboId);
+};
 /**
  * Accounts and classes as the invoicing pickers need them. Both come from the
  * shared accounting-service lists, so whatever another screen already loaded