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

package/lib/view/revenue/revenueReducer.d.ts

@@ -10,18 +10,22 @@ export declare const defaultPeriods: {
 };
 export declare const initialRevState: RevenueState;
 export declare const initialState: RevenueWithForecastState;
-export declare const fetchRevenue: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[fetchFullReport?: any, forecastId?: string | undefined, cacheOverride?: any], {
+export declare const fetchRevenue: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[fetchFullReport?: any, forecastId?: string | undefined, cacheOverride?: any, startDate?: string | undefined, endDate?: string | undefined], {
     fetchFullReport: any;
     forecastId: string | undefined;
     cacheOverride: any;
+    startDate: string | undefined;
+    endDate: string | undefined;
 }, "revenue/fetchRevenue", never, never>, fetchRevenueWithForecast: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: boolean | undefined, forecastId?: string | undefined], {
     cacheOverride: boolean;
     forecastId: string | undefined;
-}, "revenue/fetchRevenueWithForecast", never, never>, fetchRevenueForTimeframe: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[timeframe: "month" | "year" | "quarter", forecastId?: string | undefined, fetchFullReport?: boolean | undefined, cacheOverride?: boolean | undefined], {
+}, "revenue/fetchRevenueWithForecast", never, never>, fetchRevenueForTimeframe: 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;
 }, "revenue/fetchRevenueForTimeframe", never, never>, waitForForecastListThenFetchRevenueWithForecast: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: boolean | undefined, forecastId?: string | undefined], {
     cacheOverride: boolean;
     forecastId: string | undefined;
@@ -29,17 +33,22 @@ export declare const fetchRevenue: import("@reduxjs/toolkit").ActionCreatorWithP
     forecastId: string | undefined;
     report: ZeniReportData<RevenueReportPayload>;
     timeframe: "month" | "quarter" | "year";
-}, "revenue/updateRevenueForTimeframe">, updateRevenueForTimeframeFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[error: ZeniAPIStatus<Record<string, unknown>>, forecastId: string | undefined, timeframe: "month" | "year" | "quarter"], {
+    isCustomDateRange?: boolean;
+}, "revenue/updateRevenueForTimeframe">, updateRevenueForTimeframeFailure: 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;
 }, "revenue/updateRevenueForTimeframeFailure", never, never>, updateRevenueAdditionalBalancesSelection: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     additionalBalances: COABalanceType[];
     isCompareModeOn: boolean;
     maxNumOfPeriodsToHighlight: number;
 }, "revenue/updateRevenueAdditionalBalancesSelection">, updateRevenueCOABalancesRange: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     selectedCOABalancesRange: COABalancesRange;
+    customEndDate?: string;
+    customStartDate?: string;
     highlightedCOABalancesRange?: COABalancesRangeWithThisPeriod;
