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

package/lib/view/netBurnOrIncome/netBurnOrIncomeReducer.js

@@ -96,8 +96,16 @@ const netBurnOrIncome = (0, toolkit_1.createSlice)({
             },
         },
         fetchNetBurnOrIncome: {
-            prepare(fetchFullReport = false, forecastId, cacheOverride = false) {
-                return { payload: { fetchFullReport, forecastId, cacheOverride } };
+            prepare(fetchFullReport = false, forecastId, cacheOverride = false, startDate, endDate) {
+                return {
+                    payload: {
+                        fetchFullReport,
+                        forecastId,
+                        cacheOverride,
+                        startDate,
+                        endDate,
+                    },
+                };
             },
             reducer(
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -108,50 +116,138 @@ const netBurnOrIncome = (0, toolkit_1.createSlice)({
             },
         },
         fetchNetBurnOrIncomeForTimeframe: {
-            prepare(timeframe, forecastId, fetchFullReport = true, cacheOverride = false) {
+            prepare(timeframe, forecastId, fetchFullReport = true, cacheOverride = false, startDate, endDate) {
                 return {
-                    payload: { forecastId, timeframe, fetchFullReport, cacheOverride },
+                    payload: {
+                        forecastId,
+                        timeframe,
+                        fetchFullReport,
+                        cacheOverride,
+                        startDate,
+                        endDate,
+                    },
                 };
             },
             reducer(draft, action) {
                 const timeframe = action.payload.timeframe;
                 const netBurnOrIncomeState = getState(draft, draft.uiState.isForecastModeOn, action.payload.forecastId);
-                const fetchState = {
-                    ...netBurnOrIncomeState.fetchState,
-                };
-                fetchState[timeframe] = {
-                    fetchState: 'In-Progress',
-                    error: undefined,
-                };
-                updateState(draft, action.payload.forecastId, { fetchState });
+                // 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) {
+                    const customFetchState = {
+                        ...(netBurnOrIncomeState.customFetchState ?? {
+                            month: { fetchState: 'Not-Started', error: undefined },
+                            quarter: { fetchState: 'Not-Started', error: undefined },
+                            year: { fetchState: 'Not-Started', error: undefined },
+                        }),
+                    };
+                    customFetchState[timeframe] = {
+                        fetchState: 'In-Progress',
+                        error: undefined,
+                    };
+                    updateState(draft, action.payload.forecastId, { customFetchState });
+                }
+                else {
+                    const fetchState = {
+                        ...netBurnOrIncomeState.fetchState,
+                    };
+                    fetchState[timeframe] = {
+                        fetchState: 'In-Progress',
+                        error: undefined,
+                    };
+                    updateState(draft, action.payload.forecastId, { fetchState });
+                }
             },
         },
         updateNetBurnOrIncomeForTimeframe(draft, action) {
-            doUpdateNetBurnOrIncome(draft, action.payload.forecastId, action.payload.timeframe, action.payload.report);
+            doUpdateNetBurnOrIncome(draft, action.payload.forecastId, action.payload.timeframe, action.payload.report, action.payload.isCustomDateRange === true);
         },
         updateNetBurnOrIncomeForTimeframeFailure: {
-            prepare(error, forecastId, timeframe) {
+            prepare(error, forecastId, timeframe, isCustomDateRange = false) {
                 return {
                     payload: {
                         error,
                         forecastId,
                         timeframe,
+                        isCustomDateRange,
                     },
                 };
             },
             reducer(draft, action) {
                 const netBurnOrIncome = getState(draft, draft.uiState.isForecastModeOn, action.payload.forecastId);
-                const fetchState = {
-                    ...netBurnOrIncome.fetchState,
-                };
-                fetchState[action.payload.timeframe] = {
-                    fetchState: 'Error',
-                    error: action.payload.error,
-                };
-                updateState(draft, action.payload.forecastId, { fetchState });
+                // 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) {
+                    const customFetchState = netBurnOrIncome.customFetchState ?? {
+                        month: { fetchState: 'Not-Started', error: undefined },
+                        quarter: { fetchState: 'Not-Started', error: undefined },
+                        year: { fetchState: 'Not-Started', error: undefined },
+                    };
+                    customFetchState[action.payload.timeframe] = {
+                        fetchState: 'Error',
+                        error: action.payload.error,
+                    };
+                    updateState(draft, action.payload.forecastId, { customFetchState });
+                }
+                else {
+                    const fetchState = {
+                        ...netBurnOrIncome.fetchState,
+                    };
+                    fetchState[action.payload.timeframe] = {
+                        fetchState: 'Error',
+                        error: action.payload.error,
+                    };
+                    updateState(draft, action.payload.forecastId, { fetchState });
+                }
             },
         },
         updateNetBurnOrIncomeCOABalancesRange(draft, action) {
+            if (action.payload.isCustomDateRange != null) {
+                if (action.payload.isCustomDateRange === true) {
+                    // Convert the string dates the action carries to ZeniDate values and
+                    // store as a single customTimeframe. Presence signals custom-mode active.
+                    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 section store, and this lets the card
+                    // self-heal without a reload. The detail screen reads customFetchState.
+                    draft.netBurnOrIncome.fetchState = {
+                        month: { fetchState: 'Not-Started', error: undefined },
+                        quarter: { fetchState: 'Not-Started', error: undefined },
+                        year: { fetchState: 'Not-Started', 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;
+            }
             // When thisPeriod changes the selected and highlighted balances ranges should be calculated based on full report period.
             const netBurnOrIncomeReport = getState(draft, undefined, undefined);
             const { income, cogs, expenses, dataAvailable } = netBurnOrIncomeReport;
@@ -195,6 +291,13 @@ const netBurnOrIncome = (0, toolkit_1.createSlice)({
             }
         },
         updateNetBurnOrIncomeThisPeriod(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 month response, which
+            // would otherwise clamp the custom window back to the default).
+            if (draft.uiState.customTimeframe != null) {
+                return;
+            }
             // When thisPeriod changes the selected and highlighted balances ranges should be calculated based on full report period.
             const netBurnOrIncomeReport = getState(draft, undefined, undefined);
             const { income, cogs, expenses, dataAvailable } = netBurnOrIncomeReport;
@@ -246,7 +349,9 @@ const netBurnOrIncome = (0, toolkit_1.createSlice)({
                     ? true
                     : false;
             // Note: We don't want to update selected & highlighted ranges in Ui State when forecast is ON
-            if (dataAvailable != null && draft.uiState.isForecastModeOn === false) {
+            if (dataAvailable != null &&
+                draft.uiState.isForecastModeOn === false &&
+                draft.uiState.customTimeframe == null) {
                 const coaBalances = (0, getSelectedAndHighlightedRanges_1.getAvailableCOABalancesWithMostRecentNonZeroBalance)(netBurnOrIncomeReport.firstMonthOfFY, timeframe, [expenses, income, cogs], dataAvailable);
                 const thisPeriod = (0, thisPeriodHelpers_1.extractThisPeriod)(netBurnOrIncomeReport.firstMonthOfFY, timeframe, selectedCOABalancesRange, coaBalances);
                 if (thisPeriod != null &&
@@ -289,7 +394,7 @@ const netBurnOrIncome = (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)(netBurnOrIncomeReport.firstMonthOfFY, timeframe, [expenses, income, cogs], dataAvailable);
                 const selectionRanges = (0, getSelectedAndHighlightedRanges_1.getInitialSelectedAndHighlightedRanges)({
@@ -344,34 +449,73 @@ const netBurnOrIncome = (0, toolkit_1.createSlice)({
 });
 _a = netBurnOrIncome.actions, exports.fetchNetBurnOrIncome = _a.fetchNetBurnOrIncome, exports.fetchNetBurnOrIncomeForTimeframe = _a.fetchNetBurnOrIncomeForTimeframe, exports.updateNetBurnOrIncomeForTimeframe = _a.updateNetBurnOrIncomeForTimeframe, exports.updateNetBurnOrIncomeForTimeframeFailure = _a.updateNetBurnOrIncomeForTimeframeFailure, exports.updateNetBurnOrIncomeThisPeriod = _a.updateNetBurnOrIncomeThisPeriod, exports.updateNetBurnOrIncomeUIState = _a.updateNetBurnOrIncomeUIState, exports.updateNetBurnOrIncomeAdditionalBalancesSelection = _a.updateNetBurnOrIncomeAdditionalBalancesSelection, exports.updateNetBurnOrIncomeCOABalancesRange = _a.updateNetBurnOrIncomeCOABalancesRange, exports.netBurnOrIncomeToggleForecastMode = _a.netBurnOrIncomeToggleForecastMode, exports.updateNetBurnOrIncomeTimeFrame = _a.updateNetBurnOrIncomeTimeFrame, exports.updateNetBurnOrIncomeDownloadState = _a.updateNetBurnOrIncomeDownloadState, exports.fetchNetBurnOrIncomeWithForecast = _a.fetchNetBurnOrIncomeWithForecast, exports.waitForForecastListThenFetchNetBurnOrIncomeWithForecast = _a.waitForForecastListThenFetchNetBurnOrIncomeWithForecast;
 exports.default = netBurnOrIncome.reducer;
-const doUpdateNetBurnOrIncome = (draft, forecastId, timeframe, data) => {
+const doUpdateNetBurnOrIncome = (draft, forecastId, timeframe, data, isCustomDateRange) => {
     const netBurnOrIncome = getState(draft, draft.uiState.isForecastModeOn, forecastId);
     const report = (0, viewAndReportPayloadv2_1.mapReportPayloadV2ToReportV2)(data.report);
     const { expenses, income, cogs, net_burn_or_income, insights, currency, runway, } = data.report;
     const expensesCOABalance = (0, coaBalancePayload_1.mapCOABalanceGroupedByPeriodPayloadV2ToCOABalanceGroupedByPeriod)(expenses, currency, timeframe);
     const incomeCOABalance = (0, coaBalancePayload_1.mapCOABalanceGroupedByPeriodPayloadV2ToCOABalanceGroupedByPeriod)(income, currency, timeframe);
     const cogsCOABalance = (0, coaBalancePayload_1.mapCOABalanceGroupedByPeriodPayloadV2ToCOABalanceGroupedByPeriod)(cogs, currency, timeframe);
-    netBurnOrIncome.expenses = Object.assign({}, netBurnOrIncome.expenses, expensesCOABalance);
-    netBurnOrIncome.income = Object.assign({}, netBurnOrIncome.income, incomeCOABalance);
-    netBurnOrIncome.cogs = Object.assign({}, netBurnOrIncome.cogs, cogsCOABalance);
-    if (timeframe === 'month' && insights != null) {
+    // 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
+    // income/cogs/expenses) keeps the default window.
+    if (isCustomDateRange) {
+        netBurnOrIncome.customExpenses = Object.assign({}, netBurnOrIncome.customExpenses, expensesCOABalance);
+        netBurnOrIncome.customIncome = Object.assign({}, netBurnOrIncome.customIncome, incomeCOABalance);
+        netBurnOrIncome.customCogs = Object.assign({}, netBurnOrIncome.customCogs, cogsCOABalance);
+    }
+    else {
+        netBurnOrIncome.expenses = Object.assign({}, netBurnOrIncome.expenses, expensesCOABalance);
+        netBurnOrIncome.income = Object.assign({}, netBurnOrIncome.income, incomeCOABalance);
+        netBurnOrIncome.cogs = Object.assign({}, netBurnOrIncome.cogs, cogsCOABalance);
+    }
+    // Insights and runway/averages are shared (read by the dashboard card); a
+    // custom-date slice must not overwrite them with its partial window.
+    if (timeframe === 'month' && insights != null && !isCustomDateRange) {
         // we will get insights only in the month timeframe api
         netBurnOrIncome.insights = (0, insightSummaryPayload_1.mapInsightsPayloadtoInsightsState)(insights);
     }
-    netBurnOrIncome.runwayAndAverages = mapRunwayPayloadtoRunwayState(runway, net_burn_or_income.averages?.months, data.report.currency);
-    const expensesOrIncome = netBurnOrIncome.expenses != null
-        ? netBurnOrIncome.expenses
-        : netBurnOrIncome.income;
-    netBurnOrIncome.dataAvailable = report.dataAvailable
-        ? report.dataAvailable
-        : (0, dataAvailable_1.getDataAvailableDateRange)(expensesOrIncome);
+    if (!isCustomDateRange) {
+        netBurnOrIncome.runwayAndAverages = mapRunwayPayloadtoRunwayState(runway, net_burn_or_income.averages?.months, data.report.currency);
+    }
+    // Derive dataAvailable from the slot this fetch actually populated.
+    const expensesOrIncome = isCustomDateRange
+        ? netBurnOrIncome.customExpenses != null
+            ? netBurnOrIncome.customExpenses
+            : netBurnOrIncome.customIncome
+        : netBurnOrIncome.expenses != null
+            ? netBurnOrIncome.expenses
+            : netBurnOrIncome.income;
+    // Don't let a custom slice shrink the shared dataAvailable the dashboard uses
+    // for its period count; a default fetch always updates it, a custom one only
+    // populates it on first load (when nothing has set it yet).
+    if (!isCustomDateRange || netBurnOrIncome.dataAvailable == null) {
+        netBurnOrIncome.dataAvailable = report.dataAvailable
+            ? report.dataAvailable
+            : (0, dataAvailable_1.getDataAvailableDateRange)(expensesOrIncome ?? {});
+    }
     netBurnOrIncome.firstMonthOfFY = report.firstMonthOfFY;
     netBurnOrIncome.bookCloseDate = report.bookCloseDate;
-    netBurnOrIncome.fetchState[timeframe].fetchState = 'Completed';
-    netBurnOrIncome.fetchState[timeframe].error = undefined;
+    // Mark the matching fetchState Completed. A custom fetch uses customFetchState so
+    // dashboardEpic's Completed check on the default fetchState is untouched.
+    if (isCustomDateRange) {
+        const customFetchState = netBurnOrIncome.customFetchState ?? {
+            month: { fetchState: 'Not-Started', error: undefined },
+            quarter: { fetchState: 'Not-Started', error: undefined },
+            year: { fetchState: 'Not-Started', error: undefined },
+        };
+        customFetchState[timeframe] = { fetchState: 'Completed', error: undefined };
+        netBurnOrIncome.customFetchState = customFetchState;
+    }
+    else {
+        netBurnOrIncome.fetchState[timeframe].fetchState = 'Completed';
+        netBurnOrIncome.fetchState[timeframe].error = undefined;
+    }
     if (netBurnOrIncome.dataAvailable != null &&
-        forecastId == null // Note: We don't want to update selected & highlighted ranges in Ui State when forecast is ON
-    ) {
+        forecastId == null && // Note: We don't want to update selected & highlighted ranges in Ui State when forecast is ON
+        // 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)(netBurnOrIncome.firstMonthOfFY, timeframe, [netBurnOrIncome.expenses, netBurnOrIncome.income, netBurnOrIncome.cogs], netBurnOrIncome.dataAvailable);
         const selectionRanges = (0, getSelectedAndHighlightedRanges_1.getInitialSelectedAndHighlightedRanges)({

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

@@ -9,7 +9,7 @@ import { ForecastListState } from '../forecastList/forecastListState';
 import { NetBurnOrIncomeReport, NetBurnOrIncomeUIStateSelectorView } from './netBurnOrIncomeSelectorTypes';
 import { NetBurnOrIncomeWithForecastState } from './netBurnOrIncomeState';
 export declare const getNetBurnOrIncomeUIState: (state: RootState) => NetBurnOrIncomeUIStateSelectorView;
-export declare const getNetBurnOrIncomeReport: (accountState: AccountState, accountGroupState: AccountGroupState, sectionsState: SectionAccountsViewState, netBurnOrIncomeState: NetBurnOrIncomeWithForecastState, forecastState: ForecastState, forecastListState: ForecastListState, filter: COABalancesFilter, forecastId?: ID) => NetBurnOrIncomeReport;
+export declare const getNetBurnOrIncomeReport: (accountState: AccountState, accountGroupState: AccountGroupState, sectionsState: SectionAccountsViewState, netBurnOrIncomeState: NetBurnOrIncomeWithForecastState, forecastState: ForecastState, forecastListState: ForecastListState, filter: COABalancesFilter, forecastId?: ID, readCustomRangeSlot?: boolean) => NetBurnOrIncomeReport;
 export declare const getNetBurnOrIncomeForSelectedRange: (state: RootState) => NetBurnOrIncomeReport;
 export declare const getNetBurnOrIncomeForHighlightedRange: (state: RootState) => NetBurnOrIncomeReport;
 export declare const getNetBurnOrIncomeReportFetchState: (forecastId: ID | undefined, netBurnOrIncomeState: NetBurnOrIncomeWithForecastState) => FetchStateAndError;

package/lib/view/netBurnOrIncome/netBurnOrIncomeSelector.js

@@ -63,18 +63,28 @@ exports.getNetBurnOrIncomeUIState = (0, toolkit_1.createSelector)((state) => sta
         scrollPosition,
     };
 });
-const getNetBurnOrIncomeReport = (accountState, accountGroupState, sectionsState, netBurnOrIncomeState, forecastState, forecastListState, filter, forecastId) => {
+const getNetBurnOrIncomeReport = (accountState, accountGroupState, sectionsState, netBurnOrIncomeState, forecastState, forecastListState, filter, forecastId, readCustomRangeSlot) => {
     const netBurnOrIncome = (0, netBurnOrIncomeReducer_1.getState)(netBurnOrIncomeState, netBurnOrIncomeState.uiState.isForecastModeOn, forecastId);
+    // Custom detail reads the isolated custom section-accounts slot; dashboard
+    // (no flag) reads the default slot, so a default fetch can't clobber it.
+    const useCustomRange = readCustomRangeSlot === true &&
+        netBurnOrIncomeState.uiState.customTimeframe != null;
+    // The detail screen opts into customFetchState so its Completed check fires
+    // off the custom fetch; the dashboard (no flag) reads the shared fetchState,
+    // which custom-mode activation reset to Not-Started so dashboardEpic refetches.
+    const activeFetchState = useCustomRange && netBurnOrIncome.customFetchState != null
+        ? netBurnOrIncome.customFetchState
+        : netBurnOrIncome.fetchState;
     const fetchState = (0, reduceFetchState_1.reduceAnyFetchState)([
-        netBurnOrIncome.fetchState.month,
-        netBurnOrIncome.fetchState.quarter,
-        netBurnOrIncome.fetchState.year,
+        activeFetchState.month,
+        activeFetchState.quarter,
+        activeFetchState.year,
     ]);
     let allTimeframeTicks = [];
     const dataAvailable = netBurnOrIncomeState.netBurnOrIncome.dataAvailable;
     if (dataAvailable != null) {
         const noFilter = (0, coaBalancesFilter_1.newBalancesFilterForDateRange)(netBurnOrIncomeState.netBurnOrIncome.firstMonthOfFY, netBurnOrIncomeState.uiState.timeframe, dataAvailable, 'ascending_date', []);
-        const reportId = (0, netBurnOrIncomeForTimeframeEpic_1.reportIdUniqueKey)();
+        const reportId = (0, netBurnOrIncomeForTimeframeEpic_1.reportIdUniqueKey)(undefined, useCustomRange);
         const incomeBalance = (0, sectionAccountsViewSelector_1.getSectionBalances)(sectionsState, {
             reportId,
             sectionId: 'income',
@@ -91,7 +101,7 @@ const getNetBurnOrIncomeReport = (accountState, accountGroupState, sectionsState
             : (0, getCOABalancesSlice_1.getCOABalances)(incomeBalance, noFilter);
         allTimeframeTicks = incomeOrExpensesBalances.balances.map((balance) => (0, timeframeTick_1.toTimeframeTick)(balance));
     }
-    const reportId = (0, netBurnOrIncomeForTimeframeEpic_1.reportIdUniqueKey)(forecastId);
+    const reportId = (0, netBurnOrIncomeForTimeframeEpic_1.reportIdUniqueKey)(forecastId, useCustomRange);
     const sections = {};
     const calculatedSections = {};
     if (fetchState.fetchState === 'Completed') {
@@ -138,6 +148,8 @@ const getNetBurnOrIncomeReport = (accountState, accountGroupState, sectionsState
         allTimeframeTicks,
         forecastList,
         runwayAndAverages: netBurnOrIncome.runwayAndAverages,
+        // Surface the saved custom timeframe so the detail picker can restore them.
+        customTimeframe: netBurnOrIncomeState.uiState.customTimeframe,
     };
 };
 exports.getNetBurnOrIncomeReport = getNetBurnOrIncomeReport;
@@ -148,7 +160,10 @@ exports.getNetBurnOrIncomeForSelectedRange = (0, toolkit_1.createSelector)((stat
         selectedForecast?.id != null &&
         (0, exports.getNetBurnOrIncomeReportFetchState)(selectedForecast.id, netBurnOrIncomeWithForecastState).fetchState === 'Completed'
         ? getNetBurnOrIncomeWithForecastOnDataAvailableDateRange(noFilter, selectedForecast?.id, accountState, accountGroupState, sectionAccountsViewState, forecastListState, netBurnOrIncomeWithForecastState, forecastState)
-        : (0, exports.getNetBurnOrIncomeReport)(accountState, accountGroupState, sectionAccountsViewState, netBurnOrIncomeWithForecastState, forecastState, forecastListState, noFilter, selectedForecast?.id);
+        : (0, exports.getNetBurnOrIncomeReport)(accountState, accountGroupState, sectionAccountsViewState, netBurnOrIncomeWithForecastState, forecastState, forecastListState, noFilter, selectedForecast?.id, 
+        // Detail selectors read the custom slot when the detail is in custom
+        // mode; the dashboard's last-periods selector does not.
+        netBurnOrIncomeWithForecastState.uiState.customTimeframe != null);
 });
 exports.getNetBurnOrIncomeForHighlightedRange = (0, toolkit_1.createSelector)((state) => state.accountState, (state) => state.accountGroupState, (state) => state.sectionAccountsViewState, (state) => state.netBurnOrIncomeState, (state) => state.forecastState, (state) => state.forecastListState, (accountState, accountGroupState, sectionAccountsViewState, netBurnOrIncomeWithForecastState, forecastState, forecastListState) => {
     const { timeframe, highlightedCOABalancesRange, selectedAdditionalBalances, maxNumOfPeriodsToHighlight, selectedForecast, isForecastModeOn, } = netBurnOrIncomeWithForecastState.uiState;
@@ -158,7 +173,10 @@ exports.getNetBurnOrIncomeForHighlightedRange = (0, toolkit_1.createSelector)((s
         selectedForecast?.id != null &&
         (0, exports.getNetBurnOrIncomeReportFetchState)(selectedForecast.id, netBurnOrIncomeWithForecastState).fetchState === 'Completed'
         ? getNetBurnOrIncomeWithForecastOnDataAvailableDateRange(filter, selectedForecast?.id, accountState, accountGroupState, sectionAccountsViewState, forecastListState, netBurnOrIncomeWithForecastState, forecastState)
-        : (0, exports.getNetBurnOrIncomeReport)(accountState, accountGroupState, sectionAccountsViewState, netBurnOrIncomeWithForecastState, forecastState, forecastListState, filter, selectedForecast?.id);
+        : (0, exports.getNetBurnOrIncomeReport)(accountState, accountGroupState, sectionAccountsViewState, netBurnOrIncomeWithForecastState, forecastState, forecastListState, filter, selectedForecast?.id, 
+        // Detail selectors read the custom slot when the detail is in custom
+        // mode; the dashboard's last-periods selector does not.
+        netBurnOrIncomeWithForecastState.uiState.customTimeframe != null);
 });
 const getNetBurnOrIncomeReportFetchState = (forecastId, netBurnOrIncomeState) => {
     const netBurnOrIncome = (0, netBurnOrIncomeReducer_1.getState)(netBurnOrIncomeState, forecastId != null, forecastId);

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

@@ -20,6 +20,14 @@ export interface NetBurnOrIncomeState extends Report {
     insights: InsightSummary[];
     runwayAndAverages: RunwayAndAverages;
     cogs?: COABalanceGroupedByPeriod;
+    customCogs?: COABalanceGroupedByPeriod;
+    customExpenses?: COABalanceGroupedByPeriod;
+    customFetchState?: {
+        month: FetchStateAndError;
+        quarter: FetchStateAndError;
+        year: FetchStateAndError;
+    };
+    customIncome?: COABalanceGroupedByPeriod;
     expenses?: COABalanceGroupedByPeriod;
     forecastId?: ID;
     income?: COABalanceGroupedByPeriod;

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

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

package/lib/view/opEx/opExEpic.js

@@ -5,12 +5,12 @@ const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const opExReducer_1 = require("./opExReducer");
 const fetchOpExEpic = (actions$, state) => actions$.pipe((0, operators_1.filter)(opExReducer_1.fetchOpEx.match), (0, operators_1.switchMap)((action) => {
-    const { cacheOverride, forecastId } = action.payload;
+    const { cacheOverride, endDate, forecastId, startDate } = action.payload;
     if (cacheOverride === true) {
         return (0, rxjs_1.from)([
-            (0, opExReducer_1.fetchOpExReportForTimeframe)('month', forecastId),
-            (0, opExReducer_1.fetchOpExReportForTimeframe)('quarter', forecastId),
-            (0, opExReducer_1.fetchOpExReportForTimeframe)('year', forecastId),
+            (0, opExReducer_1.fetchOpExReportForTimeframe)('month', forecastId, true, false, startDate, endDate),
+            (0, opExReducer_1.fetchOpExReportForTimeframe)('quarter', forecastId, true, false, startDate, endDate),
+            (0, opExReducer_1.fetchOpExReportForTimeframe)('year', forecastId, true, false, startDate, endDate),
         ]);
     }
     else {
@@ -19,15 +19,15 @@ const fetchOpExEpic = (actions$, state) => actions$.pipe((0, operators_1.filter)
         const timeframeFetchState = opExState.fetchState;
         if (timeframeFetchState['month'].fetchState !== 'In-Progress' &&
             timeframeFetchState['month'].fetchState !== 'Completed') {
-            fetchActions.push((0, opExReducer_1.fetchOpExReportForTimeframe)('month', forecastId));
+            fetchActions.push((0, opExReducer_1.fetchOpExReportForTimeframe)('month', forecastId, true, false, startDate, endDate));
         }
         if (timeframeFetchState['quarter'].fetchState !== 'In-Progress' &&
             timeframeFetchState['quarter'].fetchState !== 'Completed') {
-            fetchActions.push((0, opExReducer_1.fetchOpExReportForTimeframe)('quarter', forecastId));
+            fetchActions.push((0, opExReducer_1.fetchOpExReportForTimeframe)('quarter', forecastId, true, false, startDate, endDate));
         }
         if (timeframeFetchState['year'].fetchState !== 'In-Progress' &&
             timeframeFetchState['year'].fetchState !== 'Completed') {
-            fetchActions.push((0, opExReducer_1.fetchOpExReportForTimeframe)('year', forecastId));
+            fetchActions.push((0, opExReducer_1.fetchOpExReportForTimeframe)('year', forecastId, true, false, startDate, endDate));
         }
         return (0, rxjs_1.from)(fetchActions);
     }

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

@@ -7,5 +7,6 @@ import { RootState } from '../../rootStateTypes';
 import { ZeniAPI } from '../../zeniAPI';
 import { fetchOpExReportForTimeframe, updateOpExFailureForTimeframe, updateOpExForTimeframe, updateOpExThisPeriod } from './opExReducer';
 export type ActionType = ReturnType<typeof fetchOpExReportForTimeframe> | ReturnType<typeof updateOpExForTimeframe> | ReturnType<typeof updateSectionAccountsView> | ReturnType<typeof updateOpExThisPeriod> | ReturnType<typeof updateOpExFailureForTimeframe> | ReturnType<typeof updateForecast>;
-export declare const reportIdUniqueKey: (forecastId?: ID) => "operating_expenses" | `operating_expenses+${string}`;
+export declare const CUSTOM_DATE_RANGE_SECTION_MARKER: ID;
+export declare const reportIdUniqueKey: (forecastId?: ID, isCustomDateRange?: boolean) => "operating_expenses" | `operating_expenses+${string}`;
 export declare const fetchOpExReportForTimeframeEpic: (actions$: ActionsObservable<ActionType>, state: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/opEx/opExForTimeFrameEpic.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchOpExReportForTimeframeEpic = exports.reportIdUniqueKey = void 0;
+exports.fetchOpExReportForTimeframeEpic = 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 opExReducer_1 = require("./opExReducer");
-const reportIdUniqueKey = (forecastId) => forecastId != null
-    ? `operating_expenses+${forecastId}`
-    : 'operating_expenses';
+// Reserved forecast-slot marker so custom-date section-accounts data lives under
+// its own key (operating_expenses+<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
+    ? `operating_expenses+${exports.CUSTOM_DATE_RANGE_SECTION_MARKER}`
+    : forecastId != null
+        ? `operating_expenses+${forecastId}`
+        : 'operating_expenses';
 exports.reportIdUniqueKey = reportIdUniqueKey;
 const fetchOpExReportForTimeframeEpic = (actions$, state, zeniAPI) => actions$.pipe((0, operators_1.filter)(opExReducer_1.fetchOpExReportForTimeframe.match), (0, operators_1.mergeMap)((action) => {
     const queryValue = {
@@ -22,16 +28,23 @@ const fetchOpExReportForTimeframeEpic = (actions$, state, zeniAPI) => actions$.p
         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/operating_expenses?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, '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, 'expenses', (0, exports.reportIdUniqueKey)(action.payload.forecastId, action.payload.startDate != null &&
+                action.payload.endDate != null), response.data.report.expenses, response.data.report.accounts, response.data.report.account_groups, response.data.report.currency));
             actions.push((0, opExReducer_1.updateOpExForTimeframe)({
                 timeframe: action.payload.timeframe,
                 forecastId: action.payload.forecastId,
                 report: response.data,
+                isCustomDateRange: action.payload.startDate != null &&
+                    action.payload.endDate != null,
             }));
             if (action.payload.forecastId == null &&
                 action.payload.timeframe === 'month') {
@@ -46,8 +59,10 @@ const fetchOpExReportForTimeframeEpic = (actions$, state, zeniAPI) => actions$.p
             return (0, rxjs_1.from)(actions);
         }
         else {
-            return (0, rxjs_1.of)((0, opExReducer_1.updateOpExFailureForTimeframe)(response.status, action.payload.forecastId, action.payload.timeframe));
+            return (0, rxjs_1.of)((0, opExReducer_1.updateOpExFailureForTimeframe)(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, opExReducer_1.updateOpExFailureForTimeframe)((0, responsePayload_1.createZeniAPIStatus)('Unexpected error', 'OpEx REST API call errored out' + JSON.stringify(error)), action.payload.forecastId, action.payload.timeframe))));
+    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, opExReducer_1.updateOpExFailureForTimeframe)((0, responsePayload_1.createZeniAPIStatus)('Unexpected error', 'OpEx REST API call errored out' + JSON.stringify(error)), action.payload.forecastId, action.payload.timeframe, action.payload.startDate != null &&
+        action.payload.endDate != null))));
 }));
 exports.fetchOpExReportForTimeframeEpic = fetchOpExReportForTimeframeEpic;

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

@@ -10,26 +10,35 @@ export declare const defaultPeriods: {
 };
 export declare const initialOpExState: OpExState;
 export declare const initialState: OpExWithForecastState;
-export declare const fetchOpEx: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[fetchFullReport?: any, forecastId?: string | undefined, cacheOverride?: any], {
+export declare const fetchOpEx: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[fetchFullReport?: any, forecastId?: string | undefined, cacheOverride?: any, startDate?: string | undefined, endDate?: string | undefined], {
     fetchFullReport: any;
     forecastId: string | undefined;
     cacheOverride: any;
-}, "operatingExpenses/fetchOpEx", never, never>, fetchOpExReportForTimeframe: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[timeframe: "month" | "year" | "quarter", forecastId?: string | undefined, fetchFullReport?: boolean | undefined, cacheOverride?: boolean | undefined], {
+    startDate: string | undefined;
+    endDate: string | undefined;
+}, "operatingExpenses/fetchOpEx", never, never>, fetchOpExReportForTimeframe: 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;
 }, "operatingExpenses/fetchOpExReportForTimeframe", never, never>, updateOpExForTimeframe: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     report: ZeniReportData<OpExReportPayload>;
     timeframe: "month" | "quarter" | "year";
     forecastId?: string;
-}, "operatingExpenses/updateOpExForTimeframe">, updateOpExFailureForTimeframe: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[error: ZeniAPIStatus<Record<string, unknown>>, forecastId: string | undefined, timeframe: "month" | "year" | "quarter"], {
+    isCustomDateRange?: boolean;
+}, "operatingExpenses/updateOpExForTimeframe">, updateOpExFailureForTimeframe: 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;
 }, "operatingExpenses/updateOpExFailureForTimeframe", never, never>, updateOpExCOABalancesRange: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     selectedCOABalancesRange: COABalancesRange;
+    customEndDate?: string;
+    customStartDate?: string;
     highlightedCOABalancesRange?: COABalancesRangeWithThisPeriod;
+    isCustomDateRange?: boolean;
 }, "operatingExpenses/updateOpExCOABalancesRange">, updateOpExAdditionalBalancesSelection: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     additionalBalances: COABalanceType[];
     isCompareModeOn: boolean;