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

package/lib/esm/view/revenue/revenueReducer.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';
 import { isCOABalanceGroupedByPeriodEmptyForTimeframe } from '../common/reportsHelpers';
 export const defaultPeriods = {
@@ -68,8 +68,16 @@ const revenue = createSlice({
     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
@@ -80,22 +88,49 @@ const revenue = 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: {
@@ -125,28 +160,47 @@ const revenue = 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) {
@@ -165,7 +219,9 @@ const revenue = 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 = getAvailableCOABalancesWithMostRecentNonZeroBalance(revenueReport.firstMonthOfFY, timeframe, [income, cogs, grossMargin], dataAvailable);
                 const thisPeriod = extractThisPeriod(revenueReport.firstMonthOfFY, timeframe, selectedCOABalancesRange, coaBalances);
                 if (thisPeriod != null &&
@@ -194,6 +250,48 @@ const revenue = 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: 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.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;
@@ -237,6 +335,13 @@ const revenue = 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;
@@ -286,7 +391,7 @@ const revenue = 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(revenueReport.firstMonthOfFY, timeframe, [income, cogs, grossMargin], dataAvailable);
                 const selectionRanges = getInitialSelectedAndHighlightedRanges({
@@ -341,37 +446,75 @@ const revenue = createSlice({
 });
 export const { fetchRevenue, fetchRevenueWithForecast, fetchRevenueForTimeframe, waitForForecastListThenFetchRevenueWithForecast, updateRevenueForTimeframe, updateRevenueForTimeframeFailure, updateRevenueAdditionalBalancesSelection, updateRevenueCOABalancesRange, updateRevenueThisPeriod, updateRevenueDownloadState, updateRevenueTimeFrame, updateRevenueUIState, revenueToggleForecastMode, } = revenue.actions;
 export 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 = mapReportPayloadV2ToReportV2(revReport.report);
     const { income, cogs, insights, currency } = revReport.report;
     const incomeCOABalance = mapCOABalanceGroupedByPeriodPayloadV2ToCOABalanceGroupedByPeriod(income, currency, timeframe);
     const cogsCOABalance = mapCOABalanceGroupedByPeriodPayloadV2ToCOABalanceGroupedByPeriod(cogs, currency, timeframe);
     const grossMarginCOABalance = 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 = mapInsightsPayloadtoInsightsState(insights);
     }
     const isIncomeEmpty = isCOABalanceGroupedByPeriodEmptyForTimeframe(incomeCOABalance, timeframe);
     const isCogsEmpty = 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
-        : 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 ?? 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 = getAvailableCOABalancesWithMostRecentNonZeroBalance(revenue.firstMonthOfFY, timeframe, [revenue.income, revenue.cogs, revenue.grossMargin], revenue.dataAvailable);
         const selectionRanges = getInitialSelectedAndHighlightedRanges({

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

@@ -13,14 +13,26 @@ import { ALL_REVENUE_CALCULATED_SECTION_IDS, ALL_REVENUE_SECTION_IDS, revenueIds
 import { reportIdUniqueKey } from './revenueForTimeframeEpic';
 import { getGrossMarginWithPercent } from './revenueHelper';
 import { getState } from './revenueReducer';
-export const getRevenueReport = (filter, accountState, accountGroupState, sectionsState, forecastListState, revenueWithForecastState, forecastState, forecastId) => {
+export const getRevenueReport = (filter, accountState, accountGroupState, sectionsState, forecastListState, revenueWithForecastState, forecastState, forecastId, readCustomRangeSlot) => {
     const revState = 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 = reduceAnyFetchState([
-        revState.fetchState.month,
-        revState.fetchState.quarter,
-        revState.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 === true &&
+        revenueWithForecastState.uiState.customTimeframe != null;
+    const reportId = reportIdUniqueKey(forecastId, useCustomRange);
     const sections = {};
     const calculatedSections = {};
     let allTimeframeTicks = [];
@@ -46,16 +58,16 @@ export const getRevenueReport = (filter, accountState, accountGroupState, sectio
         const timeframe = revenueWithForecastState.uiState.timeframe;
         // To get incomeBalances without forecast init.
         const incomeBalance = getSectionBalances(sectionsState, {
-            reportId: reportIdUniqueKey(), // reportId without forecastId init to fetch Accouts incomeBalances
+            reportId: reportIdUniqueKey(undefined, useCustomRange), // reportId without forecastId init to fetch Accouts incomeBalances
             sectionId: 'income',
         });
         // To get cogsBalance without forecast init.
         const cogsBalance = getSectionBalances(sectionsState, {
-            reportId: reportIdUniqueKey(), // reportId without forecastId init to fetch Accouts cogsBalance
+            reportId: reportIdUniqueKey(undefined, useCustomRange), // reportId without forecastId init to fetch Accouts cogsBalance
             sectionId: 'cogs',
         });
         const grossMarginBalances = getSectionBalances(sectionsState, {
-            reportId: reportIdUniqueKey(), // reportId without forecastId init to fetch Accouts cogsBalance
+            reportId: reportIdUniqueKey(undefined, useCustomRange), // reportId without forecastId init to fetch Accouts cogsBalance
             sectionId: 'grossMargin',
         });
         const incomeOrCogs = incomeBalance != null
@@ -97,6 +109,8 @@ export const getRevenueReport = (filter, accountState, accountGroupState, sectio
         allTimeframeTicks,
         insights: revenueWithForecastState.revenue.insights ?? [], // Picking insights from RevenueState in both foregast mode on and off
         availableNumberOfPeriods: getNumberOfPeriods(revState.firstMonthOfFY, filter.timeframe, revState.dataAvailable),
+        // Surface the saved custom timeframe so the detail picker can restore them.
+        customTimeframe: revenueWithForecastState.uiState.customTimeframe,
     };
 };
 export const getRevenueUIState = createSelector((state) => state.revenueState, (state) => state.forecastListState, (revenueWithForecastState, forecastListState) => {
@@ -153,7 +167,10 @@ export const getRevenueForSelectedRange = createSelector((state) => state.accoun
         selectedForecast?.id != null &&
         getRevenueReportFetchState(selectedForecast.id, revenueWithForecastState).fetchState === 'Completed'
         ? getRevenueWithForecastOnDataAvailableDateRange(noFilter, selectedForecast?.id, accountState, accountGroupState, sectionAccountsViewState, forecastListState, revenueWithForecastState, forecastState)
-        : getRevenueReport(noFilter, accountState, accountGroupState, sectionAccountsViewState, forecastListState, revenueWithForecastState, forecastState, selectedForecast?.id);
+        : 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);
 });
 export const getRevenueForHighlightedRange = 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;
@@ -164,7 +181,10 @@ export const getRevenueForHighlightedRange = createSelector((state) => state.acc
         getRevenueReportFetchState(selectedForecast.id, revenueWithForecastState)
             .fetchState === 'Completed'
         ? getRevenueWithForecastOnDataAvailableDateRange(filter, selectedForecast?.id, accountState, accountGroupState, sectionsState, forecastListState, revenueWithForecastState, forecastState)
-        : getRevenueReport(filter, accountState, accountGroupState, sectionsState, forecastListState, revenueWithForecastState, forecastState, selectedForecast?.id);
+        : 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/balanceSheet/balanceSheetForTimeframeEpic.js

@@ -24,6 +24,10 @@ const fetchBalanceSheetForTimeframeEpic = (actions$, _, zeniAPI) => actions$.pip
         is_full_response: action.payload.fetchFullReport,
         time_series_groups: [getTimeSeriesGroup(action.payload.timeframe)],
     };
+    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/balance_sheet?query=${encodeURIComponent(JSON.stringify(queryValue))}`)
         .pipe((0, operators_1.mergeMap)((response) => {

package/lib/view/balanceSheet/balanceSheetReducer.d.ts

@@ -5,10 +5,12 @@ import { BalanceSheetState } from './balanceSheetState';
 export declare const initialState: BalanceSheetState;
 export declare const fetchBalanceSheet: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: boolean | undefined], {
     cacheOverride: boolean;
-}, "balanceSheet/fetchBalanceSheet", never, never>, fetchBalanceSheetForTimeframe: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[timeframe: "month" | "year" | "quarter", fetchFullReport?: boolean | undefined, cacheOverride?: boolean | undefined], {
+}, "balanceSheet/fetchBalanceSheet", never, never>, fetchBalanceSheetForTimeframe: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[timeframe: "month" | "year" | "quarter", fetchFullReport?: boolean | undefined, cacheOverride?: boolean | undefined, startDate?: string | undefined, endDate?: string | undefined], {
     timeframe: "month" | "year" | "quarter";
     fetchFullReport: boolean;
     cacheOverride: boolean;
+    startDate: string | undefined;
+    endDate: string | undefined;
 }, "balanceSheet/fetchBalanceSheetForTimeframe", never, never>, updateBalanceSheetForTimeframe: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     report: ZeniReportData<BalanceSheetReportPayload>;
     timeframe: "month" | "quarter" | "year";

package/lib/view/balanceSheet/balanceSheetReducer.js

@@ -49,9 +49,15 @@ const balanceSheet = (0, toolkit_1.createSlice)({
             },
         },
         fetchBalanceSheetForTimeframe: {
-            prepare(timeframe, fetchFullReport = true, cacheOverride = false) {
+            prepare(timeframe, fetchFullReport = true, cacheOverride = false, startDate, endDate) {
                 return {
-                    payload: { timeframe, fetchFullReport, cacheOverride },
+                    payload: {
+                        timeframe,
+                        fetchFullReport,
+                        cacheOverride,
+                        startDate,
+                        endDate,
+                    },
                 };
             },
             reducer(draft, action) {

package/lib/view/cashFlow/cashFlowForTimeframeEpic.js

@@ -24,6 +24,10 @@ const fetchCashFlowForTimeframeEpic = (actions$, _, zeniAPI) => actions$.pipe((0
         is_full_response: action.payload.fetchFullReport,
         time_series_groups: [getTimeSeriesGroup(action.payload.timeframe)],
     };
+    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/cash_flow?query=${encodeURIComponent(JSON.stringify(queryValue))}`)
         .pipe((0, operators_1.mergeMap)((response) => {

package/lib/view/cashFlow/cashFlowReducer.d.ts

@@ -6,9 +6,11 @@ export declare const initialState: CashFlowState;
 export declare const fetchCashFlow: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[fetchFullReport?: boolean | undefined, cacheOverride?: boolean | undefined], {
     fetchFullReport: boolean;
     cacheOverride: boolean;
-}, "cashFlow/fetchCashFlow", never, never>, fetchCashFlowForTimeframe: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[timeframe: "month" | "year" | "quarter", fetchFullReport?: boolean | undefined], {
+}, "cashFlow/fetchCashFlow", never, never>, fetchCashFlowForTimeframe: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[timeframe: "month" | "year" | "quarter", fetchFullReport?: boolean | undefined, startDate?: string | undefined, endDate?: string | undefined], {
     timeframe: "month" | "year" | "quarter";
     fetchFullReport: boolean;
+    startDate: string | undefined;
+    endDate: string | undefined;
 }, "cashFlow/fetchCashFlowForTimeframe", never, never>, updateCashFlowForTimeframe: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     report: ZeniReportData<CashFlowPayload>;
     timeframe: "month" | "quarter" | "year";

package/lib/view/cashFlow/cashFlowReducer.js

@@ -47,9 +47,9 @@ const cashFlow = (0, toolkit_1.createSlice)({
             },
         },
         fetchCashFlowForTimeframe: {
-            prepare(timeframe, fetchFullReport = true) {
+            prepare(timeframe, fetchFullReport = true, startDate, endDate) {
                 return {
-                    payload: { timeframe, fetchFullReport },
+                    payload: { timeframe, fetchFullReport, startDate, endDate },
                 };
             },
             reducer(draft, action) {

package/lib/view/cashInCashOut/cashInCashOutEpic.d.ts

@@ -10,10 +10,16 @@ export declare const fetchCashInCashOutEpic: (actions$: ActionsObservable<Action
     classesViewParentId: import("../../commonStateTypes/classesView/nestedClassID").ClassesViewParentID | undefined;
     updateType: import("../..").UpdateType;
 }, never> | {
-    payload: import("../../responsePayload").ZeniReportData<import("./cashInCashOutPayload").CashInCashOutPayload>;
+    payload: {
+        data: import("../../responsePayload").ZeniReportData<import("./cashInCashOutPayload").CashInCashOutPayload>;
+        isCustomDateRange: boolean;
+    };
     type: "cashInCashOut/updateCashInCashOut";
 } | {
-    payload: import("../../zeniAPIStatus").ZeniAPIStatus<Record<string, unknown>>;
+    payload: {
+        error: import("../../zeniAPIStatus").ZeniAPIStatus<Record<string, unknown>>;
+        isCustomDateRange: boolean;
+    };
     type: "cashInCashOut/updateCashInCashOutFailure";
 } | import("@reduxjs/toolkit").PayloadAction<import("../../entity/accountGroup/accountGroupPayload").AccountGroupPayload[], "accountGroup/updateAccountGroups", {
     reportId: import("../..").ReportIDPlusForecastID;

package/lib/view/cashInCashOut/cashInCashOutEpic.js

@@ -7,18 +7,26 @@ const accountReducer_1 = require("../../entity/account/accountReducer");
 const accountGroupReducer_1 = require("../../entity/accountGroup/accountGroupReducer");
 const responsePayload_1 = require("../../responsePayload");
 const cashInCashOutReducer_1 = require("./cashInCashOutReducer");
-const fetchCashInCashOutEpic = (actions$, state, zeniAPI) => actions$.pipe((0, operators_1.filter)(cashInCashOutReducer_1.fetchCashInCashOut.match), (0, operators_1.switchMap)(() => zeniAPI
-    .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/reports/cash_in_cash_out`)
-    .pipe((0, operators_1.mergeMap)((response) => {
-    if ((0, responsePayload_1.isSuccessResponse)(response)) {
-        return (0, rxjs_1.of)((0, accountReducer_1.updateAccounts)(response.data?.report.accounts ?? [], 'cash_in_cash_out'), (0, accountGroupReducer_1.updateAccountGroups)(response.data?.report.account_groups ?? [], 'cash_in_cash_out'), (0, cashInCashOutReducer_1.updateCashInCashOut)(response.data), // eslint-disable-line @typescript-eslint/no-non-null-assertion
-        (0, cashInCashOutReducer_1.updateCashInCashOutThisPeriod)({
-            thisPeriod: state.value.reportUIOptionsState.thisPeriod,
-        }));
-    }
-    else {
-        return (0, rxjs_1.of)((0, cashInCashOutReducer_1.updateCashInCashOutFailure)(response.status));
-    }
-}), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, cashInCashOutReducer_1.updateCashInCashOutFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected error', 'CashInCashOut REST API call errored out' +
-    JSON.stringify(error))))))));
+const fetchCashInCashOutEpic = (actions$, state, zeniAPI) => actions$.pipe((0, operators_1.filter)(cashInCashOutReducer_1.fetchCashInCashOut.match), (0, operators_1.switchMap)((action) => {
+    const { startDate, endDate } = action.payload;
+    // Route by the fetch's own dates, not a global flag: a custom fetch carries
+    // start/end, so its results land in the isolated custom slots and the
+    // dashboard's default window is untouched.
+    const isCustomDateRange = startDate != null && endDate != null;
+    const url = `${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/reports/cash_in_cash_out${isCustomDateRange
+        ? `?query=${encodeURIComponent(JSON.stringify({ custom_end_date: endDate, custom_start_date: startDate }))}`
+        : ''}`;
+    return zeniAPI.getJSON(url).pipe((0, operators_1.mergeMap)((response) => {
+        if ((0, responsePayload_1.isSuccessResponse)(response)) {
+            return (0, rxjs_1.of)((0, accountReducer_1.updateAccounts)(response.data?.report.accounts ?? [], 'cash_in_cash_out'), (0, accountGroupReducer_1.updateAccountGroups)(response.data?.report.account_groups ?? [], 'cash_in_cash_out'), (0, cashInCashOutReducer_1.updateCashInCashOut)(response.data, isCustomDateRange), // eslint-disable-line @typescript-eslint/no-non-null-assertion
+            (0, cashInCashOutReducer_1.updateCashInCashOutThisPeriod)({
+                thisPeriod: state.value.reportUIOptionsState.thisPeriod,
+            }));
+        }
+        else {
+            return (0, rxjs_1.of)((0, cashInCashOutReducer_1.updateCashInCashOutFailure)(response.status, isCustomDateRange));
+        }
+    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, cashInCashOutReducer_1.updateCashInCashOutFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected error', 'CashInCashOut REST API call errored out' +
+        JSON.stringify(error)), isCustomDateRange))));
+}));
 exports.fetchCashInCashOutEpic = fetchCashInCashOutEpic;

package/lib/view/cashInCashOut/cashInCashOutReducer.d.ts

@@ -9,9 +9,21 @@ export declare const defaultPeriods: {
     numberOfPeriods: number;
 };
 export declare const initialState: CashInCashOutState;
-export declare const fetchCashInCashOut: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"cashInCashOut/fetchCashInCashOut">, updateCashInCashOut: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniReportData<CashInCashOutPayload>, "cashInCashOut/updateCashInCashOut">, updateCashInCashOutFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "cashInCashOut/updateCashInCashOutFailure">, updateCashInCashOutCOABalancesRange: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+export declare const fetchCashInCashOut: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[startDate?: string | undefined, endDate?: string | undefined], {
+    endDate: string | undefined;
+    startDate: string | undefined;
+}, "cashInCashOut/fetchCashInCashOut", never, never>, updateCashInCashOut: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[data: ZeniReportData<CashInCashOutPayload>, isCustomDateRange?: boolean | undefined], {
+    data: ZeniReportData<CashInCashOutPayload>;
+    isCustomDateRange: boolean;
+}, "cashInCashOut/updateCashInCashOut", never, never>, updateCashInCashOutFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[error: ZeniAPIStatus<Record<string, unknown>>, isCustomDateRange?: boolean | undefined], {
+    error: ZeniAPIStatus<Record<string, unknown>>;
+    isCustomDateRange: boolean;
+}, "cashInCashOut/updateCashInCashOutFailure", never, never>, updateCashInCashOutCOABalancesRange: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     selectedCOABalancesRange: COABalancesRange;
+    customEndDate?: string;
+    customStartDate?: string;
     highlightedCOABalancesRange?: COABalancesRangeWithThisPeriod;
+    isCustomDateRange?: boolean;
 }, "cashInCashOut/updateCashInCashOutCOABalancesRange">, updateCashInCashOutAdditionalBalancesSelection: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     additionalBalances: COABalanceType[];
     isCompareModeOn: boolean;