@zeniai/client-epic-state 5.2.90 → 5.2.91

package/lib/esm/view/{reportUIOptions → financeStatement}/financeStatementCompareBalances.js

@@ -14,3 +14,10 @@ export function getFinanceStatementAdditionalBalances(requestedBalances, isCompa
             : [compareBalanceFromMode]),
     ];
 }
+// The table has one change column with a $/% picker, so only the first selected compare type is
+// shown; the rest of the selection still reaches the download.
+export function getDisplayedAdditionalBalances(selectedBalances) {
+    const otherBalances = stripCompareAdditionalBalanceTypes(selectedBalances);
+    const displayedCompareBalance = selectedBalances.find((balance) => !otherBalances.includes(balance));
+    return selectedBalances.filter((balance) => otherBalances.includes(balance) || balance === displayedCompareBalance);
+}

package/lib/esm/view/financeStatement/financeStatementSelector.js

@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { stripCompareAdditionalBalanceTypes } from '../../commonStateTypes/coaBalance/coaBalanceType';
+import { stripCompareAdditionalBalanceTypes, } from '../../commonStateTypes/coaBalance/coaBalanceType';
 import { newBalancesFilter, newBalancesFilterForDateRange, } from '../../commonStateTypes/coaBalance/coaBalancesFilter';
 import { newBalancesFilterClassesView } from '../../commonStateTypes/coaBalance/coaBalancesFilterClassesView';
 import { newBalancesFilterProjectView } from '../../commonStateTypes/coaBalance/coaBalancesFilterProjectView';
@@ -17,6 +17,17 @@ import { getProfitAndLossReport, } from '../profitAndLoss/profitAndLossSelector'
 import { getProfitAndLossClassesHorizontalView } from '../profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelector';
 import { getProfitAndLossClassesView } from '../profitAndLossClassesView/profitAndLossClassesViewSelector';
 import { getProfitAndLossProjectView } from '../profitAndLossProjectView/profitAndLossProjectViewSelector';
