@zeniai/client-epic-state 5.0.21-betaRD1 → 5.0.21-betaRD2

package/lib/esm/view/profitAndLossProjectView/profitAndLossForTimeframeProjectViewEpic.js

@@ -1,10 +1,18 @@
-import { from, of } from 'rxjs';
+import { EMPTY, from, of } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
 import { updateProjects } from '../../entity/project/projectReducer';
 import { updateSectionProjectView } from '../../entity/sectionProjectView/sectionProjectViewReducer';
+import { getIsAccountingProjectsEnabled } from '../../entity/tenant/tenantSelector';
 import { createZeniAPIStatus, isSuccessResponse } from '../../responsePayload';
 import { fetchProfitAndLossForTimeframeProjectView, updateProfitAndLossForTimeframeProjectView, updateProfitAndLossForTimeframeProjectViewFailure, } from './profitAndLossProjectViewReducer';
-export const fetchProfitAndLossForTimeframeProjectViewEpic = (actions$, _, zeniAPI) => actions$.pipe(filter(fetchProfitAndLossForTimeframeProjectView.match), mergeMap((action) => {
+export const fetchProfitAndLossForTimeframeProjectViewEpic = (actions$, state, zeniAPI) => actions$.pipe(filter(fetchProfitAndLossForTimeframeProjectView.match), mergeMap((action) => {
+    // Tenant-level guard mirroring fetchProfitAndLossProjectViewEpic.
+    // Defends against any direct dispatches of this leaf action (e.g.
+    // ReportsScreen's per-timeframe useEffect) when projects accounting
+    // isn't enabled for the current tenant.
+    if (getIsAccountingProjectsEnabled(state.value) === false) {
+        return EMPTY;
+    }
     const getTimeSeriesGroup = (timeframe) => {
         switch (timeframe) {
             case 'month':

package/lib/esm/view/profitAndLossProjectView/profitAndLossProjectViewEpic.js

@@ -1,7 +1,15 @@
-import { from } from 'rxjs';
+import { EMPTY, from } from 'rxjs';
 import { filter, switchMap } from 'rxjs/operators';
+import { getIsAccountingProjectsEnabled } from '../../entity/tenant/tenantSelector';
 import { fetchProfitAndLossForTimeframeProjectView, fetchProfitAndLossProjectView, } from './profitAndLossProjectViewReducer';
 export const fetchProfitAndLossProjectViewEpic = (actions$, state) => actions$.pipe(filter(fetchProfitAndLossProjectView.match), switchMap((action) => {
+    // Tenant-level guard: when projects accounting isn't enabled for the
+    // current tenant, the View By dropdown hides "Project" and the API
+    // would either error or return empty. Skip the fetch entirely so we
+    // don't fan out three timeframe requests on every dropdown open.
+    if (getIsAccountingProjectsEnabled(state.value) === false) {
+        return EMPTY;
+    }
     const { cacheOverride } = action.payload;
     if (cacheOverride === true) {
         return from([