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

package/lib/esm/view/cashPosition/cashPositionReducer.js

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

package/lib/esm/view/cashPosition/cashPositionSelector.js

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

package/lib/esm/view/expenseAutomationView/payload/actualMatchingPayload.js

@@ -44,9 +44,14 @@ export function toActualMatchingTransactionSearchResult(payload, fallbackCurrenc
         accountDescription: payload.account_description ?? undefined,
         accountingClassId: payload.accounting_class_id ?? undefined,
         accountingClassName: payload.accounting_class_name ?? undefined,
+        categorizationStatus: payload.categorization_status == null ||
+            payload.categorization_status === ''
+            ? undefined
+            : payload.categorization_status,
         currencyCode,
         currencySymbol: resolveMatchSearchCurrencySymbol(payload, currencyCode, fallbackCurrency),
         transactionMemo: payload.transaction_memo ?? undefined,
+        lineDescription: payload.line_description ?? undefined,
         transactionDescription: payload.transaction_description ?? undefined,
         transactionTypeName: payload.transaction_type_name ?? undefined,
         syncToken: payload.sync_token == null ? '' : String(payload.sync_token),

package/lib/esm/view/netBurnOrIncome/netBurnOrIncomeEpic.js

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

package/lib/esm/view/netBurnOrIncome/netBurnOrIncomeForTimeframeEpic.js

@@ -5,9 +5,15 @@ import { updateCalculatedSectionAccountsView, updateSectionAccountsView, } from
 import { createZeniAPIStatus, isSuccessResponse } from '../../responsePayload';
 import { getTimeSeriesGroup } from '../common/reportsHelpers';
 import { fetchNetBurnOrIncomeForTimeframe, updateNetBurnOrIncomeForTimeframe, updateNetBurnOrIncomeForTimeframeFailure, updateNetBurnOrIncomeThisPeriod, } from './netBurnOrIncomeReducer';
-export const reportIdUniqueKey = (forecastId) => forecastId != null
-    ? `net_burn_or_income+${forecastId}`
-    : 'net_burn_or_income';
+// Reserved forecast-slot marker so custom-date section-accounts data lives under
+// its own key (net_burn_or_income+<marker>) and a default fetch can never
+// overwrite it. Real forecast ids are UUIDs, so this never collides.
+export const CUSTOM_DATE_RANGE_SECTION_MARKER = '__custom_date_range__';
+export const reportIdUniqueKey = (forecastId, isCustomDateRange) => isCustomDateRange === true
+    ? `net_burn_or_income+${CUSTOM_DATE_RANGE_SECTION_MARKER}`
+    : forecastId != null
+        ? `net_burn_or_income+${forecastId}`
+        : 'net_burn_or_income';
 export const fetchNetBurnOrIncomeForTimeframeEpic = (actions$, state, zeniAPI) => actions$.pipe(filter(fetchNetBurnOrIncomeForTimeframe.match), mergeMap((action) => {
     const queryValue = {
         is_full_response: action.payload.fetchFullReport,
@@ -18,20 +24,27 @@ export const fetchNetBurnOrIncomeForTimeframeEpic = (actions$, state, zeniAPI) =
         queryValue.forecast_id = action.payload.forecastId;
         queryValue.is_forecast_vs_actual = true;
     }
+    if (action.payload.startDate != null && action.payload.endDate != null) {
+        queryValue.custom_start_date = action.payload.startDate;
+        queryValue.custom_end_date = action.payload.endDate;
+    }
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/2.0/reports/net_burn_or_income?query=${encodeURIComponent(JSON.stringify(queryValue))}`)
         .pipe(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, 'expenses', reportIdUniqueKey(action.payload.forecastId), response.data.report.expenses, 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, 'grossBurn', reportIdUniqueKey(action.payload.forecastId), response.data.report.gross_burn, response.data.report.currency));
-            actions.push(updateCalculatedSectionAccountsView(action.payload.timeframe, 'netBurnOrIncome', reportIdUniqueKey(action.payload.forecastId), response.data.report.net_burn_or_income, response.data.report.currency));
+            const isCustomDateRange = action.payload.startDate != null &&
+                action.payload.endDate != null;
+            actions.push(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, 'expenses', reportIdUniqueKey(action.payload.forecastId, isCustomDateRange), response.data.report.expenses, 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, 'grossBurn', reportIdUniqueKey(action.payload.forecastId, isCustomDateRange), response.data.report.gross_burn, response.data.report.currency));
+            actions.push(updateCalculatedSectionAccountsView(action.payload.timeframe, 'netBurnOrIncome', reportIdUniqueKey(action.payload.forecastId, isCustomDateRange), response.data.report.net_burn_or_income, response.data.report.currency));
             actions.push(updateNetBurnOrIncomeForTimeframe({
                 timeframe: action.payload.timeframe,
                 forecastId: action.payload.forecastId,
                 report: response.data,
+                isCustomDateRange,
             }));
             if (action.payload.forecastId == null &&
                 action.payload.timeframe === 'month') {
@@ -46,8 +59,10 @@ export const fetchNetBurnOrIncomeForTimeframeEpic = (actions$, state, zeniAPI) =
             return from(actions);
         }
         else {
-            return of(updateNetBurnOrIncomeForTimeframeFailure(response.status, action.payload.forecastId, action.payload.timeframe));
+            return of(updateNetBurnOrIncomeForTimeframeFailure(response.status, action.payload.forecastId, action.payload.timeframe, action.payload.startDate != null &&
+                action.payload.endDate != null));
         }
     }), catchError((error) => of(updateNetBurnOrIncomeForTimeframeFailure(createZeniAPIStatus('Unexpected Error', 'Net burn or income REST API call errored out' +
-        JSON.stringify(error)), action.payload.forecastId, action.payload.timeframe))));
+        JSON.stringify(error)), action.payload.forecastId, action.payload.timeframe, action.payload.startDate != null &&
+        action.payload.endDate != null))));
 }));