@zeniai/client-epic-state 4.19.97 → 4.19.99-beta0ND

package/lib/view/profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelector.js

@@ -0,0 +1,326 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProfitAndLossClassesHorizontalView = exports.profitAndLossHorizontalIdsInOrder = void 0;
+const amount_1 = require("../../commonStateTypes/amount");
+const getSummationBalance_1 = require("../../commonStateTypes/coaBalance/additionalBalances/getSummationBalance");
+const currencyHelper_1 = require("../../commonStateTypes/currencyHelper");
+const reduceFetchState_1 = require("../../commonStateTypes/reduceFetchState");
+const sectionClassesViewSelector_1 = require("../../entity/sectionClassesViewV2/sectionClassesViewSelector");
+const profitAndLossHorizontalEnrichment_1 = require("./profitAndLossHorizontalEnrichment");
+exports.profitAndLossHorizontalIdsInOrder = [
+    'income',
+    'cogs',
+    'grossProfit',
+    'expenses',
+    'earningsBeforeInterestAndTax',
+    'otherIncome',
+    'otherExpenses',
+    'netOtherIncome',
+    'netIncome',
+];
+const SECTION_TITLES = {
+    income: 'Income',
+    cogs: 'Cost of Goods Sold',
+    grossProfit: 'Gross Profit',
+    expenses: 'Expenses',
+    earningsBeforeInterestAndTax: 'Net Operating Income',
+    otherIncome: 'Other Income',
+    otherExpenses: 'Other Expenses',
+    netOtherIncome: 'Net Other Income',
+    netIncome: 'Net Income',
+};
+/** Sections fetched and pivoted for horizontal layout (excludes e.g. `netOperatingIncome`). */
+const HORIZONTAL_PANDL_SECTION_IDS = [
+    'income',
+    'cogs',
+    'expenses',
+    'otherIncome',
+    'otherExpenses',
+];
+const getProfitAndLossClassesHorizontalView = (filter, accountState, classState, sectionsState, profitAndLossClassesViewState, selectedPeriod) => {
+    const fetchState = (0, reduceFetchState_1.reduceFetchStateParallelTimeframes)([
+        profitAndLossClassesViewState.fetchState.month,
+        profitAndLossClassesViewState.fetchState.quarter,
+        profitAndLossClassesViewState.fetchState.year,
+    ]);
+    const reportId = 'profit_and_loss_by_classes';
+    // 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 = currencyHelper_1.defaultCustomerCurrency;
+    if (fetchState.fetchState === 'Completed' && selectedPeriod != null) {
+        // Get section reports using existing selector infrastructure
+        const sectionReports = {};
+        HORIZONTAL_PANDL_SECTION_IDS.forEach((sectionId) => {
+            sectionReports[sectionId] = (0, sectionClassesViewSelector_1.getSectionClassesViewReport)(accountState, classState, sectionsState, { reportId, sectionId }, filter);
+        });
+        reportCurrency =
+            profitAndLossClassesViewState.currency ?? currencyHelper_1.defaultCustomerCurrency;
+        // Pivot each section from class→account to account→class
+        HORIZONTAL_PANDL_SECTION_IDS.forEach((sectionId) => {
+            const sectionReport = sectionReports[sectionId];
+            if (sectionReport != null) {
+                sections[sectionId] = pivotSectionToHorizontal(sectionReport, classColumns, SECTION_TITLES[sectionId] ?? sectionId, reportCurrency);
+            }
+        });
+        // Calculate derived sections
+        const incomeSection = sections['income'];
+        const cogsSection = sections['cogs'];
+        const expensesSection = sections['expenses'];
+        const otherIncomeSection = sections['otherIncome'];
+        const otherExpensesSection = sections['otherExpenses'];
+        // Gross Profit = Income - COGS
+        if (incomeSection != null && cogsSection != null) {
+            calculatedSections['grossProfit'] = computeCalculatedSection(incomeSection.classTotals, cogsSection.classTotals, incomeSection.sectionTotal, cogsSection.sectionTotal, 'subtract', SECTION_TITLES['grossProfit']);
+        }
+        // EBIT = Gross Profit - Expenses
+        const grossProfit = calculatedSections['grossProfit'];
+        if (grossProfit != null && expensesSection != null) {
+            calculatedSections['earningsBeforeInterestAndTax'] =
+                computeCalculatedSection(grossProfit.classTotals, expensesSection.classTotals, grossProfit.sectionTotal, expensesSection.sectionTotal, 'subtract', SECTION_TITLES['earningsBeforeInterestAndTax']);
+        }
+        // Net Other Income = Other Income - Other Expenses
+        if (otherIncomeSection != null && otherExpensesSection != null) {
+            calculatedSections['netOtherIncome'] = computeCalculatedSection(otherIncomeSection.classTotals, otherExpensesSection.classTotals, otherIncomeSection.sectionTotal, otherExpensesSection.sectionTotal, 'subtract', SECTION_TITLES['netOtherIncome']);
+        }
+        // Net Income = EBIT + Net Other Income
+        const ebit = calculatedSections['earningsBeforeInterestAndTax'];
+        const netOtherIncome = calculatedSections['netOtherIncome'];
+        if (ebit != null && netOtherIncome != null) {
+            calculatedSections['netIncome'] = computeCalculatedSection(ebit.classTotals, netOtherIncome.classTotals, ebit.sectionTotal, netOtherIncome.sectionTotal, 'add', SECTION_TITLES['netIncome']);
+        }
+    }
+    // Build synthetic header COABalances for rendering class names as column headers
+    const headerBalances = buildHeaderBalances(classColumns, filter.timeframe, selectedPeriod, reportCurrency);
+    const report = {
+        reportId,
+        reportTitle: 'Profit and Loss by Class',
+        firstMonthOfFY: profitAndLossClassesViewState.firstMonthOfFY,
+        fetchState: fetchState.fetchState,
+        bookCloseDate: profitAndLossClassesViewState.bookCloseDate,
+        dataAvailable: profitAndLossClassesViewState.dataAvailable,
+        selectedPeriod,
+        classColumns,
+        sections,
+        calculatedSections,
+        idsInOrder: exports.profitAndLossHorizontalIdsInOrder,
+        uiState: profitAndLossClassesViewState.uiState,
+        headerBalances,
+    };
+    (0, profitAndLossHorizontalEnrichment_1.enrichProfitAndLossByClassHorizontalReport)(report);
+    return report;
+};
+exports.getProfitAndLossClassesHorizontalView = getProfitAndLossClassesHorizontalView;
+/**
+ * Build column definitions from class hierarchy (top-level classes only).
+ */
+function buildClassColumns(classHierarchy, classesToFilterOut) {
+    const filteredIds = new Set(classesToFilterOut.map((id) => id[0]));
+    return classHierarchy
+        .filter((c) => !filteredIds.has(c.classId[0]))
+        .map((c) => ({
+        classId: c.classId[0],
+        className: c.className,
+        nestedClassId: c.classId,
+        qboId: c.qboId,
+    }))
+        .sort((a, b) => a.className.localeCompare(b.className, [], { sensitivity: 'base' }));
+}
+/**
+ * Pivot a section from class→account→balances to account→class→balance (single period).
+ */
+function pivotSectionToHorizontal(section, classColumns, title, currency) {
+    // Map: accountId -> { accountName, classId -> balance }
+    const accountMap = new Map();
+    // Also track class totals
+    const classTotalMap = new Map();
+    classColumns.forEach((col) => classTotalMap.set(col.classId, 0));
+    // Iterate over each class in the section
+    section.classes.forEach((classReport) => {
+        const classId = classReport.id[0];
+        // Only process classes that are in our columns
+        if (!classTotalMap.has(classId)) {
+            return;
+        }
+        // Sum all sliced period balances (same slice as vertical columns; multi-period = range total)
+        const classBalance = sumBalancesInSlice(classReport.childrenBalancesTotal.balances);
+        classTotalMap.set(classId, classBalance);
+        // Iterate through accounts in this class
+        collectAccountsFromClass(classReport, classId, accountMap);
+    });
+    // Build account rows in COA tree order (same parent/child ordering as vertical P&L by class).
+    // Sorting by depth + name flattened the hierarchy and broke sub-account grouping.
+    const orderedIds = collectAccountIdsInTreeOrder(section, classColumns);
+    const usedIds = new Set();
+    const accounts = [];
+    const pushAccountRow = (accountId) => {
+        const accountData = accountMap.get(accountId);
+        if (accountData == null) {
+            return;
+        }
+        usedIds.add(accountId);
+        const classBalances = classColumns.map((col) => ({
+            classId: col.classId,
+            balance: (0, amount_1.toAmountWC)(accountData.classBalances.get(col.classId) ?? 0, currency),
+        }));
+        const rowTotal = classBalances.reduce((sum, cb) => sum + cb.balance.amount, 0);
+        accounts.push({
+            accountId,
+            accountName: accountData.accountName,
+            accountType: accountData.accountType,
+            depth: accountData.depth,
+            classBalances,
+            rowTotal: (0, amount_1.toAmountWC)(rowTotal, currency),
+        });
+    };
+    for (const id of orderedIds) {
+        pushAccountRow(id);
+    }
+    for (const accountId of accountMap.keys()) {
+        if (!usedIds.has(accountId)) {
+            pushAccountRow(accountId);
+        }
+    }
+    // Build class totals
+    const classTotals = classColumns.map((col) => ({
+        classId: col.classId,
+        balance: (0, amount_1.toAmountWC)(classTotalMap.get(col.classId) ?? 0, currency),
+    }));
+    const sectionTotal = classTotals.reduce((sum, ct) => sum + ct.balance.amount, 0);
+    return {
+        title,
+        accounts,
+        classTotals,
+        sectionTotal: (0, amount_1.toAmountWC)(sectionTotal, currency),
+    };
+}
+/**
+ * DFS account ids in the same order as vertical P&L by class, using the first class
+ * column that appears in this section as the canonical tree (structure is identical per class).
+ */
+function collectAccountIdsInTreeOrder(section, classColumns) {
+    const ids = [];
+    const visitNested = (nested) => {
+        ids.push(nested.account.accountId);
+        nested.children.forEach(visitNested);
+    };
+    for (const col of classColumns) {
+        const classReport = section.classes.find((c) => c.id[0] === col.classId);
+        if (classReport == null) {
+            continue;
+        }
+        classReport.class.accounts.forEach(visitNested);
+        return ids;
+    }
+    return ids;
+}
+/**
+ * Recursively collect account balances from a NestedClassReportV2 into accountMap.
+ */
+function collectAccountsFromClass(classReport, classId, accountMap) {
+    // Process accounts directly on this class (depth 2 matches vertical `AccountsSection` first level)
+    classReport.class.accounts.forEach((nestedAccount) => {
+        collectAccountsFromNestedAccount(nestedAccount, classId, accountMap, 2);
+    });
+}
+/**
+ * Recursively collect accounts from NestedAccountReport (handles sub-accounts).
+ */
+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,
+            accountType: nestedAccount.account.accountType,
+            depth,
+            classBalances: new Map(),
+        });
+    }
+    const accountData = accountMap.get(accountId);
+    if (accountData == null) {
+        return;
+    }
+    accountData.depth = Math.max(accountData.depth, depth);
+    if (accountData.accountType == null &&
+        nestedAccount.account.accountType != null) {
+        accountData.accountType = nestedAccount.account.accountType;
+    }
+    const existing = accountData.classBalances.get(classId) ?? 0;
+    accountData.classBalances.set(classId, existing + balance);
+    // Process sub-accounts
+    nestedAccount.children.forEach((child) => {
+        collectAccountsFromNestedAccount(child, classId, accountMap, depth + 1);
+    });
+}
+/**
+ * Total `balance.amount` for the current COA slice (same aggregation as
+ * `getSummationFreeRangeTotalBalance`, used for class totals and account rows).
+ */
+function sumBalancesInSlice(balances) {
+    if (balances.length === 0) {
+        return 0;
+    }
+    const summed = (0, getSummationBalance_1.getSummationFreeRangeTotalBalance)([...balances]);
+    return summed?.balance.amount ?? 0;
+}
+/**
+ * Compute a calculated section by adding or subtracting two sets of class totals.
+ */
+function computeCalculatedSection(aTotals, bTotals, aTotal, bTotal, operation, title) {
+    const currency = {
+        currencyCode: aTotal.currencyCode,
+        currencySymbol: aTotal.currencySymbol,
+    };
+    const bTotalsMap = new Map(bTotals.map((b) => [b.classId, b.balance.amount]));
+    const classTotals = aTotals.map((a) => {
+        const bAmount = bTotalsMap.get(a.classId) ?? 0;
+        const resultAmount = operation === 'add'
+            ? a.balance.amount + bAmount
+            : a.balance.amount - bAmount;
+        return {
+            classId: a.classId,
+            balance: (0, amount_1.toAmountWC)(resultAmount, currency),
+        };
+    });
+    const sectionTotalAmount = operation === 'add'
+        ? aTotal.amount + bTotal.amount
+        : aTotal.amount - bTotal.amount;
+    return {
+        title,
+        classTotals,
+        sectionTotal: (0, amount_1.toAmountWC)(sectionTotalAmount, currency),
+    };
+}
+/**
+ * Build synthetic COABalance array for header rendering.
+ * One entry per class column + one for "Total".
+ */
+function buildHeaderBalances(classColumns, timeframe, selectedPeriod, currency) {
+    if (selectedPeriod == null) {
+        return [];
+    }
+    const { endDate, startDate } = selectedPeriod;
+    const balances = classColumns.map((col) => ({
+        balance: (0, amount_1.toAmountWC)(0, currency),
+        balanceTimeFrame: timeframe,
+        endDate,
+        startDate,
+        type: 'default',
+        label: col.className,
+    }));
+    // Add a "Total" column
+    balances.push({
+        balance: (0, amount_1.toAmountWC)(0, currency),
+        balanceTimeFrame: timeframe,
+        endDate,
+        startDate,
+        type: 'default',
+        label: 'Total',
+    });
+    return balances;
+}

