@zeniai/client-epic-state 5.1.68 → 5.1.69

package/lib/esm/view/spendManagement/billPay/billDetailView/billDetailViewSelector.js

@@ -13,7 +13,7 @@ import { getUserByUserId } from '../../../../entity/user/userSelector';
 import { getUserRoleByUserId } from '../../../../entity/userRole/userRoleSelector';
 import { getActivityHistory, } from '../../commonHistoryView/commonHistorySelector';
 import { getAllFundingAccounts, } from '../../commonSetup/setupViewSelector';
-import { getLatestApprovalDate, isAwaitingMarkAsPaid, isSodAdminFallbackEligibleForStep, isSodExcludedViewerBlocked, } from '../../helpers';
+import { getLatestApprovalDate, isAwaitingMarkAsPaid, isSodAdminFallbackEligibleForStep, isSodExcludedViewerBlocked, shouldShowSodAdminLabel, } from '../../helpers';
 import { getActivityRealTimeApproval, } from '../../realTimeApprovalView/realTimeApprovalSelector';
 import { getEntityRealTimeApprovalDetailKey } from '../../realTimeApprovalView/realTimeApprovalState';
 import { getBillPaymentSubConfigCodeKey, getInternationalSubConfigCodeKey, getInternationalWireMethodCodeKey, } from '../billPayConfig/billPayConfigPayload';
@@ -22,7 +22,12 @@ import { getBillPayConfigMethodKey, toBillPaymentSubConfigCodeKeyType, } from '.
 import { getPreviousBills, } from '../previousBills/previousBillsSelector';
 import { getBillTransactionDetailKey, initialBillDetailView, } from './billDetailViewState';
 export const getBillActivities = (state, billId, billStageCode) => {
-    const { billDetailViewState, approvalRuleState, entityApprovalStatusState, userState, } = state;
+    const { billDetailViewState, approvalRuleState, entityApprovalStatusState, userState, billTransactionState, } = state;
+    // Note: createdBy is undefined until billTransactionState is populated.
+    // getBillActivities is called from getBillDetailView which runs after the
+    // bill entity epic completes — this assumption must hold for showSodAdminLabel
+    // to render on first paint.
+    const createdBy = billTransactionState.transactionById[billId]?.createdBy;
     const key = getBillTransactionDetailKey(billId);
     const billDetail = recordGet(billDetailViewState.billDetailById, key, undefined);
     let billActivities = [];
@@ -85,6 +90,7 @@ export const getBillActivities = (state, billId, billStageCode) => {
                             actorsActivity,
                             isOriginalApprovalStep: step.isOriginalApprovalStep,
                             displayPendingApproverAsAdmin: isSodAdminFallbackEligibleForStep(sodExcludedApproverUserId, isAdminFallbackApprover, actorsActivity),
+                            showSodAdminLabel: shouldShowSodAdminLabel(sodExcludedApproverUserId, actorsActivity, createdBy),
                         };
                     }),
                 };

package/lib/esm/view/spendManagement/helpers.js

@@ -19,6 +19,18 @@ export const isSodAdminFallbackEligibleForStep = (sodExcludedApproverUserId, isA
     return (pendingResolvedApprovers.length > 0 &&
         pendingResolvedApprovers.every((activity) => getUserActorId(activity) === sodExcludedApproverUserId));
 };
