@zeniai/client-epic-state 4.20.0 → 4.20.1-beta10ND

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

@@ -1,4 +1,5 @@
 import orderBy from 'lodash/orderBy';
+import { reduceAnyFetchState } from '../../../commonStateTypes/reduceFetchState';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { getCurrentTenant } from '../../../entity/tenant/tenantSelector';
 import { getSupportedTransactionById, getSupportedTransactionsByIds, } from '../../../entity/transaction/transactionSelector';
@@ -7,7 +8,7 @@ import { getCompletedTransactionsCacheKey } from '../reducers/missingReceiptsVie
 import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes';
 import { isUnmatchedTabFileStatus, } from '../types/missingReceiptsViewState';
 export function getExpenseAutomationMissingReceiptsView(state) {
-    const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
+    const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
     const currentTenant = getCurrentTenant(state);
     const { selectedPeriodByTenantId } = expenseAutomationViewState;
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
@@ -36,7 +37,7 @@ export function getExpenseAutomationMissingReceiptsView(state) {
                     transaction.lines.length > 0 &&
                     transaction.lines[0]
                         ?.class != null
-                    ? transaction.lines[0].class.className.toLowerCase()
+                    ? transaction.lines[0].class?.className.toLowerCase()
                     : null;
             case 'vendor':
             default:
@@ -175,9 +176,16 @@ export function getExpenseAutomationMissingReceiptsView(state) {
             vendorLogo: result.vendorLogo ?? transaction?.logo?.href,
         };
     });