package/lib/view/profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelectorTypes.d.ts

@@ -0,0 +1,111 @@
+import { Amount } from '../../commonStateTypes/amount';
+import { NestedClassID } from '../../commonStateTypes/classesView/nestedClassID';
+import { COABalance } from '../../commonStateTypes/coaBalance/coaBalance';
+import { COABalancesSlice } from '../../commonStateTypes/coaBalance/coaBalancesFilter';
+import { FetchState, ID } from '../../commonStateTypes/common';
+import { DataAvailable } from '../../commonStateTypes/dataAvailable';
+import { Month } from '../../commonStateTypes/timePeriod';
+import { ReportID } from '../../commonStateTypes/viewAndReport/viewAndReport';
+import { AccountType } from '../../entity/account/accountState';
+import { ZeniDate } from '../../zeniDayJS';
+import { PandLReportViewCalculatedSectionID, PandLReportViewSectionID } from './profitAndLossClassesViewSelectorTypes';
+import { ProfitAndLossClassesViewUIState } from './profitAndLossClassesViewState';
+export interface ClassColumnDefinition {
+    classId: string;
+    className: string;
+    nestedClassId: NestedClassID;
+    qboId?: ID;
+}
+export interface HorizontalClassBalance {
+    balance: Amount;
+    classId: string;
+}
+/** Synthetic COABalance `id` for the horizontal class report Total column (transaction routing). */
+export declare const HORIZONTAL_CLASS_TOTAL_BALANCE_ID = "__horizontal_total__";
+/** One line in the account column tree chrome (same role as report-tree ancestor metadata). */
+export interface HorizontalAccountTreeLineMetadata {
+    depth: number;
+    hasChildren: boolean;
+    hasSibling: boolean;
+    isLastNode: boolean;
+    name?: string;
+}
+export interface HorizontalAccountTreeView {
+    hasChildren: boolean;
+    hasSiblings: boolean;
+    isLastNode: boolean;
+    isLeaf: boolean;
+    subAccountAncestorMetadata: HorizontalAccountTreeLineMetadata[];
+    treeDepth: number;
+}
+/**
+ * Row payload for horizontal P&L-by-class account cells (synthetic balances + tree chrome).
+ */
+export interface HorizontalAccountReportData {
+    accountId: string;
+    accountName: string;
+    balancesInTimeframe: COABalancesSlice;
+    /** Nesting depth in the section account tree (matches `HorizontalAccountRow.depth`). */
+    depth: number;
+    accountType?: AccountType;
+    horizontalTreeView?: HorizontalAccountTreeView;
+}
+export declare function isHorizontalAccountReportData(data: unknown): data is HorizontalAccountReportData;
+export interface HorizontalAccountRow {
+    accountId: string;
+    accountName: string;
+    classBalances: HorizontalClassBalance[];
+    /** Matches vertical classes PDF account indentation (`depth * 6` pt); top-level rows use 2. */
+    depth: number;
+    rowTotal: Amount;
+    /**
+     * Filled by `enrichProfitAndLossByClassHorizontalReport` for UI tree mapping
+     * (balances slice + `TreeViewRow` metadata).
+     */
+    accountReportData?: HorizontalAccountReportData;
+    /** COA account type (same as vertical `AccountReport.accountType`) for transaction links. */
+    accountType?: AccountType;
+}
+/** Nested account row structure for a horizontal section (flat rows → tree). */
+export interface HorizontalSectionTreeLayout {
+    /** Parent row index → child row indices. */
+    childrenRowIndicesByParent: Record<number, number[]>;
+    rootAccountRowIndices: number[];
+}
+export interface HorizontalSectionReport {
+    accounts: HorizontalAccountRow[];
+    classTotals: HorizontalClassBalance[];
+    sectionTotal: Amount;
+    title: string;
+    /** Synthetic balances for the section header row (class columns + Total); set by enrichment. */
+    sectionHeaderBalancesSlice?: COABalancesSlice;
+    /** Row hierarchy for mapping to report-tree nodes; set by enrichment. */
+    treeLayout?: HorizontalSectionTreeLayout;
+}
+export interface HorizontalCalculatedSection {
+    classTotals: HorizontalClassBalance[];
+    sectionTotal: Amount;
+    title: string;
+    /** Synthetic balances for the calculated row; set by enrichment. */
+    sectionHeaderBalancesSlice?: COABalancesSlice;
+}
+export interface ProfitAndLossByClassHorizontalReport {
+    calculatedSections: Partial<Record<PandLReportViewCalculatedSectionID, HorizontalCalculatedSection>>;
+    classColumns: ClassColumnDefinition[];
+    fetchState: FetchState;
+    firstMonthOfFY: Month;
+    /** Synthetic COABalance array for header rendering — one per class column + total */
+    headerBalances: COABalance[];
+    idsInOrder: (PandLReportViewSectionID | PandLReportViewCalculatedSectionID)[];
+    reportId: ReportID;
+    reportTitle: string;
+    sections: Partial<Record<PandLReportViewSectionID, HorizontalSectionReport>>;
+    selectedPeriod: {
+        endDate: ZeniDate;
+        startDate: ZeniDate;
+        label?: string;
+    } | undefined;
+    uiState: ProfitAndLossClassesViewUIState;
+    bookCloseDate?: ZeniDate;
+    dataAvailable?: DataAvailable;
+}