+const isSodExcludedUserSolePendingApproverOnStep = (sodExcludedApproverUserId, stepActorsActivity = []) => {
+    if (sodExcludedApproverUserId == null) {
+        return false;
+    }
+    const pendingResolvedApprovers = stepActorsActivity.filter((activity) => activity.activity === 'pending' && getUserActorId(activity) != null);
+    return (pendingResolvedApprovers.length > 0 &&
+        pendingResolvedApprovers.every((activity) => getUserActorId(activity) === sodExcludedApproverUserId));
+};
+export const shouldShowSodAdminLabel = (sodExcludedApproverUserId, stepActorsActivity = [], entitySubjectUserId) => sodExcludedApproverUserId != null &&
+    entitySubjectUserId != null &&
+    sodExcludedApproverUserId === entitySubjectUserId &&
+    isSodExcludedUserSolePendingApproverOnStep(sodExcludedApproverUserId, stepActorsActivity);
 export const getLatestApprovalDate = (allActivities) => {
     let allStepsWithStatus = [];
     let allApprovedActions = [];

package/lib/esm/view/spendManagement/reimbursement/editRemiView/epics/fetchEditRemiDetailPageEpic.js

@@ -6,7 +6,6 @@ import { fetchUserFinancialAccount } from '../../../../userFinancialAccount/user
 import { getLatestCreatedUserBankAccount } from '../../../../userFinancialAccount/userFinancialAccountSelector';
 import { fetchMerchantList } from '../../../merchantList/merchantListReducer';
 import { fetchReimbursementConfig } from '../../reimbursementConfig/reimbursementConfigReducer';
-import { fetchRemiSetupApproverView } from '../../remiSetupApproverView/remiSetupApproverViewReducer';
 import { fetchEditRemiDetailPage, fetchRemiAndInitializeLocalStore, updatesPaymentToInLocalStore, } from '../editRemiViewReducer';
 export const fetchEditRemiDetailPageEpic = (actions$, state$) => actions$.pipe(filter(fetchEditRemiDetailPage.match), mergeMap((action) => {
     const { cacheOverride, isLimitedCategoryEnabled, reimbursementId, isShowDeletedReimbursementEnabled, } = action.payload;
@@ -59,17 +58,6 @@ export const fetchEditRemiDetailPageEpic = (actions$, state$) => actions$.pipe(f
         if (reimbursementId != null) {
             remiDetailActions.push(fetchRemiAndInitializeLocalStore(reimbursementId, false, isShowDeletedReimbursementEnabled));
         }
-        else {
-            const approvalRules = state.remiSetupApproverViewState;
-            if (approvalRules.fetchState !== 'Completed' &&
-                approvalRules.fetchState !== 'In-Progress') {
-                // Side-fetch from the edit-reim page bootstrap. The
-                // triggering action doesn't carry the V3 flag, so we
-                // explicitly target v1; v3 tenants re-fetch via their
-                // own screen connector.
-                remiDetailActions.push(fetchRemiSetupApproverView(true, false, false, false));
-            }
-        }
     }
     return concat(from(remiDetailActions));
 }));

package/lib/esm/view/spendManagement/reimbursement/remiDetailView/remiDetailViewSelector.js

@@ -7,7 +7,7 @@ import { getEntityApprovalStatusByIds } from '../../../../entity/entityApprovalS
 import { getUserByUserId } from '../../../../entity/user/userSelector';
 import { getUserRoleByUserId } from '../../../../entity/userRole/userRoleSelector';
 import { getActivityHistory, } from '../../commonHistoryView/commonHistorySelector';
-import { getLatestApprovalDate, isSodAdminFallbackEligibleForStep, isSodExcludedViewerBlocked, } from '../../helpers';
+import { getLatestApprovalDate, isSodAdminFallbackEligibleForStep, isSodExcludedViewerBlocked, shouldShowSodAdminLabel, } from '../../helpers';
 import { getActivityRealTimeApproval, } from '../../realTimeApprovalView/realTimeApprovalSelector';
 import { getReimbursementConfigByKey } from '../reimbursementConfig/reimbursementConfigSelector';
 import { REIMBURSEMENT_PAYMENT_NUMBER_OF_DAYS } from '../reimbursementConfig/reimbursementConfigState';
@@ -110,7 +110,8 @@ export const getRemiDetailView = (state, reimbursementId) => {
     };
 };
 export const getRemiActivities = (state, reimbursementId, billStageCode) => {
-    const { remiDetailViewState, approvalRuleState, entityApprovalStatusState, userState, } = state;
+    const { remiDetailViewState, approvalRuleState, entityApprovalStatusState, userState, reimbursementState, } = state;
+    const reimburseeUserId = reimbursementState.reimbursementById[reimbursementId]?.reimburseeUserId;
     const remiTransactionDetails = recordGet(remiDetailViewState.remiDetailById, reimbursementId, undefined);
     let remiActivities = [];
     if (remiTransactionDetails != null) {
@@ -172,6 +173,7 @@ export const getRemiActivities = (state, reimbursementId, billStageCode) => {
                             actorsActivity,
                             isOriginalApprovalStep: step.isOriginalApprovalStep,
                             displayPendingApproverAsAdmin: isSodAdminFallbackEligibleForStep(sodExcludedApproverUserId, isAdminFallbackApprover, actorsActivity),
+                            showSodAdminLabel: shouldShowSodAdminLabel(sodExcludedApproverUserId, actorsActivity, reimburseeUserId),
                         };
                     }),
                 };

