@zeniai/client-epic-state 4.19.91-beta2ND → 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;
@@ -156,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,
@@ -177,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(),
         });
     }
@@ -199,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);
     });
 }
 /**