package/lib/view/profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelectorTypes.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HORIZONTAL_CLASS_TOTAL_BALANCE_ID = void 0;
+exports.isHorizontalAccountReportData = isHorizontalAccountReportData;
+/** Synthetic COABalance `id` for the horizontal class report Total column (transaction routing). */
+exports.HORIZONTAL_CLASS_TOTAL_BALANCE_ID = '__horizontal_total__';
+function isHorizontalAccountReportData(data) {
+    return (typeof data === 'object' &&
+        data !== null &&
+        'depth' in data &&
+        typeof data.depth === 'number' &&
+        !('filter' in data));
+}

package/lib/view/profitAndLossClassesView/profitAndLossClassesViewReducer.d.ts

@@ -2,7 +2,7 @@ import { NestedClassID } from '../../commonStateTypes/classesView/nestedClassID'
 import { AccountViewMode, ID } from '../../commonStateTypes/common';
 import { ZeniAPIStatus, ZeniReportData } from '../../responsePayload';
 import { ProfitAndLossClassesViewPayload } from './profitAndLossClassesViewPayload';
-import { ProfitAndLossClassesViewState } from './profitAndLossClassesViewState';
+import { ClassViewLayout, ProfitAndLossClassesViewState } from './profitAndLossClassesViewState';
 export declare const initialState: ProfitAndLossClassesViewState;
 export declare const fetchProfitAndLossClassesView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: boolean | undefined], {
     cacheOverride: boolean;
@@ -30,6 +30,8 @@ export declare const fetchProfitAndLossClassesView: import("@reduxjs/toolkit").A
     };
 }, "profitAndLossClassesView/updateProfitAndLossClassesViewUIState">, updateAccountViewMode: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     viewMode: AccountViewMode;