package/lib/view/spendManagement/billPay/billDetailView/billDetailViewSelector.d.ts

@@ -55,6 +55,7 @@ export interface StepWithStatus extends StepWithUser {
     actorsActivity: ActorActivityWithUser[];
     isOriginalApprovalStep: boolean;
     displayPendingApproverAsAdmin?: boolean;
+    showSodAdminLabel?: boolean;
 }
 export interface ActorActivityWithUser {
     activity: ActivityStatus;

package/lib/view/spendManagement/billPay/billDetailView/billDetailViewSelector.js

@@ -28,7 +28,12 @@ const billPayConfigState_1 = require("../billPayConfig/billPayConfigState");
 const previousBillsSelector_1 = require("../previousBills/previousBillsSelector");
 const billDetailViewState_1 = require("./billDetailViewState");
 const getBillActivities = (state, billId, billStageCode) => {
-    const { billDetailViewState, approvalRuleState, entityApprovalStatusState, userState, } = state;
+    const { billDetailViewState, approvalRuleState, entityApprovalStatusState, userState, billTransactionState, } = state;
+    // Note: createdBy is undefined until billTransactionState is populated.
+    // getBillActivities is called from getBillDetailView which runs after the
+    // bill entity epic completes — this assumption must hold for showSodAdminLabel
+    // to render on first paint.
+    const createdBy = billTransactionState.transactionById[billId]?.createdBy;
     const key = (0, billDetailViewState_1.getBillTransactionDetailKey)(billId);
     const billDetail = (0, get_1.default)(billDetailViewState.billDetailById, key, undefined);
     let billActivities = [];
@@ -91,6 +96,7 @@ const getBillActivities = (state, billId, billStageCode) => {
                             actorsActivity,
                             isOriginalApprovalStep: step.isOriginalApprovalStep,
                             displayPendingApproverAsAdmin: (0, helpers_1.isSodAdminFallbackEligibleForStep)(sodExcludedApproverUserId, isAdminFallbackApprover, actorsActivity),
+                            showSodAdminLabel: (0, helpers_1.shouldShowSodAdminLabel)(sodExcludedApproverUserId, actorsActivity, createdBy),
                         };
                     }),
                 };

package/lib/view/spendManagement/helpers.d.ts

@@ -17,6 +17,7 @@ import { RemiActivity } from './reimbursement/remiDetailView/remiDetailViewSelec
 export declare const isUserActorOnApprovalStep: (userId: ID, stepActorsActivity: ActorActivityWithUser[]) => boolean;
 export declare const isSodExcludedViewerBlocked: (sodExcludedApproverUserId?: ID, signedInUserId?: ID, stepActorsActivity?: ActorActivityWithUser[]) => boolean;
 export declare const isSodAdminFallbackEligibleForStep: (sodExcludedApproverUserId?: ID, isAdminFallbackApprover?: boolean, stepActorsActivity?: ActorActivityWithUser[]) => boolean;
+export declare const shouldShowSodAdminLabel: (sodExcludedApproverUserId?: ID, stepActorsActivity?: ActorActivityWithUser[], entitySubjectUserId?: ID) => boolean;
 export declare const getLatestApprovalDate: (allActivities: BillActivity[] | RemiActivity[]) => ZeniDate | undefined;
 export declare function getSpendManagementEffectiveListPeriod(): import("../..").TimePeriod;
 export declare const getSelectedCompanyOfficer: (verificationDetails: BusinessVerificationDetails) => CompanyOfficersDetails | undefined;