+    const monthEndFetchState = monthYearPeriodId != null
+        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
+        : { fetchState: 'Not-Started', error: undefined };
+    const reducedFetchStatus = reduceAnyFetchState([
+        { fetchState, error },
+        monthEndFetchState,
+    ]);
     return {
-        fetchState,
-        error,
+        fetchState: reducedFetchStatus.fetchState,
+        error: reducedFetchStatus.error,
         uploadReceiptStatusById,
         uiState,
         refreshStatus,

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

@@ -13,7 +13,7 @@ import { getAccountList, getNestedAccountListHierarchy, } from '../../accountLis
 import { getClassList, getNestedClassListHierarchy, } from '../../classList/classListSelector';
 import { initialActionFetchState, initialReconciliationTabsState, initialState, } from '../reducers/reconciliationViewReducer';
 import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes';
-export const getExpenseAutomationReconciliationView = createSelector((state) => state, (state) => getCurrentTenant(state), (state) => state.expenseAutomationReconciliationViewState, (state) => state.expenseAutomationViewState, (state) => state.plaidAccountViewState, (state) => state.accountListState, (state) => state.accountState, (state) => state.classListState, (state) => state.classState, (state) => state.monthEndCloseChecksState, (state) => state.vendorState, (state, currentTenant, reconciliationViewState, expenseAutomationViewState, plaidAccountViewState, accountListState, accountState, classListState, classState, monthEndCloseChecksState, vendorState) => {
+export const getExpenseAutomationReconciliationView = createSelector((state) => state, (state) => getCurrentTenant(state), (state) => state.expenseAutomationReconciliationViewState, (state) => state.expenseAutomationViewState, (state) => state.plaidAccountViewState, (state) => state.accountListState, (state) => state.accountState, (state) => state.classListState, (state) => state.classState, (state) => state.monthEndCloseChecksState, (state) => state.vendorState, (state) => state.monthEndCloseChecksViewState, (state, currentTenant, reconciliationViewState, expenseAutomationViewState, plaidAccountViewState, accountListState, accountState, classListState, classState, monthEndCloseChecksState, vendorState, monthEndCloseChecksViewState) => {
     const { selectedPeriodByTenantId } = expenseAutomationViewState;
     const reconcileTabUiState = reconciliationViewState.reconTabsState.reconcile.uiState;
     const reviewTabUiState = reconciliationViewState.reconTabsState.review.uiState;
@@ -35,6 +35,13 @@ export const getExpenseAutomationReconciliationView = createSelector((state) =>
         }
         return acc;
     }, []);
+    const monthYearPeriodId = selectedPeriod != null ? toMonthYearPeriodId(selectedPeriod) : null;
+    const monthEndFetchState = monthYearPeriodId != null
+        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? {
+            fetchState: 'Not-Started',
+            error: undefined,
+        })
+        : { fetchState: 'Not-Started', error: undefined };
     if (accountReconForMonthYearPeriod == null) {
         return {
             bankAccounts: [],
@@ -44,10 +51,13 @@ export const getExpenseAutomationReconciliationView = createSelector((state) =>
             classListNestedAccountHierarchy: [],
             allAccountList: [],
             allClassList: [],
-            fetchStatus: {
-                fetchState: reconciliationViewState.fetchState,
-                error: reconciliationViewState.error,
-            },
+            fetchStatus: reduceAnyFetchState([
+                {
+                    fetchState: reconciliationViewState.fetchState,
+                    error: reconciliationViewState.error,
+                },
+                monthEndFetchState,
+            ]),
             plaidConnectionDetails: plaidAccountViewState['expense_automation_reconcile']
                 .plaidConnectionDetails,
             completionStatus: 'incomplete',
@@ -270,10 +280,13 @@ export const getExpenseAutomationReconciliationView = createSelector((state) =>
         bankAccounts: uniqueBankAccounts,
         creditCards: uniqueCreditCards,
         accountReconciliationsByAccountID: reconList,
-        fetchStatus: {
-            fetchState: reconciliationViewState.fetchState,
-            error: reconciliationViewState.error,
-        },
+        fetchStatus: reduceAnyFetchState([
+            {
+                fetchState: reconciliationViewState.fetchState,
+                error: reconciliationViewState.error,
+            },
+            monthEndFetchState,
+        ]),
         plaidConnectionDetails: plaidAccountViewState['expense_automation_reconcile']
             .plaidConnectionDetails,
         reconciliationTabsState: reconciliationViewState.reconTabsState,

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

@@ -1,5 +1,5 @@
 import omit from 'lodash/omit';
-import { reduceAllFetchState } from '../../../commonStateTypes/reduceFetchState';
+import { reduceAllFetchState, reduceAnyFetchState, } from '../../../commonStateTypes/reduceFetchState';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { getCurrentTenant } from '../../../entity/tenant/tenantSelector';
 import { getTransactionWithCOT } from '../../../entity/transaction/transactionHelper';
@@ -8,7 +8,7 @@ import { getAccountList, getNestedAccountListHierarchy, getUncategorizedAccounts
 import { getClassList, getNestedClassListHierarchy, } from '../../classList/classListSelector';
 import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes';
 export function getExpenseAutomationTransactionView(state) {
-    const { accountState, classState, classListState, accountListState, expenseAutomationTransactionsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
+    const { accountState, classState, classListState, accountListState, expenseAutomationTransactionsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
     const { selectedTransactionCategorizationTab } = expenseAutomationTransactionsViewState;
     const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, uploadReceiptStatusById, selectedTransactionId, selectedTransactionLineId, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
     const uncategorizedIncomeExpense = getUncategorizedAccounts(accountState, accountListState, 'accountList');
@@ -41,10 +41,16 @@ export function getExpenseAutomationTransactionView(state) {
         .filter((transaction) => transaction != null);
     const transactions = getSupportedTransactionsByIds(transactionState, transactionIds);
     const transactionsWithCOT = transactions.map((transaction) => getTransactionWithCOT(transaction));
-    const fetchStatus = reduceAllFetchState([
-        accountList,
-        classList,
-        expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab],
+    const monthEndFetchState = monthYearPeriodId != null
+        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
+        : { fetchState: 'Not-Started', error: undefined };
+    const fetchStatus = reduceAnyFetchState([
+        reduceAllFetchState([
+            accountList,
+            classList,
+            expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab],
+        ]),
+        monthEndFetchState,
     ]);
     const totalCountByReview = expenseAutomationTransactionsViewState.transactionCategorizationView.review
         .uiState.totalCount;

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

@@ -1 +1,18 @@
-export {};
+import { stringToUnion } from '../../../commonStateTypes/stringToUnion';
+const JE_SCHEDULE_SORT_KEYS = [
+    'vendor',
+    'category',
+    'class',
+    'depCategory',
+    'scheduleCategory',
+    'startMonth',
+    'type',
+    'amortizationPeriod',
+    'jePostingDate',
+    'remainingMonths',
+    'runningBalance',
+    'totalAmount',
+    'transactionDate',
+    'memo',
+];
+export const toJEScheduleSortKey = (v) => stringToUnion(v, JE_SCHEDULE_SORT_KEYS);

package/lib/esm/view/profitAndLossClassesView/horizontalSectionEmptyBalancesSlice.js

@@ -0,0 +1,17 @@
+/**
+ * Empty `COABalancesSlice` for horizontal P&L-by-class section / calculated headers when
+ * enrichment has not produced balances yet, or for UI mapping fallbacks.
+ * Structure matches {@link enrichProfitAndLossByClassHorizontalReport} output.
+ */
+export function getEmptyHorizontalSectionBalancesSlice(firstMonthOfFY, timeframe = 'month') {
+    return {
+        balances: [],
+        additionalBalances: [],
+        filter: {
+            firstMonthOfFY,
+            timeframe,
+            balancesRange: { numberOfPeriods: 0, orderBy: 'ascending_date' },
+            additionalBalances: [],
+        },
+    };
+}

package/lib/esm/view/profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelector.js

@@ -3,6 +3,7 @@ import { getSummationFreeRangeTotalBalance } from '../../commonStateTypes/coaBal
 import { defaultCustomerCurrency } from '../../commonStateTypes/currencyHelper';
 import { reduceFetchStateParallelTimeframes } from '../../commonStateTypes/reduceFetchState';
 import { getSectionClassesViewReport } from '../../entity/sectionClassesViewV2/sectionClassesViewSelector';
+import { HORIZONTAL_CLASS_TOTAL_BALANCE_ID, } from './profitAndLossClassesByClassHorizontalSelectorTypes';
 import { enrichProfitAndLossByClassHorizontalReport } from './profitAndLossHorizontalEnrichment';
 export const profitAndLossHorizontalIdsInOrder = [
     'income',
@@ -49,16 +50,11 @@ export const getProfitAndLossClassesHorizontalView = (filter, accountState, clas
     const calculatedSections = {};
     let reportCurrency = defaultCustomerCurrency;
     if (fetchState.fetchState === 'Completed' && selectedPeriod != null) {
-        // Get section reports using existing selector infrastructure
-        const sectionReports = {};
-        HORIZONTAL_PANDL_SECTION_IDS.forEach((sectionId) => {
-            sectionReports[sectionId] = getSectionClassesViewReport(accountState, classState, sectionsState, { reportId, sectionId }, filter);
-        });
         reportCurrency =
             profitAndLossClassesViewState.currency ?? defaultCustomerCurrency;
-        // Pivot each section from class→account to account→class
+        // Fetch each section and pivot class→account to account→class in one pass
         HORIZONTAL_PANDL_SECTION_IDS.forEach((sectionId) => {
-            const sectionReport = sectionReports[sectionId];
+            const sectionReport = getSectionClassesViewReport(accountState, classState, sectionsState, { reportId, sectionId }, filter);
             if (sectionReport != null) {
                 sections[sectionId] = pivotSectionToHorizontal(sectionReport, classColumns, SECTION_TITLES[sectionId] ?? sectionId, reportCurrency);
             }
@@ -261,7 +257,7 @@ function sumBalancesInSlice(balances) {
     if (balances.length === 0) {
         return 0;
     }
-    const summed = getSummationFreeRangeTotalBalance([...balances]);
+    const summed = getSummationFreeRangeTotalBalance(balances);
     return summed?.balance.amount ?? 0;
 }
 /**
@@ -308,6 +304,7 @@ function buildHeaderBalances(classColumns, timeframe, selectedPeriod, currency)
         startDate,
         type: 'default',
         label: col.className,
+        id: col.classId,
     }));
     // Add a "Total" column
     balances.push({
@@ -317,6 +314,7 @@ function buildHeaderBalances(classColumns, timeframe, selectedPeriod, currency)
         startDate,
         type: 'default',
         label: 'Total',
+        id: HORIZONTAL_CLASS_TOTAL_BALANCE_ID,
     });
     return balances;
 }

package/lib/esm/view/profitAndLossClassesView/profitAndLossHorizontalEnrichment.js

@@ -1,4 +1,5 @@
 import { defaultCustomerCurrency } from '../../commonStateTypes/currencyHelper';
+import { getEmptyHorizontalSectionBalancesSlice } from './horizontalSectionEmptyBalancesSlice';
 import { HORIZONTAL_CLASS_TOTAL_BALANCE_ID, } from './profitAndLossClassesByClassHorizontalSelectorTypes';
 /**
  * Populates `sectionHeaderBalancesSlice`, and per-account `accountReportData`, so the
@@ -25,30 +26,31 @@ function enrichHorizontalSection(report, section) {
         return total?.balance.amount ?? 0;
     });
     section.sectionHeaderBalancesSlice = buildHorizontalClassColumnBalancesSlice(report, classAmounts, section.sectionTotal.amount);
-    const childrenRowIndicesByParent = buildHorizontalAccountChildIndicesByParent(section.accounts);
+    const parentIndices = computeHorizontalAccountParentIndices(section.accounts);
+    const childrenRowIndicesByParent = buildHorizontalAccountChildIndicesByParent(parentIndices);
     const childrenRecord = {};
     childrenRowIndicesByParent.forEach((childIndices, parentIndex) => {
         childrenRecord[parentIndex] = childIndices;
     });
     section.treeLayout = {
         rootAccountRowIndices: section.accounts
-            .map((_, i) => findHorizontalAccountParentIndex(section.accounts, i) === -1 ? i : -1)
+            .map((_, i) => (parentIndices[i] === -1 ? i : -1))
             .filter((i) => i >= 0),
         childrenRowIndicesByParent: childrenRecord,
     };
-    for (let i = 0; i < section.accounts.length; i++) {
-        const row = section.accounts[i];
-        const classRowAmounts = report.classColumns.map((col) => {
-            const cb = row.classBalances.find((b) => b.classId === col.classId);
-            return cb?.balance.amount ?? 0;
-        });
+    const siblingsPerRow = buildSiblingIndicesPerRow(section.accounts, parentIndices);
+    const hasChildFlags = computeHorizontalHasChildFlags(parentIndices);
+    for (let accountIndex = 0; accountIndex < section.accounts.length; accountIndex++) {
+        const row = section.accounts[accountIndex];
+        // Same column order as `report.classColumns` (see `pivotSectionToHorizontal`).
+        const classRowAmounts = row.classBalances.map((classBalance) => classBalance.balance.amount);
         row.accountReportData = {
             accountId: row.accountId,
             accountName: row.accountName,
             accountType: row.accountType,
             depth: row.depth,
             balancesInTimeframe: buildHorizontalClassColumnBalancesSlice(report, classRowAmounts, row.rowTotal.amount),
-            horizontalTreeView: buildHorizontalTreeView(section.accounts, i),
+            horizontalTreeView: buildHorizontalTreeViewFromPrecomputed(section.accounts, accountIndex, parentIndices, siblingsPerRow, hasChildFlags),
         };
     }
 }
@@ -66,23 +68,14 @@ function buildHorizontalClassColumnBalancesSlice(report, classAmounts, totalAmou
     const currencyCode = firstHeader?.balance.currencyCode ?? fallback.currencyCode;
     const currencySymbol = firstHeader?.balance.currencySymbol ?? fallback.currencySymbol;
     const timeframe = firstHeader?.balanceTimeFrame ?? 'month';
-    const emptySlice = {
-        balances: [],
-        additionalBalances: [],
-        filter: {
-            firstMonthOfFY: report.firstMonthOfFY,
-            timeframe,
-            balancesRange: { numberOfPeriods: 0, orderBy: 'ascending_date' },
-            additionalBalances: [],
-        },
-    };
+    const emptySlice = getEmptyHorizontalSectionBalancesSlice(report.firstMonthOfFY, timeframe);
     if (report.selectedPeriod == null) {
         return emptySlice;
     }
     const { startDate, endDate } = report.selectedPeriod;
-    const balances = report.classColumns.map((col, i) => ({
+    const balances = report.classColumns.map((col, columnIndex) => ({
         balance: {
-            amount: classAmounts[i] ?? 0,
+            amount: classAmounts[columnIndex] ?? 0,
             currencyCode,
             currencySymbol,
         },
@@ -120,64 +113,143 @@ function buildHorizontalClassColumnBalancesSlice(report, classAmounts, totalAmou
         },
     };
 }
-function findHorizontalAccountParentIndex(dfsOrderedAccountRows, childRowIndex) {
-    const childDepth = dfsOrderedAccountRows[childRowIndex].depth;
-    if (childDepth <= 2) {
-        return -1;
-    }
-    for (let earlierRowIndex = childRowIndex - 1; earlierRowIndex >= 0; earlierRowIndex--) {
-        const earlierDepth = dfsOrderedAccountRows[earlierRowIndex].depth;
-        if (earlierDepth < childDepth) {
-            if (earlierDepth === childDepth - 1) {
-                return earlierRowIndex;
+/**
+ * Parent index per DFS row — O(n). Matches the scan in the former
+ * `findHorizontalAccountParentIndex` (depth &lt;= 2 rows have no parent).
+ */
+function computeHorizontalAccountParentIndices(rows) {
+    const accountRowCount = rows.length;
+    const parentIndex = new Array(accountRowCount).fill(-1);
+    const stack = [];
+    for (let rowIndex = 0; rowIndex < accountRowCount; rowIndex++) {
+        const accountRow = rows[rowIndex];
+        if (accountRow == null) {
+            continue;
+        }
+        const depth = accountRow.depth;
+        while (stack.length > 0) {
+            const topRow = rows[stack[stack.length - 1]];
+            if (topRow == null) {
+                stack.pop();
+                continue;
+            }
+            if (topRow.depth < depth) {
+                break;
+            }
+            stack.pop();
+        }
+        if (depth > 2 && stack.length > 0) {
+            const peek = stack[stack.length - 1];
+            const parentRow = rows[peek];
+            if (parentRow != null && parentRow.depth === depth - 1) {
+                parentIndex[rowIndex] = peek;
             }
-            return -1;
         }
+        stack.push(rowIndex);
     }
-    return -1;
+    return parentIndex;
 }
-function getHorizontalAccountSiblingIndices(dfsOrderedAccountRows, rowIndex) {
-    const parentRowIndex = findHorizontalAccountParentIndex(dfsOrderedAccountRows, rowIndex);
-    const rowDepth = dfsOrderedAccountRows[rowIndex].depth;
-    const siblings = [];
-    for (let i = 0; i < dfsOrderedAccountRows.length; i++) {
-        if (dfsOrderedAccountRows[i].depth === rowDepth &&
-            findHorizontalAccountParentIndex(dfsOrderedAccountRows, i) ===
-                parentRowIndex) {
-            siblings.push(i);
+/** Sibling row indices (same parent + depth), in traversal order — O(n). */
+function buildSiblingIndicesPerRow(rows, parentIndices) {
+    const accountRowCount = rows.length;
+    const keyToIndices = new Map();
+    for (let rowIndex = 0; rowIndex < accountRowCount; rowIndex++) {
+        const parentRowIndex = parentIndices[rowIndex];
+        const accountRow = rows[rowIndex];
+        if (parentRowIndex == null || accountRow == null) {
+            continue;
+        }
+        const key = `${parentRowIndex}:${accountRow.depth}`;
+        let siblingGroup = keyToIndices.get(key);
+        if (siblingGroup == null) {
+            siblingGroup = [];
+            keyToIndices.set(key, siblingGroup);
+        }
+        siblingGroup.push(rowIndex);
+    }
+    const siblingsPerRow = new Array(accountRowCount);
+    for (let rowIndex = 0; rowIndex < accountRowCount; rowIndex++) {
+        const parentRowIndex = parentIndices[rowIndex];
+        const accountRow = rows[rowIndex];
+        if (parentRowIndex == null || accountRow == null) {
+            siblingsPerRow[rowIndex] = [rowIndex];
+            continue;
         }
+        const key = `${parentRowIndex}:${accountRow.depth}`;
+        const group = keyToIndices.get(key);
+        siblingsPerRow[rowIndex] = group != null ? group : [rowIndex];
     }
-    return siblings;
+    return siblingsPerRow;
 }
-function horizontalAccountHasChildRows(dfsOrderedAccountRows, parentRowIndex) {
-    return dfsOrderedAccountRows.some((_, rowIndex) => findHorizontalAccountParentIndex(dfsOrderedAccountRows, rowIndex) ===
-        parentRowIndex);
+function computeHorizontalHasChildFlags(parentIndices) {
+    const rowCount = parentIndices.length;
+    const flags = new Array(rowCount).fill(false);
+    for (let rowIndex = 0; rowIndex < rowCount; rowIndex++) {
+        const parentRowIndex = parentIndices[rowIndex];
+        if (parentRowIndex != null &&
+            parentRowIndex >= 0 &&
+            parentRowIndex < rowCount) {
+            flags[parentRowIndex] = true;
+        }
+    }
+    return flags;
 }
-function buildHorizontalSubAccountAncestorMetadata(dfsOrderedAccountRows, currentRowIndex) {
-    const ancestorRowIndicesRootToLeaf = [];
+function buildHorizontalSubAccountAncestorMetadataFromPrecomputed(dfsOrderedAccountRows, currentRowIndex, parentIndices, siblingsPerRow, hasChildFlags) {
+    const chain = [];
     let walkRowIndex = currentRowIndex;
     while (walkRowIndex >= 0) {
-        ancestorRowIndicesRootToLeaf.unshift(walkRowIndex);
-        walkRowIndex = findHorizontalAccountParentIndex(dfsOrderedAccountRows, walkRowIndex);
+        chain.unshift(walkRowIndex);
+        const parentRowIndex = parentIndices[walkRowIndex];
+        if (parentRowIndex == null) {
+            break;
+        }
+        walkRowIndex = parentRowIndex;
     }
-    return ancestorRowIndicesRootToLeaf.map((rowIndex) => {
-        const siblingIndices = getHorizontalAccountSiblingIndices(dfsOrderedAccountRows, rowIndex);
+    return chain.map((rowIndex) => {
+        const accountRow = dfsOrderedAccountRows[rowIndex];
+        const siblingIndices = siblingsPerRow[rowIndex];
+        const hasChild = hasChildFlags[rowIndex];
+        if (accountRow == null || siblingIndices == null) {
+            return {
+                depth: 0,
+                hasSibling: false,
+                hasChildren: hasChild === true,
+                isLastNode: true,
+                name: '',
+            };
+        }
         return {
-            depth: dfsOrderedAccountRows[rowIndex].depth - 2,
+            depth: accountRow.depth - 2,
             hasSibling: siblingIndices.length > 1,
-            hasChildren: horizontalAccountHasChildRows(dfsOrderedAccountRows, rowIndex),
+            hasChildren: hasChild === true,
             isLastNode: rowIndex === siblingIndices[siblingIndices.length - 1],
-            name: dfsOrderedAccountRows[rowIndex].accountName,
+            name: accountRow.accountName,
         };
     });
 }
-function buildHorizontalAccountChildIndicesByParent(dfsOrderedAccountRows) {
+function buildHorizontalTreeViewFromPrecomputed(dfsOrderedAccountRows, currentRowIndex, parentIndices, siblingsPerRow, hasChildFlags) {
+    const siblingIndices = siblingsPerRow[currentRowIndex];
+    const accountRow = dfsOrderedAccountRows[currentRowIndex];
+    const hasChildrenFlag = hasChildFlags[currentRowIndex];
+    const treeDepth = accountRow != null ? Math.max(0, accountRow.depth - 2) : 0;
+    const hasChildren = hasChildrenFlag === true;
+    const siblings = siblingIndices ?? [currentRowIndex];
+    return {
+        subAccountAncestorMetadata: buildHorizontalSubAccountAncestorMetadataFromPrecomputed(dfsOrderedAccountRows, currentRowIndex, parentIndices, siblingsPerRow, hasChildFlags),
+        treeDepth,
+        hasChildren,
+        hasSiblings: siblings.length > 1,
+        isLeaf: !hasChildren,
+        isLastNode: currentRowIndex === siblings[siblings.length - 1],
+    };
+}
+function buildHorizontalAccountChildIndicesByParent(parentIndices) {
     const childIndicesByParentRowIndex = new Map();
-    for (let rowIndex = 0; rowIndex < dfsOrderedAccountRows.length; rowIndex++) {
-        const parentRowIndex = findHorizontalAccountParentIndex(dfsOrderedAccountRows, rowIndex);
-        if (parentRowIndex >= 0) {
+    for (let rowIndex = 0; rowIndex < parentIndices.length; rowIndex++) {
+        const parentRowIndex = parentIndices[rowIndex];
+        if (parentRowIndex != null && parentRowIndex >= 0) {
             let childRowIndices = childIndicesByParentRowIndex.get(parentRowIndex);
-            if (childRowIndices === undefined) {
+            if (childRowIndices == null) {
                 childRowIndices = [];
                 childIndicesByParentRowIndex.set(parentRowIndex, childRowIndices);
             }
@@ -186,16 +258,3 @@ function buildHorizontalAccountChildIndicesByParent(dfsOrderedAccountRows) {
     }
     return childIndicesByParentRowIndex;
 }
-function buildHorizontalTreeView(dfsOrderedAccountRows, currentRowIndex) {
-    const treeDepth = Math.max(0, dfsOrderedAccountRows[currentRowIndex].depth - 2);
-    const siblingIndices = getHorizontalAccountSiblingIndices(dfsOrderedAccountRows, currentRowIndex);
-    const hasChildren = horizontalAccountHasChildRows(dfsOrderedAccountRows, currentRowIndex);
-    return {
-        subAccountAncestorMetadata: buildHorizontalSubAccountAncestorMetadata(dfsOrderedAccountRows, currentRowIndex),
-        treeDepth,
-        hasChildren,
-        hasSiblings: siblingIndices.length > 1,
-        isLeaf: !hasChildren,
-        isLastNode: currentRowIndex === siblingIndices[siblingIndices.length - 1],
-    };
-}

package/lib/esm/view/spendManagement/billPay/billList/billListSelector.js

@@ -416,6 +416,14 @@ export const getBillListOnSort = (sortKey, sortOrder, currentTab, transactions)
                     transactionsWithNoSortKeyValue.push(transaction);
                 }
                 break;
+            case 'invoiceNumber':
+                if (transaction.documentId != null) {
+                    transactionsWithSortKeyValue.push(transaction);
+                }
+                else {
+                    transactionsWithNoSortKeyValue.push(transaction);
+                }
+                break;
             case 'dueDate':
                 if (currentTab === 'draft') {
                     if (Boolean(transaction.dueDate) === true) {
@@ -518,6 +526,8 @@ export const getBillListOnSort = (sortKey, sortOrder, currentTab, transactions)
                 return transaction.totalAmountInUSD?.amount ?? 0;
             case 'paymentMethod':
                 return transaction.billPayInfo.billPaymentMethodType.name;
+            case 'invoiceNumber':
+                return transaction.documentId;
         }
     }, getColumnWiseSortOrder(sortOrder));
     return [

package/lib/esm/view/spendManagement/billPay/billList/billListState.js

@@ -43,6 +43,7 @@ const ALL_BILL_PAY_SORT_KEYS = [
     'invoiceDate',
     'name',
     'paymentMethod',
+    'invoiceNumber',
 ];
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const toBillPaySortKeyType = (v) => stringToUnion(v, ALL_BILL_PAY_SORT_KEYS);

package/lib/esm/view/spendManagement/billPay/billPayReview/billPayReviewSelector.js

@@ -2,6 +2,7 @@ import recordGet from 'lodash/get';
 import { reduceFetchState } from '../../../../commonStateTypes/reduceFetchState';
 import { getContactsByIds } from '../../../../entity/billPay/contact/contactSelector';
 import { getPaymentAccountsByPaymentAccountIds } from '../../../../entity/paymentAccount/paymentAccountSelector';
+import { getIsAccountingClassesEnabled } from '../../../../entity/tenant/tenantSelector';
 import { getVendorByVendorId } from '../../../../entity/vendor/vendorSelector';
 import { getAccountList } from '../../../accountList/accountListSelector';
 import { getAllFundingAccounts, } from '../../commonSetup/setupViewSelector';
@@ -73,11 +74,14 @@ export const getReviewPageBillDetail = (state, billId) => {
             }
         }
         if (sourceBillDetail != null) {
-            sourceBillDetailFetchState = reduceFetchState([
+            const fetchStateList = [
                 sourceBillDetail.fetchStatus,
                 accountListState.byReportId['billPayAccountList'],
-                classListState,
-            ]).fetchState;
+            ];
+            if (getIsAccountingClassesEnabled(state)) {
+                fetchStateList.push(classListState);
+            }
+            sourceBillDetailFetchState = reduceFetchState(fetchStateList).fetchState;
         }
     }
     else {

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

@@ -3,6 +3,7 @@ import cloneDeep from 'lodash/cloneDeep';
 import { reduceAllFetchState, reduceAnyFetchState, } from '../../../../commonStateTypes/reduceFetchState';
 import { getApprovalRulesByIds } from '../../../../entity/approvalRule/approvalRuleSelector';
 import { getClassesByIds } from '../../../../entity/class/classSelector';
+import { getIsAccountingClassesEnabled } from '../../../../entity/tenant/tenantSelector';
 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) => {
@@ -44,7 +45,7 @@ export const getBillPaySetupApproverView = createSelector((state) => state.billP
         newApprovalRuleId,
     };
 });
-export const getBillPaySetupApproverUpdateDataView = createSelector((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (state) => state.classState, (state) => state.classListState, (state) => state.userRoleState, (billPaySetupApproverViewState, approvalRuleState, userState, classState, classListState, userRoleState) => {
+export const getBillPaySetupApproverUpdateDataView = createSelector((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (state) => state.classState, (state) => state.classListState, (state) => state.userRoleState, (state) => getIsAccountingClassesEnabled(state), (billPaySetupApproverViewState, approvalRuleState, userState, classState, classListState, userRoleState, isAccountingClassesEnabled) => {
     const { affectedEntityIds, approvalRuleIds, approverListState, billPaySetupApproverViewUpdateData, fetchState, error, listeningToPusherEvent, } = billPaySetupApproverViewState;
     const { approverIds, attributes } = approverListState;
     const allApprovalRules = getApprovalRulesByIds(approvalRuleState, approvalRuleIds);
@@ -92,10 +93,9 @@ export const getBillPaySetupApproverUpdateDataView = createSelector((state) => s
         allAttributes,
         filteredAttributes,
         billPaySetupApproverViewUpdateData,
-        approverListFetchStatus: reduceAllFetchState([
-            approverListState.fetchStatus,
-            classListState,
-        ]),
+        approverListFetchStatus: isAccountingClassesEnabled
+            ? reduceAllFetchState([approverListState.fetchStatus, classListState])
+            : approverListState.fetchStatus,
         fetchState,
         allAccountingClasses,
         error,

package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/epic/fetchBillPayApproversDetailsEpic.js

@@ -1,22 +1,27 @@
 import { concat, from } from 'rxjs';
 import { filter, mergeMap } from 'rxjs/operators';
+import { getIsAccountingClassesEnabled } from '../../../../../entity/tenant/tenantSelector';
 import { fetchClassList } from '../../../../classList/classListReducer';
 import { fetchBillPayApproversDetails, fetchBillPayApproversList, } from '../billPaySetupApproverViewReducer';
 export const fetchBillPayApproversDetailsEpic = (actions$, state$) => actions$.pipe(filter(fetchBillPayApproversDetails.match), mergeMap((action) => {
     const { cacheOverride, includeUserRoles } = action.payload;
     const { billPaySetupApproverViewState, classListState } = state$.value;
     const { approverListState } = billPaySetupApproverViewState;
+    const isAccountingClassesEnabled = getIsAccountingClassesEnabled(state$.value);
     const actions = [];
     if (cacheOverride === true) {
         actions.push(fetchBillPayApproversList(cacheOverride, includeUserRoles));
-        actions.push(fetchClassList());
+        if (isAccountingClassesEnabled) {
+            actions.push(fetchClassList());
+        }
     }
     else {
         if (billPaySetupApproverViewState.hasValidState() === false &&
             approverListState.fetchStatus.fetchState !== 'In-Progress') {
             actions.push(fetchBillPayApproversList(true, includeUserRoles));
         }
-        if (classListState.hasValidState() === false &&
+        if (isAccountingClassesEnabled &&
+            classListState.hasValidState() === false &&
             classListState.fetchState !== 'In-Progress') {
             actions.push(fetchClassList());
         }