@zeniai/client-epic-state 5.3.18-betaAK2 → 5.3.19

package/lib/entity/tenant/epic/fetchAllTenantsEpic.js

@@ -54,6 +54,11 @@ const fetchAllTenantsEpic = (actions$, state, zeniAPI) => {
             // Screens that wait for this fetch (sign-in, the root route) read the
             // landing tenant's roles and product settings, which the list does
             // not carry, so it completes only once that tenant's record is in.
+            // The wait is deliberately not scoped to the landing tenant:
+            // fetchActiveTenantEpic switches to the latest request, so another
+            // tenant's fetch dispatched meanwhile cancels this one and its answer
+            // is the only one that will come. Either way a full current tenant is
+            // in once any active-tenant fetch settles.
             return (0, rxjs_1.merge)(actions$.pipe((0, operators_1.filter)((landingAction) => tenantReducer_1.updateTenantSuccess.match(landingAction) ||
                 tenantReducer_1.updateTenantFailure.match(landingAction)), (0, operators_1.take)(1), (0, operators_1.map)(() => tenantsLoaded)), (0, rxjs_1.of)((0, tenantReducer_1.fetchActiveTenant)(userId, landingTenantId, zeniSessionId)));
         }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, tenantReducer_1.updateTenantsFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected error', 'Fetch All Tenants REST API call errored out' +

package/lib/entity/tenant/tenantSelector.js

@@ -29,29 +29,29 @@ function getTenantIdByCompanyId(tenantState, companyId) {
     return (Object.values(tenantState.tenantsById).find((tenant) => tenant.companyId === companyId) ??
         Object.values(tenantState.tenantSummariesById).find((tenantSummary) => tenantSummary.companyId === companyId))?.tenantId;
 }
+/** One tenant's entry: its full record when loaded, else its list entry. */
+function getTenantListEntry(tenantState, tenantId) {
+    const tenant = tenantState.tenantsById[tenantId];
+    if (tenant != null) {
+        return {
+            companyId: tenant.companyId,
+            companyName: tenant.companyName,
+            tenantEmailDomain: tenant.tenantEmailDomain,
+            tenantId: tenant.tenantId,
+            userLastCheckInTime: tenant.userLastCheckInTime,
+            userRole: tenant.userRole,
+        };
+    }
+    const tenantSummary = tenantState.tenantSummariesById[tenantId];
+    return tenantSummary != null ? { ...tenantSummary, userRole: [] } : undefined;
+}
 /**
  * Every tenant in the list, most recently opened first. Roles are known only
  * for tenants whose full record is loaded; the list itself carries none.
  */
 function getTenantListEntriesByCheckInDate(tenantState) {
     const entries = tenantState.tenantIds
-        .map((tenantId) => {
-        const tenant = tenantState.tenantsById[tenantId];
-        const tenantSummary = tenantState.tenantSummariesById[tenantId];
-        if (tenant != null) {
-            return {
-                companyId: tenant.companyId,
-                companyName: tenant.companyName,
-                tenantEmailDomain: tenant.tenantEmailDomain,
-                tenantId: tenant.tenantId,
-                userLastCheckInTime: tenant.userLastCheckInTime,
-                userRole: tenant.userRole,
-            };
-        }
-        return tenantSummary != null
-            ? { ...tenantSummary, userRole: [] }
-            : undefined;
-    })
+        .map((tenantId) => getTenantListEntry(tenantState, tenantId))
         .filter((entry) => entry != null);
     return (0, orderBy_1.default)(entries, (entry) => entry.userLastCheckInTime.valueOf(), 'desc');
 }
