@zeniai/client-epic-state 4.19.91-beta1ND → 4.19.91-beta3ND

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

@@ -43,8 +43,10 @@ export const getProfitAndLossClassesHorizontalView = (filter, accountState, clas
         profitAndLossClassesViewState.fetchState.year,
     ]);
     const reportId = 'profit_and_loss_by_classes';
-    // Build class columns from the class hierarchy (top-level only)
-    const classColumns = buildClassColumns(profitAndLossClassesViewState.classHierarchy, profitAndLossClassesViewState.uiState.classesToFilterOut);
+    // Build class columns from the class hierarchy (top-level only).
+    // Use `filter.classesToFilterOut` so PDF/Excel downloads (fresh store, empty UI state)
+    // respect `classes_to_filter_out` from the request; in-app `classFilter` mirrors uiState.
+    const classColumns = buildClassColumns(profitAndLossClassesViewState.classHierarchy, filter.classesToFilterOut);
     const sections = {};
     const calculatedSections = {};
     let reportCurrency = FALLBACK_REPORT_CURRENCY;
@@ -120,7 +122,8 @@ function buildClassColumns(classHierarchy, classesToFilterOut) {
         className: c.className,
         nestedClassId: c.classId,
         qboId: c.qboId,
-    }));
+    }))
+        .sort((a, b) => a.className.localeCompare(b.className, undefined, { sensitivity: 'base' }));
 }
 /**
  * Pivot a section from class→account→balances to account→class→balance (single period).
@@ -155,10 +158,19 @@ function pivotSectionToHorizontal(section, classColumns, title, currency) {
         accounts.push({
             accountId,
             accountName: accountData.accountName,
+            depth: accountData.depth,
             classBalances,
             rowTotal: toAmountWC(rowTotal, currency),
         });
     });
+    accounts.sort((a, b) => {
+        if (a.depth !== b.depth) {
+            return a.depth - b.depth;
+        }
+        return a.accountName.localeCompare(b.accountName, undefined, {
+            sensitivity: 'base',
+        });
+    });
     // Build class totals
     const classTotals = classColumns.map((col) => ({
         classId: col.classId,
@@ -176,21 +188,22 @@ function pivotSectionToHorizontal(section, classColumns, title, currency) {
  * Recursively collect account balances from a NestedClassReportV2 into accountMap.
  */
 function collectAccountsFromClass(classReport, classId, accountMap) {
-    // Process accounts directly on this class
+    // Process accounts directly on this class (depth 2 matches vertical `AccountsSection` first level)
     classReport.class.accounts.forEach((nestedAccount) => {
-        collectAccountsFromNestedAccount(nestedAccount, classId, accountMap);
+        collectAccountsFromNestedAccount(nestedAccount, classId, accountMap, 2);
     });
 }
 /**
  * Recursively collect accounts from NestedAccountReport (handles sub-accounts).
  */
-function collectAccountsFromNestedAccount(nestedAccount, classId, accountMap) {
+function collectAccountsFromNestedAccount(nestedAccount, classId, accountMap, depth) {
     const accountId = nestedAccount.account.accountId;
     const accountName = nestedAccount.account.accountName;
     const balance = sumBalancesInSlice(nestedAccount.account.balancesInTimeframe.balances);
     if (!accountMap.has(accountId)) {
         accountMap.set(accountId, {
             accountName,
+            depth,
             classBalances: new Map(),
         });
     }
@@ -198,11 +211,12 @@ function collectAccountsFromNestedAccount(nestedAccount, classId, accountMap) {
     if (accountData == null) {
         return;
     }
+    accountData.depth = Math.max(accountData.depth, depth);
     const existing = accountData.classBalances.get(classId) ?? 0;
     accountData.classBalances.set(classId, existing + balance);
     // Process sub-accounts
     nestedAccount.children.forEach((child) => {
-        collectAccountsFromNestedAccount(child, classId, accountMap);
+        collectAccountsFromNestedAccount(child, classId, accountMap, depth + 1);
     });
 }
 /**

package/lib/esm/view/reportUIOptions/updateReportUIOptionCOABalancesRangeEpic.js

@@ -2,15 +2,19 @@ import { of } from 'rxjs';
 import { filter, switchMap } from 'rxjs/operators';
 import { updateCashInCashOutCOABalancesRange } from '../cashInCashOut/cashInCashOutReducer';
 import { updateCashPositionCOABalancesRange } from '../cashPosition/cashPositionReducer';
-import { initialFinanceStatementState, updateCOABalancesRange, } from '../financeStatement/financeStatementReducer';
+import { updateCOABalancesRange } from '../financeStatement/financeStatementReducer';
 import { updateNetBurnOrIncomeCOABalancesRange } from '../netBurnOrIncome/netBurnOrIncomeReducer';
 import { updateOpExCOABalancesRange } from '../opEx/opExReducer';
 import { updateRevenueCOABalancesRange } from '../revenue/revenueReducer';
 import { updateReportUIOptionCOABalancesRange } from './reportUIOptionsReducer';
 export const updateReportUIOptionCOABalancesRangeEpic = (actions$, state$) => actions$.pipe(filter(updateReportUIOptionCOABalancesRange.match), switchMap((action) => {
-    const thisPeriod = action.payload.selectedCOABalancesRange.thisPeriod;
-    const orderBy = action.payload.selectedCOABalancesRange.orderBy;
-    const highlightedNoOfPeriods = state$.value.reportUIOptionsState.isCompareModeOn === true ? 4 : 1;
+    const selectedRange = action.payload.selectedCOABalancesRange;
+    const thisPeriod = selectedRange.thisPeriod;
+    const orderBy = selectedRange.orderBy;
+    const numberOfPeriodsFromSelection = selectedRange.numberOfPeriods;
+    const highlightedNoOfPeriods = state$.value.reportUIOptionsState.isCompareModeOn === true
+        ? numberOfPeriodsFromSelection
+        : 1;
     const highlightedCOABalancesRange = action.payload.highlightedCOABalancesRange == null && thisPeriod != null
         ? {
             numberOfPeriods: highlightedNoOfPeriods,
@@ -62,9 +66,7 @@ export const updateReportUIOptionCOABalancesRangeEpic = (actions$, state$) => ac
         thisPeriod: action.payload.highlightedCOABalancesRange != null
             ? action.payload.highlightedCOABalancesRange.thisPeriod
             : thisPeriod,
-        numberOfPeriods: state$.value.reportUIOptionsState.isCompareModeOn === true
-            ? 4
-            : initialFinanceStatementState.maxNumOfPeriodsToHighlight,
+        numberOfPeriods: numberOfPeriodsFromSelection,
         orderBy,
     }));
 }));