@zeniai/client-epic-state 5.2.32-betaRD0 → 5.2.33

package/lib/esm/view/expenseAutomationView/selectors/fluxAnalysisViewSelector.js

@@ -1,3 +1,4 @@
+import { reduceAnyFetchState } from '../../../commonStateTypes/reduceFetchState';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { getAccountBase } from '../../../entity/account/accountSelector';
 import { getClassById } from '../../../entity/class/classSelector';
@@ -6,7 +7,7 @@ import { getUserByUserId } from '../../../entity/user/userSelector';
 import { getVendorByVendorId } from '../../../entity/vendor/vendorSelector';
 import { getAllSteps } from './getAllStepsHelper';
 export function getExpenseAutomationFluxAnalysisView(state) {
-    const { expenseAutomationFluxAnalysisViewState, monthEndCloseChecksState } = state;
+    const { expenseAutomationFluxAnalysisViewState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
     const { fetchState, error, lastRefreshSuccessTime, refreshStatus, uiState, reviewOperatingExpenseIdsByPeriod, selectedSectionIdsByPeriod, groupsBySelectedPeriod, fluxAnalysisEntities, bulkReviewStatus, currency, totalBalancesAndVariance, } = expenseAutomationFluxAnalysisViewState;
     const fetchStateAndError = {
         fetchState,
@@ -91,26 +92,17 @@ export function getExpenseAutomationFluxAnalysisView(state) {
         },
     };
     const completionStatus = fluxCompletionStatus != null ? fluxCompletionStatus : 'incomplete';
-    const groupsForSelectedPeriod = monthYearPeriodId != null
-        ? groupsBySelectedPeriod[monthYearPeriodId]
-        : undefined;
-    /**
-     * `fetchState` is a flat slice field that survives a period switch, so it still reads
-     * 'Completed' before the newly selected period has been requested. The per-period group is
-     * created by the fetch's own request reducer, so its absence means "not requested yet for this
-     * period" -- report 'Not-Started' so the table keeps its skeleton instead of rendering the
-     * previous period's rows during the transition.
-     *
-     * This used to fall out of merging in the month-close/checks fetch state, which also coupled
-     * the tab's first load to an unrelated request that resolves 6-12s later.
-     */
-    const fetchStatus = fetchState === 'Completed' && groupsForSelectedPeriod == null
-        ? { fetchState: 'Not-Started', error: undefined }
-        : fetchStateAndError;
+    const monthEndFetchState = monthYearPeriodId != null
+        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
+        : { fetchState: 'Not-Started', error: undefined };
+    const reducedFetchStatus = reduceAnyFetchState([
+        fetchStateAndError,
+        monthEndFetchState,
+    ]);
     return {
         sections,
         totalBalancesAndVariance,
-        fetchStatus,
+        fetchStatus: reducedFetchStatus,
         bulkReviewStatus,
         reviewOperatingExpensesIds,
         selectedSectionIds,

package/lib/esm/view/expenseAutomationView/selectors/jeSchedulesViewSelector.js

@@ -1,5 +1,6 @@
 import omit from 'lodash/omit';
 import orderBy from 'lodash/orderBy';
+import { reduceAnyFetchState } from '../../../commonStateTypes/reduceFetchState';
 import { LAST_SCHEDULE_DAY_OF_MONTH, toMonthYearPeriodId, } from '../../../commonStateTypes/timePeriod';
 import { getAccountIdsForTypes } from '../../../entity/account/accountSelector';
 import { generateJEOneTimeAccrualKey } from '../../../entity/jeSchedules/jeScheduleHelper';
@@ -209,7 +210,7 @@ export function getExpenseAutomationJESchedulesView(state) {
     const failedJeScheduledTransaction = [];
     const accruedSchedules = [];
     const oneTimeAccruals = [];
-    const { accountState, accountListState, classState, classListState, expenseAutomationJESchedulesViewState, expenseAutomationViewState, monthEndCloseChecksState, } = state;
+    const { accountState, accountListState, classState, classListState, expenseAutomationJESchedulesViewState, expenseAutomationViewState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
     const { jeScheduleTransactionKeysByPeriodAndTab, jeScheduleAccruedKeysByPeriodAndTab, jeScheduleOneTimeAccrualKeysByPeriodAndTab, failedJeScheduleTransactionKeysByPeriodAndTab, jeScheduleLocalDataById, postStatusById, ignoreStatusById, revertStatusById, oneTimeAccrualActionStatusById, uiState, error, fetchState, refreshStatus, newSchedule, } = expenseAutomationJESchedulesViewState;
     const accountSettingsView = getJEAccountSettingsView(state);
     const newScheduleView = newSchedule.selectedDetailScheduleType === 'fixed_assets' ||
@@ -400,6 +401,13 @@ export function getExpenseAutomationJESchedulesView(state) {
         : [];
     const jeCompletionStatus = allSteps.find((step) => step.step === 'je_schedules')?.completionStatus;
     const completionStatus = jeCompletionStatus != null ? jeCompletionStatus : 'incomplete';
+    const monthEndFetchState = monthYearPeriodId != null
+        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
+        : { fetchState: 'Not-Started', error: undefined };
+    const reducedFetchStatus = reduceAnyFetchState([
+        { fetchState, error },
+        monthEndFetchState,
+    ]);
     const countByType = (schedules) => {
         const counts = ALL_SCHEDULES_TYPES.reduce((acc, type) => ({ ...acc, [type]: 0 }), {});
         schedules.forEach((schedule) => {
@@ -437,10 +445,10 @@ export function getExpenseAutomationJESchedulesView(state) {
         ignoreStatusById: ignoreStatusById,
         revertStatusById: revertStatusById,
         oneTimeAccrualActionStatusById: oneTimeAccrualActionStatusById,
-        fetchState,
+        fetchState: reducedFetchStatus.fetchState,
         jeScheduleLocalDataById: jeScheduleLocalDataById,
         uiState: uiState,
-        error,
+        error: reducedFetchStatus.error,
         refreshStatus,
         completionStatus,
     };

package/lib/esm/view/expenseAutomationView/selectors/missingReceiptsSelector.js

@@ -1,4 +1,5 @@
 import orderBy from 'lodash/orderBy';
+import { reduceAnyFetchState } from '../../../commonStateTypes/reduceFetchState';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { getCurrentTenant } from '../../../entity/tenant/tenantSelector';
 import { getSupportedTransactionById, getSupportedTransactionsByIds, } from '../../../entity/transaction/transactionSelector';
@@ -7,7 +8,7 @@ import { getCompletedTransactionsCacheKey } from '../reducers/missingReceiptsVie
 import { isUnmatchedTabFileStatus, } from '../types/missingReceiptsViewState';
 import { getAllSteps } from './getAllStepsHelper';
 export function getExpenseAutomationMissingReceiptsView(state) {
-    const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
+    const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
     const currentTenant = getCurrentTenant(state);
     const { selectedPeriodByTenantId } = expenseAutomationViewState;
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
@@ -175,21 +176,16 @@ export function getExpenseAutomationMissingReceiptsView(state) {
             vendorLogo: result.vendorLogo ?? transaction?.logo?.href,
         };
     });
-    /**
-     * `fetchState` is a flat slice field that survives a period switch, so it still reads
-     * 'Completed' before the newly selected period's ids land. Report 'Not-Started' until they do,
-     * so the table keeps its skeleton rather than flashing the "all done" empty state over the
-     * previous period's rows.
-     *
-     * This used to fall out of merging in the month-close/checks fetch state, which also coupled
-     * the tab's first load to an unrelated request that resolves 6-12s later.
-     */
-    const fetchStatus = fetchState === 'Completed' && transactionIdsForSelectedPeriod == null
-        ? { fetchState: 'Not-Started', error: undefined }
-        : { fetchState, error };
+    const monthEndFetchState = monthYearPeriodId != null
+        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
+        : { fetchState: 'Not-Started', error: undefined };
+    const reducedFetchStatus = reduceAnyFetchState([
+        { fetchState, error },
+        monthEndFetchState,
+    ]);
     return {
-        fetchState: fetchStatus.fetchState,
-        error: fetchStatus.error,
+        fetchState: reducedFetchStatus.fetchState,
+        error: reducedFetchStatus.error,
         uploadReceiptStatusById,
         uiState,
         refreshStatus,

package/lib/view/expenseAutomationView/selectors/fluxAnalysisViewSelector.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExpenseAutomationFluxAnalysisView = getExpenseAutomationFluxAnalysisView;
+const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const accountSelector_1 = require("../../../entity/account/accountSelector");
 const classSelector_1 = require("../../../entity/class/classSelector");
@@ -9,7 +10,7 @@ const userSelector_1 = require("../../../entity/user/userSelector");
 const vendorSelector_1 = require("../../../entity/vendor/vendorSelector");
 const getAllStepsHelper_1 = require("./getAllStepsHelper");
 function getExpenseAutomationFluxAnalysisView(state) {
-    const { expenseAutomationFluxAnalysisViewState, monthEndCloseChecksState } = state;
+    const { expenseAutomationFluxAnalysisViewState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
     const { fetchState, error, lastRefreshSuccessTime, refreshStatus, uiState, reviewOperatingExpenseIdsByPeriod, selectedSectionIdsByPeriod, groupsBySelectedPeriod, fluxAnalysisEntities, bulkReviewStatus, currency, totalBalancesAndVariance, } = expenseAutomationFluxAnalysisViewState;
     const fetchStateAndError = {
         fetchState,
@@ -94,26 +95,17 @@ function getExpenseAutomationFluxAnalysisView(state) {
         },
     };
     const completionStatus = fluxCompletionStatus != null ? fluxCompletionStatus : 'incomplete';
-    const groupsForSelectedPeriod = monthYearPeriodId != null
-        ? groupsBySelectedPeriod[monthYearPeriodId]
-        : undefined;
-    /**
-     * `fetchState` is a flat slice field that survives a period switch, so it still reads
-     * 'Completed' before the newly selected period has been requested. The per-period group is
-     * created by the fetch's own request reducer, so its absence means "not requested yet for this
-     * period" -- report 'Not-Started' so the table keeps its skeleton instead of rendering the
-     * previous period's rows during the transition.
-     *
-     * This used to fall out of merging in the month-close/checks fetch state, which also coupled
-     * the tab's first load to an unrelated request that resolves 6-12s later.
-     */
-    const fetchStatus = fetchState === 'Completed' && groupsForSelectedPeriod == null
-        ? { fetchState: 'Not-Started', error: undefined }
-        : fetchStateAndError;
+    const monthEndFetchState = monthYearPeriodId != null
+        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
+        : { fetchState: 'Not-Started', error: undefined };
+    const reducedFetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([
+        fetchStateAndError,
+        monthEndFetchState,
+    ]);
     return {
         sections,
         totalBalancesAndVariance,
-        fetchStatus,
+        fetchStatus: reducedFetchStatus,
         bulkReviewStatus,
         reviewOperatingExpensesIds,
         selectedSectionIds,

package/lib/view/expenseAutomationView/selectors/jeSchedulesViewSelector.js

@@ -14,6 +14,7 @@ exports.getExpenseAutomationJESchedulesView = getExpenseAutomationJESchedulesVie
 exports.getExpenseAutomationJEOneTimeAccrualDetailView = getExpenseAutomationJEOneTimeAccrualDetailView;
 const omit_1 = __importDefault(require("lodash/omit"));
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
+const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const accountSelector_1 = require("../../../entity/account/accountSelector");
 const jeScheduleHelper_1 = require("../../../entity/jeSchedules/jeScheduleHelper");
@@ -224,7 +225,7 @@ function getExpenseAutomationJESchedulesView(state) {
     const failedJeScheduledTransaction = [];
     const accruedSchedules = [];
     const oneTimeAccruals = [];
-    const { accountState, accountListState, classState, classListState, expenseAutomationJESchedulesViewState, expenseAutomationViewState, monthEndCloseChecksState, } = state;
+    const { accountState, accountListState, classState, classListState, expenseAutomationJESchedulesViewState, expenseAutomationViewState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
     const { jeScheduleTransactionKeysByPeriodAndTab, jeScheduleAccruedKeysByPeriodAndTab, jeScheduleOneTimeAccrualKeysByPeriodAndTab, failedJeScheduleTransactionKeysByPeriodAndTab, jeScheduleLocalDataById, postStatusById, ignoreStatusById, revertStatusById, oneTimeAccrualActionStatusById, uiState, error, fetchState, refreshStatus, newSchedule, } = expenseAutomationJESchedulesViewState;
     const accountSettingsView = (0, jeAccountSettingsViewSelector_1.getJEAccountSettingsView)(state);
     const newScheduleView = newSchedule.selectedDetailScheduleType === 'fixed_assets' ||
@@ -415,6 +416,13 @@ function getExpenseAutomationJESchedulesView(state) {
         : [];
     const jeCompletionStatus = allSteps.find((step) => step.step === 'je_schedules')?.completionStatus;
     const completionStatus = jeCompletionStatus != null ? jeCompletionStatus : 'incomplete';
+    const monthEndFetchState = monthYearPeriodId != null
+        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
+        : { fetchState: 'Not-Started', error: undefined };
+    const reducedFetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([
+        { fetchState, error },
+        monthEndFetchState,
+    ]);
     const countByType = (schedules) => {
         const counts = jeSchedulesTypes_1.ALL_SCHEDULES_TYPES.reduce((acc, type) => ({ ...acc, [type]: 0 }), {});
         schedules.forEach((schedule) => {
@@ -452,10 +460,10 @@ function getExpenseAutomationJESchedulesView(state) {
         ignoreStatusById: ignoreStatusById,
         revertStatusById: revertStatusById,
         oneTimeAccrualActionStatusById: oneTimeAccrualActionStatusById,
-        fetchState,
+        fetchState: reducedFetchStatus.fetchState,
         jeScheduleLocalDataById: jeScheduleLocalDataById,
         uiState: uiState,
-        error,
+        error: reducedFetchStatus.error,
         refreshStatus,
         completionStatus,
     };

package/lib/view/expenseAutomationView/selectors/missingReceiptsSelector.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExpenseAutomationMissingReceiptsView = getExpenseAutomationMissingReceiptsView;
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
+const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const tenantSelector_1 = require("../../../entity/tenant/tenantSelector");
 const transactionSelector_1 = require("../../../entity/transaction/transactionSelector");
@@ -13,7 +14,7 @@ const missingReceiptsViewReducer_1 = require("../reducers/missingReceiptsViewRed
 const missingReceiptsViewState_1 = require("../types/missingReceiptsViewState");
 const getAllStepsHelper_1 = require("./getAllStepsHelper");
 function getExpenseAutomationMissingReceiptsView(state) {
-    const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
+    const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
     const { selectedPeriodByTenantId } = expenseAutomationViewState;
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
@@ -181,21 +182,16 @@ function getExpenseAutomationMissingReceiptsView(state) {
             vendorLogo: result.vendorLogo ?? transaction?.logo?.href,
         };
     });
-    /**
-     * `fetchState` is a flat slice field that survives a period switch, so it still reads
-     * 'Completed' before the newly selected period's ids land. Report 'Not-Started' until they do,
-     * so the table keeps its skeleton rather than flashing the "all done" empty state over the
-     * previous period's rows.
-     *
-     * This used to fall out of merging in the month-close/checks fetch state, which also coupled
-     * the tab's first load to an unrelated request that resolves 6-12s later.
-     */
-    const fetchStatus = fetchState === 'Completed' && transactionIdsForSelectedPeriod == null
-        ? { fetchState: 'Not-Started', error: undefined }
-        : { fetchState, error };
+    const monthEndFetchState = monthYearPeriodId != null
+        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
+        : { fetchState: 'Not-Started', error: undefined };
+    const reducedFetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([
+        { fetchState, error },
+        monthEndFetchState,
+    ]);
     return {
-        fetchState: fetchStatus.fetchState,
-        error: fetchStatus.error,
+        fetchState: reducedFetchStatus.fetchState,
+        error: reducedFetchStatus.error,
         uploadReceiptStatusById,
         uiState,
         refreshStatus,

package/package.json

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