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

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

@@ -5,7 +5,7 @@ import { getDataAvailableDateRange, getNumberOfPeriods, } from '../../commonStat
 import { extractThisPeriod, getMatchingThisPeriod, } from '../../commonStateTypes/viewAndReport/thisPeriodHelpers';
 import { mapInsightsPayloadtoInsightsState } from '../../entity/insights/insightSummaryPayload';
 import { clearAll } from '../../rootActions';
-import { dateNow } from '../../zeniDayJS';
+import { date, dateNow } from '../../zeniDayJS';
 import { getAvailableCOABalancesWithMostRecentNonZeroBalance, getInitialSelectedAndHighlightedRanges, getSelectedAndHighlightedRangesForNewSelection, getSelectedAndHighlightedRangesForThisPeriod, } from '../common/getSelectedAndHighlightedRanges';
 export const defaultPeriods = {
     numberOfPeriods: 8,
@@ -65,8 +65,16 @@ const operatingExpenses = createSlice({
     initialState,
     reducers: {
         fetchOpEx: {
-            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
@@ -77,22 +85,49 @@ const operatingExpenses = createSlice({
             },
         },
         fetchOpExReportForTimeframe: {
-            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 opExReport = getState(draft, draft.uiState.isForecastModeOn, action.payload.forecastId);
-                const fetchState = {
-                    ...opExReport.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 = {
+                        ...(opExReport.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 = {
+                        ...opExReport.fetchState,
+                    };
+                    fetchState[timeframe] = {
+                        fetchState: 'In-Progress',
+                        error: undefined,
+                    };
+                    updateState(draft, action.payload.forecastId, { fetchState });
+                }
             },
         },
         fetchOpExWithForecast: {
@@ -122,25 +157,44 @@ const operatingExpenses = createSlice({
             },
         },
         updateOpExForTimeframe(draft, action) {
-            doUpdatedOpExReport(draft, action.payload.forecastId, action.payload.timeframe, action.payload.report);
+            doUpdatedOpExReport(draft, action.payload.forecastId, action.payload.timeframe, action.payload.report, action.payload.isCustomDateRange === true);
         },
         updateOpExFailureForTimeframe: {
-            prepare(error, forecastId, timeframe) {
+            prepare(error, forecastId, timeframe, isCustomDateRange = false) {
                 return {
                     payload: {
                         error,
                         forecastId,
                         timeframe,
+                        isCustomDateRange,
                     },
                 };
             },
             reducer(draft, action) {
                 const timeframe = action.payload.timeframe;
                 const opExReport = getState(draft, draft.uiState.isForecastModeOn, draft.uiState.selectedForecast?.id);
-                opExReport.fetchState[timeframe] = {
-                    fetchState: 'Error',
-                    error: action.payload.error,
-                };
+                // 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 = opExReport.customFetchState ?? {
+                        month: { fetchState: 'Not-Started', error: undefined },
+                        quarter: { fetchState: 'Not-Started', error: undefined },
+                        year: { fetchState: 'Not-Started', error: undefined },
+                    };
+                    customFetchState[timeframe] = {
+                        fetchState: 'Error',
+                        error: action.payload.error,
+                    };
+                    opExReport.customFetchState = customFetchState;
+                }
+                else {
+                    opExReport.fetchState[timeframe] = {
+                        fetchState: 'Error',
+                        error: action.payload.error,
+                    };
+                }
                 updateState(draft, action.payload.forecastId, opExReport);
             },
         },
@@ -158,8 +212,12 @@ const operatingExpenses = createSlice({
                     action.payload.additionalBalances.length != 0
                     ? 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) {
+            // Note: We don't want to update selected & highlighted ranges in Ui State when forecast is ON.
+            // Also skip when a custom date range is driving the window — otherwise the
+            // auto-window re-derivation below clamps the user's range to the default.
+            if (dataAvailable != null &&
+                draft.uiState.isForecastModeOn === false &&
+                draft.uiState.customTimeframe == null) {
                 const coaBalances = getAvailableCOABalancesWithMostRecentNonZeroBalance(opExReport.firstMonthOfFY, draft.uiState.timeframe, [opExBalancesByTimeframe], dataAvailable);
                 const thisPeriod = extractThisPeriod(opExReport.firstMonthOfFY, draft.uiState.timeframe, draft.uiState.selectedCOABalancesRange, coaBalances);
                 if (thisPeriod != null &&
@@ -188,6 +246,48 @@ const operatingExpenses = createSlice({
             }
         },
         updateOpExCOABalancesRange(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: date(action.payload.customStartDate),
+                                endDate: 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.opEx.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 opExReport = getState(draft, undefined, undefined);
             const { opExBalancesByTimeframe, dataAvailable } = opExReport;
@@ -232,6 +332,13 @@ const operatingExpenses = createSlice({
             }
         },
         updateOpExThisPeriod(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 opExReport = getState(draft, undefined, undefined);
             const { opExBalancesByTimeframe, dataAvailable } = opExReport;
@@ -310,7 +417,7 @@ const operatingExpenses = createSlice({
                 draft.uiState.maxNumOfPeriodsToHighlight =
                     initialState.uiState.maxNumOfPeriodsToHighlight;
             }
-            if (dataAvailable != null) {
+            if (dataAvailable != null && draft.uiState.customTimeframe == null) {
                 const timeframe = draft.uiState.timeframe;
                 const coaBalances = getAvailableCOABalancesWithMostRecentNonZeroBalance(opExReport.firstMonthOfFY, timeframe, [opExBalancesByTimeframe], dataAvailable);
                 const selectionRanges = getInitialSelectedAndHighlightedRanges({
@@ -338,27 +445,57 @@ const operatingExpenses = createSlice({
 });
 export const { fetchOpEx, fetchOpExReportForTimeframe, updateOpExForTimeframe, updateOpExFailureForTimeframe, updateOpExCOABalancesRange, updateOpExAdditionalBalancesSelection, updateOpExThisPeriod, updateOpExDownloadState, updateOpExUIState, opExToggleForecastMode, fetchOpExWithForecast, waitForForecastListThenFetchOpExWithForecast, updateOpExTimeFrame, } = operatingExpenses.actions;
 export default operatingExpenses.reducer;
-const doUpdatedOpExReport = (draft, forecastId, timeframe, data) => {
+const doUpdatedOpExReport = (draft, forecastId, timeframe, data, isCustomDateRange) => {
     const report = mapReportPayloadV2ToReportV2(data.report);
     const opExReport = getState(draft, draft.uiState.isForecastModeOn, forecastId);
     const { currency, expenses, insights } = data.report;
     const { firstMonthOfFY, bookCloseDate, dataAvailable } = report;
     const expensesCOABalance = mapCOABalanceGroupedByPeriodPayloadV2ToCOABalanceGroupedByPeriod(expenses, currency, timeframe);
-    opExReport.opExBalancesByTimeframe = Object.assign({}, opExReport.opExBalancesByTimeframe, expensesCOABalance);
-    if (timeframe === 'month' && insights != null) {
+    // Route custom-date results (identified by the fetch's own dates, not the
+    // global flag) to the separate slot so the dashboard card (which reads
+    // opExBalancesByTimeframe) keeps the default window.
+    if (isCustomDateRange) {
+        opExReport.customOpExBalancesByTimeframe = Object.assign({}, opExReport.customOpExBalancesByTimeframe, expensesCOABalance);
+    }
+    else {
+        opExReport.opExBalancesByTimeframe = Object.assign({}, opExReport.opExBalancesByTimeframe, expensesCOABalance);
+    }
+    // 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
         opExReport.insights = mapInsightsPayloadtoInsightsState(insights);
     }
-    opExReport.dataAvailable = dataAvailable
-        ? dataAvailable
-        : getDataAvailableDateRange(expensesCOABalance);
+    // 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 || opExReport.dataAvailable == null) {
+        opExReport.dataAvailable = dataAvailable
+            ? dataAvailable
+            : getDataAvailableDateRange(expensesCOABalance);
+    }
     opExReport.firstMonthOfFY = firstMonthOfFY;
     opExReport.bookCloseDate = bookCloseDate;
-    opExReport.fetchState[timeframe].fetchState = 'Completed';
-    opExReport.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 = opExReport.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 };
+        opExReport.customFetchState = customFetchState;
+    }
+    else {
+        opExReport.fetchState[timeframe].fetchState = 'Completed';
+        opExReport.fetchState[timeframe].error = undefined;
+    }
     if (opExReport.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 = getAvailableCOABalancesWithMostRecentNonZeroBalance(opExReport.firstMonthOfFY, timeframe, [expensesCOABalance], opExReport.dataAvailable);
         const selectionRanges = getInitialSelectedAndHighlightedRanges({

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

@@ -58,8 +58,10 @@ export const getOperatingExpensesUIState = createSelector((state) => state.opExS
         reportFormat,
     };
 });
-const getOpExBalancesInTimeFrame = createSelector((state) => state.opExState, (state) => state.sectionAccountsViewState, (opExState, sectionState) => {
-    const reportId = 'operating_expenses';
+const getOpExBalancesInTimeFrame = createSelector((state) => state.opExState, (state) => state.sectionAccountsViewState, (_state, readCustomRangeSlot) => readCustomRangeSlot === true, (opExState, sectionState, readCustomRangeSlot) => {
+    // Custom detail reads its own section-accounts slot so a default fetch can't
+    // overwrite the partial-period data; the dashboard reads the default slot.
+    const reportId = reportIdUniqueKey(undefined, readCustomRangeSlot && opExState.uiState.customTimeframe != null);
     const opExStateReport = getState(opExState, false, undefined);
     if (opExStateReport.dataAvailable != null) {
         const noFilter = newBalancesFilterForDateRange(opExStateReport.firstMonthOfFY, opExState.uiState.timeframe, opExStateReport.dataAvailable, 'ascending_date', []);
@@ -72,14 +74,25 @@ const getOpExBalancesInTimeFrame = createSelector((state) => state.opExState, (s
     }
     return [];
 });
-export const getOperatingExpensesReport = createSelector((state) => state, (state) => state.accountState, (state) => state.accountGroupState, (state) => state.sectionAccountsViewState, (state) => state.opExState, (state) => state.forecastState, (state) => state.forecastListState, (_state, filter) => filter, (_state, _filter, forecastId) => forecastId, (state, accountState, accountGroupState, sectionsState, opExState, forecastState, forecastListState, filter, forecastId) => {
+export const getOperatingExpensesReport = createSelector((state) => state, (state) => state.accountState, (state) => state.accountGroupState, (state) => state.sectionAccountsViewState, (state) => state.opExState, (state) => state.forecastState, (state) => state.forecastListState, (_state, filter) => filter, (_state, _filter, forecastId) => forecastId, (_state, _filter, _forecastId, readCustomRangeSlot) => readCustomRangeSlot === true, (state, accountState, accountGroupState, sectionsState, opExState, forecastState, forecastListState, filter, forecastId, readCustomRangeSlot) => {
     const opEx = getState(opExState, opExState.uiState.isForecastModeOn, forecastId);
+    // The detail screen opts into customFetchState so its Completed check fires
+    // off the custom fetch; the dashboard (no flag) reads the shared fetchState,
+    // which custom-mode activation reset to Not-Started so dashboardEpic refetches.
+    const activeFetchState = readCustomRangeSlot &&
+        opExState.uiState.customTimeframe != null &&
+        opEx.customFetchState != null
+        ? opEx.customFetchState
+        : opEx.fetchState;
     const fetchState = reduceAnyFetchState([
-        opEx.fetchState.month,
-        opEx.fetchState.quarter,
-        opEx.fetchState.year,
+        activeFetchState.month,
+        activeFetchState.quarter,
+        activeFetchState.year,
     ]);
-    const reportId = 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 && opExState.uiState.customTimeframe != null;
+    const reportId = reportIdUniqueKey(forecastId, useCustomRange);
     const sections = {};
     const calculatedSections = {};
     if (fetchState.fetchState === 'Completed') {
@@ -90,7 +103,7 @@ export const getOperatingExpensesReport = createSelector((state) => state, (stat
             }, filter);
         });
     }
-    const balancesInTimeframe = getOpExBalancesInTimeFrame(state);
+    const balancesInTimeframe = getOpExBalancesInTimeFrame(state, useCustomRange);
     const allTimeframeTicks = balancesInTimeframe.map((balance) => toTimeframeTick(balance));
     const forecast = opEx.forecastId != null
         ? getForecast(forecastState, opEx.forecastId)
@@ -117,6 +130,8 @@ export const getOperatingExpensesReport = createSelector((state) => state, (stat
         allTimeframeTicks,
         balancesInTimeframe,
         availableNumberOfPeriods: getNumberOfPeriods(opEx.firstMonthOfFY, filter.timeframe, opEx.dataAvailable),
+        // Surface the saved custom timeframe so the detail picker can restore them.
+        customTimeframe: opExState.uiState.customTimeframe,
     };
 });
 export const getOperatingExpensesForSelectedRange = createSelector((state) => state, (state) => state.opExState, (state, opExWithForecastState) => {
@@ -126,7 +141,10 @@ export const getOperatingExpensesForSelectedRange = createSelector((state) => st
         selectedForecast?.id != null &&
         getOperatingExpensesReportFetchState(selectedForecast.id, opExWithForecastState).fetchState === 'Completed'
         ? getOpExWithForecastOnDataAvailableDateRange(state, noFilter, selectedForecast?.id)
-        : getOperatingExpensesReport(state, noFilter, opExWithForecastState.uiState.selectedForecast?.id);
+        : getOperatingExpensesReport(state, noFilter, opExWithForecastState.uiState.selectedForecast?.id, 
+        // Detail selectors read the custom slot when the detail is in custom
+        // mode; the dashboard's getOperatingExpensesForLast5Periods does not.
+        opExWithForecastState.uiState.customTimeframe != null);
 });
 export const getOperatingExpensesForHighlightedRange = createSelector((state) => state, (state) => state.opExState, (state, opExWithForecastState) => {
     const { timeframe, highlightedCOABalancesRange, selectedAdditionalBalances, maxNumOfPeriodsToHighlight, isForecastModeOn, selectedForecast, } = opExWithForecastState.uiState;
@@ -136,7 +154,7 @@ export const getOperatingExpensesForHighlightedRange = createSelector((state) =>
         selectedForecast?.id != null &&
         getOperatingExpensesReportFetchState(selectedForecast.id, opExWithForecastState).fetchState === 'Completed'
         ? getOpExWithForecastOnDataAvailableDateRange(state, filter, selectedForecast?.id)
-        : getOperatingExpensesReport(state, filter, opExWithForecastState.uiState.selectedForecast?.id);
+        : getOperatingExpensesReport(state, filter, opExWithForecastState.uiState.selectedForecast?.id, opExWithForecastState.uiState.customTimeframe != null);
 });
 /**
  * Get Net Burn or Income with forecast data overlaid on actuals.

package/lib/esm/view/profitAndLoss/profitAndLossForTimeframeEpic.js

@@ -25,6 +25,10 @@ export const fetchProfitAndLossForTimeframeEpic = (actions$, _, zeniAPI) => acti
         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/profit_and_loss?query=${encodeURIComponent(JSON.stringify(queryValue))}`)
         .pipe(mergeMap((response) => {

package/lib/esm/view/profitAndLoss/profitAndLossReducer.js

@@ -49,9 +49,16 @@ const profitAndLoss = createSlice({
             },
         },
         fetchProfitAndLossForTimeframe: {
-            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) {

package/lib/esm/view/revenue/revenueEpic.js

@@ -2,12 +2,12 @@ import { from } from 'rxjs';
 import { filter, switchMap } from 'rxjs/operators';
 import { fetchRevenue, fetchRevenueForTimeframe, getState, } from './revenueReducer';
 export const fetchRevenueEpic = (actions$, state) => actions$.pipe(filter(fetchRevenue.match), switchMap((action) => {
-    const { cacheOverride, forecastId } = action.payload;
+    const { cacheOverride, endDate, forecastId, startDate } = action.payload;
     if (cacheOverride === true) {
         return from([
-            fetchRevenueForTimeframe('month', forecastId),
-            fetchRevenueForTimeframe('quarter', forecastId),
-            fetchRevenueForTimeframe('year', forecastId),
+            fetchRevenueForTimeframe('month', forecastId, true, false, startDate, endDate),
+            fetchRevenueForTimeframe('quarter', forecastId, true, false, startDate, endDate),
+            fetchRevenueForTimeframe('year', forecastId, true, false, startDate, endDate),
         ]);
     }
     else {
@@ -16,15 +16,15 @@ export const fetchRevenueEpic = (actions$, state) => actions$.pipe(filter(fetchR
         const timeframeFetchState = revState.fetchState;
         if (timeframeFetchState['month'].fetchState !== 'In-Progress' &&
             timeframeFetchState['month'].fetchState !== 'Completed') {
-            fetchActions.push(fetchRevenueForTimeframe('month', forecastId));
+            fetchActions.push(fetchRevenueForTimeframe('month', forecastId, true, false, startDate, endDate));
         }
         if (timeframeFetchState['quarter'].fetchState !== 'In-Progress' &&
             timeframeFetchState['quarter'].fetchState !== 'Completed') {
-            fetchActions.push(fetchRevenueForTimeframe('quarter', forecastId));
+            fetchActions.push(fetchRevenueForTimeframe('quarter', forecastId, true, false, startDate, endDate));
         }
         if (timeframeFetchState['year'].fetchState !== 'In-Progress' &&
             timeframeFetchState['year'].fetchState !== 'Completed') {
-            fetchActions.push(fetchRevenueForTimeframe('year', forecastId));
+            fetchActions.push(fetchRevenueForTimeframe('year', forecastId, true, false, startDate, endDate));
         }
         return from(fetchActions);
     }

package/lib/esm/view/revenue/revenueForTimeframeEpic.js

@@ -5,9 +5,15 @@ import { updateCalculatedSectionAccountsView, updateSectionAccountsView, } from
 import { createZeniAPIStatus, isSuccessResponse } from '../../responsePayload';
 import { getTimeSeriesGroup } from '../common/reportsHelpers';
 import { fetchRevenueForTimeframe, updateRevenueForTimeframe, updateRevenueForTimeframeFailure, updateRevenueThisPeriod, } from './revenueReducer';
-export const reportIdUniqueKey = (forecastId) => forecastId != null
-    ? `revenue+${forecastId}`
-    : 'revenue';
+// Reserved forecast-slot marker so custom-date section-accounts data lives under
+// its own key (revenue+<marker>) and a default fetch can never overwrite it.
+// Real forecast ids are UUIDs, so this never collides.
+export const CUSTOM_DATE_RANGE_SECTION_MARKER = '__custom_date_range__';
+export const reportIdUniqueKey = (forecastId, isCustomDateRange) => isCustomDateRange === true
+    ? `revenue+${CUSTOM_DATE_RANGE_SECTION_MARKER}`
+    : forecastId != null
+        ? `revenue+${forecastId}`
+        : 'revenue';
 export const fetchRevenueForTimeframeEpic = (actions$, state, zeniAPI) => actions$.pipe(filter(fetchRevenueForTimeframe.match), mergeMap((action) => {
     const queryValue = {
         is_full_response: action.payload.fetchFullReport,
@@ -18,18 +24,25 @@ export const fetchRevenueForTimeframeEpic = (actions$, state, zeniAPI) => action
         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/revenue?query=${encodeURIComponent(JSON.stringify(queryValue))}`)
         .pipe(mergeMap((response) => {
         if (response.data != null && isSuccessResponse(response)) {
             const actions = [];
-            actions.push(updateSectionAccountsView(action.payload.timeframe, 'cogs', reportIdUniqueKey(action.payload.forecastId), response.data.report.cogs, response.data.report.accounts, response.data.report.account_groups, response.data.report.currency));
-            actions.push(updateSectionAccountsView(action.payload.timeframe, 'income', reportIdUniqueKey(action.payload.forecastId), response.data.report.income, response.data.report.accounts, response.data.report.account_groups, response.data.report.currency));
-            actions.push(updateCalculatedSectionAccountsView(action.payload.timeframe, 'grossMargin', reportIdUniqueKey(action.payload.forecastId), response.data.report.gross_profit, response.data.report.currency));
+            const isCustomDateRange = action.payload.startDate != null &&
+                action.payload.endDate != null;
+            actions.push(updateSectionAccountsView(action.payload.timeframe, 'cogs', reportIdUniqueKey(action.payload.forecastId, isCustomDateRange), response.data.report.cogs, response.data.report.accounts, response.data.report.account_groups, response.data.report.currency));
+            actions.push(updateSectionAccountsView(action.payload.timeframe, 'income', reportIdUniqueKey(action.payload.forecastId, isCustomDateRange), response.data.report.income, response.data.report.accounts, response.data.report.account_groups, response.data.report.currency));
+            actions.push(updateCalculatedSectionAccountsView(action.payload.timeframe, 'grossMargin', reportIdUniqueKey(action.payload.forecastId, isCustomDateRange), response.data.report.gross_profit, response.data.report.currency));
             actions.push(updateRevenueForTimeframe({
                 timeframe: action.payload.timeframe,
                 forecastId: action.payload.forecastId,
                 report: response.data,
+                isCustomDateRange,
             }));
             if (action.payload.forecastId == null &&
                 action.payload.timeframe === 'month') {
@@ -44,7 +57,9 @@ export const fetchRevenueForTimeframeEpic = (actions$, state, zeniAPI) => action
             return from(actions);
         }
         else {
-            return of(updateRevenueForTimeframeFailure(response.status, action.payload.forecastId, action.payload.timeframe));
+            return of(updateRevenueForTimeframeFailure(response.status, action.payload.forecastId, action.payload.timeframe, action.payload.startDate != null &&
+                action.payload.endDate != null));
         }
-    }), catchError((error) => of(updateRevenueForTimeframeFailure(createZeniAPIStatus('Unexpected Error', 'Revenue REST API call errored out' + JSON.stringify(error)), action.payload.forecastId, action.payload.timeframe))));
+    }), catchError((error) => of(updateRevenueForTimeframeFailure(createZeniAPIStatus('Unexpected Error', 'Revenue REST API call errored out' + JSON.stringify(error)), action.payload.forecastId, action.payload.timeframe, action.payload.startDate != null &&
+        action.payload.endDate != null))));
 }));