+import { getDisplayedAdditionalBalances } from './financeStatementCompareBalances';
+/**
+ * Reports are built from the displayed columns, but their filter carries the full selection: the
+ * download and the Add Columns picker read it from there.
+ */
+function withSelectedAdditionalBalances(report, selectedAdditionalBalances) {
+    return {
+        ...report,
+        filter: { ...report.filter, additionalBalances: selectedAdditionalBalances },
+    };
+}
 function getDateRangeForFinanceReports(profitAndLossState, balanceSheetState, cashFlowState) {
     const datesSorted = [
         profitAndLossState.dataAvailable?.startDate,
@@ -71,7 +82,7 @@ export const getFinanceStatement = createSelector((state) => state.accountState,
     const additionalBalancesForFilter = useHorizontalClassesLayout
         ? stripCompareAdditionalBalanceTypes(rawAdditionalBalances)
         : rawAdditionalBalances;
-    const filter = newBalancesFilter(firstMonthOfFY, financeStatementState.timeframe, Math.min(getNumberOfPeriods(firstMonthOfFY, financeStatementState.timeframe, dataAvailable) ?? financeStatementState.selectedCOABalancesRange.numberOfPeriods, financeStatementState.selectedCOABalancesRange.numberOfPeriods), thisPeriod, 'ascending_date', additionalBalancesForFilter);
+    const filter = newBalancesFilter(firstMonthOfFY, financeStatementState.timeframe, Math.min(getNumberOfPeriods(firstMonthOfFY, financeStatementState.timeframe, dataAvailable) ?? financeStatementState.selectedCOABalancesRange.numberOfPeriods, financeStatementState.selectedCOABalancesRange.numberOfPeriods), thisPeriod, 'ascending_date', getDisplayedAdditionalBalances(additionalBalancesForFilter));
     const profitAndLossReport = getProfitAndLossReport(filter, undefined, accountState, accountGroupState, sectionAccountsViewState, profitAndLossState, forecastState);
     const classFilter = newBalancesFilterClassesView(filter.firstMonthOfFY, filter.timeframe, filter.balancesRange.numberOfPeriods, filter.balancesRange.thisPeriod, filter.balancesRange.orderBy, filter.additionalBalances, profitAndLossClassesViewState.uiState.classesToFilterOut);
     const profitAndLossByClassReport = getProfitAndLossClassesView(classFilter, accountState, classState, sectionsState, profitAndLossClassesViewState);
@@ -163,17 +174,17 @@ export const getFinanceStatement = createSelector((state) => state.accountState,
         reportFormat: financeStatementState.reportFormat,
         firstMonthOfFY,
         dataAvailable,
-        profitAndLossReport,
-        profitAndLossByClassReport,
-        profitAndLossByProjectReport,
+        profitAndLossReport: withSelectedAdditionalBalances(profitAndLossReport, additionalBalancesForFilter),
+        profitAndLossByClassReport: withSelectedAdditionalBalances(profitAndLossByClassReport, additionalBalancesForFilter),
+        profitAndLossByProjectReport: withSelectedAdditionalBalances(profitAndLossByProjectReport, additionalBalancesForFilter),
         profitAndLossByClassHorizontalReport,
-        balanceSheetReport,
-        balanceSheetByClassReport,
-        cashFlowByClassReport,
-        cashFlowByProjectReport,
-        balanceSheetByProjectReport,
-        cashFlowReport,
-        filter,
+        balanceSheetReport: withSelectedAdditionalBalances(balanceSheetReport, additionalBalancesForFilter),
+        balanceSheetByClassReport: withSelectedAdditionalBalances(balanceSheetByClassReport, additionalBalancesForFilter),
+        cashFlowByClassReport: withSelectedAdditionalBalances(cashFlowByClassReport, additionalBalancesForFilter),
+        cashFlowByProjectReport: withSelectedAdditionalBalances(cashFlowByProjectReport, additionalBalancesForFilter),
+        balanceSheetByProjectReport: withSelectedAdditionalBalances(balanceSheetByProjectReport, additionalBalancesForFilter),
+        cashFlowReport: withSelectedAdditionalBalances(cashFlowReport, additionalBalancesForFilter),
+        filter: { ...filter, additionalBalances: additionalBalancesForFilter },
         selectedReportId: financeStatementState.selectedReportId,
         downloadState: financeStatementState.downloadState,
         isCompareModeOn: useHorizontalClassesLayout

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

@@ -2,12 +2,12 @@ import { of } from 'rxjs';
 import { filter, switchMap } from 'rxjs/operators';
 import { updateCashInCashOutAdditionalBalancesSelection } from '../cashInCashOut/cashInCashOutReducer';
 import { updateCashPositionAdditionalBalancesSelection } from '../cashPosition/cashPositionReducer';
+import { getFinanceStatementAdditionalBalances } from '../financeStatement/financeStatementCompareBalances';
 import { updateFinanceStatementAdditionalBalancesSelection } from '../financeStatement/financeStatementReducer';
 import { getFinanceStatement } from '../financeStatement/financeStatementSelector';
 import { updateNetBurnOrIncomeAdditionalBalancesSelection } from '../netBurnOrIncome/netBurnOrIncomeReducer';
 import { updateOpExAdditionalBalancesSelection } from '../opEx/opExReducer';
 import { updateRevenueAdditionalBalancesSelection } from '../revenue/revenueReducer';
-import { getFinanceStatementAdditionalBalances } from './financeStatementCompareBalances';
 import { updateReportUIOptionCompareMode } from './reportUIOptionsReducer';
 export const updateReportUIOptionIsCompareModeEpic = (actions$, state) => actions$.pipe(filter(updateReportUIOptionCompareMode.match), switchMap((action) => {
     const { additionalBalances } = action.payload;

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

@@ -2,12 +2,12 @@ import { from } from 'rxjs';
 import { filter, switchMap } from 'rxjs/operators';
 import { updateCashInCashOutAdditionalBalancesSelection } from '../cashInCashOut/cashInCashOutReducer';
 import { updateCashPositionAdditionalBalancesSelection } from '../cashPosition/cashPositionReducer';
+import { getFinanceStatementAdditionalBalances } from '../financeStatement/financeStatementCompareBalances';
 import { updateFinanceStatementAdditionalBalancesSelection } from '../financeStatement/financeStatementReducer';
 import { getFinanceStatement } from '../financeStatement/financeStatementSelector';
 import { updateNetBurnOrIncomeAdditionalBalancesSelection } from '../netBurnOrIncome/netBurnOrIncomeReducer';
 import { updateOpExAdditionalBalancesSelection } from '../opEx/opExReducer';
 import { updateRevenueAdditionalBalancesSelection } from '../revenue/revenueReducer';
-import { getFinanceStatementAdditionalBalances } from './financeStatementCompareBalances';
 import { toggleReportUIOptionForecastMode, updateReportUIOptionIsCompareModeOn, } from './reportUIOptionsReducer';
 export const updateReportUIOptionIsCompareModeOnEpic = (actions$, state) => actions$.pipe(filter(updateReportUIOptionIsCompareModeOn.match), switchMap((action) => {
     const { additionalBalances } = action.payload;

package/lib/view/{reportUIOptions → financeStatement}/financeStatementCompareBalances.d.ts

@@ -1,2 +1,3 @@
 import { COABalanceType } from '../../commonStateTypes/coaBalance/coaBalanceType';
 export declare function getFinanceStatementAdditionalBalances(requestedBalances: COABalanceType[], isCompareModeOn: boolean, compareBalanceFromMode: COABalanceType): COABalanceType[];
+export declare function getDisplayedAdditionalBalances(selectedBalances: COABalanceType[]): COABalanceType[];

package/lib/view/{reportUIOptions → financeStatement}/financeStatementCompareBalances.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFinanceStatementAdditionalBalances = getFinanceStatementAdditionalBalances;
+exports.getDisplayedAdditionalBalances = getDisplayedAdditionalBalances;
 const coaBalanceType_1 = require("../../commonStateTypes/coaBalance/coaBalanceType");
 // Reports can show the $ and % change columns together, so every requested compare type is kept;
 // compareMode picks one only when none was requested.
@@ -17,3 +18,10 @@ function getFinanceStatementAdditionalBalances(requestedBalances, isCompareModeO
             : [compareBalanceFromMode]),
     ];
 }
+// The table has one change column with a $/% picker, so only the first selected compare type is
+// shown; the rest of the selection still reaches the download.
+function getDisplayedAdditionalBalances(selectedBalances) {
+    const otherBalances = (0, coaBalanceType_1.stripCompareAdditionalBalanceTypes)(selectedBalances);
+    const displayedCompareBalance = selectedBalances.find((balance) => !otherBalances.includes(balance));
+    return selectedBalances.filter((balance) => otherBalances.includes(balance) || balance === displayedCompareBalance);
+}

package/lib/view/financeStatement/financeStatementSelector.js

@@ -20,6 +20,17 @@ const profitAndLossSelector_1 = require("../profitAndLoss/profitAndLossSelector"
 const profitAndLossClassesByClassHorizontalSelector_1 = require("../profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelector");
 const profitAndLossClassesViewSelector_1 = require("../profitAndLossClassesView/profitAndLossClassesViewSelector");
 const profitAndLossProjectViewSelector_1 = require("../profitAndLossProjectView/profitAndLossProjectViewSelector");
+const financeStatementCompareBalances_1 = require("./financeStatementCompareBalances");
+/**
+ * Reports are built from the displayed columns, but their filter carries the full selection: the
+ * download and the Add Columns picker read it from there.
+ */
+function withSelectedAdditionalBalances(report, selectedAdditionalBalances) {
+    return {
+        ...report,
+        filter: { ...report.filter, additionalBalances: selectedAdditionalBalances },
+    };
+}
 function getDateRangeForFinanceReports(profitAndLossState, balanceSheetState, cashFlowState) {
     const datesSorted = [
         profitAndLossState.dataAvailable?.startDate,
@@ -74,7 +85,7 @@ exports.getFinanceStatement = (0, toolkit_1.createSelector)((state) => state.acc
     const additionalBalancesForFilter = useHorizontalClassesLayout
         ? (0, coaBalanceType_1.stripCompareAdditionalBalanceTypes)(rawAdditionalBalances)
         : rawAdditionalBalances;
-    const filter = (0, coaBalancesFilter_1.newBalancesFilter)(firstMonthOfFY, financeStatementState.timeframe, Math.min((0, dataAvailable_1.getNumberOfPeriods)(firstMonthOfFY, financeStatementState.timeframe, dataAvailable) ?? financeStatementState.selectedCOABalancesRange.numberOfPeriods, financeStatementState.selectedCOABalancesRange.numberOfPeriods), thisPeriod, 'ascending_date', additionalBalancesForFilter);
+    const filter = (0, coaBalancesFilter_1.newBalancesFilter)(firstMonthOfFY, financeStatementState.timeframe, Math.min((0, dataAvailable_1.getNumberOfPeriods)(firstMonthOfFY, financeStatementState.timeframe, dataAvailable) ?? financeStatementState.selectedCOABalancesRange.numberOfPeriods, financeStatementState.selectedCOABalancesRange.numberOfPeriods), thisPeriod, 'ascending_date', (0, financeStatementCompareBalances_1.getDisplayedAdditionalBalances)(additionalBalancesForFilter));
     const profitAndLossReport = (0, profitAndLossSelector_1.getProfitAndLossReport)(filter, undefined, accountState, accountGroupState, sectionAccountsViewState, profitAndLossState, forecastState);
     const classFilter = (0, coaBalancesFilterClassesView_1.newBalancesFilterClassesView)(filter.firstMonthOfFY, filter.timeframe, filter.balancesRange.numberOfPeriods, filter.balancesRange.thisPeriod, filter.balancesRange.orderBy, filter.additionalBalances, profitAndLossClassesViewState.uiState.classesToFilterOut);
     const profitAndLossByClassReport = (0, profitAndLossClassesViewSelector_1.getProfitAndLossClassesView)(classFilter, accountState, classState, sectionsState, profitAndLossClassesViewState);
@@ -166,17 +177,17 @@ exports.getFinanceStatement = (0, toolkit_1.createSelector)((state) => state.acc
         reportFormat: financeStatementState.reportFormat,
         firstMonthOfFY,
         dataAvailable,
-        profitAndLossReport,
-        profitAndLossByClassReport,
-        profitAndLossByProjectReport,
+        profitAndLossReport: withSelectedAdditionalBalances(profitAndLossReport, additionalBalancesForFilter),
+        profitAndLossByClassReport: withSelectedAdditionalBalances(profitAndLossByClassReport, additionalBalancesForFilter),
+        profitAndLossByProjectReport: withSelectedAdditionalBalances(profitAndLossByProjectReport, additionalBalancesForFilter),
         profitAndLossByClassHorizontalReport,
-        balanceSheetReport,
-        balanceSheetByClassReport,
-        cashFlowByClassReport,
-        cashFlowByProjectReport,
-        balanceSheetByProjectReport,
-        cashFlowReport,
-        filter,
+        balanceSheetReport: withSelectedAdditionalBalances(balanceSheetReport, additionalBalancesForFilter),
+        balanceSheetByClassReport: withSelectedAdditionalBalances(balanceSheetByClassReport, additionalBalancesForFilter),
+        cashFlowByClassReport: withSelectedAdditionalBalances(cashFlowByClassReport, additionalBalancesForFilter),
+        cashFlowByProjectReport: withSelectedAdditionalBalances(cashFlowByProjectReport, additionalBalancesForFilter),
+        balanceSheetByProjectReport: withSelectedAdditionalBalances(balanceSheetByProjectReport, additionalBalancesForFilter),
+        cashFlowReport: withSelectedAdditionalBalances(cashFlowReport, additionalBalancesForFilter),
+        filter: { ...filter, additionalBalances: additionalBalancesForFilter },
         selectedReportId: financeStatementState.selectedReportId,
         downloadState: financeStatementState.downloadState,
         isCompareModeOn: useHorizontalClassesLayout

package/lib/view/reportUIOptions/updateReportUIOptionCompareModeEpic.js

@@ -5,12 +5,12 @@ const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const cashInCashOutReducer_1 = require("../cashInCashOut/cashInCashOutReducer");
 const cashPositionReducer_1 = require("../cashPosition/cashPositionReducer");
+const financeStatementCompareBalances_1 = require("../financeStatement/financeStatementCompareBalances");
 const financeStatementReducer_1 = require("../financeStatement/financeStatementReducer");
 const financeStatementSelector_1 = require("../financeStatement/financeStatementSelector");
 const netBurnOrIncomeReducer_1 = require("../netBurnOrIncome/netBurnOrIncomeReducer");
 const opExReducer_1 = require("../opEx/opExReducer");
 const revenueReducer_1 = require("../revenue/revenueReducer");
-const financeStatementCompareBalances_1 = require("./financeStatementCompareBalances");
 const reportUIOptionsReducer_1 = require("./reportUIOptionsReducer");
 const updateReportUIOptionIsCompareModeEpic = (actions$, state) => actions$.pipe((0, operators_1.filter)(reportUIOptionsReducer_1.updateReportUIOptionCompareMode.match), (0, operators_1.switchMap)((action) => {
     const { additionalBalances } = action.payload;

package/lib/view/reportUIOptions/updateReportUIOptionIsCompareModeOnEpic.js

@@ -5,12 +5,12 @@ const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const cashInCashOutReducer_1 = require("../cashInCashOut/cashInCashOutReducer");
 const cashPositionReducer_1 = require("../cashPosition/cashPositionReducer");
+const financeStatementCompareBalances_1 = require("../financeStatement/financeStatementCompareBalances");
 const financeStatementReducer_1 = require("../financeStatement/financeStatementReducer");
 const financeStatementSelector_1 = require("../financeStatement/financeStatementSelector");
 const netBurnOrIncomeReducer_1 = require("../netBurnOrIncome/netBurnOrIncomeReducer");
 const opExReducer_1 = require("../opEx/opExReducer");
 const revenueReducer_1 = require("../revenue/revenueReducer");
-const financeStatementCompareBalances_1 = require("./financeStatementCompareBalances");
 const reportUIOptionsReducer_1 = require("./reportUIOptionsReducer");
 const updateReportUIOptionIsCompareModeOnEpic = (actions$, state) => actions$.pipe((0, operators_1.filter)(reportUIOptionsReducer_1.updateReportUIOptionIsCompareModeOn.match), (0, operators_1.switchMap)((action) => {
     const { additionalBalances } = action.payload;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.2.90",
+  "version": "5.2.91",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",