@zeniai/client-epic-state 5.3.24-betaAK1 → 5.3.24

package/lib/esm/view/dashboard/dashboardSelector.js

@@ -16,7 +16,7 @@ import { getInsights } from '../insightsCard/insightsCardSelector';
 import { getMonthEndCloseChecksViewByTenantId } from '../monthEndCloseChecksView/monthEndCloseChecksViewSelector';
 import { getNetBurnOrIncomeReport } from '../netBurnOrIncome/netBurnOrIncomeSelector';
 import { getNetBurnOrIncomeStoryCardReport } from '../netBurnOrIncomeStoryCard/netBurnOrIncomeStoryCardSelector';
-import { getOperatingExpensesReport } from '../opEx/opExSelector';
+import { getOperatingExpensesReportForDashboard } from '../opEx/opExSelector';
 import { getRewardsPlanCard } from '../referralView/referralSelector';
 import { getReimbursementCardReport } from '../reimbursementCard/reimbursementCardSelector';
 import { getRevenueReport } from '../revenue/revenueSelector';
@@ -27,7 +27,7 @@ import { getTop6Expenses } from '../topEx/topExSelector';
 const getNetBurnOrIncomeFilter = createSelector((state) => state.netBurnOrIncomeState.netBurnOrIncome.firstMonthOfFY, (state) => state.netBurnOrIncomeState.uiState.timeframe, (state) => state.netBurnOrIncomeState.uiState.selectedAdditionalBalances, (firstMonthOfFY, timeframe, selectedAdditionalBalances) => newBalancesFilter(firstMonthOfFY, timeframe, 4, undefined, 'ascending_date', selectedAdditionalBalances));
 const getNetBurnOrIncomeForLast4Periods = createSelector((state) => state.accountState, (state) => state.accountGroupState, (state) => state.sectionAccountsViewState, (state) => state.netBurnOrIncomeState, (state) => state.forecastState, (state) => state.forecastListState, getNetBurnOrIncomeFilter, (accountState, accountGroupState, sectionAccountsViewState, netBurnOrIncomeState, forecastState, forecastListState, filter) => getNetBurnOrIncomeReport(accountState, accountGroupState, sectionAccountsViewState, netBurnOrIncomeState, forecastState, forecastListState, filter));
 const getOperatingExpensesFilter = createSelector((state) => state.opExState.opEx.firstMonthOfFY, (state) => state.opExState.uiState.timeframe, (state) => state.opExState.uiState.selectedAdditionalBalances, (firstMonthOfFY, timeframe, selectedAdditionalBalances) => newBalancesFilter(firstMonthOfFY, timeframe, 5, undefined, 'ascending_date', selectedAdditionalBalances));
-const getOperatingExpensesForLast5Periods = (state) => getOperatingExpensesReport(state, getOperatingExpensesFilter(state));
+const getOperatingExpensesForLast5Periods = (state) => getOperatingExpensesReportForDashboard(state, getOperatingExpensesFilter(state));
 const getRevenueFilter = createSelector((state) => state.revenueState.revenue.firstMonthOfFY, (state) => state.revenueState.uiState.timeframe, (state) => state.revenueState.uiState.selectedAdditionalBalances, (firstMonthOfFY, timeframe, selectedAdditionalBalances) => newBalancesFilter(firstMonthOfFY, timeframe, 4, undefined, 'ascending_date', selectedAdditionalBalances));
 const getRevenueForLast4Periods = createSelector(getRevenueFilter, (state) => state.accountState, (state) => state.accountGroupState, (state) => state.sectionAccountsViewState, (state) => state.forecastListState, (state) => state.revenueState, (state) => state.forecastState, (filter, accountState, accountGroupState, sectionAccountsViewState, forecastListState, revenueState, forecastState) => getRevenueReport(filter, accountState, accountGroupState, sectionAccountsViewState, forecastListState, revenueState, forecastState));
 const getCashPositionFilter = createSelector((state) => state.cashPositionState.firstMonthOfFY, (state) => state.cashPositionState.uiState.timeframe, (state) => state.cashPositionState.uiState.selectedAdditionalBalances, (firstMonthOfFY, timeframe, selectedAdditionalBalances) => newBalancesFilter(firstMonthOfFY, timeframe, 5, undefined, 'ascending_date', selectedAdditionalBalances));

package/lib/esm/view/opEx/opExSelector.js

@@ -74,7 +74,7 @@ function getOpExBalancesInTimeFrame(opExState, sectionState, readCustomRangeSlot
     }
     return [];
 }