package/lib/view/spendManagement/helpers.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toSameDayAchDisablementConfig = exports.checkIfLowBalance = exports.getReportIDPlusForecastIDFromSetupViewType = exports.isAwaitingMarkAsPaid = exports.isPaymentMethodOutsideZeni = exports.toAccountsPromoConfig = exports.getBulkOperationSuffix = exports.getRemiListUniqueType = exports.getBillListUniqueType = exports.isBulkProcessing = exports.getActualPaymentDate = exports.accountTypeSubConfigCodeToAccType = exports.isRecurringConfigChanged = exports.updateRecurringBillDetails = exports.getPaymentDateFromVendorReceiveDate = exports.getSelectedCompanyOfficer = exports.getLatestApprovalDate = exports.isSodAdminFallbackEligibleForStep = exports.isSodExcludedViewerBlocked = exports.isUserActorOnApprovalStep = void 0;
+exports.toSameDayAchDisablementConfig = exports.checkIfLowBalance = exports.getReportIDPlusForecastIDFromSetupViewType = exports.isAwaitingMarkAsPaid = exports.isPaymentMethodOutsideZeni = exports.toAccountsPromoConfig = exports.getBulkOperationSuffix = exports.getRemiListUniqueType = exports.getBillListUniqueType = exports.isBulkProcessing = exports.getActualPaymentDate = exports.accountTypeSubConfigCodeToAccType = exports.isRecurringConfigChanged = exports.updateRecurringBillDetails = exports.getPaymentDateFromVendorReceiveDate = exports.getSelectedCompanyOfficer = exports.getLatestApprovalDate = exports.shouldShowSodAdminLabel = exports.isSodAdminFallbackEligibleForStep = exports.isSodExcludedViewerBlocked = exports.isUserActorOnApprovalStep = void 0;
 exports.getSpendManagementEffectiveListPeriod = getSpendManagementEffectiveListPeriod;
 exports.showReimbursementPromoPage = showReimbursementPromoPage;
 exports.showBillPayPromoPage = showBillPayPromoPage;
@@ -33,6 +33,19 @@ const isSodAdminFallbackEligibleForStep = (sodExcludedApproverUserId, isAdminFal
         pendingResolvedApprovers.every((activity) => getUserActorId(activity) === sodExcludedApproverUserId));
 };
 exports.isSodAdminFallbackEligibleForStep = isSodAdminFallbackEligibleForStep;
