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

package/lib/view/cashInCashOut/cashInCashOutReducer.js

@@ -9,6 +9,7 @@ const dataAvailable_1 = require("../../commonStateTypes/dataAvailable");
 const thisPeriodHelpers_1 = require("../../commonStateTypes/viewAndReport/thisPeriodHelpers");
 const insightSummaryPayload_1 = require("../../entity/insights/insightSummaryPayload");
 const rootActions_1 = require("../../rootActions");
+const zeniDayJS_1 = require("../../zeniDayJS");
 const getSelectedAndHighlightedRanges_1 = require("../common/getSelectedAndHighlightedRanges");
 exports.defaultPeriods = {
     numberOfPeriods: 5,
@@ -19,6 +20,10 @@ exports.initialState = {
     cashIn: undefined,
     cashOut: undefined,
     netCashFlow: undefined,
+    customCashIn: undefined,
+    customCashOut: undefined,
+    customNetCashFlow: undefined,
+    customFetchState: undefined,
     dataAvailable: undefined,
     firstMonthOfFY: 1,
     reportId: 'cash_in_cash_out',
@@ -53,49 +58,118 @@ const cashInCashOut = (0, toolkit_1.createSlice)({
     name: 'cashInCashOut',
     initialState: exports.initialState,
     reducers: {
-        fetchCashInCashOut(draft) {
-            draft.fetchState = 'In-Progress';
-            draft.error = undefined;
+        fetchCashInCashOut: {
+            prepare(startDate, endDate) {
+                return { payload: { endDate, startDate } };
+            },
+            reducer(draft, action) {
+                // Route by per-fetch dates: a custom (dated) fetch marks only the
+                // isolated customFetchState so the shared fetchState the dashboard reads
+                // stays as custom-mode activation left it (self-heal), and the shared
+                // error isn't cleared by a detail-only fetch.
+                if (action.payload.startDate != null &&
+                    action.payload.endDate != null) {
+                    draft.customFetchState = 'In-Progress';
+                }
+                else {
+                    draft.fetchState = 'In-Progress';
+                    draft.error = undefined;
+                }
+            },
         },
-        updateCashInCashOut(draft, action) {
-            draft.fetchState = 'Completed';
-            draft.error = undefined;
-            const report = (0, viewAndReportPayload_1.mapReportPayloadToReport)(action.payload.report);
-            Object.assign(draft, report);
-            const { cash_in, cash_out, net_cash_flow, insights } = action.payload.report;
-            draft.cashIn =
-                (0, coaBalancePayload_1.mapCOABalanceGroupedWithIDsPayloadToCOABalanceGroupedWithIDs)(cash_in);
-            draft.cashOut =
-                (0, coaBalancePayload_1.mapCOABalanceGroupedWithIDsPayloadToCOABalanceGroupedWithIDs)(cash_out);
-            draft.netCashFlow =
-                (0, coaBalancePayload_1.mapCOABalanceGroupedPayloadToCOABalanceGrouped)(net_cash_flow);
-            draft.insights = (0, insightSummaryPayload_1.mapInsightsPayloadtoInsightsState)(insights);
-            const cashInOrCashOut = draft.cashIn != null ? draft.cashIn : draft.cashOut;
-            draft.dataAvailable = report.dataAvailable
-                ? report.dataAvailable
-                : (0, dataAvailable_1.getDataAvailableDateRange)(cashInOrCashOut);
-            if (draft.dataAvailable != null) {
-                const timeframe = draft.uiState.timeframe;
-                const coaBalances = (0, getSelectedAndHighlightedRanges_1.getAvailableCOABalancesWithMostRecentNonZeroBalance)(draft.firstMonthOfFY, timeframe, [draft.cashIn, draft.cashOut], draft.dataAvailable);
-                const selectionRanges = (0, getSelectedAndHighlightedRanges_1.getInitialSelectedAndHighlightedRanges)({
-                    firstMonthOfFY: draft.firstMonthOfFY,
-                    timeframe,
-                    coaBalances,
-                    orderBy: 'ascending_date',
-                    maxNumOfPeriodsToSelect: exports.defaultPeriods.numberOfPeriods,
-                    maxNumOfPeriodsToHighlight: exports.initialState.uiState.maxNumOfPeriodsToHighlight,
-                });
-                if (selectionRanges?.selectedCOABalancesRange != null) {
-                    draft.uiState.selectedCOABalancesRange =
-                        selectionRanges?.selectedCOABalancesRange;
+        updateCashInCashOut: {
+            prepare(data, isCustomDateRange = false) {
+                return { payload: { data, isCustomDateRange } };
+            },
+            reducer(draft, action) {
+                const isCustomDateRange = action.payload.isCustomDateRange === true;
+                // A custom (dated) fetch marks the isolated scalar customFetchState so the
+                // shared fetchState the dashboard reads via hasValidState() stays as
+                // custom-mode activation left it (Not-Started), letting the card self-heal.
+                if (isCustomDateRange) {
+                    draft.customFetchState = 'Completed';
                 }
-                draft.uiState.highlightedCOABalancesRange =
-                    selectionRanges?.highlightedCOABalancesRange;
-            }
+                else {
+                    draft.fetchState = 'Completed';
+                    draft.error = undefined;
+                }
+                const report = (0, viewAndReportPayload_1.mapReportPayloadToReport)(action.payload.data.report);
+                // A custom (dated) fetch must not overwrite the shared report fields the
+                // dashboard card reads (firstMonthOfFY, bookCloseDate, reportTitle,
+                // status, version) — only its isolated custom* slots below.
+                if (!isCustomDateRange) {
+                    Object.assign(draft, report);
+                }
+                const { cash_in, cash_out, net_cash_flow, insights } = action.payload.data.report;
+                const mappedCashIn = (0, coaBalancePayload_1.mapCOABalanceGroupedWithIDsPayloadToCOABalanceGroupedWithIDs)(cash_in);
+                const mappedCashOut = (0, coaBalancePayload_1.mapCOABalanceGroupedWithIDsPayloadToCOABalanceGroupedWithIDs)(cash_out);
+                const mappedNetCashFlow = (0, coaBalancePayload_1.mapCOABalanceGroupedPayloadToCOABalanceGrouped)(net_cash_flow);
+                // Route custom-date results to the separate slots so the dashboard card
+                // (which reads cashIn/cashOut/netCashFlow) keeps the default window.
+                if (isCustomDateRange) {
+                    draft.customCashIn = mappedCashIn;
+                    draft.customCashOut = mappedCashOut;
+                    draft.customNetCashFlow = mappedNetCashFlow;
+                }
+                else {
+                    draft.cashIn = mappedCashIn;
+                    draft.cashOut = mappedCashOut;
+                    draft.netCashFlow = mappedNetCashFlow;
+                }
+                // Insights are shared (read by the dashboard card); a custom slice must
+                // not overwrite them.
+                if (!isCustomDateRange) {
+                    draft.insights = (0, insightSummaryPayload_1.mapInsightsPayloadtoInsightsState)(insights);
+                }
+                // Derive dataAvailable from the slot this fetch actually populated.
+                const cashInOrCashOut = mappedCashIn != null ? mappedCashIn : mappedCashOut;
+                // 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 || draft.dataAvailable == null) {
+                    draft.dataAvailable = report.dataAvailable
+                        ? report.dataAvailable
+                        : (0, dataAvailable_1.getDataAvailableDateRange)(cashInOrCashOut);
+                }
+                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 = (0, getSelectedAndHighlightedRanges_1.getAvailableCOABalancesWithMostRecentNonZeroBalance)(draft.firstMonthOfFY, timeframe, [draft.cashIn, draft.cashOut], draft.dataAvailable);
+                    const selectionRanges = (0, getSelectedAndHighlightedRanges_1.getInitialSelectedAndHighlightedRanges)({
+                        firstMonthOfFY: draft.firstMonthOfFY,
+                        timeframe,
+                        coaBalances,
+                        orderBy: 'ascending_date',
+                        maxNumOfPeriodsToSelect: exports.defaultPeriods.numberOfPeriods,
+                        maxNumOfPeriodsToHighlight: exports.initialState.uiState.maxNumOfPeriodsToHighlight,
+                    });
+                    if (selectionRanges?.selectedCOABalancesRange != null) {
+                        draft.uiState.selectedCOABalancesRange =
+                            selectionRanges?.selectedCOABalancesRange;
+                    }
+                    draft.uiState.highlightedCOABalancesRange =
+                        selectionRanges?.highlightedCOABalancesRange;
+                }
+            },
         },
-        updateCashInCashOutFailure(draft, action) {
-            draft.fetchState = 'Error';
-            draft.error = action.payload;
+        updateCashInCashOutFailure: {
+            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.
+                if (action.payload.isCustomDateRange === true) {
+                    draft.customFetchState = 'Error';
+                }
+                else {
+                    draft.fetchState = 'Error';
+                    draft.error = action.payload.error;
+                }
+            },
         },
         updateCashInCashOutAdditionalBalancesSelection(draft, action) {
             const { cashIn, cashOut, dataAvailable } = draft;
@@ -111,7 +185,7 @@ const cashInCashOut = (0, toolkit_1.createSlice)({
                     action.payload.additionalBalances.length != 0
                     ? true
                     : false;
-            if (dataAvailable != null) {
+            if (dataAvailable != null && draft.uiState.customTimeframe == null) {
                 const coaBalances = (0, getSelectedAndHighlightedRanges_1.getAvailableCOABalancesWithMostRecentNonZeroBalance)(draft.firstMonthOfFY, timeframe, [cashIn, cashOut], dataAvailable);
                 const thisPeriod = (0, thisPeriodHelpers_1.extractThisPeriod)(draft.firstMonthOfFY, timeframe, selectedCOABalancesRange, coaBalances);
                 if (thisPeriod != null &&
@@ -140,6 +214,45 @@ const cashInCashOut = (0, toolkit_1.createSlice)({
             }
         },
         updateCashInCashOutCOABalancesRange(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: (0, zeniDayJS_1.date)(action.payload.customStartDate),
+                                endDate: (0, zeniDayJS_1.date)(action.payload.customEndDate),
+                            }
+                            : undefined;
+                    // Invalidate the shared default-window fetchState so dashboardEpic
+                    // refetches the default data on the next dashboard visit — the custom
+                    // fetch writes into the custom slots, and this lets the card self-heal
+                    // without a reload. The detail screen reads customFetchState.
+                    draft.fetchState = 'Not-Started';
+                }
+                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 { cashIn, cashOut, dataAvailable } = draft;
             const { timeframe, selectedCOABalancesRange, maxNumOfPeriodsToHighlight, highlightedCOABalancesRange, } = draft.uiState;
             if (dataAvailable != null &&
@@ -184,6 +297,13 @@ const cashInCashOut = (0, toolkit_1.createSlice)({
             draft.uiState.downloadState = action.payload;
         },
         updateCashInCashOutThisPeriod(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 { cashIn, cashOut, dataAvailable } = draft;
             const { timeframe, selectedCOABalancesRange, highlightedCOABalancesRange, maxNumOfPeriodsToHighlight, } = draft.uiState;
             if (dataAvailable != null && action.payload.thisPeriod != null) {

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

@@ -6,7 +6,7 @@ import { AccountGroupState } from '../../entity/accountGroup/accountGroupState';
 import { RootState } from '../../rootStateTypes';
 import { CashInCashOutReport, CashInCashOutUIStateSelectorView } from './cashInCashOutSelectorTypes';
 import { CashInCashOutState } from './cashInCashOutState';
-export declare const getCashInCashOut: (accountState: AccountState, accountGroupState: AccountGroupState, cashInCashOutState: CashInCashOutState, filter: COABalancesFilter) => {
+export declare const getCashInCashOut: (accountState: AccountState, accountGroupState: AccountGroupState, cashInCashOutState: CashInCashOutState, filter: COABalancesFilter, readCustomRangeSlot?: boolean) => {
     filter: COABalancesFilter;
     cashIn: Section;
     cashOut: Section;
@@ -23,6 +23,7 @@ export declare const getCashInCashOut: (accountState: AccountState, accountGroup
     error: import("../..").ZeniAPIStatus<Record<string, unknown>> | undefined;
     insights: import("../..").InsightSummary[];
     downloadState: import("../..").FetchState;
+    customTimeframe: import("../../commonStateTypes/timeframeTick").TimeframeTick | undefined;
 };
 export declare const getCashInCashOutUIState: (state: RootState) => CashInCashOutUIStateSelectorView;
 export declare const getCashInCashOutForSelectedRange: (state: RootState) => CashInCashOutReport;

package/lib/view/cashInCashOut/cashInCashOutSelector.js

@@ -8,39 +8,53 @@ const dataAvailable_1 = require("../../commonStateTypes/dataAvailable");
 const timeframeTick_1 = require("../../commonStateTypes/timeframeTick");
 const accountSelector_1 = require("../../entity/account/accountSelector");
 const accountGroupSelector_1 = require("../../entity/accountGroup/accountGroupSelector");
-const getCashInCashOut = (accountState, accountGroupState, cashInCashOutState, filter) => {
+const getCashInCashOut = (accountState, accountGroupState, cashInCashOutState, filter, readCustomRangeSlot) => {
     const reportId = 'cash_in_cash_out';
+    // The detail (in custom mode) reads the isolated custom slots so a default
+    // fetch can't overwrite the partial-period data; the dashboard (no flag) reads
+    // the default slots, so the two can never clobber each other.
+    const useCustomRange = readCustomRangeSlot === true &&
+        cashInCashOutState.uiState.customTimeframe != null;
+    const cashInSource = useCustomRange
+        ? cashInCashOutState.customCashIn
+        : cashInCashOutState.cashIn;
+    const cashOutSource = useCustomRange
+        ? cashInCashOutState.customCashOut
+        : cashInCashOutState.cashOut;
+    const netCashFlowSource = useCustomRange
+        ? cashInCashOutState.customNetCashFlow
+        : cashInCashOutState.netCashFlow;
     const cashIn = {
         itemOrder: 'last_balance_descending',
-        accountGroupsOrdered: (0, accountGroupSelector_1.getAccountGroupsOrdered)(filter, accountState, accountGroupState, cashInCashOutState.cashIn?.accountGroupIDs ?? [], 'cash_in_cash_out', 'cash_in_cash_out', 'cashIn'),
-        accountsOrdered: cashInCashOutState.cashIn?.accountGroupIDs.length === 0
+        accountGroupsOrdered: (0, accountGroupSelector_1.getAccountGroupsOrdered)(filter, accountState, accountGroupState, cashInSource?.accountGroupIDs ?? [], 'cash_in_cash_out', 'cash_in_cash_out', 'cashIn'),
+        accountsOrdered: cashInSource?.accountGroupIDs.length === 0
             ? (0, accountSelector_1.getAccountsOrdered)(filter, accountState, {
-                accountIDs: cashInCashOutState.cashIn?.accountIDs ?? [],
+                accountIDs: cashInSource?.accountIDs ?? [],
                 reportId,
             }, 'cashIn')
             : [],
-        ...(0, getCOABalancesSlice_1.getCOABalances)(cashInCashOutState.cashIn, filter),
+        ...(0, getCOABalancesSlice_1.getCOABalances)(cashInSource, filter),
     };
     const cashOut = {
         itemOrder: 'last_balance_descending',
-        accountGroupsOrdered: (0, accountGroupSelector_1.getAccountGroupsOrdered)(filter, accountState, accountGroupState, cashInCashOutState.cashOut?.accountGroupIDs ?? [], 'cash_in_cash_out', 'cash_in_cash_out', 'cashOut'),
-        accountsOrdered: cashInCashOutState.cashOut?.accountGroupIDs.length === 0
+        accountGroupsOrdered: (0, accountGroupSelector_1.getAccountGroupsOrdered)(filter, accountState, accountGroupState, cashOutSource?.accountGroupIDs ?? [], 'cash_in_cash_out', 'cash_in_cash_out', 'cashOut'),
+        accountsOrdered: cashOutSource?.accountGroupIDs.length === 0
             ? (0, accountSelector_1.getAccountsOrdered)(filter, accountState, {
-                accountIDs: cashInCashOutState.cashOut?.accountIDs ?? [],
+                accountIDs: cashOutSource?.accountIDs ?? [],
                 reportId,
             }, 'cashOut')
             : [],
-        ...(0, getCOABalancesSlice_1.getCOABalances)(cashInCashOutState.cashOut, filter),
+        ...(0, getCOABalancesSlice_1.getCOABalances)(cashOutSource, filter),
     };
-    const netCashFlow = (0, getCOABalancesSlice_1.getCOABalances)(cashInCashOutState.netCashFlow, filter);
+    const netCashFlow = (0, getCOABalancesSlice_1.getCOABalances)(netCashFlowSource, filter);
     let allTimeframeTicks = [];
     const dataAvailable = cashInCashOutState.dataAvailable;
     const firstMonthOfFY = cashInCashOutState.firstMonthOfFY;
     if (dataAvailable != null) {
         const noFilter = (0, coaBalancesFilter_1.newBalancesFilterForDateRange)(firstMonthOfFY, cashInCashOutState.uiState.timeframe, dataAvailable, 'ascending_date', []);
         const cashInCashOutBalances = cashIn.balances.length > 0
-            ? (0, getCOABalancesSlice_1.getCOABalances)(cashInCashOutState.cashIn, noFilter)
-            : (0, getCOABalancesSlice_1.getCOABalances)(cashInCashOutState.cashOut, noFilter);
+            ? (0, getCOABalancesSlice_1.getCOABalances)(cashInSource, noFilter)
+            : (0, getCOABalancesSlice_1.getCOABalances)(cashOutSource, noFilter);
         allTimeframeTicks = cashInCashOutBalances.balances.map((balance) => (0, timeframeTick_1.toTimeframeTick)(balance));
     }
     return {
@@ -56,10 +70,17 @@ const getCashInCashOut = (accountState, accountGroupState, cashInCashOutState, f
         reportTitle: cashInCashOutState.reportTitle,
         version: cashInCashOutState.version,
         status: cashInCashOutState.status,
-        fetchState: cashInCashOutState.fetchState,
+        // The detail reads the isolated customFetchState so its loading state follows
+        // the custom fetch; the dashboard (no flag) reads the shared fetchState, which
+        // custom-mode activation reset to Not-Started so dashboardEpic refetches.
+        fetchState: useCustomRange && cashInCashOutState.customFetchState != null
+            ? cashInCashOutState.customFetchState
+            : cashInCashOutState.fetchState,
         error: cashInCashOutState.error,
         insights: cashInCashOutState.insights ?? [],
         downloadState: cashInCashOutState.uiState.downloadState,
+        // Surface the customTimeframe so the detail picker can restore the selection.
+        customTimeframe: cashInCashOutState.uiState.customTimeframe,
     };
 };
 exports.getCashInCashOut = getCashInCashOut;
@@ -86,11 +107,17 @@ exports.getCashInCashOutUIState = (0, toolkit_1.createSelector)((state) => state
 exports.getCashInCashOutForSelectedRange = (0, toolkit_1.createSelector)((state) => state.accountState, (state) => state.accountGroupState, (state) => state.cashInCashOutState, (accountState, accountGroupState, cashInCashOutState) => {
     const { timeframe, selectedCOABalancesRange, selectedAdditionalBalances } = cashInCashOutState.uiState;
     const noFilter = (0, coaBalancesFilter_1.newBalancesFilter)(cashInCashOutState.firstMonthOfFY, timeframe, selectedCOABalancesRange.numberOfPeriods, selectedCOABalancesRange.thisPeriod, 'ascending_date', selectedAdditionalBalances);
-    return (0, exports.getCashInCashOut)(accountState, accountGroupState, cashInCashOutState, noFilter);
+    return (0, exports.getCashInCashOut)(accountState, accountGroupState, cashInCashOutState, noFilter, 
+    // Detail selectors read the custom slot when the detail is in custom mode;
+    // the dashboard's getCashInCashOutLast4Periods does not.
+    cashInCashOutState.uiState.customTimeframe != null);
 });
 exports.getCashInCashOutForHighlightedRange = (0, toolkit_1.createSelector)((state) => state.accountState, (state) => state.accountGroupState, (state) => state.cashInCashOutState, (accountState, accountGroupState, cashInCashOutState) => {
     const { timeframe, highlightedCOABalancesRange, selectedAdditionalBalances, maxNumOfPeriodsToHighlight, } = cashInCashOutState.uiState;
     const filter = (0, coaBalancesFilter_1.newBalancesFilter)(cashInCashOutState.firstMonthOfFY, timeframe, highlightedCOABalancesRange?.numberOfPeriods ??
         maxNumOfPeriodsToHighlight, highlightedCOABalancesRange?.thisPeriod, 'ascending_date', selectedAdditionalBalances);
-    return (0, exports.getCashInCashOut)(accountState, accountGroupState, cashInCashOutState, filter);
+    return (0, exports.getCashInCashOut)(accountState, accountGroupState, cashInCashOutState, filter, 
+    // Detail selectors read the custom slot when the detail is in custom mode;
+    // the dashboard's getCashInCashOutLast4Periods does not.
+    cashInCashOutState.uiState.customTimeframe != null);
 });

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

@@ -1,5 +1,5 @@
 import { COABalanceGrouped, COABalanceGroupedWithIDs } from '../../commonStateTypes/coaBalance/coaBalance';
-import { FetchedState, ID } from '../../commonStateTypes/common';
+import { FetchState, FetchedState, ID } from '../../commonStateTypes/common';
 import { ReportUIState } from '../../commonStateTypes/viewAndReport/reportUIState';
 import { Report } from '../../commonStateTypes/viewAndReport/viewAndReport';
 import { InsightSummary } from '../../entity/insights/insightSummary';
@@ -15,5 +15,9 @@ export interface CashInCashOutState extends FetchedState, Report {
     uiState: CashInCashOutUIState;
     cashIn?: COABalanceGroupedWithIDs;
     cashOut?: COABalanceGroupedWithIDs;
+    customCashIn?: COABalanceGroupedWithIDs;
+    customCashOut?: COABalanceGroupedWithIDs;
+    customFetchState?: FetchState;
+    customNetCashFlow?: COABalanceGrouped;
     netCashFlow?: COABalanceGrouped;
 }

package/lib/view/cashPosition/cashPositionEpic.d.ts

@@ -9,10 +9,16 @@ export declare const fetchCashPositionEpic: (actions$: ActionsObservable<ActionT
     classesViewParentId: import("../../commonStateTypes/classesView/nestedClassID").ClassesViewParentID | undefined;
     updateType: import("../..").UpdateType;
 }, never> | {
-    payload: import("../../responsePayload").ZeniReportData<import("./cashPositionPayload").CashPositionPayload>;
+    payload: {
+        reportData: import("../../responsePayload").ZeniReportData<import("./cashPositionPayload").CashPositionPayload>;
+        isCustomDateRange: boolean;
+    };
     type: "cashPosition/updateCashPosition";
 } | {
-    payload: import("../../zeniAPIStatus").ZeniAPIStatus<Record<string, unknown>>;
+    payload: {
+        error: import("../../zeniAPIStatus").ZeniAPIStatus<Record<string, unknown>>;
+        isCustomDateRange: boolean;
+    };
     type: "cashPosition/updateCashPositionFailure";
 } | {
     payload: {

package/lib/view/cashPosition/cashPositionEpic.js

@@ -6,18 +6,26 @@ const operators_1 = require("rxjs/operators");
 const accountReducer_1 = require("../../entity/account/accountReducer");
 const responsePayload_1 = require("../../responsePayload");
 const cashPositionReducer_1 = require("./cashPositionReducer");
-const fetchCashPositionEpic = (actions$, state, zeniAPI) => actions$.pipe((0, operators_1.filter)(cashPositionReducer_1.fetchCashPosition.match), (0, operators_1.switchMap)((action) => zeniAPI
-    .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/reports/cash_position?query=${encodeURIComponent(`{"is_full_response":${action.payload.fetchFullReport}}`)}`)
-    .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_position'), (0, cashPositionReducer_1.updateCashPosition)(response.data), // eslint-disable-line @typescript-eslint/no-non-null-assertion
-        (0, cashPositionReducer_1.updateCashPositionThisPeriod)({
-            thisPeriod: state.value.reportUIOptionsState.thisPeriod,
-        }));
+const fetchCashPositionEpic = (actions$, state, zeniAPI) => actions$.pipe((0, operators_1.filter)(cashPositionReducer_1.fetchCashPosition.match), (0, operators_1.switchMap)((action) => {
+    const queryValue = { is_full_response: action.payload.fetchFullReport };
+    const isCustomDateRange = action.payload.startDate != null && action.payload.endDate != null;
+    if (isCustomDateRange) {
+        queryValue.custom_start_date = action.payload.startDate;
+        queryValue.custom_end_date = action.payload.endDate;
     }
-    else {
-        return (0, rxjs_1.of)((0, cashPositionReducer_1.updateCashPositionFailure)(response.status));
-    }
-}), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, cashPositionReducer_1.updateCashPositionFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected error', 'Cash Position REST API call errored out' +
-    JSON.stringify(error))))))));
+    return zeniAPI
+        .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/reports/cash_position?query=${encodeURIComponent(JSON.stringify(queryValue))}`)
+        .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_position'), (0, cashPositionReducer_1.updateCashPosition)(response.data, isCustomDateRange), // eslint-disable-line @typescript-eslint/no-non-null-assertion
+            (0, cashPositionReducer_1.updateCashPositionThisPeriod)({
+                thisPeriod: state.value.reportUIOptionsState.thisPeriod,
+            }));
+        }
+        else {
+            return (0, rxjs_1.of)((0, cashPositionReducer_1.updateCashPositionFailure)(response.status, isCustomDateRange));
+        }
+    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, cashPositionReducer_1.updateCashPositionFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected error', 'Cash Position REST API call errored out' +
+        JSON.stringify(error)), isCustomDateRange))));
+}));
 exports.fetchCashPositionEpic = fetchCashPositionEpic;

package/lib/view/cashPosition/cashPositionReducer.d.ts

@@ -9,11 +9,22 @@ export declare const defaultPeriods: {
     numberOfPeriods: number;
 };
 export declare const initialState: CashPositionState;
-export declare const fetchCashPosition: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[fetchFullReport?: boolean | undefined], {
+export declare const fetchCashPosition: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[fetchFullReport?: boolean | undefined, startDate?: string | undefined, endDate?: string | undefined], {
     fetchFullReport: boolean;
-}, "cashPosition/fetchCashPosition", never, never>, updateCashPosition: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniReportData<CashPositionPayload>, "cashPosition/updateCashPosition">, updateCashPositionFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "cashPosition/updateCashPositionFailure">, updateCashPositionTimeFrame: import("@reduxjs/toolkit").ActionCreatorWithPayload<"month" | "year" | "quarter", "cashPosition/updateCashPositionTimeFrame">, updateCashPositionCOABalancesRange: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    startDate: string | undefined;
+    endDate: string | undefined;
+}, "cashPosition/fetchCashPosition", never, never>, updateCashPosition: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[reportData: ZeniReportData<CashPositionPayload>, isCustomDateRange?: boolean | undefined], {
+    reportData: ZeniReportData<CashPositionPayload>;
+    isCustomDateRange: boolean;
+}, "cashPosition/updateCashPosition", never, never>, updateCashPositionFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[error: ZeniAPIStatus<Record<string, unknown>>, isCustomDateRange?: boolean | undefined], {
+    error: ZeniAPIStatus<Record<string, unknown>>;
+    isCustomDateRange: boolean;
+}, "cashPosition/updateCashPositionFailure", never, never>, updateCashPositionTimeFrame: import("@reduxjs/toolkit").ActionCreatorWithPayload<"month" | "year" | "quarter", "cashPosition/updateCashPositionTimeFrame">, updateCashPositionCOABalancesRange: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     selectedCOABalancesRange: COABalancesRange;
+    customEndDate?: string;
+    customStartDate?: string;
     highlightedCOABalancesRange?: COABalancesRangeWithThisPeriod;
+    isCustomDateRange?: boolean;
 }, "cashPosition/updateCashPositionCOABalancesRange">, updateCashPositionAdditionalBalancesSelection: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     additionalBalances: COABalanceType[];
     isCompareModeOn: boolean;