-}, "profitAndLossClassesView/updateAccountViewMode">, resetProfitAndLossClassesNodeCollapseState: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"profitAndLossClassesView/resetProfitAndLossClassesNodeCollapseState">, clearProfitAndLossClassesView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"profitAndLossClassesView/clearProfitAndLossClassesView">;
+}, "profitAndLossClassesView/updateAccountViewMode">, updateClassViewLayout: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    classViewLayout: ClassViewLayout;
+}, "profitAndLossClassesView/updateClassViewLayout">, resetProfitAndLossClassesNodeCollapseState: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"profitAndLossClassesView/resetProfitAndLossClassesNodeCollapseState">, clearProfitAndLossClassesView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"profitAndLossClassesView/clearProfitAndLossClassesView">;
 declare const _default: import("redux").Reducer<ProfitAndLossClassesViewState>;
 export default _default;

package/lib/view/profitAndLossClassesView/profitAndLossClassesViewReducer.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearProfitAndLossClassesView = exports.resetProfitAndLossClassesNodeCollapseState = exports.updateAccountViewMode = exports.updateProfitAndLossClassesViewUIState = exports.updateClassesToFilterOut = exports.updateProfitAndLossForTimeframeClassesViewFailure = exports.updateProfitAndLossForTimeframeClassesView = exports.fetchProfitAndLossForTimeframeClassesView = exports.fetchProfitAndLossClassesView = exports.initialState = void 0;
+exports.clearProfitAndLossClassesView = exports.resetProfitAndLossClassesNodeCollapseState = exports.updateClassViewLayout = exports.updateAccountViewMode = exports.updateProfitAndLossClassesViewUIState = exports.updateClassesToFilterOut = exports.updateProfitAndLossForTimeframeClassesViewFailure = exports.updateProfitAndLossForTimeframeClassesView = exports.fetchProfitAndLossForTimeframeClassesView = exports.fetchProfitAndLossClassesView = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const viewAndReportPayloadv2_1 = require("../../commonPayloadTypes/v2/viewAndReportPayloadv2");
 const getNestedClassIDHierarchyForReport_1 = require("../../commonStateTypes/classesView/getNestedClassIDHierarchyForReport");
