@zeniai/client-epic-state 5.1.66 → 5.1.68

package/lib/view/spendManagement/billPay/editBillView/epics/fetchEditBillDetailPageEpic.js

@@ -11,7 +11,6 @@ const vendorTypeListReducer_1 = require("../../../../vendorTypeList/vendorTypeLi
 const depositAccountListReducer_1 = require("../../../zeniAccounts/depositAccountList/depositAccountListReducer");
 const paymentAccountListReducer_1 = require("../../../zeniAccounts/paymentAccountList/paymentAccountListReducer");
 const billPayConfigReducer_1 = require("../../billPayConfig/billPayConfigReducer");
-const billPaySetupApproverViewReducer_1 = require("../../billPaySetupApproverView/billPaySetupApproverViewReducer");
 const editBillViewReducer_1 = require("../editBillViewReducer");
 const fetchEditBillDetailPageEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(editBillViewReducer_1.fetchEditBillDetailPage.match), (0, operators_1.mergeMap)((action) => {
     const { cacheOverride, billId, isShowDeletedBillsEnabled, hasZeniAssistAccess, isInternationalWireEnabled, } = action.payload;
@@ -41,10 +40,6 @@ const fetchEditBillDetailPageEpic = (actions$, state$) => actions$.pipe((0, oper
         else {
             billDetailActions.push((0, editBillViewReducer_1.updateShowAutofill)(true));
         }
-        // Side-fetch from the edit-bill page bootstrap. The triggering
-        // action doesn't carry the V3 flag, so we explicitly target v1
-        // here; tenants on v3 re-fetch through their own screen connector.
-        billDetailActions.push((0, billPaySetupApproverViewReducer_1.fetchBillPaySetupApproverView)(true, true, false));
     }
     else {
         if (state.ownerListState.fetchState !== 'In-Progress' &&
@@ -83,15 +78,6 @@ const fetchEditBillDetailPageEpic = (actions$, state$) => actions$.pipe((0, oper
         if (billId != null) {
             billDetailActions.push((0, editBillViewReducer_1.fetchBillAndInitializeLocalStore)(billId, false, isShowDeletedBillsEnabled, hasZeniAssistAccess));
         }
-        const approvalViewFetchState = state.billPaySetupApproverViewState.fetchState;
-        // While opening New Bill Refresh Approval Rules and Payment Accounts
-        if (approvalViewFetchState !== 'In-Progress' &&
-            approvalViewFetchState !== 'Completed') {
-            // Side-fetch from the edit-bill page bootstrap. The triggering
-            // action doesn't carry the V3 flag, so we explicitly target v1
-            // here; tenants on v3 re-fetch through their own screen connector.
-            billDetailActions.push((0, billPaySetupApproverViewReducer_1.fetchBillPaySetupApproverView)(true, true, false));
-        }
     }
     return (0, rxjs_1.concat)((0, rxjs_1.from)(billDetailActions));
 }));

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

@@ -1,4 +1,5 @@
 import { Amount } from '../../commonStateTypes/amount';
+import { ID } from '../../commonStateTypes/common';
 import { ReportIDPlusForecastID } from '../../commonStateTypes/viewAndReport/viewAndReport';
 import { BillPayInfo, BulkProcessingStateType } from '../../entity/billPay/billTransaction/billTransactionState';
 import { RecurringBillConfig } from '../../entity/billPay/recurringBills/recurringBillsState';
@@ -6,13 +7,16 @@ import { ReimbursementTypeCode } from '../../entity/reimbursement/reimbursementS
 import { CurrentTenant } from '../../entity/tenant/tenantSelector';
 import { RoleMap } from '../../entity/userRole/userRoleType';
 import { ZeniDate } from '../../zeniDayJS';
-import { BillActivity } from './billPay/billDetailView/billDetailViewSelector';
+import { ActorActivityWithUser, BillActivity } from './billPay/billDetailView/billDetailViewSelector';
 import { BillTransactionView } from './billPay/billList/billListSelector';
 import { AccType, AccountTypeSubConfigCodeKeyType } from './billPay/billPayConfig/billPayConfigState';
 import { RecurringBillConfigLocalData, RecurringBillInstance } from './billPay/editBillView/editBillViewState';
 import { BusinessVerificationDetails, CompanyOfficersDetails } from './commonSetup/setupViewSelector';
 import { SetupViewType } from './commonSetup/setupViewState';
 import { RemiActivity } from './reimbursement/remiDetailView/remiDetailViewSelector';
+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 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 = 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.isSodAdminFallbackEligibleForStep = exports.isSodExcludedViewerBlocked = exports.isUserActorOnApprovalStep = void 0;
 exports.getSpendManagementEffectiveListPeriod = getSpendManagementEffectiveListPeriod;
 exports.showReimbursementPromoPage = showReimbursementPromoPage;
 exports.showBillPayPromoPage = showBillPayPromoPage;
@@ -16,6 +16,23 @@ const workingDayHelper_1 = require("../../commonStateTypes/workingDayHelper");
 const paymentAccountState_1 = require("../../entity/paymentAccount/paymentAccountState");
 const userRoleType_1 = require("../../entity/userRole/userRoleType");
 const zeniDayJS_1 = require("../../zeniDayJS");
+const getUserActorId = (activity) => activity.actor?.userId ?? activity.userId;
+const isUserActorOnApprovalStep = (userId, stepActorsActivity) => stepActorsActivity.some((activity) => getUserActorId(activity) === userId);
+exports.isUserActorOnApprovalStep = isUserActorOnApprovalStep;
+const isSodExcludedViewerBlocked = (sodExcludedApproverUserId, signedInUserId, stepActorsActivity = []) => sodExcludedApproverUserId != null &&
+    signedInUserId != null &&
+    signedInUserId === sodExcludedApproverUserId &&
+    (0, exports.isUserActorOnApprovalStep)(sodExcludedApproverUserId, stepActorsActivity);
+exports.isSodExcludedViewerBlocked = isSodExcludedViewerBlocked;
+const isSodAdminFallbackEligibleForStep = (sodExcludedApproverUserId, isAdminFallbackApprover, stepActorsActivity = []) => {
+    if (sodExcludedApproverUserId == null || isAdminFallbackApprover !== true) {
+        return false;
+    }
+    const pendingResolvedApprovers = stepActorsActivity.filter((activity) => activity.activity === 'pending' && getUserActorId(activity) != null);
+    return (pendingResolvedApprovers.length > 0 &&
+        pendingResolvedApprovers.every((activity) => getUserActorId(activity) === sodExcludedApproverUserId));
+};
+exports.isSodAdminFallbackEligibleForStep = isSodAdminFallbackEligibleForStep;
 const getLatestApprovalDate = (allActivities) => {
     let allStepsWithStatus = [];
     let allApprovedActions = [];

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

@@ -43,6 +43,7 @@ export interface RemiDetails extends Reimbursement {
 export interface StepWithStatus extends StepWithUser {
     actorsActivity: ActorActivityWithUser[];
     isOriginalApprovalStep: boolean;
+    displayPendingApproverAsAdmin?: boolean;
 }
 export interface ActorActivityWithUser extends Actor {
     activity: ActivityStatus;
@@ -66,6 +67,7 @@ export interface RemiActivity {
     currentPendingStepIndex?: number;
     entityApprovalId?: ID;
     isAdminFallbackApprover?: boolean;
+    sodExcludedApproverUserId?: ID;
 }
 export declare const getRemiDetailView: (state: RootState, reimbursementId: ID) => RemiDetailViewSelector;
 export declare const getRemiActivities: (state: RootState, reimbursementId: ID, billStageCode?: BillStageCodeType) => RemiActivity[];

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

@@ -151,7 +151,7 @@ const getRemiActivities = (state, reimbursementId, billStageCode) => {
             const approvalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, remiTransactionDetails.approvalRuleIds);
             const entityApprovalStatusByIds = (0, entityApprovalStatusSelector_1.getEntityApprovalStatusByIds)(entityApprovalStatusState, remiTransactionDetails.entityApprovalIds);
             remiActivities = entityApprovalStatusByIds.map((entityApprovalStatus) => {
-                const { approvalRuleId, entityType, createTime, updateTime, stepsApprovalStatus, areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, isRealTimeApprovalEnabled, } = entityApprovalStatus;
+                const { approvalRuleId, entityType, createTime, updateTime, stepsApprovalStatus, areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, isRealTimeApprovalEnabled, sodExcludedApproverUserId, } = entityApprovalStatus;
                 const approvalRule = approvalRules.find((rule) => rule.approvalRuleId === approvalRuleId);
                 return {
                     approvalRuleId,
@@ -163,21 +163,22 @@ const getRemiActivities = (state, reimbursementId, billStageCode) => {
                     isAdminFallbackApprover,
                     currentPendingStepIndex,
                     isRealTimeApprovalEnabled,
+                    sodExcludedApproverUserId,
                     entityApprovalId: entityApprovalStatus.entityApprovalId,
                     stepsWithStatus: stepsApprovalStatus.map((step) => {
+                        const actorsActivity = step.actorsActivity.map((activity) => ({
+                            ...activity,
+                            actor: (0, userSelector_1.getUserByUserId)(userState, activity.userId),
+                        }));
                         return {
                             ...step,
                             actors: step.actors
                                 .map((actor) => (0, userSelector_1.getUserByUserId)(userState, actor.userId))
                                 .filter((user) => user != null),
                             nonUserActors: step.actors.filter((actor) => actor.userId == null && actor.type !== 'user'),
-                            actorsActivity: step.actorsActivity.map((activity) => {
-                                return {
-                                    ...activity,
-                                    actor: (0, userSelector_1.getUserByUserId)(userState, activity.userId),
-                                };
-                            }),
+                            actorsActivity,
                             isOriginalApprovalStep: step.isOriginalApprovalStep,
+                            displayPendingApproverAsAdmin: (0, helpers_1.isSodAdminFallbackEligibleForStep)(sodExcludedApproverUserId, isAdminFallbackApprover, actorsActivity),
                         };
                     }),
                 };
@@ -191,7 +192,7 @@ const checkApproveRejectBtnShow = (remiActivities, isUserAdmin, signedInUser) =>
     let isApprovalorRejectBtnVisible = false;
     let rejectedId = -1;
     const stepsWithStatusData = remiActivities[0].stepsWithStatus;
-    const { areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, } = remiActivities[0];
+    const { areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, sodExcludedApproverUserId, } = remiActivities[0];
     for (const [index, stepWithStatus] of stepsWithStatusData.entries()) {
         if (stepWithStatus.action === 'require_approval') {
             for (const actorActivity of stepWithStatus.actorsActivity) {
@@ -227,27 +228,39 @@ const checkApproveRejectBtnShow = (remiActivities, isUserAdmin, signedInUser) =>
                         break;
                     }
                 }
+                const sodBlocked = (0, helpers_1.isSodExcludedViewerBlocked)(sodExcludedApproverUserId, signedInUser?.userId, pendingStep.actorsActivity);
                 for (const actorActivity of pendingStep.actorsActivity) {
-                    if (actorActivity.actor?.userId === signedInUser?.userId &&
+                    if (!sodBlocked &&
+                        actorActivity.actor?.userId === signedInUser?.userId &&
                         isAllActivitiesPending) {
                         isApprovalorRejectBtnVisible = true;
                     }
                     else if (actorActivity.subType === 'admin' &&
                         isUserAdmin &&
-                        isAllActivitiesPending) {
+                        isAllActivitiesPending &&
+                        signedInUser?.userId != null &&
+                        signedInUser.userId !== sodExcludedApproverUserId) {
                         isApprovalorRejectBtnVisible = true;
                     }
-                    // admin will be fallback approver if vendor-owner/manager are not assigned any user id
                     else if (actorActivity.type === 'attribute' &&
                         (actorActivity.subType === 'manager' ||
                             actorActivity.subType === 'vendor_owner' ||
                             actorActivity.subType === 'manager_of_manager') &&
                         actorActivity.userId === null &&
                         isAdminFallbackApprover === true &&
-                        isUserAdmin === true) {
+                        isUserAdmin &&
+                        signedInUser?.userId != null &&
+                        signedInUser.userId !== sodExcludedApproverUserId) {
                         isApprovalorRejectBtnVisible = true;
                     }
                 }
+                if (!isApprovalorRejectBtnVisible &&
+                    isUserAdmin &&
+                    signedInUser?.userId != null &&
+                    signedInUser.userId !== sodExcludedApproverUserId &&
+                    pendingStep.displayPendingApproverAsAdmin === true) {
+                    isApprovalorRejectBtnVisible = true;
+                }
             }
         }
     }
@@ -261,27 +274,39 @@ const checkApproveRejectBtnShow = (remiActivities, isUserAdmin, signedInUser) =>
                         break;
                     }
                 }
+                const sodBlocked = (0, helpers_1.isSodExcludedViewerBlocked)(sodExcludedApproverUserId, signedInUser?.userId, stepWithStatus.actorsActivity);
                 for (const actorActivity of stepWithStatus.actorsActivity) {
-                    if (actorActivity.actor?.userId === signedInUser?.userId &&
+                    if (!sodBlocked &&
+                        actorActivity.actor?.userId === signedInUser?.userId &&
                         isAllActivitiesPending) {
                         isApprovalorRejectBtnVisible = true;
                     }
                     else if (actorActivity.subType === 'admin' &&
                         isUserAdmin &&
-                        isAllActivitiesPending) {
+                        isAllActivitiesPending &&
+                        signedInUser?.userId != null &&
+                        signedInUser.userId !== sodExcludedApproverUserId) {
                         isApprovalorRejectBtnVisible = true;
                     }
-                    // admin will be fallback approver if vendor-owner/manager are not assigned any user id
                     else if (actorActivity.type === 'attribute' &&
                         (actorActivity.subType === 'manager' ||
                             actorActivity.subType === 'vendor_owner' ||
                             actorActivity.subType === 'manager_of_manager') &&
                         actorActivity.userId === null &&
                         isAdminFallbackApprover === true &&
-                        isUserAdmin === true) {
+                        isUserAdmin &&
+                        signedInUser?.userId != null &&
+                        signedInUser.userId !== sodExcludedApproverUserId) {
                         isApprovalorRejectBtnVisible = true;
                     }
                 }
+                if (!isApprovalorRejectBtnVisible &&
+                    isUserAdmin &&
+                    signedInUser?.userId != null &&
+                    signedInUser.userId !== sodExcludedApproverUserId &&
+                    stepWithStatus.displayPendingApproverAsAdmin === true) {
+                    isApprovalorRejectBtnVisible = true;
+                }
             }
             if (isApprovalorRejectBtnVisible) {
                 break;

package/lib/view/spendManagement/reimbursement/remiListView/remiListSelector.js

@@ -216,7 +216,7 @@ const getApproversOrRejectors = (reimbursement, entityApprovalStatusState, userS
     };
     if (reimbursement.entityApprovalId !== null) {
         const entityApprovalStatus = entityApprovalStatusState.entityApprovalStatusById[reimbursement.entityApprovalId];
-        const { areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, } = entityApprovalStatus;
+        const { areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, sodExcludedApproverUserId, } = entityApprovalStatus;
         const isReimbursementSerailized = areApprovalsSerialized === true &&
             currentPendingStepIndex != null &&
             currentPendingStepIndex > -1;
@@ -244,23 +244,20 @@ const getApproversOrRejectors = (reimbursement, entityApprovalStatusState, userS
                 if (isReimbursementSerailized) {
                     requireApprovalInfo = [stepsApprovalStatus[currentPendingStepIndex]];
                 }
-                const pendingActivitiesList = [];
                 requireApprovalInfo.forEach((approvalStep) => {
-                    const pendingActivities = approvalStep.actorsActivity.filter((activity) => activity.activity === 'pending');
-                    //if isReimbursementSerailized, we need to show all the approvers in currentPendingStepIndex
-                    if (isReimbursementSerailized) {
-                        pendingActivitiesList.push(...pendingActivities);
+                    if (approvers.displayPendingApproverAsAdmin === true) {
+                        return;
                     }
-                    else {
-                        //if not isReimbursementSerailized, we need to show all the first approvers in each steps_approval_status
-                        const pendingActivity = pendingActivities[0];
-                        if (pendingActivity != null) {
-                            pendingActivitiesList.push(pendingActivity);
-                        }
+                    const pendingActivities = approvalStep.actorsActivity.filter((activity) => activity.activity === 'pending');
+                    const sodDisplayAsAdmin = (0, helpers_1.isSodAdminFallbackEligibleForStep)(sodExcludedApproverUserId, isAdminFallbackApprover, approvalStep.actorsActivity);
+                    const activitiesToShow = isReimbursementSerailized
+                        ? pendingActivities
+                        : pendingActivities.slice(0, 1);
+                    if (sodDisplayAsAdmin) {
+                        approvers.displayPendingApproverAsAdmin = true;
+                        return;
                     }
-                });
-                if (pendingActivitiesList.length > 0) {
-                    pendingActivitiesList.forEach((activity) => {
+                    activitiesToShow.forEach((activity) => {
                         const user = (0, userSelector_1.getUserByUserId)(userState, activity.userId);
                         if (user != null) {
                             approvers.users.push(user);
@@ -272,7 +269,7 @@ const getApproversOrRejectors = (reimbursement, entityApprovalStatusState, userS
                             }
                         }
                     });
-                }
+                });
             }
         }
     }

package/package.json

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