-export const getOperatingExpensesReport = createSelector((state) => state.accountState, (state) => state.accountGroupState, (state) => state.sectionAccountsViewState, (state) => state.opExState, (state) => state.forecastState, (state) => state.forecastListState, (_state, filter) => filter, (_state, _filter, forecastId) => forecastId, (_state, _filter, _forecastId, readCustomRangeSlot) => readCustomRangeSlot === true, (accountState, accountGroupState, sectionsState, opExState, forecastState, forecastListState, filter, forecastId, readCustomRangeSlot) => {
+const createOperatingExpensesReportSelector = () => createSelector((state) => state.accountState, (state) => state.accountGroupState, (state) => state.sectionAccountsViewState, (state) => state.opExState, (state) => state.forecastState, (state) => state.forecastListState, (_state, filter) => filter, (_state, _filter, forecastId) => forecastId, (_state, _filter, _forecastId, readCustomRangeSlot) => readCustomRangeSlot === true, (accountState, accountGroupState, sectionsState, opExState, forecastState, forecastListState, filter, forecastId, readCustomRangeSlot) => {
     const opEx = getState(opExState, opExState.uiState.isForecastModeOn, forecastId);
     // The detail screen opts into customFetchState so its Completed check fires
     // off the custom fetch; the dashboard (no flag) reads the shared fetchState,
@@ -134,6 +134,9 @@ export const getOperatingExpensesReport = createSelector((state) => state.accoun
         customTimeframe: opExState.uiState.customTimeframe,
     };
 });
+export const getOperatingExpensesReport = createOperatingExpensesReportSelector();
+// The dashboard card keeps its own cache so the detail page's calls with other filters can't evict it.
+export const getOperatingExpensesReportForDashboard = createOperatingExpensesReportSelector();
 export const getOperatingExpensesForSelectedRange = createSelector((state) => state, (state) => state.opExState, (state, opExWithForecastState) => {
     const { timeframe, selectedCOABalancesRange, selectedAdditionalBalances, isForecastModeOn, selectedForecast, } = opExWithForecastState.uiState;
     const noFilter = newBalancesFilter(opExWithForecastState.opEx.firstMonthOfFY, timeframe, selectedCOABalancesRange.numberOfPeriods, selectedCOABalancesRange.thisPeriod, 'ascending_date', selectedAdditionalBalances);

package/lib/view/dashboard/dashboardSelector.js

@@ -30,7 +30,7 @@ const topExSelector_1 = require("../topEx/topExSelector");
 const getNetBurnOrIncomeFilter = (0, toolkit_1.createSelector)((state) => state.netBurnOrIncomeState.netBurnOrIncome.firstMonthOfFY, (state) => state.netBurnOrIncomeState.uiState.timeframe, (state) => state.netBurnOrIncomeState.uiState.selectedAdditionalBalances, (firstMonthOfFY, timeframe, selectedAdditionalBalances) => (0, coaBalancesFilter_1.newBalancesFilter)(firstMonthOfFY, timeframe, 4, undefined, 'ascending_date', selectedAdditionalBalances));
 const getNetBurnOrIncomeForLast4Periods = (0, toolkit_1.createSelector)((state) => state.accountState, (state) => state.accountGroupState, (state) => state.sectionAccountsViewState, (state) => state.netBurnOrIncomeState, (state) => state.forecastState, (state) => state.forecastListState, getNetBurnOrIncomeFilter, (accountState, accountGroupState, sectionAccountsViewState, netBurnOrIncomeState, forecastState, forecastListState, filter) => (0, netBurnOrIncomeSelector_1.getNetBurnOrIncomeReport)(accountState, accountGroupState, sectionAccountsViewState, netBurnOrIncomeState, forecastState, forecastListState, filter));
 const getOperatingExpensesFilter = (0, toolkit_1.createSelector)((state) => state.opExState.opEx.firstMonthOfFY, (state) => state.opExState.uiState.timeframe, (state) => state.opExState.uiState.selectedAdditionalBalances, (firstMonthOfFY, timeframe, selectedAdditionalBalances) => (0, coaBalancesFilter_1.newBalancesFilter)(firstMonthOfFY, timeframe, 5, undefined, 'ascending_date', selectedAdditionalBalances));
-const getOperatingExpensesForLast5Periods = (state) => (0, opExSelector_1.getOperatingExpensesReport)(state, getOperatingExpensesFilter(state));
+const getOperatingExpensesForLast5Periods = (state) => (0, opExSelector_1.getOperatingExpensesReportForDashboard)(state, getOperatingExpensesFilter(state));
 const getRevenueFilter = (0, toolkit_1.createSelector)((state) => state.revenueState.revenue.firstMonthOfFY, (state) => state.revenueState.uiState.timeframe, (state) => state.revenueState.uiState.selectedAdditionalBalances, (firstMonthOfFY, timeframe, selectedAdditionalBalances) => (0, coaBalancesFilter_1.newBalancesFilter)(firstMonthOfFY, timeframe, 4, undefined, 'ascending_date', selectedAdditionalBalances));
 const getRevenueForLast4Periods = (0, toolkit_1.createSelector)(getRevenueFilter, (state) => state.accountState, (state) => state.accountGroupState, (state) => state.sectionAccountsViewState, (state) => state.forecastListState, (state) => state.revenueState, (state) => state.forecastState, (filter, accountState, accountGroupState, sectionAccountsViewState, forecastListState, revenueState, forecastState) => (0, revenueSelector_1.getRevenueReport)(filter, accountState, accountGroupState, sectionAccountsViewState, forecastListState, revenueState, forecastState));
 const getCashPositionFilter = (0, toolkit_1.createSelector)((state) => state.cashPositionState.firstMonthOfFY, (state) => state.cashPositionState.uiState.timeframe, (state) => state.cashPositionState.uiState.selectedAdditionalBalances, (firstMonthOfFY, timeframe, selectedAdditionalBalances) => (0, coaBalancesFilter_1.newBalancesFilter)(firstMonthOfFY, timeframe, 5, undefined, 'ascending_date', selectedAdditionalBalances));

package/lib/view/opEx/opExSelector.d.ts

@@ -4,7 +4,10 @@ import { RootState } from '../../rootStateTypes';
 import { OpExReport, OpExUIStateSelectorView } from './opExSelectorTypes';
 import { OpExWithForecastState } from './opExState';
 export declare const getOperatingExpensesUIState: (state: RootState) => OpExUIStateSelectorView;
-export declare const getOperatingExpensesReport: (state: RootState, filter: COABalancesFilter, forecastId?: ID, readCustomRangeSlot?: boolean) => OpExReport;
+type OperatingExpensesReportSelector = (state: RootState, filter: COABalancesFilter, forecastId?: ID, readCustomRangeSlot?: boolean) => OpExReport;
+export declare const getOperatingExpensesReport: OperatingExpensesReportSelector;
+export declare const getOperatingExpensesReportForDashboard: OperatingExpensesReportSelector;
 export declare const getOperatingExpensesForSelectedRange: (state: RootState) => OpExReport;
 export declare const getOperatingExpensesForHighlightedRange: (state: RootState) => OpExReport;
 export declare const getOperatingExpensesReportFetchState: (forecastId: ID | undefined, opExState: OpExWithForecastState) => FetchStateAndError;
+export {};

package/lib/view/opEx/opExSelector.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOperatingExpensesReportFetchState = exports.getOperatingExpensesForHighlightedRange = exports.getOperatingExpensesForSelectedRange = exports.getOperatingExpensesReport = exports.getOperatingExpensesUIState = void 0;
+exports.getOperatingExpensesReportFetchState = exports.getOperatingExpensesForHighlightedRange = exports.getOperatingExpensesForSelectedRange = exports.getOperatingExpensesReportForDashboard = exports.getOperatingExpensesReport = exports.getOperatingExpensesUIState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const coaBalancesFilter_1 = require("../../commonStateTypes/coaBalance/coaBalancesFilter");
 const getCOABalancesSlice_1 = require("../../commonStateTypes/coaBalance/getCOABalancesSlice");
@@ -77,7 +77,7 @@ function getOpExBalancesInTimeFrame(opExState, sectionState, readCustomRangeSlot
     }
     return [];
 }
-exports.getOperatingExpensesReport = (0, toolkit_1.createSelector)((state) => state.accountState, (state) => state.accountGroupState, (state) => state.sectionAccountsViewState, (state) => state.opExState, (state) => state.forecastState, (state) => state.forecastListState, (_state, filter) => filter, (_state, _filter, forecastId) => forecastId, (_state, _filter, _forecastId, readCustomRangeSlot) => readCustomRangeSlot === true, (accountState, accountGroupState, sectionsState, opExState, forecastState, forecastListState, filter, forecastId, readCustomRangeSlot) => {
+const createOperatingExpensesReportSelector = () => (0, toolkit_1.createSelector)((state) => state.accountState, (state) => state.accountGroupState, (state) => state.sectionAccountsViewState, (state) => state.opExState, (state) => state.forecastState, (state) => state.forecastListState, (_state, filter) => filter, (_state, _filter, forecastId) => forecastId, (_state, _filter, _forecastId, readCustomRangeSlot) => readCustomRangeSlot === true, (accountState, accountGroupState, sectionsState, opExState, forecastState, forecastListState, filter, forecastId, readCustomRangeSlot) => {
     const opEx = (0, opExReducer_1.getState)(opExState, opExState.uiState.isForecastModeOn, forecastId);
     // The detail screen opts into customFetchState so its Completed check fires
     // off the custom fetch; the dashboard (no flag) reads the shared fetchState,
@@ -137,6 +137,9 @@ exports.getOperatingExpensesReport = (0, toolkit_1.createSelector)((state) => st
         customTimeframe: opExState.uiState.customTimeframe,
     };
 });
+exports.getOperatingExpensesReport = createOperatingExpensesReportSelector();
+// The dashboard card keeps its own cache so the detail page's calls with other filters can't evict it.
+exports.getOperatingExpensesReportForDashboard = createOperatingExpensesReportSelector();
 exports.getOperatingExpensesForSelectedRange = (0, toolkit_1.createSelector)((state) => state, (state) => state.opExState, (state, opExWithForecastState) => {
     const { timeframe, selectedCOABalancesRange, selectedAdditionalBalances, isForecastModeOn, selectedForecast, } = opExWithForecastState.uiState;
     const noFilter = (0, coaBalancesFilter_1.newBalancesFilter)(opExWithForecastState.opEx.firstMonthOfFY, timeframe, selectedCOABalancesRange.numberOfPeriods, selectedCOABalancesRange.thisPeriod, 'ascending_date', selectedAdditionalBalances);

package/package.json

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