+const isSodExcludedUserSolePendingApproverOnStep = (sodExcludedApproverUserId, stepActorsActivity = []) => {
+    if (sodExcludedApproverUserId == null) {
+        return false;
+    }
+    const pendingResolvedApprovers = stepActorsActivity.filter((activity) => activity.activity === 'pending' && getUserActorId(activity) != null);
+    return (pendingResolvedApprovers.length > 0 &&
+        pendingResolvedApprovers.every((activity) => getUserActorId(activity) === sodExcludedApproverUserId));
+};
+const shouldShowSodAdminLabel = (sodExcludedApproverUserId, stepActorsActivity = [], entitySubjectUserId) => sodExcludedApproverUserId != null &&
+    entitySubjectUserId != null &&
+    sodExcludedApproverUserId === entitySubjectUserId &&
+    isSodExcludedUserSolePendingApproverOnStep(sodExcludedApproverUserId, stepActorsActivity);
+exports.shouldShowSodAdminLabel = shouldShowSodAdminLabel;
 const getLatestApprovalDate = (allActivities) => {
     let allStepsWithStatus = [];
     let allApprovedActions = [];

package/lib/view/spendManagement/reimbursement/editRemiView/epics/fetchEditRemiDetailPageEpic.d.ts

@@ -7,7 +7,6 @@ import { fetchUserFinancialAccount } from '../../../../userFinancialAccount/user
 import { fetchMerchantList } from '../../../merchantList/merchantListReducer';
 import { fetchReimbursementConfig } from '../../reimbursementConfig/reimbursementConfigReducer';
 import { fetchRemiDetail } from '../../remiDetailView/remiDetailViewReducer';
-import { fetchRemiSetupApproverView } from '../../remiSetupApproverView/remiSetupApproverViewReducer';
 import { fetchEditRemiDetailPage, fetchRemiAndInitializeLocalStore, updatesPaymentToInLocalStore } from '../editRemiViewReducer';
-export type ActionType = ReturnType<typeof fetchEditRemiDetailPage> | ReturnType<typeof fetchRemiDetail> | ReturnType<typeof fetchClassList> | ReturnType<typeof fetchMerchantList> | ReturnType<typeof fetchUserFinancialAccount> | ReturnType<typeof updatesPaymentToInLocalStore> | ReturnType<typeof fetchReimbursementConfig> | ReturnType<typeof fetchAccountList> | ReturnType<typeof fetchRemiAndInitializeLocalStore> | ReturnType<typeof fetchRemiSetupApproverView>;
+export type ActionType = ReturnType<typeof fetchEditRemiDetailPage> | ReturnType<typeof fetchRemiDetail> | ReturnType<typeof fetchClassList> | ReturnType<typeof fetchMerchantList> | ReturnType<typeof fetchUserFinancialAccount> | ReturnType<typeof updatesPaymentToInLocalStore> | ReturnType<typeof fetchReimbursementConfig> | ReturnType<typeof fetchAccountList> | ReturnType<typeof fetchRemiAndInitializeLocalStore>;
 export declare const fetchEditRemiDetailPageEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

package/lib/view/spendManagement/reimbursement/editRemiView/epics/fetchEditRemiDetailPageEpic.js

@@ -9,7 +9,6 @@ const userFinancialAccountReducer_1 = require("../../../../userFinancialAccount/
 const userFinancialAccountSelector_1 = require("../../../../userFinancialAccount/userFinancialAccountSelector");
 const merchantListReducer_1 = require("../../../merchantList/merchantListReducer");
 const reimbursementConfigReducer_1 = require("../../reimbursementConfig/reimbursementConfigReducer");
-const remiSetupApproverViewReducer_1 = require("../../remiSetupApproverView/remiSetupApproverViewReducer");
 const editRemiViewReducer_1 = require("../editRemiViewReducer");
 const fetchEditRemiDetailPageEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(editRemiViewReducer_1.fetchEditRemiDetailPage.match), (0, operators_1.mergeMap)((action) => {
     const { cacheOverride, isLimitedCategoryEnabled, reimbursementId, isShowDeletedReimbursementEnabled, } = action.payload;
@@ -62,17 +61,6 @@ const fetchEditRemiDetailPageEpic = (actions$, state$) => actions$.pipe((0, oper
         if (reimbursementId != null) {
             remiDetailActions.push((0, editRemiViewReducer_1.fetchRemiAndInitializeLocalStore)(reimbursementId, false, isShowDeletedReimbursementEnabled));
         }
-        else {
-            const approvalRules = state.remiSetupApproverViewState;
-            if (approvalRules.fetchState !== 'Completed' &&
-                approvalRules.fetchState !== 'In-Progress') {
-                // Side-fetch from the edit-reim page bootstrap. The
-                // triggering action doesn't carry the V3 flag, so we
-                // explicitly target v1; v3 tenants re-fetch via their
-                // own screen connector.
-                remiDetailActions.push((0, remiSetupApproverViewReducer_1.fetchRemiSetupApproverView)(true, false, false, false));
-            }
-        }
     }
     return (0, rxjs_1.concat)((0, rxjs_1.from)(remiDetailActions));
 }));

package/lib/view/spendManagement/reimbursement/remiDetailView/remiDetailViewSelector.d.ts

@@ -44,6 +44,7 @@ export interface StepWithStatus extends StepWithUser {
     actorsActivity: ActorActivityWithUser[];
     isOriginalApprovalStep: boolean;
     displayPendingApproverAsAdmin?: boolean;
+    showSodAdminLabel?: boolean;
 }
 export interface ActorActivityWithUser extends Actor {
     activity: ActivityStatus;

package/lib/view/spendManagement/reimbursement/remiDetailView/remiDetailViewSelector.js

@@ -117,7 +117,8 @@ const getRemiDetailView = (state, reimbursementId) => {
 };
 exports.getRemiDetailView = getRemiDetailView;
 const getRemiActivities = (state, reimbursementId, billStageCode) => {
-    const { remiDetailViewState, approvalRuleState, entityApprovalStatusState, userState, } = state;
+    const { remiDetailViewState, approvalRuleState, entityApprovalStatusState, userState, reimbursementState, } = state;
+    const reimburseeUserId = reimbursementState.reimbursementById[reimbursementId]?.reimburseeUserId;
     const remiTransactionDetails = (0, get_1.default)(remiDetailViewState.remiDetailById, reimbursementId, undefined);
     let remiActivities = [];
     if (remiTransactionDetails != null) {
@@ -179,6 +180,7 @@ const getRemiActivities = (state, reimbursementId, billStageCode) => {
                             actorsActivity,
                             isOriginalApprovalStep: step.isOriginalApprovalStep,
                             displayPendingApproverAsAdmin: (0, helpers_1.isSodAdminFallbackEligibleForStep)(sodExcludedApproverUserId, isAdminFallbackApprover, actorsActivity),
+                            showSodAdminLabel: (0, helpers_1.shouldShowSodAdminLabel)(sodExcludedApproverUserId, actorsActivity, reimburseeUserId),
                         };
                     }),
                 };

package/package.json

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