@@ -89,7 +89,7 @@ const isCurrentTenantLoaded = (state) => {
 };
 exports.isCurrentTenantLoaded = isCurrentTenantLoaded;
 exports.getTenantBaseViewForTenantId = (0, toolkit_1.createSelector)((state) => state.tenantState, (state) => state.companyState, (_state, tenantId) => tenantId, (tenantState, companyState, tenantId) => {
-    const entry = getTenantListEntriesByCheckInDate(tenantState).find((listEntry) => listEntry.tenantId === tenantId);
+    const entry = getTenantListEntry(tenantState, tenantId);
     return entry != null
         ? getTenantBaseViewForEntry(entry, companyState)
         : undefined;

package/lib/esm/entity/tenant/epic/fetchAllTenantsEpic.js

@@ -1,7 +1,7 @@
 import { defer, from, merge, of } from 'rxjs';
 import { catchError, filter, map, mergeMap, switchMap, take, } from 'rxjs/operators';
 import { toMonth } from '../../../commonStateTypes/timePeriod';
-import { createZeniAPIStatus, isSuccessResponse, } from '../../../responsePayload';
+import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { getSessionEndpointsLoader } from '../../../sessionEndpointsLoader';
 import { date, dateNow } from '../../../zeniDayJS';
 import { fetchActiveTenant, fetchAllTenants, updateTenantFailure, updateTenantSuccess, updateTenantSummariesSuccess, updateTenantsFailure, } from '../tenantReducer';
@@ -51,6 +51,11 @@ export const fetchAllTenantsEpic = (actions$, state, zeniAPI) => {
             // Screens that wait for this fetch (sign-in, the root route) read the
             // landing tenant's roles and product settings, which the list does
             // not carry, so it completes only once that tenant's record is in.
+            // The wait is deliberately not scoped to the landing tenant:
+            // fetchActiveTenantEpic switches to the latest request, so another
+            // tenant's fetch dispatched meanwhile cancels this one and its answer
+            // is the only one that will come. Either way a full current tenant is
+            // in once any active-tenant fetch settles.
             return merge(actions$.pipe(filter((landingAction) => updateTenantSuccess.match(landingAction) ||
                 updateTenantFailure.match(landingAction)), take(1), map(() => tenantsLoaded)), of(fetchActiveTenant(userId, landingTenantId, zeniSessionId)));
         }), catchError((error) => of(updateTenantsFailure(createZeniAPIStatus('Unexpected error', 'Fetch All Tenants REST API call errored out' +

package/lib/esm/entity/tenant/tenantSelector.js

@@ -19,29 +19,29 @@ export function getTenantIdByCompanyId(tenantState, companyId) {
     return (Object.values(tenantState.tenantsById).find((tenant) => tenant.companyId === companyId) ??
         Object.values(tenantState.tenantSummariesById).find((tenantSummary) => tenantSummary.companyId === companyId))?.tenantId;
 }
+/** One tenant's entry: its full record when loaded, else its list entry. */
+function getTenantListEntry(tenantState, tenantId) {
+    const tenant = tenantState.tenantsById[tenantId];
+    if (tenant != null) {
+        return {
+            companyId: tenant.companyId,
+            companyName: tenant.companyName,
+            tenantEmailDomain: tenant.tenantEmailDomain,
+            tenantId: tenant.tenantId,
+            userLastCheckInTime: tenant.userLastCheckInTime,
+            userRole: tenant.userRole,
+        };
+    }
+    const tenantSummary = tenantState.tenantSummariesById[tenantId];
+    return tenantSummary != null ? { ...tenantSummary, userRole: [] } : undefined;
+}
 /**
  * Every tenant in the list, most recently opened first. Roles are known only
  * for tenants whose full record is loaded; the list itself carries none.
  */
 function getTenantListEntriesByCheckInDate(tenantState) {
     const entries = tenantState.tenantIds
-        .map((tenantId) => {
-        const tenant = tenantState.tenantsById[tenantId];
-        const tenantSummary = tenantState.tenantSummariesById[tenantId];
-        if (tenant != null) {
-            return {
-                companyId: tenant.companyId,
-                companyName: tenant.companyName,
-                tenantEmailDomain: tenant.tenantEmailDomain,
-                tenantId: tenant.tenantId,
-                userLastCheckInTime: tenant.userLastCheckInTime,
-                userRole: tenant.userRole,
-            };
-        }
-        return tenantSummary != null
-            ? { ...tenantSummary, userRole: [] }
-            : undefined;
-    })
+        .map((tenantId) => getTenantListEntry(tenantState, tenantId))
         .filter((entry) => entry != null);
     return orderBy(entries, (entry) => entry.userLastCheckInTime.valueOf(), 'desc');
 }
@@ -77,7 +77,7 @@ export const isCurrentTenantLoaded = (state) => {
     return currentTenantId != null && isTenantLoaded(state, currentTenantId);
 };
 export const getTenantBaseViewForTenantId = createSelector((state) => state.tenantState, (state) => state.companyState, (_state, tenantId) => tenantId, (tenantState, companyState, tenantId) => {
-    const entry = getTenantListEntriesByCheckInDate(tenantState).find((listEntry) => listEntry.tenantId === tenantId);
+    const entry = getTenantListEntry(tenantState, tenantId);
     return entry != null
         ? getTenantBaseViewForEntry(entry, companyState)
         : undefined;

package/package.json

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