@@ -27,6 +27,7 @@ exports.initialState = {
         nodeCollapseState: {},
         scrollPosition: undefined,
         accountViewMode: 'account_group',
+        classViewLayout: 'vertical',
         classesToFilterOut: [],
     },
     firstMonthOfFY: 1,
@@ -98,6 +99,9 @@ const profitAndLossClassesView = (0, toolkit_1.createSlice)({
         updateAccountViewMode(draft, action) {
             draft.uiState.accountViewMode = action.payload.viewMode;
         },
+        updateClassViewLayout(draft, action) {
+            draft.uiState.classViewLayout = action.payload.classViewLayout;
+        },
         resetProfitAndLossClassesNodeCollapseState(draft) {
             draft.uiState.nodeCollapseState = {};
         },
@@ -106,10 +110,11 @@ const profitAndLossClassesView = (0, toolkit_1.createSlice)({
         },
     },
 });
-_a = profitAndLossClassesView.actions, exports.fetchProfitAndLossClassesView = _a.fetchProfitAndLossClassesView, exports.fetchProfitAndLossForTimeframeClassesView = _a.fetchProfitAndLossForTimeframeClassesView, exports.updateProfitAndLossForTimeframeClassesView = _a.updateProfitAndLossForTimeframeClassesView, exports.updateProfitAndLossForTimeframeClassesViewFailure = _a.updateProfitAndLossForTimeframeClassesViewFailure, exports.updateClassesToFilterOut = _a.updateClassesToFilterOut, exports.updateProfitAndLossClassesViewUIState = _a.updateProfitAndLossClassesViewUIState, exports.updateAccountViewMode = _a.updateAccountViewMode, exports.resetProfitAndLossClassesNodeCollapseState = _a.resetProfitAndLossClassesNodeCollapseState, exports.clearProfitAndLossClassesView = _a.clearProfitAndLossClassesView;
+_a = profitAndLossClassesView.actions, exports.fetchProfitAndLossClassesView = _a.fetchProfitAndLossClassesView, exports.fetchProfitAndLossForTimeframeClassesView = _a.fetchProfitAndLossForTimeframeClassesView, exports.updateProfitAndLossForTimeframeClassesView = _a.updateProfitAndLossForTimeframeClassesView, exports.updateProfitAndLossForTimeframeClassesViewFailure = _a.updateProfitAndLossForTimeframeClassesViewFailure, exports.updateClassesToFilterOut = _a.updateClassesToFilterOut, exports.updateProfitAndLossClassesViewUIState = _a.updateProfitAndLossClassesViewUIState, exports.updateAccountViewMode = _a.updateAccountViewMode, exports.updateClassViewLayout = _a.updateClassViewLayout, exports.resetProfitAndLossClassesNodeCollapseState = _a.resetProfitAndLossClassesNodeCollapseState, exports.clearProfitAndLossClassesView = _a.clearProfitAndLossClassesView;
 exports.default = profitAndLossClassesView.reducer;
 const doUpdatedProfitAndLossClassesView = (draft, timeframe, pandLReport) => {
     const report = (0, viewAndReportPayloadv2_1.mapReportPayloadV2ToReportV2)(pandLReport.report);
+    draft.currency = report.currency;
     draft.dataAvailable = report.dataAvailable;
     draft.firstMonthOfFY = report.firstMonthOfFY;
     draft.bookCloseDate = report.bookCloseDate;

package/lib/view/profitAndLossClassesView/profitAndLossClassesViewSelector.js

@@ -4,6 +4,7 @@ exports.getProfitAndLossClassesView = exports.profitAndLossIdsInOrder = void 0;
 const getDifferenceOfBalancesGroupedByPeriod_1 = require("../../commonStateTypes/coaBalance/classBalances/getDifferenceOfBalancesGroupedByPeriod");
 const getSumOfBalancesGroupedByPeriod_1 = require("../../commonStateTypes/coaBalance/classBalances/getSumOfBalancesGroupedByPeriod");
 const coaBalance_1 = require("../../commonStateTypes/coaBalance/coaBalance");
+const reduceFetchState_1 = require("../../commonStateTypes/reduceFetchState");
 const sectionClassesViewSelector_1 = require("../../entity/sectionClassesViewV2/sectionClassesViewSelector");
 const profitAndLossClassesViewSelectorTypes_1 = require("./profitAndLossClassesViewSelectorTypes");
 exports.profitAndLossIdsInOrder = [
@@ -18,7 +19,7 @@ exports.profitAndLossIdsInOrder = [
     'netIncome',
 ];
 const getProfitAndLossClassesView = (filter, accountState, classState, sectionsState, profitAndLossClassesViewState) => {
-    const fetchState = reduceFetchState([
+    const fetchState = (0, reduceFetchState_1.reduceFetchStateParallelTimeframes)([
         profitAndLossClassesViewState.fetchState.month,
         profitAndLossClassesViewState.fetchState.quarter,
         profitAndLossClassesViewState.fetchState.year,
@@ -68,31 +69,3 @@ const getProfitAndLossClassesView = (filter, accountState, classState, sectionsS
     };
 };
 exports.getProfitAndLossClassesView = getProfitAndLossClassesView;
-function reduceFetchState(fetchStateList) {
-    const isAnyProgress = fetchStateList.reduce((prevValue, currentValue) => {
-        return prevValue === true || currentValue.fetchState === 'In-Progress';
-    }, false);
-    const isAllCompleted = fetchStateList.reduce((prevValue, currentValue) => {
-        return prevValue === true && currentValue.fetchState === 'Completed';
-    }, true);
-    const isAnyError = fetchStateList.reduce((prevValue, currentValue) => {
-        return prevValue === true || currentValue.fetchState === 'Error';
-    }, false);
-    const error = fetchStateList.reduce((prevValue, currentValue) => {
-        return prevValue ?? currentValue.error;
-    }, undefined);
-    let fetchState = 'Not-Started';
-    if (isAnyProgress) {
-        fetchState = 'In-Progress';
-    }
-    else if (isAllCompleted) {
-        fetchState = 'Completed';
-    }
-    else if (isAnyError) {
-        fetchState = 'Error';
-    }
-    return {
-        fetchState,
-        error,
-    };
-}

package/lib/view/profitAndLossClassesView/profitAndLossClassesViewState.d.ts

@@ -1,9 +1,12 @@
+import { Currency } from '../../commonStateTypes/amount';
 import { NestedClassHierarchyForReport, NestedClassID } from '../../commonStateTypes/classesView/nestedClassID';
 import { AccountViewMode, FetchStateAndError, ID } from '../../commonStateTypes/common';
 import { Report } from '../../commonStateTypes/viewAndReport/viewAndReport';
+export type ClassViewLayout = 'vertical' | 'horizontal';
 export interface ProfitAndLossClassesViewUIState {
     accountViewMode: AccountViewMode;
     classesToFilterOut: NestedClassID[];
+    classViewLayout: ClassViewLayout;
     nodeCollapseState: Record<ID, boolean>;
     scrollPosition: {
         scrollTop: number;
@@ -18,4 +21,5 @@ export interface ProfitAndLossClassesViewState extends Report {
         year: FetchStateAndError;
     };
     uiState: ProfitAndLossClassesViewUIState;
+    currency?: Currency;
 }

package/lib/view/profitAndLossClassesView/profitAndLossForTimeframeClassesViewEpic.js

@@ -27,11 +27,13 @@ const fetchProfitAndLossForTimeframeClassesViewEpic = (actions$, _, zeniAPI) =>
         .pipe((0, operators_1.mergeMap)((response) => {
         if (response.data != null && (0, responsePayload_1.isSuccessResponse)(response)) {
             const actions = [];
-            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'cogs', 'profit_and_loss_by_classes', response.data.report.cogs, response.data.report.classes, response.data.report.accounts, response.data.report.currency));
-            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'expenses', 'profit_and_loss_by_classes', response.data.report.expenses, response.data.report.classes, response.data.report.accounts, response.data.report.currency));
-            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'income', 'profit_and_loss_by_classes', response.data.report.income, response.data.report.classes, response.data.report.accounts, response.data.report.currency));
-            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'otherExpenses', 'profit_and_loss_by_classes', response.data.report.other_expenses, response.data.report.classes, response.data.report.accounts, response.data.report.currency));
-            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'otherIncome', 'profit_and_loss_by_classes', response.data.report.other_income, response.data.report.classes, response.data.report.accounts, response.data.report.currency));
+            const report = response.data.report;
+            const currency = report.currency;
+            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'cogs', 'profit_and_loss_by_classes', report.cogs, report.classes, report.accounts, currency));
+            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'expenses', 'profit_and_loss_by_classes', report.expenses, report.classes, report.accounts, currency));
+            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'income', 'profit_and_loss_by_classes', report.income, report.classes, report.accounts, currency));
+            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'otherExpenses', 'profit_and_loss_by_classes', report.other_expenses, report.classes, report.accounts, currency));
+            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'otherIncome', 'profit_and_loss_by_classes', report.other_income, report.classes, report.accounts, currency));
             actions.push((0, profitAndLossClassesViewReducer_1.updateProfitAndLossForTimeframeClassesView)({
                 timeframe: action.payload.timeframe,
                 report: response.data,

package/lib/view/profitAndLossClassesView/profitAndLossHorizontalEnrichment.d.ts

@@ -0,0 +1,6 @@
+import { ProfitAndLossByClassHorizontalReport } from './profitAndLossClassesByClassHorizontalSelectorTypes';
+/**
+ * Populates `sectionHeaderBalancesSlice`, and per-account `accountReportData`, so the
+ * web layer only maps selector output to tree nodes.
+ */
+export declare function enrichProfitAndLossByClassHorizontalReport(report: ProfitAndLossByClassHorizontalReport): void;