@zeniai/client-epic-state 5.2.89 → 5.2.90-betaRD0

package/lib/entity/invoicing/invoicingCommonPayload.d.ts

@@ -120,12 +120,6 @@ export declare const firstSelectableInvoicingId: (candidates: readonly (string |
 export declare const toInvoicingQboAccountMappingSlot: (code: string) => string;
 /** Read one account-mapping dropdown value by its config `code`. */
 export declare function getInvoicingQboAccountMappingId(accountMappings: InvoicingQboAccountMappingsPayload | undefined, code: string): string | undefined;
-/**
- * The Zeni-owned account the service posts sales tax to. It arrives with the
- * settings for display only: it is not a mapping the user picks, and the
- * service ignores it on save.
- */
-export declare const INVOICING_QBO_SALES_TAX_POSTING_ACCOUNT_SLOT = "sales_tax_posting_account";
 /**
  * Build the `account_mappings` request body from the ids the pickers submitted.
  * Each kind is sent as the whole account, which is what the service stores; an
@@ -146,14 +140,11 @@ export interface InvoicingQboAccountMappingKindOptionWire {
     account_types: string;
     code: string;
     name: string;
-    /** Comma-separated QuickBooks account sub types this kind must not offer. */
-    excluded_account_sub_types?: string | null;
 }
 export interface InvoicingQboAccountMappingKindOption {
     accountTypes: string;
     code: string;
     name: string;
-    excludedAccountSubTypes?: string;
 }
 export declare function toInvoicingQboAccountMappingKindOption(option: InvoicingQboAccountMappingKindOptionWire): InvoicingQboAccountMappingKindOption;
 export interface InvoicingSettingsPayload {

package/lib/entity/invoicing/invoicingCommonPayload.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ALL_INVOICING_FIELD_HELP_GROUPS = exports.toInvoicingQboAccountMappingsPayload = exports.INVOICING_QBO_SALES_TAX_POSTING_ACCOUNT_SLOT = exports.toInvoicingQboAccountMappingSlot = exports.firstSelectableInvoicingId = exports.INVOICING_QBO_CUSTOMER_MATCHING_MODES = exports.INVOICING_DISCOUNT_LIFECYCLE_ACTIONS = exports.INVOICING_CATALOG_PRODUCT_LIFECYCLE_ACTIONS = exports.INVOICING_CATALOG_ITEM_LIFECYCLE_ACTIONS = exports.INVOICING_SUBSCRIPTION_LIFECYCLE_ACTIONS = exports.INVOICING_DUNNING_ACTIONS = void 0;
+exports.ALL_INVOICING_FIELD_HELP_GROUPS = exports.toInvoicingQboAccountMappingsPayload = exports.toInvoicingQboAccountMappingSlot = exports.firstSelectableInvoicingId = exports.INVOICING_QBO_CUSTOMER_MATCHING_MODES = exports.INVOICING_DISCOUNT_LIFECYCLE_ACTIONS = exports.INVOICING_CATALOG_PRODUCT_LIFECYCLE_ACTIONS = exports.INVOICING_CATALOG_ITEM_LIFECYCLE_ACTIONS = exports.INVOICING_SUBSCRIPTION_LIFECYCLE_ACTIONS = exports.INVOICING_DUNNING_ACTIONS = void 0;
 exports.toInvoicingDunningAction = toInvoicingDunningAction;
 exports.toInvoicingSubscriptionLifecycleAction = toInvoicingSubscriptionLifecycleAction;
 exports.toInvoicingSubscriptionLifecycleActionOption = toInvoicingSubscriptionLifecycleActionOption;
@@ -178,12 +178,6 @@ function getInvoicingQboAccountMappingId(accountMappings, code) {
     }
     return (0, exports.firstSelectableInvoicingId)([slot?.qbo_id, slot?.account_id]);
 }
-/**
- * The Zeni-owned account the service posts sales tax to. It arrives with the
- * settings for display only: it is not a mapping the user picks, and the
- * service ignores it on save.
- */
-exports.INVOICING_QBO_SALES_TAX_POSTING_ACCOUNT_SLOT = 'sales_tax_posting_account';
 /**
  * Build the `account_mappings` request body from the ids the pickers submitted.
  * Each kind is sent as the whole account, which is what the service stores; an
@@ -207,7 +201,6 @@ function toInvoicingQboAccountMappingKindOption(option) {
     return {
         accountTypes: option.account_types,
         code: option.code,
-        excludedAccountSubTypes: option.excluded_account_sub_types ?? undefined,
         name: option.name,
     };
 }

package/lib/esm/entity/invoicing/invoicingCommonPayload.js

@@ -152,12 +152,6 @@ export function getInvoicingQboAccountMappingId(accountMappings, code) {
     }
     return firstSelectableInvoicingId([slot?.qbo_id, slot?.account_id]);
 }
-/**
- * The Zeni-owned account the service posts sales tax to. It arrives with the
- * settings for display only: it is not a mapping the user picks, and the
- * service ignores it on save.
- */
-export const INVOICING_QBO_SALES_TAX_POSTING_ACCOUNT_SLOT = 'sales_tax_posting_account';
 /**
  * Build the `account_mappings` request body from the ids the pickers submitted.
  * Each kind is sent as the whole account, which is what the service stores; an
@@ -180,7 +174,6 @@ export function toInvoicingQboAccountMappingKindOption(option) {
     return {
         accountTypes: option.account_types,
         code: option.code,
-        excludedAccountSubTypes: option.excluded_account_sub_types ?? undefined,
         name: option.name,
     };
 }

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

@@ -0,0 +1,23 @@
+import { stripCompareAdditionalBalanceTypes, } from '../../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.
+export function getFinanceStatementAdditionalBalances(requestedBalances, isCompareModeOn, compareBalanceFromMode) {
+    const otherBalances = stripCompareAdditionalBalanceTypes(requestedBalances);
+    if (!isCompareModeOn) {
+        return otherBalances;
+    }
+    const requestedCompareBalances = requestedBalances.filter((balance) => !otherBalances.includes(balance));
+    return [
+        ...otherBalances,
+        ...(requestedCompareBalances.length > 0
+            ? requestedCompareBalances
+            : [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/financeStatementReducer.js

@@ -1,4 +1,5 @@
 import { createSlice } from '@reduxjs/toolkit';
+import { stripCompareAdditionalBalanceTypes, } from '../../commonStateTypes/coaBalance/coaBalanceType';
 import { extractThisPeriod, getMatchingThisPeriod, } from '../../commonStateTypes/viewAndReport/thisPeriodHelpers';
 import { clearAll } from '../../rootActions';
 import { dateNow } from '../../zeniDayJS';
@@ -88,17 +89,11 @@ const financeStatement = createSlice({
         updateFinanceStatementAdditionalBalancesSelection(draft, action) {
             const { additionalBalances: additionalBalancesPayload, maxNumOfPeriodsToHighlight, } = action.payload;
             const additionalBalances = additionalBalancesPayload ?? [];
-            let tempAdditionalBalances = [...additionalBalances];
-            if (additionalBalances.includes('this_period_vs_last_period') ||
-                additionalBalances.includes('this_period_vs_last_period_percent')) {
-                const id = tempAdditionalBalances.findIndex((balance) => balance === 'this_period_vs_last_period' ||
-                    balance === 'this_period_vs_last_period_percent');
-                if (id > -1) {
-                    const balance = tempAdditionalBalances.splice(id, 1);
-                    tempAdditionalBalances = [...balance, ...tempAdditionalBalances];
-                }
-            }
-            draft.selectedAdditionalBalances = tempAdditionalBalances;
+            const otherBalances = stripCompareAdditionalBalanceTypes(additionalBalances);
+            draft.selectedAdditionalBalances = [
+                ...additionalBalances.filter((balance) => !otherBalances.includes(balance)),
+                ...otherBalances,
+            ];
             draft.maxNumOfPeriodsToHighlight = maxNumOfPeriodsToHighlight;
             draft.isAdditionalBalancesShown =
                 additionalBalances.length != 0 ? true : false;

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/invoicing/invoicingQboView/invoicingQboViewSelector.js

@@ -106,7 +106,6 @@ export const getInvoicingQboAccountOptions = createSelector([
             {
                 id: String(account.qboId),
                 name: account.accountName,
-                accountSubType: account.accountSubType,
                 accountType: account.accountType,
             },
         ];
@@ -130,29 +129,22 @@ const normalizeAccountTypeName = (value) => {
     // trailing "s" alone would leave "liabilitie", matching nothing.
     return normalized.replace(/ies$/, 'y').replace(/([^s])s$/, '$1');
 };
-const toAccountTypeNameSet = (names) => new Set((names ?? '')
-    .split(',')
-    .map(normalizeAccountTypeName)
-    .filter((name) => name !== ''));
 /**
  * The accounts valid for one QBO mapping kind, whose `accountTypes` is a
  * comma-separated list of QuickBooks type names. An unrecognised list yields no
  * accounts rather than every account: offering a bank account where income is
  * required would post a mapping QuickBooks rejects.
- *
- * `excludedAccountSubTypes` drops accounts QuickBooks will not post to for that
- * kind even though their type matches, e.g. a tax agency's system payable for
- * the sales tax liability.
  */
-export const invoicingAccountsForQboAccountTypes = (accounts, accountTypes, excludedAccountSubTypes) => {
-    const wanted = toAccountTypeNameSet(accountTypes);
-    const excluded = toAccountTypeNameSet(excludedAccountSubTypes);
-    return accounts.filter((account) => (wanted.size === 0 ||
-        (account.accountType != null &&
-            wanted.has(normalizeAccountTypeName(account.accountType)))) &&
-        (excluded.size === 0 ||
-            account.accountSubType == null ||
-            !excluded.has(normalizeAccountTypeName(account.accountSubType))));
+export const invoicingAccountsForQboAccountTypes = (accounts, accountTypes) => {
+    const wanted = new Set(accountTypes
+        .split(',')
+        .map(normalizeAccountTypeName)
+        .filter((accountType) => accountType !== ''));
+    if (wanted.size === 0) {
+        return accounts;
+    }
+    return accounts.filter((account) => account.accountType != null &&
+        wanted.has(normalizeAccountTypeName(account.accountType)));
 };
 /**
  * The account-mapping slot a catalog price point's income account shares with
@@ -180,8 +172,8 @@ export const INVOICING_DEFAULT_INCOME_ACCOUNT_TYPES = 'Income';
  * not carry falls back to `defaultAccountTypes` rather than to every account.
  */
 export const invoicingQboAccountIdsForMappingSlot = (accounts, accountMappingKindOptions, mappingSlot, defaultAccountTypes) => {
-    const kindOption = accountMappingKindOptions.find((option) => toInvoicingQboAccountMappingSlot(option.code) === mappingSlot);
-    return invoicingAccountsForQboAccountTypes(accounts, kindOption?.accountTypes ?? defaultAccountTypes, kindOption?.excludedAccountSubTypes).map((account) => account.id);
+    const accountTypes = accountMappingKindOptions.find((kindOption) => toInvoicingQboAccountMappingSlot(kindOption.code) === mappingSlot)?.accountTypes ?? defaultAccountTypes;
+    return invoicingAccountsForQboAccountTypes(accounts, accountTypes).map((account) => account.id);
 };
 /**
  * Stable empties for a tenant with no QBO connection.

package/lib/esm/view/invoicing/settingsView/invoicingQboSettingsFormConfig.js

@@ -1,4 +1,4 @@
-import { INVOICING_QBO_SALES_TAX_POSTING_ACCOUNT_SLOT, getInvoicingQboAccountMappingId, toInvoicingQboAccountMappingSlot, toInvoicingQboAccountMappingsPayload, } from '../../../entity/invoicing/invoicingCommonPayload';
+import { getInvoicingQboAccountMappingId, toInvoicingQboAccountMappingSlot, toInvoicingQboAccountMappingsPayload, } from '../../../entity/invoicing/invoicingCommonPayload';
 export const initialInvoicingQboSettingsLocalData = {
     accountIdByMappingCode: {},
     autoCreateItems: false,
@@ -15,11 +15,6 @@ export const entityToInvoicingQboSettingsLocalData = (qbo) => {
     // Keyed by the slot the payload used, which is the config code the page will
     // ask for — the reader tolerates the older `_id` form on the way in.
     Object.keys(accountMappings).forEach((key) => {
-        // Display-only, so it is never edited or written back on save.
-        if (toInvoicingQboAccountMappingSlot(key) ===
-            INVOICING_QBO_SALES_TAX_POSTING_ACCOUNT_SLOT) {
-            return;
-        }
         const accountId = getInvoicingQboAccountMappingId(accountMappings, key);
         if (accountId != null) {
             accountIdByMappingCode[toInvoicingQboAccountMappingSlot(key)] = accountId;

package/lib/esm/view/invoicing/settingsView/settingsViewReducer.js

@@ -1,5 +1,4 @@
 import { createSlice } from '@reduxjs/toolkit';
-import { INVOICING_QBO_SALES_TAX_POSTING_ACCOUNT_SLOT, } from '../../../entity/invoicing/invoicingCommonPayload';
 import { clearAll } from '../../../rootActions';
 import { entityToInvoicingQboSettingsLocalData, } from './invoicingQboSettingsFormConfig';
 export const initialState = {
@@ -41,24 +40,7 @@ const settingsView = createSlice({
         saveInvoicingSettings(draft, action) {
             draft.saveFetchState = { fetchState: 'In-Progress', error: undefined };
             if (draft.settings != null) {
-                // The display-only sales tax posting account is never in a save body,
-                // so carry it over rather than blank it until the response lands.
-                const postingAccount = draft.settings.qbo?.account_mappings?.[INVOICING_QBO_SALES_TAX_POSTING_ACCOUNT_SLOT];
-                const settings = { ...draft.settings, ...action.payload.settings };
-                const accountMappings = settings.qbo?.account_mappings;
-                draft.settings =
-                    postingAccount != null && accountMappings != null
-                        ? {
-                            ...settings,
-                            qbo: {
-                                ...settings.qbo,
-                                account_mappings: {
-                                    ...accountMappings,
-                                    [INVOICING_QBO_SALES_TAX_POSTING_ACCOUNT_SLOT]: postingAccount,
-                                },
-                            },
-                        }
-                        : settings;
+                draft.settings = { ...draft.settings, ...action.payload.settings };
             }
         },
         saveInvoicingSettingsSuccess(draft, action) {

package/lib/esm/view/invoicing/settingsView/settingsViewSelector.js

@@ -1,6 +1,6 @@
+import { getInvoicingQboAccountMappingId, } from '../../../entity/invoicing/invoicingCommonPayload';
 import { getAddressByAddressId } from '../../../entity/address/addressSelector';
 import { getFileByFileId } from '../../../entity/file/fileSelector';
-import { INVOICING_QBO_SALES_TAX_POSTING_ACCOUNT_SLOT, getInvoicingQboAccountMappingId, } from '../../../entity/invoicing/invoicingCommonPayload';
 import { getFormattedAddress } from '../../addressView/addressViewSelector';
 import { getInvoicingConfigView, invoicingFieldHelpForGroup, } from '../invoicingConfigView/invoicingConfigViewSelector';
 import { getInvoicingQboView, isInvoicingAccountingPickerDataLoading, } from '../invoicingQboView/invoicingQboViewSelector';
@@ -102,19 +102,6 @@ export const getInvoicingSettingsHubView = (state) => {
         status,
     };
 };
-/**
- * The name of the account the service posts sales tax to. Read from the whole
- * account the settings carry, or looked up by id in the account list for a
- * payload that sends only the id.
- */
-const invoicingSalesTaxPostingAccountName = (accountMappings, accounts) => {
-    const slot = accountMappings?.[INVOICING_QBO_SALES_TAX_POSTING_ACCOUNT_SLOT];
-    const name = typeof slot === 'string'
-        ? accounts.find((account) => account.id === slot)?.name
-        : slot?.account_name;
-    const trimmed = name?.trim() ?? '';
-    return trimmed !== '' ? trimmed : undefined;
-};
 /**
  * Bundled view for the QBO configuration page: the draft it edits, the accounts
  * and option lists its dropdowns render, the connection and sync health it
@@ -148,7 +135,6 @@ export const getInvoicingQboSettingsFormView = (state) => {
         localData: qboDraft ?? initialInvoicingQboSettingsLocalData,
         nestedAccountHierarchy: qboView.nestedAccountHierarchy,
         retryFetchStateByTaskId: qboView.retryFetchStateByTaskId,
-        salesTaxPostingAccountName: invoicingSalesTaxPostingAccountName(settings?.qbo?.account_mappings, qboView.accounts),
         saveState: saveFetchState.fetchState === 'Not-Started' && error != null
             ? { fetchState, error }
             : saveFetchState,

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

@@ -2,6 +2,7 @@ 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';
@@ -15,11 +16,7 @@ export const updateReportUIOptionIsCompareModeEpic = (actions$, state) => action
         ? 'this_period_vs_last_period_percent'
         : 'this_period_vs_last_period';
     const financeStatementState = getFinanceStatement(state.value);
-    const filteredFinanceAdditionalBalances = additionalBalances.filter((balance) => balance !== 'this_period_vs_last_period' &&
-        balance !== 'this_period_vs_last_period_percent');
-    const financeAdditionalBalances = isCompareModeOn
-        ? [...filteredFinanceAdditionalBalances, additionalBalance]
-        : filteredFinanceAdditionalBalances;
+    const financeAdditionalBalances = getFinanceStatementAdditionalBalances(additionalBalances, isCompareModeOn, additionalBalance);
     return of(updateNetBurnOrIncomeAdditionalBalancesSelection({
         isCompareModeOn,
         additionalBalances: isCompareModeOn ? [additionalBalance] : [],

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

@@ -2,6 +2,7 @@ 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';
@@ -10,19 +11,14 @@ import { updateRevenueAdditionalBalancesSelection } from '../revenue/revenueRedu
 import { toggleReportUIOptionForecastMode, updateReportUIOptionIsCompareModeOn, } from './reportUIOptionsReducer';
 export const updateReportUIOptionIsCompareModeOnEpic = (actions$, state) => actions$.pipe(filter(updateReportUIOptionIsCompareModeOn.match), switchMap((action) => {
     const { additionalBalances } = action.payload;
+    const compareBalanceFromMode = state.value.reportUIOptionsState.compareMode === 'compare_mode_percent'
+        ? 'this_period_vs_last_period_percent'
+        : 'this_period_vs_last_period';
     const additionalBalance = action.payload.isCompareModeOn
-        ? state.value.reportUIOptionsState.compareMode ===
-            'compare_mode_percent'
-            ? ['this_period_vs_last_period_percent']
-            : ['this_period_vs_last_period']
+        ? [compareBalanceFromMode]
         : [];
     const financeStatementState = getFinanceStatement(state.value);
-    const filteredFinanceAdditionalBalances = additionalBalances.filter((balance) => balance !== 'this_period_vs_last_period' &&
-        balance !== 'this_period_vs_last_period_percent');
-    const financeAdditionalBalances = [
-        ...filteredFinanceAdditionalBalances,
-        ...additionalBalance,
-    ];
+    const financeAdditionalBalances = getFinanceStatementAdditionalBalances(additionalBalances, action.payload.isCompareModeOn, compareBalanceFromMode);
     const actions = [
         updateNetBurnOrIncomeAdditionalBalancesSelection({
             isCompareModeOn: action.payload.isCompareModeOn,

package/lib/view/financeStatement/financeStatementCompareBalances.d.ts

@@ -0,0 +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/financeStatement/financeStatementCompareBalances.js

@@ -0,0 +1,27 @@
+"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.
+function getFinanceStatementAdditionalBalances(requestedBalances, isCompareModeOn, compareBalanceFromMode) {
+    const otherBalances = (0, coaBalanceType_1.stripCompareAdditionalBalanceTypes)(requestedBalances);
+    if (!isCompareModeOn) {
+        return otherBalances;
+    }
+    const requestedCompareBalances = requestedBalances.filter((balance) => !otherBalances.includes(balance));
+    return [
+        ...otherBalances,
+        ...(requestedCompareBalances.length > 0
+            ? requestedCompareBalances
+            : [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/financeStatementReducer.js

@@ -3,6 +3,7 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateFinanceStatementFormat = exports.updateFinanceStatementDisplayOrder = exports.updateDownloadState = exports.updateFinanceStatementAdditionalBalancesSelection = exports.updateSelectedReportId = exports.updateCOABalancesRange = exports.updateFinanceStatementThisPeriod = exports.updateFinanceStatementTimeframe = exports.fetchFinanceStatement = exports.initialFinanceStatementState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
+const coaBalanceType_1 = require("../../commonStateTypes/coaBalance/coaBalanceType");
 const thisPeriodHelpers_1 = require("../../commonStateTypes/viewAndReport/thisPeriodHelpers");
 const rootActions_1 = require("../../rootActions");
 const zeniDayJS_1 = require("../../zeniDayJS");
@@ -92,17 +93,11 @@ const financeStatement = (0, toolkit_1.createSlice)({
         updateFinanceStatementAdditionalBalancesSelection(draft, action) {
             const { additionalBalances: additionalBalancesPayload, maxNumOfPeriodsToHighlight, } = action.payload;
             const additionalBalances = additionalBalancesPayload ?? [];
-            let tempAdditionalBalances = [...additionalBalances];
-            if (additionalBalances.includes('this_period_vs_last_period') ||
-                additionalBalances.includes('this_period_vs_last_period_percent')) {
-                const id = tempAdditionalBalances.findIndex((balance) => balance === 'this_period_vs_last_period' ||
-                    balance === 'this_period_vs_last_period_percent');
-                if (id > -1) {
-                    const balance = tempAdditionalBalances.splice(id, 1);
-                    tempAdditionalBalances = [...balance, ...tempAdditionalBalances];
-                }
-            }
-            draft.selectedAdditionalBalances = tempAdditionalBalances;
+            const otherBalances = (0, coaBalanceType_1.stripCompareAdditionalBalanceTypes)(additionalBalances);
+            draft.selectedAdditionalBalances = [
+                ...additionalBalances.filter((balance) => !otherBalances.includes(balance)),
+                ...otherBalances,
+            ];
             draft.maxNumOfPeriodsToHighlight = maxNumOfPeriodsToHighlight;
             draft.isAdditionalBalancesShown =
                 additionalBalances.length != 0 ? true : false;

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/invoicing/invoicingQboView/invoicingQboViewSelector.d.ts

@@ -41,7 +41,6 @@ export declare const getInvoicingCatalogAccountingLookup: (state: RootState) =>
 export interface InvoicingAccountingOption {
     id: string;
     name: string;
-    accountSubType?: string;
     accountType?: string;
 }
 export interface InvoicingQboView {
@@ -78,12 +77,8 @@ export declare const getInvoicingQboAccountOptions: (state: RootState) => Invoic
  * comma-separated list of QuickBooks type names. An unrecognised list yields no
  * accounts rather than every account: offering a bank account where income is
  * required would post a mapping QuickBooks rejects.
- *
- * `excludedAccountSubTypes` drops accounts QuickBooks will not post to for that
- * kind even though their type matches, e.g. a tax agency's system payable for
- * the sales tax liability.
  */
-export declare const invoicingAccountsForQboAccountTypes: (accounts: InvoicingAccountingOption[], accountTypes: string, excludedAccountSubTypes?: string) => InvoicingAccountingOption[];
+export declare const invoicingAccountsForQboAccountTypes: (accounts: InvoicingAccountingOption[], accountTypes: string) => InvoicingAccountingOption[];
 /**
  * The account-mapping slot a catalog price point's income account shares with
  * the settings page, and the one a discount's account shares with it.

package/lib/view/invoicing/invoicingQboView/invoicingQboViewSelector.js

@@ -115,7 +115,6 @@ exports.getInvoicingQboAccountOptions = (0, toolkit_1.createSelector)([
             {
                 id: String(account.qboId),
                 name: account.accountName,
-                accountSubType: account.accountSubType,
                 accountType: account.accountType,
             },
         ];
@@ -139,29 +138,22 @@ const normalizeAccountTypeName = (value) => {
     // trailing "s" alone would leave "liabilitie", matching nothing.
     return normalized.replace(/ies$/, 'y').replace(/([^s])s$/, '$1');
 };
-const toAccountTypeNameSet = (names) => new Set((names ?? '')
-    .split(',')
-    .map(normalizeAccountTypeName)
-    .filter((name) => name !== ''));
 /**
  * The accounts valid for one QBO mapping kind, whose `accountTypes` is a
  * comma-separated list of QuickBooks type names. An unrecognised list yields no
  * accounts rather than every account: offering a bank account where income is
  * required would post a mapping QuickBooks rejects.
- *
- * `excludedAccountSubTypes` drops accounts QuickBooks will not post to for that
- * kind even though their type matches, e.g. a tax agency's system payable for
- * the sales tax liability.
  */
-const invoicingAccountsForQboAccountTypes = (accounts, accountTypes, excludedAccountSubTypes) => {
-    const wanted = toAccountTypeNameSet(accountTypes);
-    const excluded = toAccountTypeNameSet(excludedAccountSubTypes);
-    return accounts.filter((account) => (wanted.size === 0 ||
-        (account.accountType != null &&
-            wanted.has(normalizeAccountTypeName(account.accountType)))) &&
-        (excluded.size === 0 ||
-            account.accountSubType == null ||
-            !excluded.has(normalizeAccountTypeName(account.accountSubType))));
+const invoicingAccountsForQboAccountTypes = (accounts, accountTypes) => {
+    const wanted = new Set(accountTypes
+        .split(',')
+        .map(normalizeAccountTypeName)
+        .filter((accountType) => accountType !== ''));
+    if (wanted.size === 0) {
+        return accounts;
+    }
+    return accounts.filter((account) => account.accountType != null &&
+        wanted.has(normalizeAccountTypeName(account.accountType)));
 };
 exports.invoicingAccountsForQboAccountTypes = invoicingAccountsForQboAccountTypes;
 /**
@@ -190,8 +182,8 @@ exports.INVOICING_DEFAULT_INCOME_ACCOUNT_TYPES = 'Income';
  * not carry falls back to `defaultAccountTypes` rather than to every account.
  */
 const invoicingQboAccountIdsForMappingSlot = (accounts, accountMappingKindOptions, mappingSlot, defaultAccountTypes) => {
-    const kindOption = accountMappingKindOptions.find((option) => (0, invoicingCommonPayload_1.toInvoicingQboAccountMappingSlot)(option.code) === mappingSlot);
-    return (0, exports.invoicingAccountsForQboAccountTypes)(accounts, kindOption?.accountTypes ?? defaultAccountTypes, kindOption?.excludedAccountSubTypes).map((account) => account.id);
+    const accountTypes = accountMappingKindOptions.find((kindOption) => (0, invoicingCommonPayload_1.toInvoicingQboAccountMappingSlot)(kindOption.code) === mappingSlot)?.accountTypes ?? defaultAccountTypes;
+    return (0, exports.invoicingAccountsForQboAccountTypes)(accounts, accountTypes).map((account) => account.id);
 };
 exports.invoicingQboAccountIdsForMappingSlot = invoicingQboAccountIdsForMappingSlot;
 /**

package/lib/view/invoicing/settingsView/invoicingQboSettingsFormConfig.js

@@ -18,11 +18,6 @@ const entityToInvoicingQboSettingsLocalData = (qbo) => {
     // Keyed by the slot the payload used, which is the config code the page will
     // ask for — the reader tolerates the older `_id` form on the way in.
     Object.keys(accountMappings).forEach((key) => {
-        // Display-only, so it is never edited or written back on save.
-        if ((0, invoicingCommonPayload_1.toInvoicingQboAccountMappingSlot)(key) ===
-            invoicingCommonPayload_1.INVOICING_QBO_SALES_TAX_POSTING_ACCOUNT_SLOT) {
-            return;
-        }
         const accountId = (0, invoicingCommonPayload_1.getInvoicingQboAccountMappingId)(accountMappings, key);
         if (accountId != null) {
             accountIdByMappingCode[(0, invoicingCommonPayload_1.toInvoicingQboAccountMappingSlot)(key)] = accountId;

package/lib/view/invoicing/settingsView/settingsViewReducer.js

@@ -3,7 +3,6 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.invoicingStripeConnectionFailure = exports.updateInvoicingStripeConnection = exports.disconnectInvoicingStripe = exports.connectInvoicingStripe = exports.resetInvoicingQboSettingsDraft = exports.submitInvoicingQboSettings = exports.updateInvoicingQboSettingsDraft = exports.resetInvoicingBrandingFormDraft = exports.submitInvoicingBrandingForm = exports.updateInvoicingBrandingFormDraft = exports.resetSaveInvoicingSettings = exports.saveInvoicingSettingsFailure = exports.saveInvoicingSettingsSuccess = exports.saveInvoicingSettings = exports.updateInvoicingSettingsFailure = exports.updateInvoicingSettings = exports.fetchInvoicingSettings = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
-const invoicingCommonPayload_1 = require("../../../entity/invoicing/invoicingCommonPayload");
 const rootActions_1 = require("../../../rootActions");
 const invoicingQboSettingsFormConfig_1 = require("./invoicingQboSettingsFormConfig");
 exports.initialState = {
@@ -45,24 +44,7 @@ const settingsView = (0, toolkit_1.createSlice)({
         saveInvoicingSettings(draft, action) {
             draft.saveFetchState = { fetchState: 'In-Progress', error: undefined };
             if (draft.settings != null) {
-                // The display-only sales tax posting account is never in a save body,
-                // so carry it over rather than blank it until the response lands.
-                const postingAccount = draft.settings.qbo?.account_mappings?.[invoicingCommonPayload_1.INVOICING_QBO_SALES_TAX_POSTING_ACCOUNT_SLOT];
-                const settings = { ...draft.settings, ...action.payload.settings };
-                const accountMappings = settings.qbo?.account_mappings;
-                draft.settings =
-                    postingAccount != null && accountMappings != null
-                        ? {
-                            ...settings,
-                            qbo: {
-                                ...settings.qbo,
-                                account_mappings: {
-                                    ...accountMappings,
-                                    [invoicingCommonPayload_1.INVOICING_QBO_SALES_TAX_POSTING_ACCOUNT_SLOT]: postingAccount,
-                                },
-                            },
-                        }
-                        : settings;
+                draft.settings = { ...draft.settings, ...action.payload.settings };
             }
         },
         saveInvoicingSettingsSuccess(draft, action) {

package/lib/view/invoicing/settingsView/settingsViewSelector.d.ts

@@ -1,7 +1,7 @@
 import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accountView/nestedAccountID';
 import { FetchState, FetchStateAndError } from '../../../commonStateTypes/common';
-import { File } from '../../../entity/file/fileState';
 import { InvoicingDunningActionOption, InvoicingFieldHelpByCode, InvoicingNamedOption, InvoicingQboAccountMappingKindOption, InvoicingSettingsPayload } from '../../../entity/invoicing/invoicingCommonPayload';
+import { File } from '../../../entity/file/fileState';
 import { ZeniAPIStatus } from '../../../responsePayload';
 import { RootState } from '../../../rootStateTypes';
 import { AddressUpdatableInfo } from '../../addressView/addressViewState';
@@ -120,8 +120,6 @@ export interface InvoicingQboSettingsFormView {
     settingsFetchState: FetchState;
     syncStatusOptions: InvoicingNamedOption[];
     connection?: InvoicingQboConnection;
-    /** The Zeni-owned account sales tax posts to, shown read-only when present. */
-    salesTaxPostingAccountName?: string;
     syncHealth?: InvoicingQboSyncHealth;
 }
 /**

package/lib/view/invoicing/settingsView/settingsViewSelector.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInvoicingBrandingFormView = exports.getInvoicingQboSettingsFormView = exports.getInvoicingSettingsHubView = exports.getInvoicingSettingsView = exports.getInvoicingSettingsFetchState = exports.getInvoicingSettings = void 0;
 exports.deriveInvoicingEnablePrerequisites = deriveInvoicingEnablePrerequisites;
+const invoicingCommonPayload_1 = require("../../../entity/invoicing/invoicingCommonPayload");
 const addressSelector_1 = require("../../../entity/address/addressSelector");
 const fileSelector_1 = require("../../../entity/file/fileSelector");
-const invoicingCommonPayload_1 = require("../../../entity/invoicing/invoicingCommonPayload");
 const addressViewSelector_1 = require("../../addressView/addressViewSelector");
 const invoicingConfigViewSelector_1 = require("../invoicingConfigView/invoicingConfigViewSelector");
 const invoicingQboViewSelector_1 = require("../invoicingQboView/invoicingQboViewSelector");
@@ -110,19 +110,6 @@ const getInvoicingSettingsHubView = (state) => {
     };
 };
 exports.getInvoicingSettingsHubView = getInvoicingSettingsHubView;
-/**
- * The name of the account the service posts sales tax to. Read from the whole
- * account the settings carry, or looked up by id in the account list for a
- * payload that sends only the id.
- */
-const invoicingSalesTaxPostingAccountName = (accountMappings, accounts) => {
-    const slot = accountMappings?.[invoicingCommonPayload_1.INVOICING_QBO_SALES_TAX_POSTING_ACCOUNT_SLOT];
-    const name = typeof slot === 'string'
-        ? accounts.find((account) => account.id === slot)?.name
-        : slot?.account_name;
-    const trimmed = name?.trim() ?? '';
-    return trimmed !== '' ? trimmed : undefined;
-};
 /**
  * Bundled view for the QBO configuration page: the draft it edits, the accounts
  * and option lists its dropdowns render, the connection and sync health it
@@ -156,7 +143,6 @@ const getInvoicingQboSettingsFormView = (state) => {
         localData: qboDraft ?? invoicingQboSettingsFormConfig_1.initialInvoicingQboSettingsLocalData,
         nestedAccountHierarchy: qboView.nestedAccountHierarchy,
         retryFetchStateByTaskId: qboView.retryFetchStateByTaskId,
-        salesTaxPostingAccountName: invoicingSalesTaxPostingAccountName(settings?.qbo?.account_mappings, qboView.accounts),
         saveState: saveFetchState.fetchState === 'Not-Started' && error != null
             ? { fetchState, error }
             : saveFetchState,

package/lib/view/reportUIOptions/updateReportUIOptionCompareModeEpic.js

@@ -5,6 +5,7 @@ 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");
@@ -18,11 +19,7 @@ const updateReportUIOptionIsCompareModeEpic = (actions$, state) => actions$.pipe
         ? 'this_period_vs_last_period_percent'
         : 'this_period_vs_last_period';
     const financeStatementState = (0, financeStatementSelector_1.getFinanceStatement)(state.value);
-    const filteredFinanceAdditionalBalances = additionalBalances.filter((balance) => balance !== 'this_period_vs_last_period' &&
-        balance !== 'this_period_vs_last_period_percent');
-    const financeAdditionalBalances = isCompareModeOn
-        ? [...filteredFinanceAdditionalBalances, additionalBalance]
-        : filteredFinanceAdditionalBalances;
+    const financeAdditionalBalances = (0, financeStatementCompareBalances_1.getFinanceStatementAdditionalBalances)(additionalBalances, isCompareModeOn, additionalBalance);
     return (0, rxjs_1.of)((0, netBurnOrIncomeReducer_1.updateNetBurnOrIncomeAdditionalBalancesSelection)({
         isCompareModeOn,
         additionalBalances: isCompareModeOn ? [additionalBalance] : [],

package/lib/view/reportUIOptions/updateReportUIOptionIsCompareModeOnEpic.js

@@ -5,6 +5,7 @@ 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");
@@ -13,19 +14,14 @@ const revenueReducer_1 = require("../revenue/revenueReducer");
 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;
+    const compareBalanceFromMode = state.value.reportUIOptionsState.compareMode === 'compare_mode_percent'
+        ? 'this_period_vs_last_period_percent'
+        : 'this_period_vs_last_period';
     const additionalBalance = action.payload.isCompareModeOn
-        ? state.value.reportUIOptionsState.compareMode ===
-            'compare_mode_percent'
-            ? ['this_period_vs_last_period_percent']
-            : ['this_period_vs_last_period']
+        ? [compareBalanceFromMode]
         : [];
     const financeStatementState = (0, financeStatementSelector_1.getFinanceStatement)(state.value);
-    const filteredFinanceAdditionalBalances = additionalBalances.filter((balance) => balance !== 'this_period_vs_last_period' &&
-        balance !== 'this_period_vs_last_period_percent');
-    const financeAdditionalBalances = [
-        ...filteredFinanceAdditionalBalances,
-        ...additionalBalance,
-    ];
+    const financeAdditionalBalances = (0, financeStatementCompareBalances_1.getFinanceStatementAdditionalBalances)(additionalBalances, action.payload.isCompareModeOn, compareBalanceFromMode);
     const actions = [
         (0, netBurnOrIncomeReducer_1.updateNetBurnOrIncomeAdditionalBalancesSelection)({
             isCompareModeOn: action.payload.isCompareModeOn,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.2.89",
+  "version": "5.2.90-betaRD0",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",
@@ -53,6 +53,31 @@
     "url": "https://github.com/zeni-ai/client-epic-state/issues"
   },
   "homepage": "https://github.com/zeni-ai/client-epic-state#readme",
+  "devDependencies": {
+    "@eslint/js": "^9.24.0",
+    "@liveblocks/client": "^2.23.0",
+    "@trivago/prettier-plugin-sort-imports": "^5.2.2",
+    "@types/big.js": "^6.2.2",
+    "@types/lodash": "^4.17.23",
+    "@types/node": "^20.19.0",
+    "@types/url-parse": "^1.4.11",
+    "@typescript-eslint/eslint-plugin": "^8.56.0",
+    "@typescript-eslint/parser": "^8.56.0",
+    "concurrently": "^9.1.2",
+    "eslint": "^9.24.0",
+    "eslint-config-prettier": "^10.0.2",
+    "eslint-plugin-perfectionist": "^4.15.0",
+    "eslint-plugin-unused-imports": "^4.1.4",
+    "globals": "^16.0.0",
+    "knip": "^6.21.0",
+    "madge": "^8.0.0",
+    "prettier": "^3.5.3",
+    "rimraf": "^6.0.1",
+    "semver": "^7.7.1",
+    "typescript": "^5.7.3",
+    "vite": "^7.3.5",
+    "vitest": "^4.1.11"
+  },
   "dependencies": {
     "@redux-devtools/extension": "^3.3.0",
     "@reduxjs/toolkit": "^1.6.2",