@zeniai/client-epic-state 5.2.93-betaNB2 → 5.2.94

package/lib/view/cashPosition/cashPositionReducer.js

@@ -9,6 +9,7 @@ const dataAvailable_1 = require("../../commonStateTypes/dataAvailable");
 const thisPeriodHelpers_1 = require("../../commonStateTypes/viewAndReport/thisPeriodHelpers");
 const insightSummaryPayload_1 = require("../../entity/insights/insightSummaryPayload");
 const rootActions_1 = require("../../rootActions");
+const zeniDayJS_1 = require("../../zeniDayJS");
 const getSelectedAndHighlightedRanges_1 = require("../common/getSelectedAndHighlightedRanges");
 exports.defaultPeriods = {
     numberOfPeriods: 8,
@@ -18,6 +19,12 @@ exports.initialState = {
     error: undefined,
     cashPosition: undefined,
     dataAvailable: undefined,
+    // Custom-date slots must be explicit in initialState so clearAll's
+    // Object.assign(draft, initialState) resets them on tenant switch (absent
+    // keys would otherwise survive). Mirrors cashInCashOut.
+    customCashPosition: undefined,
+    customDataAvailable: undefined,
+    customFetchState: undefined,
     firstMonthOfFY: 1,
     reportId: 'cash_position',
     reportTitle: '',
@@ -49,52 +56,54 @@ const cashPosition = (0, toolkit_1.createSlice)({
     initialState: exports.initialState,
     reducers: {
         fetchCashPosition: {
-            prepare(fetchFullReport = false) {
-                return { payload: { fetchFullReport } };
+            prepare(fetchFullReport = false, startDate, endDate) {
+                return { payload: { fetchFullReport, startDate, endDate } };
             },
-            reducer(draft) {
-                draft.fetchState = 'In-Progress';
-                draft.error = undefined;
+            reducer(draft, action) {
+                // Route by the fetch's own dates, not the global flag: a custom fetch
+                // (carries start/end) marks customFetchState so the shared fetchState the
+                // dashboard reads is never left In-Progress by a detail-screen fetch.
+                const isCustomDateRange = action.payload.startDate != null && action.payload.endDate != null;
+                if (isCustomDateRange) {
+                    draft.customFetchState = {
+                        fetchState: 'In-Progress',
+                        error: undefined,
+                    };
+                }
+                else {
+                    draft.fetchState = 'In-Progress';
+                    draft.error = undefined;
+                }
             },
         },
-        updateCashPosition(draft, action) {
-            const reportDataPayload = action.payload;
-            const report = (0, viewAndReportPayload_1.mapReportPayloadToReport)(reportDataPayload.report);
-            Object.assign(draft, report);
-            const { cash_position, insights } = reportDataPayload.report;
-            draft.fetchState = 'Completed';
-            draft.error = undefined;
-            draft.cashPosition =
-                (0, coaBalancePayload_1.mapCOABalanceGroupedWithAccountIDsPayloadToCOABalanceGroupedWithAccountIDs)({
-                    ...cash_position,
-                    account_ids: reportDataPayload.report.accounts.map((payload) => payload.account_id),
-                });
-            draft.insights = (0, insightSummaryPayload_1.mapInsightsPayloadtoInsightsState)(insights);
-            draft.dataAvailable = report.dataAvailable
-                ? report.dataAvailable
-                : (0, dataAvailable_1.getDataAvailableDateRange)(draft.cashPosition);
-            if (draft.dataAvailable != null) {
-                const timeframe = draft.uiState.timeframe;
-                const coaBalances = (0, getSelectedAndHighlightedRanges_1.getAvailableCOABalancesWithMostRecentNonZeroBalance)(draft.firstMonthOfFY, timeframe, [draft.cashPosition], draft.dataAvailable);
-                const selectionRanges = (0, getSelectedAndHighlightedRanges_1.getInitialSelectedAndHighlightedRanges)({
-                    firstMonthOfFY: draft.firstMonthOfFY,
-                    timeframe,
-                    coaBalances,
-                    orderBy: 'ascending_date',
-                    maxNumOfPeriodsToSelect: exports.defaultPeriods.numberOfPeriods,
-                    maxNumOfPeriodsToHighlight: exports.initialState.uiState.maxNumOfPeriodsToHighlight,
-                });
-                if (selectionRanges?.selectedCOABalancesRange != null) {
-                    draft.uiState.selectedCOABalancesRange =
-                        selectionRanges?.selectedCOABalancesRange;
-                }
-                draft.uiState.highlightedCOABalancesRange =
-                    selectionRanges?.highlightedCOABalancesRange;
-            }
+        updateCashPosition: {
+            prepare(reportData, isCustomDateRange = false) {
+                return { payload: { reportData, isCustomDateRange } };
+            },
+            reducer(draft, action) {
+                doUpdateCashPosition(draft, action.payload.reportData, action.payload.isCustomDateRange);
+            },
         },
-        updateCashPositionFailure(draft, action) {
-            draft.fetchState = 'Error';
-            draft.error = action.payload;
+        updateCashPositionFailure: {
+            prepare(error, isCustomDateRange = false) {
+                return { payload: { error, isCustomDateRange } };
+            },
+            reducer(draft, action) {
+                // Route the error like the request/success: a custom (dated) fetch's
+                // failure lands in customFetchState so the shared default the dashboard
+                // reads isn't marked Error, and the detail's customFetchState isn't left
+                // stuck In-Progress.
+                if (action.payload.isCustomDateRange === true) {
+                    draft.customFetchState = {
+                        fetchState: 'Error',
+                        error: action.payload.error,
+                    };
+                }
+                else {
+                    draft.fetchState = 'Error';
+                    draft.error = action.payload.error;
+                }
+            },
         },
         updateCashPositionAdditionalBalancesSelection(draft, action) {
             const { cashPosition, dataAvailable, uiState } = draft;
@@ -109,7 +118,7 @@ const cashPosition = (0, toolkit_1.createSlice)({
                     action.payload.additionalBalances.length != 0
                     ? true
                     : false;
-            if (dataAvailable != null) {
+            if (dataAvailable != null && draft.uiState.customTimeframe == null) {
                 const coaBalances = (0, getSelectedAndHighlightedRanges_1.getAvailableCOABalancesWithMostRecentNonZeroBalance)(draft.firstMonthOfFY, uiState.timeframe, [cashPosition], dataAvailable);
                 const thisPeriod = (0, thisPeriodHelpers_1.extractThisPeriod)(draft.firstMonthOfFY, timeframe, selectedCOABalancesRange, coaBalances);
                 if (thisPeriod != null &&
@@ -138,6 +147,46 @@ const cashPosition = (0, toolkit_1.createSlice)({
             }
         },
         updateCashPositionCOABalancesRange(draft, action) {
+            if (action.payload.isCustomDateRange != null) {
+                if (action.payload.isCustomDateRange === true) {
+                    // Collapse the two raw date strings into a single customTimeframe object.
+                    // Presence of customTimeframe signals custom-mode active (replaces the
+                    // old isCustomDateRangeActive boolean + customStartDate/customEndDate).
+                    draft.uiState.customTimeframe =
+                        action.payload.customStartDate != null &&
+                            action.payload.customEndDate != null
+                            ? {
+                                startDate: (0, zeniDayJS_1.date)(action.payload.customStartDate),
+                                endDate: (0, zeniDayJS_1.date)(action.payload.customEndDate),
+                            }
+                            : undefined;
+                    // Invalidate the shared default-window fetchState so dashboardEpic
+                    // refetches the default data on the next dashboard visit — the custom
+                    // fetch writes into the shared report store, and this lets the card
+                    // self-heal without a reload. The detail screen reads customFetchState.
+                    draft.fetchState = 'Not-Started';
+                    draft.error = undefined;
+                }
+                else {
+                    draft.uiState.customTimeframe = undefined;
+                }
+            }
+            // A custom date range drives the visible window directly: honor the exact
+            // numberOfPeriods + thisPeriod from the payload instead of re-deriving
+            // (which clamps the range to the available/non-zero periods).
+            if (draft.uiState.customTimeframe != null) {
+                draft.uiState.selectedCOABalancesRange =
+                    action.payload.selectedCOABalancesRange;
+                if (action.payload.highlightedCOABalancesRange != null) {
+                    // Clamp the highlight to the same cap the non-custom path enforces so
+                    // a wide custom range doesn't highlight all N periods at once.
+                    draft.uiState.highlightedCOABalancesRange = {
+                        ...action.payload.highlightedCOABalancesRange,
+                        numberOfPeriods: Math.min(action.payload.highlightedCOABalancesRange.numberOfPeriods, draft.uiState.maxNumOfPeriodsToHighlight),
+                    };
+                }
+                return;
+            }
             const { cashPosition, dataAvailable, uiState } = draft;
             if (dataAvailable != null &&
                 action.payload.selectedCOABalancesRange.thisPeriod != null) {
@@ -178,6 +227,13 @@ const cashPosition = (0, toolkit_1.createSlice)({
             }
         },
         updateCashPositionThisPeriod(draft, action) {
+            // In custom-date mode the picker drives the window; skip re-deriving the
+            // selected/highlighted ranges from the default dataAvailable (the epic
+            // re-dispatches the default thisPeriod on every response, which would
+            // otherwise clamp the custom window back to the default).
+            if (draft.uiState.customTimeframe != null) {
+                return;
+            }
             const { cashPosition, dataAvailable, uiState } = draft;
             if (dataAvailable != null && action.payload.thisPeriod != null) {
                 const coaBalances = (0, getSelectedAndHighlightedRanges_1.getAvailableCOABalancesWithMostRecentNonZeroBalance)(draft.firstMonthOfFY, uiState.timeframe, [cashPosition], dataAvailable);
@@ -222,7 +278,7 @@ const cashPosition = (0, toolkit_1.createSlice)({
                 draft.uiState.maxNumOfPeriodsToHighlight =
                     exports.initialState.uiState.maxNumOfPeriodsToHighlight;
             }
-            if (dataAvailable != null) {
+            if (dataAvailable != null && draft.uiState.customTimeframe == null) {
                 const timeframe = draft.uiState.timeframe;
                 const coaBalances = (0, getSelectedAndHighlightedRanges_1.getAvailableCOABalancesWithMostRecentNonZeroBalance)(draft.firstMonthOfFY, timeframe, [cashPosition], dataAvailable);
                 const selectionRanges = (0, getSelectedAndHighlightedRanges_1.getInitialSelectedAndHighlightedRanges)({
@@ -262,5 +318,60 @@ const cashPosition = (0, toolkit_1.createSlice)({
         });
     },
 });
+const doUpdateCashPosition = (draft, reportDataPayload, isCustomDateRange) => {
+    const report = (0, viewAndReportPayload_1.mapReportPayloadToReport)(reportDataPayload.report);
+    const { cash_position, insights } = reportDataPayload.report;
+    const cashPosition = (0, coaBalancePayload_1.mapCOABalanceGroupedWithAccountIDsPayloadToCOABalanceGroupedWithAccountIDs)({
+        ...cash_position,
+        account_ids: reportDataPayload.report.accounts.map((payload) => payload.account_id),
+    });
+    const dataAvailable = report.dataAvailable
+        ? report.dataAvailable
+        : (0, dataAvailable_1.getDataAvailableDateRange)(cashPosition);
+    // Route custom-date results (identified by the fetch's own dates, not the
+    // global flag) to the separate slots so the dashboard card (which reads
+    // cashPosition / dataAvailable) keeps the default window.
+    if (isCustomDateRange) {
+        draft.customCashPosition = cashPosition;
+        // Don't let a custom slice shrink the shared dataAvailable the dashboard uses;
+        // a default fetch always updates it, a custom one only populates it on first
+        // load (when nothing has set it yet).
+        draft.customDataAvailable = dataAvailable;
+        if (draft.dataAvailable == null) {
+            draft.dataAvailable = dataAvailable;
+        }
+        draft.customFetchState = { fetchState: 'Completed', error: undefined };
+        // Skip insights on a custom fetch so the dashboard card keeps the
+        // default-window copy (matches cashInCashOut / opEx / revenue / netBurn).
+        return;
+    }
+    Object.assign(draft, report);
+    draft.fetchState = 'Completed';
+    draft.error = undefined;
+    draft.cashPosition = cashPosition;
+    draft.insights = (0, insightSummaryPayload_1.mapInsightsPayloadtoInsightsState)(insights);
+    draft.dataAvailable = dataAvailable;
+    if (draft.dataAvailable != null &&
+        // A custom date range drives the window; don't reset it to the default on
+        // every report receipt (this is what clamped wide ranges back to 8).
+        draft.uiState.customTimeframe == null) {
+        const timeframe = draft.uiState.timeframe;
+        const coaBalances = (0, getSelectedAndHighlightedRanges_1.getAvailableCOABalancesWithMostRecentNonZeroBalance)(draft.firstMonthOfFY, timeframe, [draft.cashPosition], draft.dataAvailable);
+        const selectionRanges = (0, getSelectedAndHighlightedRanges_1.getInitialSelectedAndHighlightedRanges)({
+            firstMonthOfFY: draft.firstMonthOfFY,
+            timeframe,
+            coaBalances,
+            orderBy: 'ascending_date',
+            maxNumOfPeriodsToSelect: exports.defaultPeriods.numberOfPeriods,
+            maxNumOfPeriodsToHighlight: exports.initialState.uiState.maxNumOfPeriodsToHighlight,
+        });
+        if (selectionRanges?.selectedCOABalancesRange != null) {
+            draft.uiState.selectedCOABalancesRange =
+                selectionRanges?.selectedCOABalancesRange;
+        }
+        draft.uiState.highlightedCOABalancesRange =
+            selectionRanges?.highlightedCOABalancesRange;
+    }
+};
 _a = cashPosition.actions, exports.fetchCashPosition = _a.fetchCashPosition, exports.updateCashPosition = _a.updateCashPosition, exports.updateCashPositionFailure = _a.updateCashPositionFailure, exports.updateCashPositionTimeFrame = _a.updateCashPositionTimeFrame, exports.updateCashPositionCOABalancesRange = _a.updateCashPositionCOABalancesRange, exports.updateCashPositionAdditionalBalancesSelection = _a.updateCashPositionAdditionalBalancesSelection, exports.updateCashPositionThisPeriod = _a.updateCashPositionThisPeriod, exports.updateCashPositionDownloadState = _a.updateCashPositionDownloadState, exports.updateCashPositionUIState = _a.updateCashPositionUIState;
 exports.default = cashPosition.reducer;

package/lib/view/cashPosition/cashPositionSelector.d.ts

@@ -5,7 +5,7 @@ import { AccountState } from '../../entity/account/accountState';
 import { RootState } from '../../rootStateTypes';
 import { CashPositionReport, CashPositionUIStateSelectorView } from './cashPositionSelectorTypes';
 import { CashPositionState } from './cashPositionState';
-export declare const getCashPosition: (accountState: AccountState, cashPositionState: CashPositionState, filter: COABalancesFilter) => {
+export declare const getCashPosition: (accountState: AccountState, cashPositionState: CashPositionState, filter: COABalancesFilter, readCustomRangeSlot?: boolean) => {
     filter: COABalancesFilter;
     cashPosition: SectionWithAccountOnly;
     allTimeframeTicks: TimeframeTickWithMetaData[];
@@ -20,6 +20,7 @@ export declare const getCashPosition: (accountState: AccountState, cashPositionS
     error: import("../..").ZeniAPIStatus<Record<string, unknown>> | undefined;
     insights: import("../..").InsightSummary[];
     downloadState: import("../..").FetchState;
+    customTimeframe: import("../../commonStateTypes/timeframeTick").TimeframeTick | undefined;
 };
 export declare const getCashPositionUIState: (state: RootState) => CashPositionUIStateSelectorView;
 export declare const getCashPositionForSelectedRange: (state: RootState) => CashPositionReport;

package/lib/view/cashPosition/cashPositionSelector.js

@@ -7,20 +7,30 @@ const getCOABalancesSlice_1 = require("../../commonStateTypes/coaBalance/getCOAB
 const dataAvailable_1 = require("../../commonStateTypes/dataAvailable");
 const timeframeTick_1 = require("../../commonStateTypes/timeframeTick");
 const accountSelector_1 = require("../../entity/account/accountSelector");
-const getCashPosition = (accountState, cashPositionState, filter) => {
+const getCashPosition = (accountState, cashPositionState, filter, readCustomRangeSlot) => {
+    // The detail screen opts into the isolated custom slot when custom mode is
+    // active; the dashboard (no flag) reads the default slot, so a default fetch
+    // can't clobber the custom partial-period data the detail is showing.
+    const useCustomRange = readCustomRangeSlot === true &&
+        cashPositionState.uiState.customTimeframe != null;
+    const activeCashPosition = useCustomRange
+        ? cashPositionState.customCashPosition
+        : cashPositionState.cashPosition;
+    const dataAvailable = useCustomRange
+        ? cashPositionState.customDataAvailable
+        : cashPositionState.dataAvailable;
     const cashPosition = {
         itemOrder: 'last_balance_descending',
         accountsOrdered: (0, accountSelector_1.getAccountsOrdered)(filter, accountState, {
-            accountIDs: cashPositionState.cashPosition?.accountIDs ?? [],
+            accountIDs: activeCashPosition?.accountIDs ?? [],
             reportId: 'cash_position',
         }, 'cashPosition'),
-        ...(0, getCOABalancesSlice_1.getCOABalances)(cashPositionState.cashPosition, filter),
+        ...(0, getCOABalancesSlice_1.getCOABalances)(activeCashPosition, filter),
     };
     let allTimeframeTicks = [];
-    const dataAvailable = cashPositionState.dataAvailable;
     if (dataAvailable != null) {
         const noFilter = (0, coaBalancesFilter_1.newBalancesFilterForDateRange)(cashPositionState.firstMonthOfFY, cashPositionState.uiState.timeframe, dataAvailable, 'ascending_date', []);
-        const cashPositionBalances = (0, getCOABalancesSlice_1.getCOABalances)(cashPositionState.cashPosition, noFilter);
+        const cashPositionBalances = (0, getCOABalancesSlice_1.getCOABalances)(activeCashPosition, noFilter);
         allTimeframeTicks = cashPositionBalances.balances.map((balance) => (0, timeframeTick_1.toTimeframeTick)(balance));
     }
     return {
@@ -34,10 +44,19 @@ const getCashPosition = (accountState, cashPositionState, filter) => {
         reportTitle: cashPositionState.reportTitle,
         version: cashPositionState.version,
         status: cashPositionState.status,
-        fetchState: cashPositionState.fetchState,
-        error: cashPositionState.error,
+        // The detail screen opts into customFetchState so its loading/complete state
+        // tracks the custom fetch; the dashboard (no flag) reads the shared
+        // fetchState, which custom-mode activation reset so dashboardEpic refetches.
+        fetchState: useCustomRange && cashPositionState.customFetchState != null
+            ? cashPositionState.customFetchState.fetchState
+            : cashPositionState.fetchState,
+        error: useCustomRange && cashPositionState.customFetchState != null
+            ? cashPositionState.customFetchState.error
+            : cashPositionState.error,
         insights: cashPositionState.insights ?? [],
         downloadState: cashPositionState.uiState.downloadState,
+        // Surface the customTimeframe so the detail picker can restore the selection.
+        customTimeframe: cashPositionState.uiState.customTimeframe,
     };
 };
 exports.getCashPosition = getCashPosition;
@@ -64,11 +83,11 @@ exports.getCashPositionUIState = (0, toolkit_1.createSelector)((state) => state.
 exports.getCashPositionForSelectedRange = (0, toolkit_1.createSelector)((state) => state.accountState, (state) => state.cashPositionState, (accountState, cashPositionState) => {
     const { timeframe, selectedCOABalancesRange, selectedAdditionalBalances } = cashPositionState.uiState;
     const noFilter = (0, coaBalancesFilter_1.newBalancesFilter)(cashPositionState.firstMonthOfFY, timeframe, selectedCOABalancesRange.numberOfPeriods, selectedCOABalancesRange.thisPeriod, 'ascending_date', selectedAdditionalBalances);
-    return (0, exports.getCashPosition)(accountState, cashPositionState, noFilter);
+    return (0, exports.getCashPosition)(accountState, cashPositionState, noFilter, true);
 });
 exports.getCashPositionForHighlightedRange = (0, toolkit_1.createSelector)((state) => state.accountState, (state) => state.cashPositionState, (accountState, cashPositionState) => {
     const { timeframe, highlightedCOABalancesRange, selectedAdditionalBalances, maxNumOfPeriodsToHighlight, } = cashPositionState.uiState;
     const filter = (0, coaBalancesFilter_1.newBalancesFilter)(cashPositionState.firstMonthOfFY, timeframe, highlightedCOABalancesRange?.numberOfPeriods ??
         maxNumOfPeriodsToHighlight, highlightedCOABalancesRange?.thisPeriod, 'ascending_date', selectedAdditionalBalances);
-    return (0, exports.getCashPosition)(accountState, cashPositionState, filter);
+    return (0, exports.getCashPosition)(accountState, cashPositionState, filter, true);
 });

package/lib/view/cashPosition/cashPositionState.d.ts

@@ -1,5 +1,6 @@
 import { COABalanceGroupedWithAccountIDs } from '../../commonStateTypes/coaBalance/coaBalance';
-import { FetchedState, ID } from '../../commonStateTypes/common';
+import { FetchStateAndError, FetchedState, ID } from '../../commonStateTypes/common';
+import { DataAvailable } from '../../commonStateTypes/dataAvailable';
 import { ReportUIState } from '../../commonStateTypes/viewAndReport/reportUIState';
 import { Report } from '../../commonStateTypes/viewAndReport/viewAndReport';
 import { InsightSummary } from '../../entity/insights/insightSummary';
@@ -14,4 +15,7 @@ export interface CashPositionState extends FetchedState, Report {
     insights: InsightSummary[];
     uiState: CashPositionUIState;
     cashPosition?: COABalanceGroupedWithAccountIDs;
+    customCashPosition?: COABalanceGroupedWithAccountIDs;
+    customDataAvailable?: DataAvailable;
+    customFetchState?: FetchStateAndError;
 }

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

@@ -22,6 +22,8 @@ export declare const fetchFinanceStatementEpic: (actions$: ActionsObservable<Act
         timeframe: "month" | "year" | "quarter";
         fetchFullReport: boolean;
         cacheOverride: boolean;
+        startDate: string | undefined;
+        endDate: string | undefined;
     };
     type: "balanceSheet/fetchBalanceSheetForTimeframe";
 } | {
@@ -34,6 +36,8 @@ export declare const fetchFinanceStatementEpic: (actions$: ActionsObservable<Act
     payload: {
         timeframe: "month" | "year" | "quarter";
         fetchFullReport: boolean;
+        startDate: string | undefined;
+        endDate: string | undefined;
     };
     type: "cashFlow/fetchCashFlowForTimeframe";
 } | {
@@ -42,6 +46,8 @@ export declare const fetchFinanceStatementEpic: (actions$: ActionsObservable<Act
         timeframe: "month" | "year" | "quarter";
         fetchFullReport: boolean;
         cacheOverride: boolean;
+        startDate: string | undefined;
+        endDate: string | undefined;
     };
     type: "profitAndLoss/fetchProfitAndLossForTimeframe";
 } | {

package/lib/view/netBurnOrIncome/fetchNetBurnOrIncomeWithForecastEpic.d.ts

@@ -9,6 +9,7 @@ export declare const fetchNetBurnOrIncomeWithForecastEpic: (actions$: ActionsObs
         error: import("../../zeniAPIStatus").ZeniAPIStatus<Record<string, unknown>>;
         forecastId: string | undefined;
         timeframe: "month" | "year" | "quarter";
+        isCustomDateRange: boolean;
     };
     type: "net_burn_or_income/updateNetBurnOrIncomeForTimeframeFailure";
 }[]>;

package/lib/view/netBurnOrIncome/netBurnOrIncomeEpic.js

@@ -5,12 +5,12 @@ const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const netBurnOrIncomeReducer_1 = require("./netBurnOrIncomeReducer");
 const fetchNetBurnOrIncomeEpic = (actions$, state) => actions$.pipe((0, operators_1.filter)(netBurnOrIncomeReducer_1.fetchNetBurnOrIncome.match), (0, operators_1.mergeMap)((action) => {
-    const { cacheOverride, forecastId } = action.payload;
+    const { cacheOverride, endDate, forecastId, startDate } = action.payload;
     if (cacheOverride === true) {
         return (0, rxjs_1.from)([
-            (0, netBurnOrIncomeReducer_1.fetchNetBurnOrIncomeForTimeframe)('month', forecastId),
-            (0, netBurnOrIncomeReducer_1.fetchNetBurnOrIncomeForTimeframe)('quarter', forecastId),
-            (0, netBurnOrIncomeReducer_1.fetchNetBurnOrIncomeForTimeframe)('year', forecastId),
+            (0, netBurnOrIncomeReducer_1.fetchNetBurnOrIncomeForTimeframe)('month', forecastId, true, false, startDate, endDate),
+            (0, netBurnOrIncomeReducer_1.fetchNetBurnOrIncomeForTimeframe)('quarter', forecastId, true, false, startDate, endDate),
+            (0, netBurnOrIncomeReducer_1.fetchNetBurnOrIncomeForTimeframe)('year', forecastId, true, false, startDate, endDate),
         ]);
     }
     else {
@@ -19,15 +19,15 @@ const fetchNetBurnOrIncomeEpic = (actions$, state) => actions$.pipe((0, operator
         const timeframeFetchState = netBurnOrIncomeState.fetchState;
         if (timeframeFetchState['month'].fetchState !== 'In-Progress' &&
             timeframeFetchState['month'].fetchState !== 'Completed') {
-            fetchActions.push((0, netBurnOrIncomeReducer_1.fetchNetBurnOrIncomeForTimeframe)('month', forecastId));
+            fetchActions.push((0, netBurnOrIncomeReducer_1.fetchNetBurnOrIncomeForTimeframe)('month', forecastId, true, false, startDate, endDate));
         }
         if (timeframeFetchState['quarter'].fetchState !== 'In-Progress' &&
             timeframeFetchState['quarter'].fetchState !== 'Completed') {
-            fetchActions.push((0, netBurnOrIncomeReducer_1.fetchNetBurnOrIncomeForTimeframe)('quarter', forecastId));
+            fetchActions.push((0, netBurnOrIncomeReducer_1.fetchNetBurnOrIncomeForTimeframe)('quarter', forecastId, true, false, startDate, endDate));
         }
         if (timeframeFetchState['year'].fetchState !== 'In-Progress' &&
             timeframeFetchState['year'].fetchState !== 'Completed') {
-            fetchActions.push((0, netBurnOrIncomeReducer_1.fetchNetBurnOrIncomeForTimeframe)('year', forecastId));
+            fetchActions.push((0, netBurnOrIncomeReducer_1.fetchNetBurnOrIncomeForTimeframe)('year', forecastId, true, false, startDate, endDate));
         }
         return (0, rxjs_1.from)(fetchActions);
     }

package/lib/view/netBurnOrIncome/netBurnOrIncomeForTimeframeEpic.d.ts

@@ -7,5 +7,6 @@ import { RootState } from '../../rootStateTypes';
 import { ZeniAPI } from '../../zeniAPI';
 import { fetchNetBurnOrIncomeForTimeframe, updateNetBurnOrIncomeForTimeframe, updateNetBurnOrIncomeForTimeframeFailure, updateNetBurnOrIncomeThisPeriod } from './netBurnOrIncomeReducer';
 export type ActionType = ReturnType<typeof fetchNetBurnOrIncomeForTimeframe> | ReturnType<typeof updateNetBurnOrIncomeForTimeframe> | ReturnType<typeof updateNetBurnOrIncomeForTimeframeFailure> | ReturnType<typeof updateSectionAccountsView> | ReturnType<typeof updateCalculatedSectionAccountsView> | ReturnType<typeof updateForecast> | ReturnType<typeof updateNetBurnOrIncomeThisPeriod>;
-export declare const reportIdUniqueKey: (forecastId?: ID) => "net_burn_or_income" | `net_burn_or_income+${string}`;
+export declare const CUSTOM_DATE_RANGE_SECTION_MARKER: ID;
+export declare const reportIdUniqueKey: (forecastId?: ID, isCustomDateRange?: boolean) => "net_burn_or_income" | `net_burn_or_income+${string}`;
 export declare const fetchNetBurnOrIncomeForTimeframeEpic: (actions$: ActionsObservable<ActionType>, state: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/netBurnOrIncome/netBurnOrIncomeForTimeframeEpic.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchNetBurnOrIncomeForTimeframeEpic = exports.reportIdUniqueKey = void 0;
+exports.fetchNetBurnOrIncomeForTimeframeEpic = exports.reportIdUniqueKey = exports.CUSTOM_DATE_RANGE_SECTION_MARKER = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const forecastReducer_1 = require("../../entity/forecast/forecastReducer");
@@ -8,9 +8,15 @@ const sectionAccountsViewReducer_1 = require("../../entity/sectionAccountsView/s
 const responsePayload_1 = require("../../responsePayload");
 const reportsHelpers_1 = require("../common/reportsHelpers");
 const netBurnOrIncomeReducer_1 = require("./netBurnOrIncomeReducer");
-const reportIdUniqueKey = (forecastId) => forecastId != null
-    ? `net_burn_or_income+${forecastId}`
-    : 'net_burn_or_income';
+// Reserved forecast-slot marker so custom-date section-accounts data lives under
+// its own key (net_burn_or_income+<marker>) and a default fetch can never
+// overwrite it. Real forecast ids are UUIDs, so this never collides.
+exports.CUSTOM_DATE_RANGE_SECTION_MARKER = '__custom_date_range__';
+const reportIdUniqueKey = (forecastId, isCustomDateRange) => isCustomDateRange === true
+    ? `net_burn_or_income+${exports.CUSTOM_DATE_RANGE_SECTION_MARKER}`
+    : forecastId != null
+        ? `net_burn_or_income+${forecastId}`
+        : 'net_burn_or_income';
 exports.reportIdUniqueKey = reportIdUniqueKey;
 const fetchNetBurnOrIncomeForTimeframeEpic = (actions$, state, zeniAPI) => actions$.pipe((0, operators_1.filter)(netBurnOrIncomeReducer_1.fetchNetBurnOrIncomeForTimeframe.match), (0, operators_1.mergeMap)((action) => {
     const queryValue = {
@@ -22,20 +28,27 @@ const fetchNetBurnOrIncomeForTimeframeEpic = (actions$, state, zeniAPI) => actio
         queryValue.forecast_id = action.payload.forecastId;
         queryValue.is_forecast_vs_actual = true;
     }
+    if (action.payload.startDate != null && action.payload.endDate != null) {
+        queryValue.custom_start_date = action.payload.startDate;
+        queryValue.custom_end_date = action.payload.endDate;
+    }
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/2.0/reports/net_burn_or_income?query=${encodeURIComponent(JSON.stringify(queryValue))}`)
         .pipe((0, operators_1.mergeMap)((response) => {
         if (response.data != null && (0, responsePayload_1.isSuccessResponse)(response)) {
             const actions = [];
-            actions.push((0, sectionAccountsViewReducer_1.updateSectionAccountsView)(action.payload.timeframe, 'cogs', (0, exports.reportIdUniqueKey)(action.payload.forecastId), response.data.report.cogs, response.data.report.accounts, response.data.report.account_groups, response.data.report.currency));
-            actions.push((0, sectionAccountsViewReducer_1.updateSectionAccountsView)(action.payload.timeframe, 'expenses', (0, exports.reportIdUniqueKey)(action.payload.forecastId), response.data.report.expenses, response.data.report.accounts, response.data.report.account_groups, response.data.report.currency));
-            actions.push((0, sectionAccountsViewReducer_1.updateSectionAccountsView)(action.payload.timeframe, 'income', (0, exports.reportIdUniqueKey)(action.payload.forecastId), response.data.report.income, response.data.report.accounts, response.data.report.account_groups, response.data.report.currency));
-            actions.push((0, sectionAccountsViewReducer_1.updateCalculatedSectionAccountsView)(action.payload.timeframe, 'grossBurn', (0, exports.reportIdUniqueKey)(action.payload.forecastId), response.data.report.gross_burn, response.data.report.currency));
-            actions.push((0, sectionAccountsViewReducer_1.updateCalculatedSectionAccountsView)(action.payload.timeframe, 'netBurnOrIncome', (0, exports.reportIdUniqueKey)(action.payload.forecastId), response.data.report.net_burn_or_income, response.data.report.currency));
+            const isCustomDateRange = action.payload.startDate != null &&
+                action.payload.endDate != null;
+            actions.push((0, sectionAccountsViewReducer_1.updateSectionAccountsView)(action.payload.timeframe, 'cogs', (0, exports.reportIdUniqueKey)(action.payload.forecastId, isCustomDateRange), response.data.report.cogs, response.data.report.accounts, response.data.report.account_groups, response.data.report.currency));
+            actions.push((0, sectionAccountsViewReducer_1.updateSectionAccountsView)(action.payload.timeframe, 'expenses', (0, exports.reportIdUniqueKey)(action.payload.forecastId, isCustomDateRange), response.data.report.expenses, response.data.report.accounts, response.data.report.account_groups, response.data.report.currency));
+            actions.push((0, sectionAccountsViewReducer_1.updateSectionAccountsView)(action.payload.timeframe, 'income', (0, exports.reportIdUniqueKey)(action.payload.forecastId, isCustomDateRange), response.data.report.income, response.data.report.accounts, response.data.report.account_groups, response.data.report.currency));
+            actions.push((0, sectionAccountsViewReducer_1.updateCalculatedSectionAccountsView)(action.payload.timeframe, 'grossBurn', (0, exports.reportIdUniqueKey)(action.payload.forecastId, isCustomDateRange), response.data.report.gross_burn, response.data.report.currency));
+            actions.push((0, sectionAccountsViewReducer_1.updateCalculatedSectionAccountsView)(action.payload.timeframe, 'netBurnOrIncome', (0, exports.reportIdUniqueKey)(action.payload.forecastId, isCustomDateRange), response.data.report.net_burn_or_income, response.data.report.currency));
             actions.push((0, netBurnOrIncomeReducer_1.updateNetBurnOrIncomeForTimeframe)({
                 timeframe: action.payload.timeframe,
                 forecastId: action.payload.forecastId,
                 report: response.data,
+                isCustomDateRange,
             }));
             if (action.payload.forecastId == null &&
                 action.payload.timeframe === 'month') {
@@ -50,9 +63,11 @@ const fetchNetBurnOrIncomeForTimeframeEpic = (actions$, state, zeniAPI) => actio
             return (0, rxjs_1.from)(actions);
         }
         else {
-            return (0, rxjs_1.of)((0, netBurnOrIncomeReducer_1.updateNetBurnOrIncomeForTimeframeFailure)(response.status, action.payload.forecastId, action.payload.timeframe));
+            return (0, rxjs_1.of)((0, netBurnOrIncomeReducer_1.updateNetBurnOrIncomeForTimeframeFailure)(response.status, action.payload.forecastId, action.payload.timeframe, action.payload.startDate != null &&
+                action.payload.endDate != null));
         }
     }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, netBurnOrIncomeReducer_1.updateNetBurnOrIncomeForTimeframeFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Net burn or income REST API call errored out' +
-        JSON.stringify(error)), action.payload.forecastId, action.payload.timeframe))));
+        JSON.stringify(error)), action.payload.forecastId, action.payload.timeframe, action.payload.startDate != null &&
+        action.payload.endDate != null))));
 }));
 exports.fetchNetBurnOrIncomeForTimeframeEpic = fetchNetBurnOrIncomeForTimeframeEpic;

package/lib/view/netBurnOrIncome/netBurnOrIncomeReducer.d.ts

@@ -10,23 +10,29 @@ export declare const defaultPeriods: {
 };
 export declare const initialNetBurnOrIncomeState: NetBurnOrIncomeState;
 export declare const initialState: NetBurnOrIncomeWithForecastState;
-export declare const fetchNetBurnOrIncome: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[fetchFullReport?: any, forecastId?: string | undefined, cacheOverride?: any], {
+export declare const fetchNetBurnOrIncome: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[fetchFullReport?: any, forecastId?: string | undefined, cacheOverride?: any, startDate?: string | undefined, endDate?: string | undefined], {
     fetchFullReport: any;
     forecastId: string | undefined;
     cacheOverride: any;
-}, "net_burn_or_income/fetchNetBurnOrIncome", never, never>, fetchNetBurnOrIncomeForTimeframe: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[timeframe: "month" | "year" | "quarter", forecastId?: string | undefined, fetchFullReport?: boolean | undefined, cacheOverride?: boolean | undefined], {
+    startDate: string | undefined;
+    endDate: string | undefined;
+}, "net_burn_or_income/fetchNetBurnOrIncome", never, never>, fetchNetBurnOrIncomeForTimeframe: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[timeframe: "month" | "year" | "quarter", forecastId?: string | undefined, fetchFullReport?: boolean | undefined, cacheOverride?: boolean | undefined, startDate?: string | undefined, endDate?: string | undefined], {
     forecastId: string | undefined;
     timeframe: "month" | "year" | "quarter";
     fetchFullReport: boolean;
     cacheOverride: boolean;
+    startDate: string | undefined;
+    endDate: string | undefined;
 }, "net_burn_or_income/fetchNetBurnOrIncomeForTimeframe", never, never>, updateNetBurnOrIncomeForTimeframe: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     forecastId: string | undefined;
     report: ZeniReportData<NetBurnOrIncomePayload>;
     timeframe: "month" | "quarter" | "year";
-}, "net_burn_or_income/updateNetBurnOrIncomeForTimeframe">, updateNetBurnOrIncomeForTimeframeFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[error: ZeniAPIStatus<Record<string, unknown>>, forecastId: string | undefined, timeframe: "month" | "year" | "quarter"], {
+    isCustomDateRange?: boolean;
+}, "net_burn_or_income/updateNetBurnOrIncomeForTimeframe">, updateNetBurnOrIncomeForTimeframeFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[error: ZeniAPIStatus<Record<string, unknown>>, forecastId: string | undefined, timeframe: "month" | "year" | "quarter", isCustomDateRange?: boolean | undefined], {
     error: ZeniAPIStatus<Record<string, unknown>>;
     forecastId: string | undefined;
     timeframe: "month" | "year" | "quarter";
+    isCustomDateRange: boolean;
 }, "net_burn_or_income/updateNetBurnOrIncomeForTimeframeFailure", never, never>, updateNetBurnOrIncomeThisPeriod: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     thisPeriod: TimeframeTick | undefined;
 }, "net_burn_or_income/updateNetBurnOrIncomeThisPeriod">, updateNetBurnOrIncomeUIState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
@@ -45,7 +51,10 @@ export declare const fetchNetBurnOrIncome: import("@reduxjs/toolkit").ActionCrea
     maxNumOfPeriodsToHighlight: number;
 }, "net_burn_or_income/updateNetBurnOrIncomeAdditionalBalancesSelection">, updateNetBurnOrIncomeCOABalancesRange: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     selectedCOABalancesRange: COABalancesRange;
+    customEndDate?: string;
+    customStartDate?: string;
     highlightedCOABalancesRange?: COABalancesRangeWithThisPeriod;
+    isCustomDateRange?: boolean;
 }, "net_burn_or_income/updateNetBurnOrIncomeCOABalancesRange">, netBurnOrIncomeToggleForecastMode: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     isForecastModeOn: boolean;
     maxNumOfPeriodsToHighlightWithForecast: number;