@zeniai/client-epic-state 5.3.16 → 5.3.18-betaAK1

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

@@ -1,62 +1,65 @@
-import { defer, from, of } from 'rxjs';
-import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
+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 { initializeSelectedPeriodForTenants } from '../../../view/expenseAutomationView/expenseAutomationViewReducer';
 import { date, dateNow } from '../../../zeniDayJS';
-import { updateCompanies } from '../../company/companyReducer';
-import { fetchAllTenants, updateTenantsFailure, updateTenantsSuccess, } from '../tenantReducer';
+import { fetchActiveTenant, fetchAllTenants, updateTenantFailure, updateTenantSuccess, updateTenantSummariesSuccess, updateTenantsFailure, } from '../tenantReducer';
+// Only what the tenant switcher and tenant lookups read (~0.3 KB a tenant
+// instead of ~18 KB with full records and companies). A tenant's full record
+// comes from `fetchActiveTenant` when it is opened.
+const TENANT_SUMMARIES_QUERY = {
+    is_full: false,
+    is_include_companies_in_response: false,
+};
+/**
+ * The tenant the app lands on: the selected one, or the most recently opened
+ * when none is selected (sign-in, the root route).
+ */
+function getLandingTenantId(tenants, currentTenantId) {
+    if (currentTenantId != null &&
+        tenants.some((tenant) => tenant.tenant_id === currentTenantId)) {
+        return currentTenantId;
+    }
+    const lastCheckIn = (tenant) => tenant.user_last_check_in_time_into_tenant != null
+        ? date(tenant.user_last_check_in_time_into_tenant).valueOf()
+        : 0;
+    return tenants.reduce((mostRecent, tenant) => mostRecent == null || lastCheckIn(tenant) > lastCheckIn(mostRecent)
+        ? tenant
+        : mostRecent, undefined)?.tenant_id;
+}
 export const fetchAllTenantsEpic = (actions$, state, zeniAPI) => {
-    const queryParam = {
-        is_include_companies_in_response: true,
-    };
     return actions$.pipe(filter(fetchAllTenants.match), switchMap((action) => {
-        const fetchTenants$ = defer(() => zeniAPI.getJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/users/${action.payload.userId}/tenants?query=${encodeURIComponent(JSON.stringify(queryParam))}`, Object.assign({ 'zeni-user-id': action.payload.userId }, { 'zeni-tenant-id': '' }, action.payload.zeniSessionId != null
-            ? { 'zeni-session-id': action.payload.zeniSessionId }
-            : {}))).pipe(mergeMap((response) => {
-            const currentTenantId = state.value.tenantState.currentTenantId;
-            if (isSuccessResponse(response) && response.data != null) {
-                const defaultSelectedPeriodsForTenants = getDefaultSelectedPeriodsForTenants(response.data);
-                let actions = [
-                    updateTenantsSuccess(response.data),
-                    initializeSelectedPeriodForTenants({
-                        selectedPeriodByTenantId: defaultSelectedPeriodsForTenants,
-                    }),
-                ];
-                if (response.data.companies != null) {
-                    let companiesPayload = response.data.companies;
-                    if (currentTenantId != null) {
-                        // filter out this tenant ID related company detail
-                        // Find companyID for this tenant
-                        const currentTenantPayload = response.data.tenants.find((tenant) => tenant.tenant_id === currentTenantId);
-                        if (currentTenantPayload != null) {
-                            companiesPayload = response.data.companies.filter((company) => company.company_id !== currentTenantPayload.company_id);
-                        }
-                        else {
-                            console.warn('Selected tenant record not found in response', currentTenantId);
-                        }
-                    }
-                    actions = [
-                        updateCompanies({
-                            payload: companiesPayload,
-                            schema: {},
-                        }),
-                        ...actions,
-                    ];
-                }
-                return from(actions);
-            }
-            else {
+        const { userId, zeniSessionId } = action.payload;
+        const fetchTenants$ = defer(() => zeniAPI.getJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/users/${userId}/tenants?query=${encodeURIComponent(JSON.stringify(TENANT_SUMMARIES_QUERY))}`, Object.assign({ 'zeni-user-id': userId }, { 'zeni-tenant-id': '' }, zeniSessionId != null ? { 'zeni-session-id': zeniSessionId } : {}))).pipe(mergeMap((response) => {
+            if (!isSuccessResponse(response) || response.data == null) {
                 return of(updateTenantsFailure(response.status));
             }
+            const { tenants } = response.data;
+            if (tenants.length === 0) {
+                return of(updateTenantsFailure(createZeniAPIStatus('Unexpected error', 'Empty list of tenants')));
+            }
+            const tenantsLoaded = updateTenantSummariesSuccess(tenants);
+            const { tenantState } = state.value;
+            const landingTenantId = getLandingTenantId(tenants, tenantState.currentTenantId);
+            const isLandingTenantLoadedOrLoading = landingTenantId == null ||
+                tenantState.tenantsById[landingTenantId] != null ||
+                tenantState.activeTenantFetchState.fetchState === 'In-Progress';
+            if (isLandingTenantLoadedOrLoading) {
+                return of(tenantsLoaded);
+            }
+            // 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.
+            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' +
             JSON.stringify(error))))));
         const sessionEndpointsLoader = getSessionEndpointsLoader();
         if (sessionEndpointsLoader == null) {
             return fetchTenants$;
         }
-        return defer(() => from(sessionEndpointsLoader(action.payload.userId, action.payload.zeniSessionId))).pipe(switchMap(() => fetchTenants$), catchError((error) => of(updateTenantsFailure(createZeniAPIStatus('Unexpected error', 'Loading session endpoints errored out: ' +
+        return defer(() => from(sessionEndpointsLoader(userId, zeniSessionId))).pipe(switchMap(() => fetchTenants$), catchError((error) => of(updateTenantsFailure(createZeniAPIStatus('Unexpected error', 'Loading session endpoints errored out: ' +
             JSON.stringify(error))))));
     }));
 };

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

@@ -17,6 +17,7 @@ export const initialState = {
     error: undefined,
     accountLocked: false,
     tenantsById: {},
+    tenantSummariesById: {},
     onboardingTenantsById: {},
     tenantIds: [],
     signInState: 'Not-Started',
@@ -107,26 +108,24 @@ const tenant = createSlice({
                 });
             },
         },
-        updateTenantsSuccess(draft, action) {
-            const { tenants, user } = action.payload;
+        updateTenantSummariesSuccess(draft, action) {
             draft.fetchState = 'Completed';
             draft.error = undefined;
-            const [tenantsbyId, tenantIds, firstUser] = mapTenantsPayloadToState(tenants, user);
-            tenantIds.forEach((tenantId) => {
-                const existingTenant = draft.tenantsById[tenantId];
-                tenantsbyId[tenantId] = applyTreasuryPromoUserFieldsFromPayload(existingTenant, tenantsbyId[tenantId], user);
-                if (existingTenant != null) {
-                    tenantsbyId[tenantId].capitalizableAccountOverrides =
-                        tenantsbyId[tenantId].capitalizableAccountOverrides ??
-                            existingTenant.capitalizableAccountOverrides;
-                    tenantsbyId[tenantId].capitalizationOnboardingDismissedAccounts =
-                        tenantsbyId[tenantId].capitalizationOnboardingDismissedAccounts ??
-                            existingTenant.capitalizationOnboardingDismissedAccounts;
+            const tenantSummariesById = {};
+            action.payload.forEach((payload) => {
+                tenantSummariesById[payload.tenant_id] =
+                    mapTenantSummaryPayloadToTenantSummary(payload);
+            });
+            draft.tenantSummariesById = tenantSummariesById;
+            draft.tenantIds = Object.keys(tenantSummariesById);
+            // A tenant missing from the list is no longer accessible to the user.
+            const accessibleTenantsById = {};
+            Object.values(draft.tenantsById).forEach((tenant) => {
+                if (tenantSummariesById[tenant.tenantId] != null) {
+                    accessibleTenantsById[tenant.tenantId] = tenant;
                 }
             });
-            draft.tenantsById = tenantsbyId;
-            draft.tenantIds = tenantIds;
-            draft.loggedInUser = assignWith(draft.loggedInUser ?? {}, firstUser, (objValue, srcValue) => srcValue ?? objValue);
+            draft.tenantsById = accessibleTenantsById;
         },
         updateTenantsFailure(draft, action) {
             draft.fetchState = 'Error';
@@ -134,6 +133,7 @@ const tenant = createSlice({
             draft.error = action.payload;
             draft.tenantIds = [];
             draft.tenantsById = {};
+            draft.tenantSummariesById = {};
         },
         updateTenantSuccess(draft, action) {
             const { tenants, user } = action.payload;
@@ -242,6 +242,7 @@ const tenant = createSlice({
             draft.signInState = 'Error';
             draft.tenantIds = [];
             draft.tenantsById = {};
+            draft.tenantSummariesById = {};
         },
         updateTenantReimbursementInfo(draft, action) {
             const { tenant_id, reimbursement_info } = action.payload;
@@ -934,7 +935,7 @@ const tenant = createSlice({
         });
     },
 });
-export const { updateTenants, fetchAllTenants, updateTenantsSuccess, updateTenantsFailure, fetchActiveTenant, updateTenantSuccess, updateTenantFailure, updateCurrentTenant, fetchExcludedResources, updateExcludedResourcesSuccess, updateExcludedResourcesFailure, doSignIn, doMagicLinkSignIn, magicLinkSignInSuccess, magicLinkSignInFailure, sendEmailMagicLinkToUser, sendEmailMagicLinkToUserSuccess, sendEmailMagicLinkToUserFailure, updateSignInState, doSignOut, signOutSuccess, sendSessionHeartbeat, sessionHeartbeatSuccess, sessionHeartbeatFailure, updateLoggedInUser, fetchExternalConnections, saveExternalConnection, saveExternalConnectionSuccess, saveExternalConnectionFailure, fetchExternalConnectionsFailure, fetchExternalConnectionsSuccess, saveAPIKeyConnection, saveAPIKeyConnectionSuccess, saveAPIKeyConnectionFailure, saveOAuthConnection, saveOAuthConnectionSuccess, saveOAuthConnectionFailure, saveConnectorCredentials, saveConnectorCredentialsSuccess, saveConnectorCredentialsFailure, initEmailConnectOAuth, initEmailConnectOAuthSuccess, initEmailConnectOAuthFailure, deleteConnection, deleteConnectionSuccess, deleteConnectionFailure, fetchSubscriptionSummaryForTenant, updateSubscriptionSummaryForTenantSuccess, updateSubscriptionSummaryForTenantFailure, updateOnboardingTenants, removeOnboardingTenant, updateTenantReimbursementInfo, updateReferViewedForLoggedInUser, resetSignInState, trigger2FA, updateTenantAccountingClassesEnabled, updateTenantAccountingProjectsEnabled, updateTenantAutoReviewIncomeWithoutCustomer, updateTenantProductSettings, updateTenantCapitalizationOnboardingDismissed, updateTenantCapitalizationAccountOverride, updateTenantMasterTOSInfo, verifyDeviceWithTwoFA, verifyDeviceWithTwoFASuccess, verifyDeviceWithTwoFAFailure, updateTreasuryVideoViewedForLoggedInUser, updateTreasuryPromoRemindMeLaterClickedForLoggedInUser, updateTreasuryPromoIntroClosedByOutsideClickForLoggedInUser, resendVerifyDeviceOTP, resendVerifyDeviceOTPSuccess, resendVerifyDeviceOTPFailure, } = tenant.actions;
+export const { updateTenants, fetchAllTenants, updateTenantSummariesSuccess, updateTenantsFailure, fetchActiveTenant, updateTenantSuccess, updateTenantFailure, updateCurrentTenant, fetchExcludedResources, updateExcludedResourcesSuccess, updateExcludedResourcesFailure, doSignIn, doMagicLinkSignIn, magicLinkSignInSuccess, magicLinkSignInFailure, sendEmailMagicLinkToUser, sendEmailMagicLinkToUserSuccess, sendEmailMagicLinkToUserFailure, updateSignInState, doSignOut, signOutSuccess, sendSessionHeartbeat, sessionHeartbeatSuccess, sessionHeartbeatFailure, updateLoggedInUser, fetchExternalConnections, saveExternalConnection, saveExternalConnectionSuccess, saveExternalConnectionFailure, fetchExternalConnectionsFailure, fetchExternalConnectionsSuccess, saveAPIKeyConnection, saveAPIKeyConnectionSuccess, saveAPIKeyConnectionFailure, saveOAuthConnection, saveOAuthConnectionSuccess, saveOAuthConnectionFailure, saveConnectorCredentials, saveConnectorCredentialsSuccess, saveConnectorCredentialsFailure, initEmailConnectOAuth, initEmailConnectOAuthSuccess, initEmailConnectOAuthFailure, deleteConnection, deleteConnectionSuccess, deleteConnectionFailure, fetchSubscriptionSummaryForTenant, updateSubscriptionSummaryForTenantSuccess, updateSubscriptionSummaryForTenantFailure, updateOnboardingTenants, removeOnboardingTenant, updateTenantReimbursementInfo, updateReferViewedForLoggedInUser, resetSignInState, trigger2FA, updateTenantAccountingClassesEnabled, updateTenantAccountingProjectsEnabled, updateTenantAutoReviewIncomeWithoutCustomer, updateTenantProductSettings, updateTenantCapitalizationOnboardingDismissed, updateTenantCapitalizationAccountOverride, updateTenantMasterTOSInfo, verifyDeviceWithTwoFA, verifyDeviceWithTwoFASuccess, verifyDeviceWithTwoFAFailure, updateTreasuryVideoViewedForLoggedInUser, updateTreasuryPromoRemindMeLaterClickedForLoggedInUser, updateTreasuryPromoIntroClosedByOutsideClickForLoggedInUser, resendVerifyDeviceOTP, resendVerifyDeviceOTPSuccess, resendVerifyDeviceOTPFailure, } = tenant.actions;
 export default tenant.reducer;
 /**
  * Applies treasury promo user fields from the tenants API user block when present.
@@ -976,6 +977,16 @@ function mapTenantsPayloadToState(tenantsPayload, userTenantPayload) {
     const firstUser = mapTenantPayloadToUser(tenantsPayload[0]);
     return [tenantsById, tenantIds, firstUser];
 }
+function mapTenantSummaryPayloadToTenantSummary(payload) {
+    return {
+        companyId: payload.company_id,
+        companyName: payload.company_name,
+        tenantEmailDomain: payload.tenant_email_domain,
+        tenantId: payload.tenant_id,
+        // A tenant never opened sorts last, as in `mapTenantPayloadToTenant`.
+        userLastCheckInTime: date(payload.user_last_check_in_time_into_tenant ?? '1970-01-01'),
+    };
+}
 function mapTenantPayloadToTenant(payload, userTenantPayload) {
     const tenant = {
         accountingClassIDs: payload.accounting_class_ids,

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

@@ -16,50 +16,75 @@ export function getTenant(tenantState, companyState, tenantId) {
     }
 }
 export function getTenantIdByCompanyId(tenantState, companyId) {
-    return Object.values(tenantState.tenantsById).find((tenant) => tenant.companyId === companyId)?.tenantId;
+    return (Object.values(tenantState.tenantsById).find((tenant) => tenant.companyId === companyId) ??
+        Object.values(tenantState.tenantSummariesById).find((tenantSummary) => tenantSummary.companyId === companyId))?.tenantId;
 }
-function getTenantsByCheckInDate(tenantState, companyState) {
-    const tenants = tenantState.tenantIds
-        .map((tenantId) => getTenant(tenantState, companyState, tenantId))
-        .filter((value) => value != null);
-    const tenantsOrdered = orderBy(tenants, (value) => value.userLastCheckInTime.valueOf(), 'desc');
-    return {
-        order: 'descending_last_check_in',
-        tenantsInOrder: tenantsOrdered,
-    };
+/**
+ * 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;
+    })
+        .filter((entry) => entry != null);
+    return orderBy(entries, (entry) => entry.userLastCheckInTime.valueOf(), 'desc');
 }
-export const getTenantBaseViewForTenantId = createSelector((state) => state.tenantState, (state) => state.companyState, (_state, tenantId) => tenantId, (tenantState, companyState, tenantId) => {
-    const tenant = tenantState.tenantsById[tenantId];
-    if (tenant != null) {
-        const companyId = tenant.companyId;
-        const companyName = companyState.companiesById[companyId]?.companyInfo.name;
-        const tenantName = tenant.companyName ?? companyName;
-        const tenantEmailDomain = tenant.tenantEmailDomain;
-        const userRole = tenant.userRole;
-        const companyLocaleInfo = companyState.companiesById[companyId]?.companyLocaleInfo;
-        return {
-            tenantId,
-            tenantName,
-            tenantEmailDomain,
-            companyId,
-            companyName,
-            userRole,
-            companyLocaleInfo,
-        };
+/**
+ * The selected tenant's full record. With no tenant selected, or one the user
+ * can no longer open, it is the most recently opened loaded tenant. A selected
+ * tenant that is in the list but not loaded yet reads as no tenant until its
+ * fetch lands, so nothing renders another tenant's record in its place.
+ */
+function getCurrentTenantView(tenantState, companyState) {
+    const { currentTenantId } = tenantState;
+    if (currentTenantId != null) {
+        const tenant = getTenant(tenantState, companyState, currentTenantId);
+        if (tenant != null ||
+            tenantState.tenantSummariesById[currentTenantId] != null) {
+            return tenant;
+        }
     }
-    return undefined;
+    const mostRecentLoadedTenant = getTenantListEntriesByCheckInDate(tenantState).find((entry) => tenantState.tenantsById[entry.tenantId] != null);
+    return mostRecentLoadedTenant != null
+        ? getTenant(tenantState, companyState, mostRecentLoadedTenant.tenantId)
+        : undefined;
+}
+/** Whether the tenant's full record is loaded, not just its list entry. */
+export const isTenantLoaded = (state, tenantId) => state.tenantState.tenantsById[tenantId] != null;
+/**
+ * Whether the selected tenant's full record is loaded. Screens that act on
+ * roles or product settings wait for this rather than for either tenant fetch
+ * to complete: the tenants list alone carries neither.
+ */
+export const isCurrentTenantLoaded = (state) => {
+    const { currentTenantId } = state.tenantState;
+    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);
+    return entry != null
+        ? getTenantBaseViewForEntry(entry, companyState)
+        : undefined;
 });
 const getCurrentTenantHelper = (tenantState, companyState) => {
-    const { tenantIds, currentTenantId, excludedResourcesByTenant, subscriptionSummaryByTenant, } = tenantState;
-    let tenant = undefined;
-    if (currentTenantId != null) {
-        tenant = getTenant(tenantState, companyState, currentTenantId);
-    }
-    if (tenant == null && tenantIds.length > 0) {
-        const tenants = getTenantsByCheckInDate(tenantState, companyState);
-        tenant =
-            tenants.tenantsInOrder.length > 0 ? tenants.tenantsInOrder[0] : undefined;
-    }
+    const { currentTenantId, excludedResourcesByTenant, subscriptionSummaryByTenant, } = tenantState;
+    const tenant = getCurrentTenantView(tenantState, companyState);
     let excludedResources = undefined;
     if (tenant != null) {
         excludedResources = excludedResourcesByTenant[tenant.tenantId];
@@ -120,9 +145,12 @@ const getCurrentTenantHelper = (tenantState, companyState) => {
 export const getCurrentTenant = createSelector((state) => state.tenantState, (state) => state.companyState, (tenantState, companyState) => {
     return getCurrentTenantHelper(tenantState, companyState);
 });
-export const getTenantsByCheckInDateSelector = createSelector((state) => state.tenantState, (state) => state.companyState, (tenantState, companyState) => {
-    return getTenantsByCheckInDate(tenantState, companyState);
-});
+/**
+ * The selected tenant's id as soon as it is chosen. Unlike `getCurrentTenant`,
+ * it is set before the tenant fetch lands (boot reads it from the cached
+ * tenant list).
+ */
+export const getCurrentTenantId = (state) => state.tenantState.currentTenantId;
 export function getOnboardingTenantByTenantId(tenantState, tenantId) {
     const tenant = tenantState.onboardingTenantsById[tenantId];
     if (tenant != null) {
@@ -133,10 +161,7 @@ export function getOnboardingTenantByTenantId(tenantState, tenantId) {
     }
 }
 export const getTenantBaseById = createSelector((state) => state.tenantState, (state) => state.companyState, (tenantState, companyState) => {
-    return tenantState.tenantIds.map((tenantId) => {
-        const tenant = tenantState.tenantsById[tenantId];
-        return getTenantBaseViewForTenant(tenant, companyState);
-    });
+    return getTenantListEntriesByCheckInDate(tenantState).map((entry) => getTenantBaseViewForEntry(entry, companyState));
 });
 export const getTenantsBaseByCheckInDateSelector = createSelector((state) => state.tenantState, (state) => state.companyState, (tenantState, companyState) => {
     return getTenantsBaseByCheckInDate(tenantState, companyState);
@@ -165,16 +190,8 @@ export const isTenantUsingZeniCOA = (currentTenant) => {
     return currentTenant.company?.companyInfo.isZeniCOAInUse ?? true; // defaulting to true
 };
 export const getCurrentTenantExternalConnections = (tenantState, companyState) => {
-    const { externalConnectionsByTenant, tenantIds, currentTenantId } = tenantState;
-    let tenant = undefined;
-    if (currentTenantId != null) {
-        tenant = getTenant(tenantState, companyState, currentTenantId);
-    }
-    if (tenant == null && tenantIds.length > 0) {
-        const tenants = getTenantsByCheckInDate(tenantState, companyState);
-        tenant =
-            tenants.tenantsInOrder.length > 0 ? tenants.tenantsInOrder[0] : undefined;
-    }
+    const { externalConnectionsByTenant, currentTenantId } = tenantState;
+    const tenant = getCurrentTenantView(tenantState, companyState);
     let externalConnections = undefined;
     if (tenant != null) {
         externalConnections = externalConnectionsByTenant[tenant.tenantId];
@@ -188,58 +205,39 @@ export const getCurrentTenantExternalConnections = (tenantState, companyState) =
  * Helpers
  */
 function getTenantsBaseByCheckInDate(tenantState, companyState) {
-    const tenants = tenantState.tenantIds
-        .map((tenantId) => getTenant(tenantState, companyState, tenantId))
-        .filter((value) => value != null);
-    const tenantsOrdered = orderBy(tenants, (value) => value.userLastCheckInTime.valueOf(), 'desc');
-    const tenantsBaseOrdered = tenantsOrdered.map((tenant) => getTenantBaseViewForTenant(tenant, companyState));
     return {
         order: 'descending_last_check_in',
-        tenantsBaseInOrder: tenantsBaseOrdered,
+        tenantsBaseInOrder: getTenantListEntriesByCheckInDate(tenantState).map((entry) => getTenantBaseViewForEntry(entry, companyState)),
     };
 }
-const getTenantBaseViewForTenant = (tenant, companyState) => {
-    const tenantId = tenant.tenantId;
-    const companyId = tenant.companyId;
-    const companyName = companyState.companiesById[companyId]?.companyInfo.name;
-    const tenantName = tenant.companyName ?? companyName ?? tenant.tenantEmailDomain ?? '';
-    const tenantEmailDomain = tenant.tenantEmailDomain;
-    const userRole = tenant.userRole;
-    const companyLocaleInfo = companyState.companiesById[companyId]?.companyLocaleInfo;
+const getTenantBaseViewForEntry = (entry, companyState) => {
+    const company = companyState.companiesById[entry.companyId];
     return {
-        tenantId,
-        tenantName,
-        tenantEmailDomain,
-        companyId,
-        companyName,
-        userRole,
-        companyLocaleInfo,
+        tenantId: entry.tenantId,
+        tenantName: entry.companyName ??
+            company?.companyInfo.name ??
+            entry.tenantEmailDomain ??
+            '',
+        tenantEmailDomain: entry.tenantEmailDomain,
+        companyId: entry.companyId,
+        // Companies are loaded only for opened tenants; the list carries the name.
+        companyName: company?.companyInfo.name ?? entry.companyName,
+        userRole: entry.userRole,
+        companyLocaleInfo: company?.companyLocaleInfo,
     };
 };
 function getTenantCoreDetailsByCheckInDate(tenantState, companyState) {
-    const tenants = tenantState.tenantIds
-        .map((tenantId) => getTenant(tenantState, companyState, tenantId))
-        .filter((value) => value != null);
-    const tenantsOrdered = orderBy(tenants, (value) => value.userLastCheckInTime.valueOf(), 'desc');
-    const tenantsCoreDetailsOrdered = tenantsOrdered.map((tenant) => getTenantCoreDetailsViewForTenant(tenant, companyState));
     return {
         order: 'descending_last_check_in',
-        tenantsCoreDetailsInOrder: tenantsCoreDetailsOrdered,
+        tenantsCoreDetailsInOrder: getTenantListEntriesByCheckInDate(tenantState).map((entry) => ({
+            tenantId: entry.tenantId,
+            tenantName: entry.companyName ??
+                companyState.companiesById[entry.companyId]?.companyInfo.name,
+            tenantEmailDomain: entry.tenantEmailDomain,
+            companyId: entry.companyId,
+        })),
     };
 }
-const getTenantCoreDetailsViewForTenant = (tenant, companyState) => {
-    const tenantId = tenant.tenantId;
-    const companyId = tenant.companyId;
-    const companyName = companyState.companiesById[companyId]?.companyInfo.name;
-    const tenantName = tenant.companyName ?? companyName;
-    const tenantEmailDomain = tenant.tenantEmailDomain;
-    return {
-        tenantId,
-        tenantName,
-        tenantEmailDomain,
-        companyId,
-    };
-};
 export const toTenantCoreDetailsView = (tenantsBaseView) => {
     return tenantsBaseView.map(({ tenantId, tenantName, tenantEmailDomain, companyId }) => {
         return {

package/lib/esm/index.js

@@ -73,7 +73,7 @@ import { getSnackbar } from './entity/snackbar/snackbarSelector';
 import { ALL_WEEK_DAYS, toDayOfWeek, toPriorityCodeType, toTaskStatusCodeType, } from './entity/task/taskState';
 import { getTaskGroupById } from './entity/taskGroup/taskGroupSelector';
 import { deleteConnection, doMagicLinkSignIn, doSignIn, doSignOut, fetchActiveTenant, fetchAllTenants, fetchExcludedResources as fetchExcludedResourcesForTenant, fetchExternalConnections as fetchExternalConnectionsForTenant, fetchSubscriptionSummaryForTenant, initEmailConnectOAuth, resendVerifyDeviceOTP, resetSignInState, saveAPIKeyConnection, saveConnectorCredentials, saveExternalConnection as saveExternalConnectionForTenant, saveOAuthConnection, sendEmailMagicLinkToUser, sendSessionHeartbeat, toExternalIntegrationType, updateCurrentTenant, updateSignInState, verifyDeviceWithTwoFA, } from './entity/tenant/tenantReducer';
-import { DEFAULT_RECEIPTS_EMAIL, getCurrentTenant, getIsAccountingClassesEnabled, getIsAccountingProjectsEnabled, getIsAutoReviewIncomeWithoutCustomerEnabled, getReceiptsEmail, getTenantBaseById, getTenantBaseViewForTenantId, getTenantBaseViewForTenantView, getTenantsBaseByCheckInDateSelector, getTenantsByCheckInDateSelector, getTenantsCoreDetailsByCheckInDateSelector, isOtherProductsEnabledForTenant, isTenantBankingOnly, isTenantBookkeepingEnabled, isTenantCardsOnly, isTenantUsingZeniCOA, isZeniDomainTenant, toTenantCoreDetailsView, } from './entity/tenant/tenantSelector';
+import { DEFAULT_RECEIPTS_EMAIL, getCurrentTenant, getCurrentTenantId, getIsAccountingClassesEnabled, getIsAccountingProjectsEnabled, getIsAutoReviewIncomeWithoutCustomerEnabled, getReceiptsEmail, getTenantBaseById, getTenantBaseViewForTenantId, getTenantBaseViewForTenantView, getTenantsBaseByCheckInDateSelector, getTenantsCoreDetailsByCheckInDateSelector, isCurrentTenantLoaded, isOtherProductsEnabledForTenant, isTenantBankingOnly, isTenantBookkeepingEnabled, isTenantCardsOnly, isTenantLoaded, isTenantUsingZeniCOA, isZeniDomainTenant, toTenantCoreDetailsView, } from './entity/tenant/tenantSelector';
 import { toExternalSupportedTool } from './entity/tenant/tenantTypes';
 import { pushToastNotification } from './entity/toastNotification/toastNotificationReducer';
 import { getLastNotificationTime, getNotifications, } from './entity/toastNotification/toastNotificationSelector';
@@ -509,7 +509,7 @@ export { toTimeframeTick, mapTimePeriodtoTimeframeTick, toTimePeriod, toAbsolute
 export { toVendorSpendTrendFilterTabsTypeStrict, } from './entity/vendorExpense/vendorSpendTrendFilterTabType';
 export { getNumberOfPeriods };
 export { SCHEDULE_DAYS_OF_MONTH, toScheduleDaysOfMonth, toMonth, toMonthStrict, toQuarter, toQuarterStrict, };
-export { getTenantBaseById, getCurrentTenant, getIsAccountingClassesEnabled, getIsAccountingProjectsEnabled, getIsAutoReviewIncomeWithoutCustomerEnabled, getTenantsByCheckInDateSelector, getTenantsBaseByCheckInDateSelector, getTenantsCoreDetailsByCheckInDateSelector, toTenantCoreDetailsView, getTenantBaseViewForTenantView, getTenantBaseViewForTenantId, isZeniDomainTenant, isTenantUsingZeniCOA, fetchActiveTenant, fetchAllTenants, updateCurrentTenant, clearAll, doMagicLinkSignIn, verifyDeviceWithTwoFA, resendVerifyDeviceOTP, sendEmailMagicLinkToUser, doSignIn, updateSignInState, doSignOut, sendSessionHeartbeat, resetSignInState, fetchExcludedResourcesForTenant, fetchExternalConnectionsForTenant, saveExternalConnectionForTenant, deleteConnection, saveAPIKeyConnection, saveConnectorCredentials, saveOAuthConnection, initEmailConnectOAuth, toExternalIntegrationType, toExternalSupportedTool, fetchSubscriptionSummaryForTenant, isTenantBankingOnly, isTenantCardsOnly, isTenantBookkeepingEnabled, isOtherProductsEnabledForTenant, DEFAULT_RECEIPTS_EMAIL, getReceiptsEmail, };
+export { getTenantBaseById, getCurrentTenant, getCurrentTenantId, isCurrentTenantLoaded, isTenantLoaded, getIsAccountingClassesEnabled, getIsAccountingProjectsEnabled, getIsAutoReviewIncomeWithoutCustomerEnabled, getTenantsBaseByCheckInDateSelector, getTenantsCoreDetailsByCheckInDateSelector, toTenantCoreDetailsView, getTenantBaseViewForTenantView, getTenantBaseViewForTenantId, isZeniDomainTenant, isTenantUsingZeniCOA, fetchActiveTenant, fetchAllTenants, updateCurrentTenant, clearAll, doMagicLinkSignIn, verifyDeviceWithTwoFA, resendVerifyDeviceOTP, sendEmailMagicLinkToUser, doSignIn, updateSignInState, doSignOut, sendSessionHeartbeat, resetSignInState, fetchExcludedResourcesForTenant, fetchExternalConnectionsForTenant, saveExternalConnectionForTenant, deleteConnection, saveAPIKeyConnection, saveConnectorCredentials, saveOAuthConnection, initEmailConnectOAuth, toExternalIntegrationType, toExternalSupportedTool, fetchSubscriptionSummaryForTenant, isTenantBankingOnly, isTenantCardsOnly, isTenantBookkeepingEnabled, isOtherProductsEnabledForTenant, DEFAULT_RECEIPTS_EMAIL, getReceiptsEmail, };
 export { toAccountType, toAccountGroupType, getAccountGroupKey, getAllAccounts, getTransactionFilterAccountOptions, };
 export { getAllClasses, getClassById, getClassFilterOptions, } from './entity/class/classSelector';
 export { getForecast };

package/lib/esm/view/dashboard/dashboardEpic.js

@@ -88,10 +88,6 @@ export const fetchDashboardEpic = (actions$, state$) => actions$.pipe(filter(fet
         const revenueState = getRevenueReportFetchState(state.revenueState.uiState.selectedForecast?.id, state.revenueState);
         const opExState = getOperatingExpensesReportFetchState(state.opExState.uiState.selectedForecast?.id, state.opExState);
         const netBurnOrIncomeReportFetchState = getNetBurnOrIncomeReportFetchState(state.netBurnOrIncomeState.uiState.selectedForecast?.id, state.netBurnOrIncomeState);
-        if (state.tenantState.fetchState !== 'In-Progress' &&
-            !state.tenantState.hasValidState()) {
-            fetchActions.push(fetchAllTenants(userId));
-        }
         if (state.cardBalanceState.fetchState !== 'In-Progress' &&
             !state.cardBalanceState.hasValidState()) {
             fetchActions.push(fetchCardBalance());

package/lib/esm/view/dashboard/dashboardSelector.js

@@ -1,7 +1,7 @@
 import { createSelector } from '@reduxjs/toolkit';
 import { newBalancesFilter } from '../../commonStateTypes/coaBalance/coaBalancesFilter';
 import { reduceFetchState } from '../../commonStateTypes/reduceFetchState';
-import { getCurrentTenant, getTenantsByCheckInDateSelector, } from '../../entity/tenant/tenantSelector';
+import { getCurrentTenant } from '../../entity/tenant/tenantSelector';
 import { hasAdminLevelAccess, hasInvestorBankerLevelAccess, } from '../../entity/userRole/userRoleType';
 import { getApAgingReport } from '../apAgingView/apAgingReport/apAgingSelector';
 import { getArAgingReport } from '../arAgingView/arAgingReport/arAgingSelector';
@@ -34,8 +34,7 @@ const getCashInCashOutLast4Periods = (state) => getCashInCashOut(state.accountSt
 const getNetBurnOrIncomeStoryCard = (state) => getNetBurnOrIncomeStoryCardReport(state);
 const apAgingSelector = (state) => getApAgingReport(state);
 const arAgingSelector = (state) => getArAgingReport(state);
-const tenantSelector = createSelector(getTenantsByCheckInDateSelector, getCurrentTenant, (tenantsOrdered, currentTenant) => ({
-    tenantsOrdered,
+const tenantSelector = createSelector(getCurrentTenant, (currentTenant) => ({
     currentTenant,
 }));
 export const getDashboard = createSelector(tenantSelector, getCardBalance, getCashBalance, getOperatingExpensesForLast5Periods, getRevenueForLast4Periods, getTop6Expenses, getNetBurnOrIncomeForLast4Periods, getNetBurnOrIncomeStoryCard, getCashPositionLast5Periods, getCashInCashOutLast4Periods, getInsights, getCompanyPassportView, getTasksCardReport, getBillPayCardReport, getReimbursementCardReport, apAgingSelector, arAgingSelector, getRewardsPlanCard, getDashboardCardsOrdered, (state) => {

package/lib/esm/view/financeStatement/financeStatementEpic.js

@@ -15,12 +15,8 @@ export const fetchFinanceStatementEpic = (actions$, state$) => actions$.pipe(fil
         return of(fetchAllTenants(userId), fetchProfitAndLoss(), fetchBalanceSheet(), fetchCashFlow());
     }
     else {
-        const { tenantState, financeStatementState } = state;
+        const { financeStatementState } = state;
         const fetchActions = [];
-        if (tenantState.fetchState !== 'In-Progress' &&
-            !tenantState.hasValidState()) {
-            fetchActions.push(fetchAllTenants(userId));
-        }
         const pandLFetchState = getPandLReportFetchState(undefined, state.profitAndLossState);
         const balanceSheetFetchState = getBalanceSheetFetchState(state.balanceSheetState);
         const cashFlowFetchState = getCashFlowReportFetchState(state.cashFlowState);

package/lib/esm/view/people/peoplePageEpic.js

@@ -10,10 +10,6 @@ export const fetchPeoplePageEpic = (actions$, state$) => actions$.pipe(filter(fe
     else {
         const state = state$.value;
         const fetchActions = [];
-        if (state.tenantState.fetchState !== 'In-Progress' &&
-            !state.tenantState.hasValidState()) {
-            fetchActions.push(fetchAllTenants(userId));
-        }
         if (state.peopleState.fetchState != 'In-Progress' &&
             !state.peopleState.hasValidState()) {
             fetchActions.push(fetchPeople());

package/lib/index.d.ts

@@ -147,7 +147,7 @@ import { getTaskGroupById } from './entity/taskGroup/taskGroupSelector';
 import { TaskGroupState } from './entity/taskGroup/taskGroupState';
 import { TaskGroupTemplate } from './entity/taskGroupTemplate/taskGroupTemplateState';
 import { DoSignInPayload, deleteConnection, doMagicLinkSignIn, doSignIn, doSignOut, fetchActiveTenant, fetchAllTenants, fetchExcludedResources as fetchExcludedResourcesForTenant, fetchExternalConnections as fetchExternalConnectionsForTenant, fetchSubscriptionSummaryForTenant, initEmailConnectOAuth, resendVerifyDeviceOTP, resetSignInState, saveAPIKeyConnection, saveConnectorCredentials, saveExternalConnection as saveExternalConnectionForTenant, saveOAuthConnection, sendEmailMagicLinkToUser, sendSessionHeartbeat, toExternalIntegrationType, updateCurrentTenant, updateSignInState, verifyDeviceWithTwoFA } from './entity/tenant/tenantReducer';
-import { CurrentTenant, DEFAULT_RECEIPTS_EMAIL, TenantBaseView, TenantCoreDetailsView, TenantView, TenantsBaseOrdered, TenantsOrdered, getCurrentTenant, getIsAccountingClassesEnabled, getIsAccountingProjectsEnabled, getIsAutoReviewIncomeWithoutCustomerEnabled, getReceiptsEmail, getTenantBaseById, getTenantBaseViewForTenantId, getTenantBaseViewForTenantView, getTenantsBaseByCheckInDateSelector, getTenantsByCheckInDateSelector, getTenantsCoreDetailsByCheckInDateSelector, isOtherProductsEnabledForTenant, isTenantBankingOnly, isTenantBookkeepingEnabled, isTenantCardsOnly, isTenantUsingZeniCOA, isZeniDomainTenant, toTenantCoreDetailsView } from './entity/tenant/tenantSelector';
+import { CurrentTenant, DEFAULT_RECEIPTS_EMAIL, TenantBaseView, TenantCoreDetailsView, TenantView, TenantsBaseOrdered, getCurrentTenant, getCurrentTenantId, getIsAccountingClassesEnabled, getIsAccountingProjectsEnabled, getIsAutoReviewIncomeWithoutCustomerEnabled, getReceiptsEmail, getTenantBaseById, getTenantBaseViewForTenantId, getTenantBaseViewForTenantView, getTenantsBaseByCheckInDateSelector, getTenantsCoreDetailsByCheckInDateSelector, isCurrentTenantLoaded, isOtherProductsEnabledForTenant, isTenantBankingOnly, isTenantBookkeepingEnabled, isTenantCardsOnly, isTenantLoaded, isTenantUsingZeniCOA, isZeniDomainTenant, toTenantCoreDetailsView } from './entity/tenant/tenantSelector';
 import { CapitalizableAccount, CapitalizableAccounts, CapitalizableClassificationType, CapitalizableMatchPattern, Connection, LoggedInUser, RoleResource, Tenant, TenantProductSettings } from './entity/tenant/tenantState';
 import { toExternalSupportedTool } from './entity/tenant/tenantTypes';
 import { ToastNotificationPayload } from './entity/toastNotification/toastNotificationPayload';
@@ -754,7 +754,7 @@ export { TimeframeTick, TimeframeTickWithMetaData, toTimeframeTick, mapTimePerio
 export { VendorSpendTrendFilterTabType, toVendorSpendTrendFilterTabsTypeStrict, } from './entity/vendorExpense/vendorSpendTrendFilterTabType';
 export { getNumberOfPeriods };
 export { SCHEDULE_DAYS_OF_MONTH, ScheduleDaysOfMonth, toScheduleDaysOfMonth, Day, Month, toMonth, toMonthStrict, Quarter, toQuarter, toQuarterStrict, AbsoluteDay, TimePeriod, };
-export { CapitalizableAccount, CapitalizableAccounts, CapitalizableClassificationType, CapitalizableMatchPattern, Tenant, TenantView, LoggedInUser, TenantBaseView, CurrentTenant, TenantProductSettings, getTenantBaseById, getCurrentTenant, getIsAccountingClassesEnabled, getIsAccountingProjectsEnabled, getIsAutoReviewIncomeWithoutCustomerEnabled, getTenantsByCheckInDateSelector, getTenantsBaseByCheckInDateSelector, getTenantsCoreDetailsByCheckInDateSelector, toTenantCoreDetailsView, getTenantBaseViewForTenantView, getTenantBaseViewForTenantId, isZeniDomainTenant, isTenantUsingZeniCOA, TenantsBaseOrdered, TenantsOrdered, TenantCoreDetailsView, fetchActiveTenant, fetchAllTenants, updateCurrentTenant, clearAll, doMagicLinkSignIn, verifyDeviceWithTwoFA, resendVerifyDeviceOTP, sendEmailMagicLinkToUser, doSignIn, updateSignInState, DoSignInPayload, doSignOut, sendSessionHeartbeat, resetSignInState, RoleResource, Connection, fetchExcludedResourcesForTenant, fetchExternalConnectionsForTenant, saveExternalConnectionForTenant, deleteConnection, saveAPIKeyConnection, saveConnectorCredentials, saveOAuthConnection, initEmailConnectOAuth, toExternalIntegrationType, toExternalSupportedTool, fetchSubscriptionSummaryForTenant, isTenantBankingOnly, isTenantCardsOnly, isTenantBookkeepingEnabled, isOtherProductsEnabledForTenant, DEFAULT_RECEIPTS_EMAIL, getReceiptsEmail, };
+export { CapitalizableAccount, CapitalizableAccounts, CapitalizableClassificationType, CapitalizableMatchPattern, Tenant, TenantView, LoggedInUser, TenantBaseView, CurrentTenant, TenantProductSettings, getTenantBaseById, getCurrentTenant, getCurrentTenantId, isCurrentTenantLoaded, isTenantLoaded, getIsAccountingClassesEnabled, getIsAccountingProjectsEnabled, getIsAutoReviewIncomeWithoutCustomerEnabled, getTenantsBaseByCheckInDateSelector, getTenantsCoreDetailsByCheckInDateSelector, toTenantCoreDetailsView, getTenantBaseViewForTenantView, getTenantBaseViewForTenantId, isZeniDomainTenant, isTenantUsingZeniCOA, TenantsBaseOrdered, TenantCoreDetailsView, fetchActiveTenant, fetchAllTenants, updateCurrentTenant, clearAll, doMagicLinkSignIn, verifyDeviceWithTwoFA, resendVerifyDeviceOTP, sendEmailMagicLinkToUser, doSignIn, updateSignInState, DoSignInPayload, doSignOut, sendSessionHeartbeat, resetSignInState, RoleResource, Connection, fetchExcludedResourcesForTenant, fetchExternalConnectionsForTenant, saveExternalConnectionForTenant, deleteConnection, saveAPIKeyConnection, saveConnectorCredentials, saveOAuthConnection, initEmailConnectOAuth, toExternalIntegrationType, toExternalSupportedTool, fetchSubscriptionSummaryForTenant, isTenantBankingOnly, isTenantCardsOnly, isTenantBookkeepingEnabled, isOtherProductsEnabledForTenant, DEFAULT_RECEIPTS_EMAIL, getReceiptsEmail, };
 export { Account, AccountType, AccountBase, StatementCloseDay, toAccountType, AccountReport, NestedAccountReport, AccountWithBalanceReport, AccountGroup, AccountGroupReportV2, AccountGroupType, toAccountGroupType, AccountGroupReport, getAccountGroupKey, AccountGroupKey, RecommendedAccountBase, AccountFilterOption, getAllAccounts, getTransactionFilterAccountOptions, };
 export { Class, ClassBase, RecommendedClassBase, } from './entity/class/classState';
 export { ClassFilterOption, getAllClasses, getClassById, getClassFilterOptions, } from './entity/class/classSelector';