@zeniai/client-epic-state 4.12.8 → 4.12.9

package/lib/view/opExByVendor/opExByVendorReducer.js

@@ -77,7 +77,10 @@ exports.initialState = {
     totalOpexByVendor: {
         totals: {},
     },
-    dataAvailable: undefined,
+    dataAvailable: {
+        month: undefined,
+        quarter: undefined,
+    },
     firstMonthOfFY: 1,
     reportId: 'operating_expenses_by_vendor',
     reportTitle: 'OpEx By Vendor',
@@ -249,7 +252,7 @@ const doUpdateOpexByVendorReport = (draft, timeframe, reportPayload, queryProps)
     var _a, _b, _c;
     if (reportPayload.status.is_report_generated == null) {
         const report = (0, viewAndReportPayload_1.mapReportPayloadToReport)(reportPayload);
-        draft.dataAvailable = report.dataAvailable;
+        draft.dataAvailable[timeframe] = report.dataAvailable;
         draft.firstMonthOfFY = report.firstMonthOfFY;
         draft.bookCloseDate = report.bookCloseDate;
         const currencyPayload = reportPayload.currency;

package/lib/view/opExByVendor/opExByVendorSelector.js

@@ -16,6 +16,15 @@ function getOpexVendorTimeframeKey(timeframeTick) {
     return `${timeframeTick.startDate.toString()}-${timeframeTick.endDate.toString()}`;
 }
 exports.getOpexVendorTimeframeKey = getOpexVendorTimeframeKey;
+const getDateRange = (timeframe, firstMonthOfFY, dataAvailable) => {
+    if (dataAvailable != null) {
+        if (timeframe === 'month') {
+            return dataAvailable;
+        }
+        return getDataAvailableForQuarter(dataAvailable, firstMonthOfFY);
+    }
+    return undefined;
+};
 exports.getOpExByVendorReport = (0, toolkit_1.createSelector)((state) => state.opExByVendorState, (state) => state.vendorState, (state) => state.accountState, (state) => state.classState, (opExByVendorState, vendorState, accountState, classState) => {
     const fetchState = (0, reduceFetchState_1.reduceFetchState)([
         opExByVendorState.reportFetchState.month,
@@ -31,13 +40,12 @@ exports.getOpExByVendorReport = (0, toolkit_1.createSelector)((state) => state.o
     let opexBalances = [];
     const summaryBalances = [];
     let totalBalances = undefined;
-    if (dataAvailable != null &&
+    const dateRange = getDateRange(timeframe, firstMonthOfFY, dataAvailable[timeframe]);
+    if (dateRange != null &&
         (fetchState.fetchState === 'Completed' ||
             opExByVendorState.uiState.sortOrSearchInProgress === true ||
             opExByVendorState.uiState.pageFetchInProgress === true)) {
-        filter = (0, coaBalancesFilter_1.newBalancesFilterForDateRange)(firstMonthOfFY, opExByVendorState.uiState.timeframe, timeframe === 'month'
-            ? dataAvailable
-            : getDataAvailableForQuarter(dataAvailable, firstMonthOfFY), 'ascending_date', opExByVendorState.uiState.selectedAdditionalBalances);
+        filter = (0, coaBalancesFilter_1.newBalancesFilterForDateRange)(firstMonthOfFY, timeframe, dateRange, 'ascending_date', opExByVendorState.uiState.selectedAdditionalBalances);
         const opexByVendorBalances = (0, coaBalance_1.getCOABalancesWithTotals)(opExByVendorState.totalOpexByVendor, filter);
         const opexKeys = opExByVendorState.uiState.searchString[timeframe].length > 0
             ? opExByVendorState.opExByVendorKeysForSearchByTimeframe[timeframe]
@@ -64,7 +72,7 @@ exports.getOpExByVendorReport = (0, toolkit_1.createSelector)((state) => state.o
         summaryBalances,
         allTimeframeTicks,
         totalBalances,
-        dataAvailable: opExByVendorState.dataAvailable,
+        dataAvailable: opExByVendorState.dataAvailable[timeframe],
         bookCloseDate: opExByVendorState.bookCloseDate,
         reportId: opExByVendorState.reportId,
         reportTitle: opExByVendorState.reportTitle,

package/lib/view/opExByVendor/opExByVendorState.d.ts

@@ -4,6 +4,7 @@ import { SortOrder } from '../../commonStateTypes/selectorTypes/sortOrderTypes';
 import { ReportUIState } from '../../commonStateTypes/viewAndReport/reportUIState';
 import { PageToken, Report } from '../../commonStateTypes/viewAndReport/viewAndReport';
 import { ZeniDate } from '../../zeniDayJS';
+import { DataAvailable } from '../../commonStateTypes/dataAvailable';
 export interface OpExByVendorQuery {
     sortKey: OpexByVendorSortKey;
     sortOrder: SortOrder;
@@ -49,7 +50,7 @@ export interface OpexByVendorUIState extends ReportUIState {
         scrollTop: number;
     };
 }
-export interface OpExByVendorState extends Report {
+export interface OpExByVendorState extends Omit<Report, 'dataAvailable'> {
     opExByVendorReportGenerated: boolean;
     opExByVendorKeysByTimeframe: {
         month: OpexVendorKey[];
@@ -69,4 +70,8 @@ export interface OpExByVendorState extends Report {
     };
     summaryFetchState: FetchStateAndError;
     lastRefreshSuccessTime?: ZeniDate;
+    dataAvailable: {
+        month?: DataAvailable;
+        quarter?: DataAvailable;
+    };
 }

package/package.json

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