+    isCustomDateRange?: boolean;
 }, "revenue/updateRevenueCOABalancesRange">, updateRevenueThisPeriod: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     thisPeriod: TimeframeTick | undefined;
 }, "revenue/updateRevenueThisPeriod">, updateRevenueDownloadState: import("@reduxjs/toolkit").ActionCreatorWithPayload<FetchState, "revenue/updateRevenueDownloadState">, updateRevenueTimeFrame: import("@reduxjs/toolkit").ActionCreatorWithPayload<"month" | "year" | "quarter", "revenue/updateRevenueTimeFrame">, updateRevenueUIState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{

package/lib/view/revenue/revenueReducer.js

@@ -73,8 +73,16 @@ const revenue = (0, toolkit_1.createSlice)({
     initialState: exports.initialState,
     reducers: {
         fetchRevenue: {
-            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
@@ -85,22 +93,49 @@ const revenue = (0, toolkit_1.createSlice)({
             },
         },
         fetchRevenueForTimeframe: {
-            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 revState = getState(draft, draft.uiState.isForecastModeOn, action.payload.forecastId);
-                const fetchState = {
-                    ...revState.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 = {
+                        ...(revState.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 = {
+                        ...revState.fetchState,
+                    };
+                    fetchState[timeframe] = {
+                        fetchState: 'In-Progress',
+                        error: undefined,
+                    };
+                    updateState(draft, action.payload.forecastId, { fetchState });
+                }
             },
         },
         fetchRevenueWithForecast: {
@@ -130,28 +165,47 @@ const revenue = (0, toolkit_1.createSlice)({
             },
         },
         updateRevenueForTimeframe(draft, action) {
-            doUpdateRevenue(draft, action.payload.forecastId, action.payload.timeframe, action.payload.report);
+            doUpdateRevenue(draft, action.payload.forecastId, action.payload.timeframe, action.payload.report, action.payload.isCustomDateRange === true);
         },
         updateRevenueForTimeframeFailure: {
-            prepare(error, forecastId, timeframe) {
+            prepare(error, forecastId, timeframe, isCustomDateRange = false) {
                 return {
                     payload: {
                         error,
                         forecastId,
                         timeframe,
+                        isCustomDateRange,
                     },
                 };
             },
             reducer(draft, action) {
                 const revState = getState(draft, draft.uiState.isForecastModeOn, action.payload.forecastId);
-                const fetchState = {
-                    ...revState.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 = revState.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 = {
+                        ...revState.fetchState,
+                    };
+                    fetchState[action.payload.timeframe] = {
+                        fetchState: 'Error',
+                        error: action.payload.error,
+                    };
+                    updateState(draft, action.payload.forecastId, { fetchState });
+                }
             },
         },
         updateRevenueAdditionalBalancesSelection(draft, action) {
@@ -170,7 +224,9 @@ const revenue = (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)(revenueReport.firstMonthOfFY, timeframe, [income, cogs, grossMargin], dataAvailable);
                 const thisPeriod = (0, thisPeriodHelpers_1.extractThisPeriod)(revenueReport.firstMonthOfFY, timeframe, selectedCOABalancesRange, coaBalances);
                 if (thisPeriod != null &&
@@ -199,6 +255,48 @@ const revenue = (0, toolkit_1.createSlice)({
             }
         },
         updateRevenueCOABalancesRange(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.revenue.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;
+            }
             // Note: When thisPeriod changes the selected and highlighted balances ranges should be calculated based on full report period.
             const revenueReport = getState(draft, undefined, undefined);
             const { income, cogs, grossMargin, dataAvailable } = revenueReport;
@@ -242,6 +340,13 @@ const revenue = (0, toolkit_1.createSlice)({
             }
         },
         updateRevenueThisPeriod(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;
+            }
             // Note: When thisPeriod changes the selected and highlighted balances ranges should be calculated based on full report period.
             const revenueReport = getState(draft, undefined, undefined);
             const { income, cogs, grossMargin, dataAvailable } = revenueReport;
@@ -291,7 +396,7 @@ const revenue = (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)(revenueReport.firstMonthOfFY, timeframe, [income, cogs, grossMargin], dataAvailable);
                 const selectionRanges = (0, getSelectedAndHighlightedRanges_1.getInitialSelectedAndHighlightedRanges)({
@@ -346,37 +451,75 @@ const revenue = (0, toolkit_1.createSlice)({
 });
 _a = revenue.actions, exports.fetchRevenue = _a.fetchRevenue, exports.fetchRevenueWithForecast = _a.fetchRevenueWithForecast, exports.fetchRevenueForTimeframe = _a.fetchRevenueForTimeframe, exports.waitForForecastListThenFetchRevenueWithForecast = _a.waitForForecastListThenFetchRevenueWithForecast, exports.updateRevenueForTimeframe = _a.updateRevenueForTimeframe, exports.updateRevenueForTimeframeFailure = _a.updateRevenueForTimeframeFailure, exports.updateRevenueAdditionalBalancesSelection = _a.updateRevenueAdditionalBalancesSelection, exports.updateRevenueCOABalancesRange = _a.updateRevenueCOABalancesRange, exports.updateRevenueThisPeriod = _a.updateRevenueThisPeriod, exports.updateRevenueDownloadState = _a.updateRevenueDownloadState, exports.updateRevenueTimeFrame = _a.updateRevenueTimeFrame, exports.updateRevenueUIState = _a.updateRevenueUIState, exports.revenueToggleForecastMode = _a.revenueToggleForecastMode;
 exports.default = revenue.reducer;
-const doUpdateRevenue = (draft, forecastId, timeframe, revReport) => {
+const doUpdateRevenue = (draft, forecastId, timeframe, revReport, isCustomDateRange) => {
     const revenue = getState(draft, draft.uiState.isForecastModeOn, forecastId);
     const report = (0, viewAndReportPayloadv2_1.mapReportPayloadV2ToReportV2)(revReport.report);
     const { income, cogs, insights, currency } = revReport.report;
     const incomeCOABalance = (0, coaBalancePayload_1.mapCOABalanceGroupedByPeriodPayloadV2ToCOABalanceGroupedByPeriod)(income, currency, timeframe);
     const cogsCOABalance = (0, coaBalancePayload_1.mapCOABalanceGroupedByPeriodPayloadV2ToCOABalanceGroupedByPeriod)(cogs, currency, timeframe);
     const grossMarginCOABalance = (0, coaBalancePayload_1.mapCOABalanceGroupedByPeriodPayloadV2ToCOABalanceGroupedByPeriod)(revReport.report.gross_profit, currency, timeframe);
-    revenue.income = Object.assign({}, revenue.income, incomeCOABalance);
-    revenue.cogs = Object.assign({}, revenue.cogs, cogsCOABalance);
-    revenue.grossMargin = Object.assign({}, revenue.grossMargin, grossMarginCOABalance);
-    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/grossMargin) keeps the default window.
+    if (isCustomDateRange) {
+        revenue.customIncome = Object.assign({}, revenue.customIncome, incomeCOABalance);
+        revenue.customCogs = Object.assign({}, revenue.customCogs, cogsCOABalance);
+        revenue.customGrossMargin = Object.assign({}, revenue.customGrossMargin, grossMarginCOABalance);
+    }
+    else {
+        revenue.income = Object.assign({}, revenue.income, incomeCOABalance);
+        revenue.cogs = Object.assign({}, revenue.cogs, cogsCOABalance);
+        revenue.grossMargin = Object.assign({}, revenue.grossMargin, grossMarginCOABalance);
+    }
+    // Insights are shared (read by the dashboard card); a custom slice must not
+    // overwrite them.
+    if (timeframe === 'month' && insights != null && !isCustomDateRange) {
         // we will get insights only in the month timeframe api
         revenue.insights = (0, insightSummaryPayload_1.mapInsightsPayloadtoInsightsState)(insights);
     }
     const isIncomeEmpty = (0, reportsHelpers_1.isCOABalanceGroupedByPeriodEmptyForTimeframe)(incomeCOABalance, timeframe);
     const isCogsEmpty = (0, reportsHelpers_1.isCOABalanceGroupedByPeriodEmptyForTimeframe)(cogsCOABalance, timeframe);
+    // Derive dataAvailable from the slot this fetch actually populated.
     const cogsOrIncome = isIncomeEmpty
         ? isCogsEmpty
-            ? revenue.grossMargin
-            : revenue.cogs
-        : revenue.income;
-    revenue.dataAvailable = report.dataAvailable
-        ? report.dataAvailable
-        : (0, dataAvailable_1.getDataAvailableDateRange)(cogsOrIncome);
+            ? isCustomDateRange
+                ? revenue.customGrossMargin
+                : revenue.grossMargin
+            : isCustomDateRange
+                ? revenue.customCogs
+                : revenue.cogs
+        : isCustomDateRange
+            ? revenue.customIncome
+            : revenue.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 || revenue.dataAvailable == null) {
+        revenue.dataAvailable =
+            report.dataAvailable ?? (0, dataAvailable_1.getDataAvailableDateRange)(cogsOrIncome ?? {});
+    }
     revenue.firstMonthOfFY = report.firstMonthOfFY;
     revenue.bookCloseDate = report.bookCloseDate;
-    revenue.fetchState[timeframe].fetchState = 'Completed';
-    revenue.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 = revenue.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 };
+        revenue.customFetchState = customFetchState;
+    }
+    else {
+        revenue.fetchState[timeframe].fetchState = 'Completed';
+        revenue.fetchState[timeframe].error = undefined;
+    }
     if (revenue.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)(revenue.firstMonthOfFY, timeframe, [revenue.income, revenue.cogs, revenue.grossMargin], revenue.dataAvailable);
         const selectionRanges = (0, getSelectedAndHighlightedRanges_1.getInitialSelectedAndHighlightedRanges)({

package/lib/view/revenue/revenueSelector.d.ts

@@ -8,7 +8,7 @@ import { RootState } from '../../rootStateTypes';
 import { ForecastListState } from '../forecastList/forecastListState';
 import { RevenueReport, RevenueUIStateSelectorView } from '../revenue/revenueSelectorTypes';
 import { RevenueWithForecastState } from './revenueState';
-export declare const getRevenueReport: (filter: COABalancesFilter, accountState: AccountState, accountGroupState: AccountGroupState, sectionsState: SectionAccountsViewState, forecastListState: ForecastListState, revenueWithForecastState: RevenueWithForecastState, forecastState: ForecastState, forecastId?: ID) => RevenueReport;
+export declare const getRevenueReport: (filter: COABalancesFilter, accountState: AccountState, accountGroupState: AccountGroupState, sectionsState: SectionAccountsViewState, forecastListState: ForecastListState, revenueWithForecastState: RevenueWithForecastState, forecastState: ForecastState, forecastId?: ID, readCustomRangeSlot?: boolean) => RevenueReport;
 export declare const getRevenueUIState: (state: RootState) => RevenueUIStateSelectorView;
 export declare const getRevenueForSelectedRange: (state: RootState) => RevenueReport;
 export declare const getRevenueForHighlightedRange: (state: RootState) => RevenueReport;

package/lib/view/revenue/revenueSelector.js

@@ -16,14 +16,26 @@ const revenueSelectorTypes_1 = require("../revenue/revenueSelectorTypes");
 const revenueForTimeframeEpic_1 = require("./revenueForTimeframeEpic");
 const revenueHelper_1 = require("./revenueHelper");
 const revenueReducer_1 = require("./revenueReducer");
-const getRevenueReport = (filter, accountState, accountGroupState, sectionsState, forecastListState, revenueWithForecastState, forecastState, forecastId) => {
+const getRevenueReport = (filter, accountState, accountGroupState, sectionsState, forecastListState, revenueWithForecastState, forecastState, forecastId, readCustomRangeSlot) => {
     const revState = (0, revenueReducer_1.getState)(revenueWithForecastState, revenueWithForecastState.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,
+    // which custom-mode activation reset to Not-Started so dashboardEpic refetches.
+    const activeFetchState = readCustomRangeSlot === true &&
+        revenueWithForecastState.uiState.customTimeframe != null &&
+        revState.customFetchState != null
+        ? revState.customFetchState
+        : revState.fetchState;
     const fetchState = (0, reduceFetchState_1.reduceAnyFetchState)([
-        revState.fetchState.month,
-        revState.fetchState.quarter,
-        revState.fetchState.year,
+        activeFetchState.month,
+        activeFetchState.quarter,
+        activeFetchState.year,
     ]);
-    const reportId = (0, revenueForTimeframeEpic_1.reportIdUniqueKey)(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 &&
+        revenueWithForecastState.uiState.customTimeframe != null;
+    const reportId = (0, revenueForTimeframeEpic_1.reportIdUniqueKey)(forecastId, useCustomRange);
     const sections = {};
     const calculatedSections = {};
     let allTimeframeTicks = [];
@@ -49,16 +61,16 @@ const getRevenueReport = (filter, accountState, accountGroupState, sectionsState
         const timeframe = revenueWithForecastState.uiState.timeframe;
         // To get incomeBalances without forecast init.
         const incomeBalance = (0, sectionAccountsViewSelector_1.getSectionBalances)(sectionsState, {
-            reportId: (0, revenueForTimeframeEpic_1.reportIdUniqueKey)(), // reportId without forecastId init to fetch Accouts incomeBalances
+            reportId: (0, revenueForTimeframeEpic_1.reportIdUniqueKey)(undefined, useCustomRange), // reportId without forecastId init to fetch Accouts incomeBalances
             sectionId: 'income',
         });
         // To get cogsBalance without forecast init.
         const cogsBalance = (0, sectionAccountsViewSelector_1.getSectionBalances)(sectionsState, {
-            reportId: (0, revenueForTimeframeEpic_1.reportIdUniqueKey)(), // reportId without forecastId init to fetch Accouts cogsBalance
+            reportId: (0, revenueForTimeframeEpic_1.reportIdUniqueKey)(undefined, useCustomRange), // reportId without forecastId init to fetch Accouts cogsBalance
             sectionId: 'cogs',
         });
         const grossMarginBalances = (0, sectionAccountsViewSelector_1.getSectionBalances)(sectionsState, {
-            reportId: (0, revenueForTimeframeEpic_1.reportIdUniqueKey)(), // reportId without forecastId init to fetch Accouts cogsBalance
+            reportId: (0, revenueForTimeframeEpic_1.reportIdUniqueKey)(undefined, useCustomRange), // reportId without forecastId init to fetch Accouts cogsBalance
             sectionId: 'grossMargin',
         });
         const incomeOrCogs = incomeBalance != null
@@ -100,6 +112,8 @@ const getRevenueReport = (filter, accountState, accountGroupState, sectionsState
         allTimeframeTicks,
         insights: revenueWithForecastState.revenue.insights ?? [], // Picking insights from RevenueState in both foregast mode on and off
         availableNumberOfPeriods: (0, dataAvailable_1.getNumberOfPeriods)(revState.firstMonthOfFY, filter.timeframe, revState.dataAvailable),
+        // Surface the saved custom timeframe so the detail picker can restore them.
+        customTimeframe: revenueWithForecastState.uiState.customTimeframe,
     };
 };
 exports.getRevenueReport = getRevenueReport;
@@ -157,7 +171,10 @@ exports.getRevenueForSelectedRange = (0, toolkit_1.createSelector)((state) => st
         selectedForecast?.id != null &&
         (0, exports.getRevenueReportFetchState)(selectedForecast.id, revenueWithForecastState).fetchState === 'Completed'
         ? getRevenueWithForecastOnDataAvailableDateRange(noFilter, selectedForecast?.id, accountState, accountGroupState, sectionAccountsViewState, forecastListState, revenueWithForecastState, forecastState)
-        : (0, exports.getRevenueReport)(noFilter, accountState, accountGroupState, sectionAccountsViewState, forecastListState, revenueWithForecastState, forecastState, selectedForecast?.id);
+        : (0, exports.getRevenueReport)(noFilter, accountState, accountGroupState, sectionAccountsViewState, forecastListState, revenueWithForecastState, forecastState, selectedForecast?.id, 
+        // Detail selectors read the custom slot when the detail is in custom
+        // mode; the dashboard's getRevenueForLast4Periods does not.
+        revenueWithForecastState.uiState.customTimeframe != null);
 });
 exports.getRevenueForHighlightedRange = (0, toolkit_1.createSelector)((state) => state.accountGroupState, (state) => state.accountState, (state) => state.revenueState, (state) => state.forecastState, (state) => state.forecastListState, (state) => state.sectionAccountsViewState, (accountGroupState, accountState, revenueWithForecastState, forecastState, forecastListState, sectionsState) => {
     const { timeframe, highlightedCOABalancesRange, selectedAdditionalBalances, maxNumOfPeriodsToHighlight, isForecastModeOn, selectedForecast, } = revenueWithForecastState.uiState;
@@ -168,7 +185,10 @@ exports.getRevenueForHighlightedRange = (0, toolkit_1.createSelector)((state) =>
         (0, exports.getRevenueReportFetchState)(selectedForecast.id, revenueWithForecastState)
             .fetchState === 'Completed'
         ? getRevenueWithForecastOnDataAvailableDateRange(filter, selectedForecast?.id, accountState, accountGroupState, sectionsState, forecastListState, revenueWithForecastState, forecastState)
-        : (0, exports.getRevenueReport)(filter, accountState, accountGroupState, sectionsState, forecastListState, revenueWithForecastState, forecastState, selectedForecast?.id);
+        : (0, exports.getRevenueReport)(filter, accountState, accountGroupState, sectionsState, forecastListState, revenueWithForecastState, forecastState, selectedForecast?.id, 
+        // Detail selectors read the custom slot when the detail is in custom
+        // mode; the dashboard's getRevenueForLast4Periods does not.
+        revenueWithForecastState.uiState.customTimeframe != null);
 });
 /**
  * Get Revenue with forecast data overlaid on actuals.

package/lib/view/revenue/revenueState.d.ts

@@ -19,6 +19,14 @@ export interface RevenueState extends Report {
     };
     insights: InsightSummary[];
     cogs?: COABalanceGroupedByPeriod;
+    customCogs?: COABalanceGroupedByPeriod;
+    customFetchState?: {
+        month: FetchStateAndError;
+        quarter: FetchStateAndError;
+        year: FetchStateAndError;
+    };
+    customGrossMargin?: COABalanceGroupedByPeriod;
+    customIncome?: COABalanceGroupedByPeriod;
     forecastId?: ID;
     grossMargin?: COABalanceGroupedByPeriod;
     income?: COABalanceGroupedByPeriod;

package/package.json

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