@zeniai/client-epic-state 5.3.26 → 5.3.28

package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewReducer.js

@@ -88,11 +88,17 @@ const remiSetupApproverView = (0, toolkit_1.createSlice)({
             },
         },
         fetchRemiApproversList: {
-            reducer(draft) {
+            reducer(draft, action) {
                 draft.approverListState.fetchStatus = {
                     fetchState: 'In-Progress',
                     error: undefined,
                 };
+                // The attribute mapping is specific to `lastUpdatedByUserId`; drop the
+                // previous user's mapping so it is never shown for someone else while
+                // the new one loads.
+                if (action.payload.includeAttributesUserIds === true) {
+                    draft.approverListState.attributeSubTypeToUserIdMapping = undefined;
+                }
             },
             prepare(cacheOverride = false, includeUserRoles = true, includeAttributesUserIds = false, lastUpdatedByUserId = undefined) {
                 return {

package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewSelector.js

@@ -16,23 +16,36 @@ const getRemiSetupApproverView = (state, filterAdmins = true) => {
     const { approvalRulesDeleteStatusById, approvalRuleIds, approverListState, fetchState, error, listeningToPusherEvent, newApprovalRuleId, } = remiSetupApproverViewState;
     const deleteStateList = Object.values(approvalRulesDeleteStatusById);
     const approvalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, approvalRuleIds);
-    const allApprovalRules = approvalRules.map((approvalRule) => {
-        const approvalRuleWithUser = {
-            ...approvalRule,
-            steps: approvalRule.steps.map((step) => {
-                return {
-                    ...step,
-                    actors: step.actors
-                        .filter((actor) => actor.userId != null)
-                        .map((actor) => (0, userSelector_1.getUserByUserId)(userState, actor.userId))
-                        .filter((user) => user != null),
-                    nonUserActors: step.actors.filter((actor) => actor.type !== 'user' &&
-                        (filterAdmins ? actor.isImplicitActor === false : true)),
-                };
-            }),
-        };
-        return approvalRuleWithUser;
+    const toStepWithUser = (step) => ({
+        ...step,
+        actors: step.actors
+            .filter((actor) => actor.userId != null)
+            .map((actor) => (0, userSelector_1.getUserByUserId)(userState, actor.userId))
+            .filter((user) => user != null),
+        nonUserActors: step.actors.filter((actor) => actor.type !== 'user' &&
+            (filterAdmins ? actor.isImplicitActor === false : true)),
+    });
+    const toApprovalRuleWithUser = (approvalRule) => ({
+        ...approvalRule,
+        steps: approvalRule.steps.map(toStepWithUser),
     });
+    const allApprovalRules = approvalRules.map(toApprovalRuleWithUser);
+    // Exposed separately so the new-reimbursement preview can show it when no other
+    // rule matches. (It is also in allApprovalRules; the rules pages filter it
+    // out by `isFallback`.)
+    const fallbackApprovalRule = (0, approvalRuleSelector_1.getFallbackApprovalRule)(approvalRuleState, 'reimbursement');
+    // A fallback step shows its implicit Admin only when it has no explicit
+    // approver, regardless of `filterAdmins` (same as bills; see
+    // getFallbackStepNonUserActors).
+    const fallbackRule = fallbackApprovalRule != null
+        ? {
+            ...fallbackApprovalRule,
+            steps: fallbackApprovalRule.steps.map((step) => ({
+                ...toStepWithUser(step),
+                nonUserActors: (0, approvalRuleSelector_1.getFallbackStepNonUserActors)(step),
+            })),
+        }
+        : undefined;
     const approvalRulesStatus = allApprovalRules.length > 0
         ? {
             code: 'created',
@@ -47,6 +60,7 @@ const getRemiSetupApproverView = (state, filterAdmins = true) => {
     const inactiveApproverIds = Array.from(referencedApproverIds).filter((userId) => !activeApproverIds.has(userId));
     return {
         allApprovalRules,
+        fallbackRule,
         deleteStatus: (0, reduceFetchState_1.reduceAnyFetchState)(deleteStateList),
         approvalRulesStatus,
         approverListFetchStatus: approverListState.fetchStatus,

package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewSelectorTypes.d.ts

@@ -51,6 +51,7 @@ export interface RemiSetupApproverView extends SelectorView {
     approverListFetchStatus: FetchStateAndError;
     deleteStatus: FetchStateAndError;
     inactiveApproverIds: ID[];
+    fallbackRule?: ApprovalRuleWithUser;
     listeningToPusherEvent?: boolean;
     newApprovalRuleId?: ID;
 }

package/package.json

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