@zeniai/client-epic-state 5.2.14 → 5.2.16

package/lib/view/scheduleView/scheduleListView/scheduleListReducer.d.ts

@@ -16,7 +16,7 @@ export declare const initialState: ScheduleListViewState;
 export declare const fetchDownloadSchedules: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[scheduleType: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue", timeframeAndCategory: {
     selectedCategoryId: ID;
     selectedTimeframe: TimeframeTick;
-}, downloadCategories: string[], cacheOverride?: any], {
+}, downloadCategories: string[], statusFilter?: "completed" | "new" | "ongoing" | "all" | undefined, cacheOverride?: any], {
     timeframeAndCategory: {
         selectedCategoryId: ID;
         selectedTimeframe: TimeframeTick;
@@ -24,16 +24,18 @@ export declare const fetchDownloadSchedules: import("@reduxjs/toolkit").ActionCr
     scheduleType: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue";
     cacheOverride: any;
     downloadCategories: string[];
+    statusFilter: "completed" | "new" | "ongoing" | "all";
 }, "scheduleListView/fetchDownloadSchedules", never, never>, fetchAccruedScheduleList: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[scheduleType: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue", timeframeAndCategory?: {
     selectedCategoryId: ID;
     selectedTimeframe: TimeframeTick;
-} | undefined, cacheOverride?: any], {
+} | undefined, cacheOverride?: any, statusFilter?: "completed" | "new" | "ongoing" | "all" | undefined], {
     timeframeAndCategory: {
         selectedCategoryId: ID;
         selectedTimeframe: TimeframeTick;
     } | undefined;
     scheduleType: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue";
     cacheOverride: any;
+    statusFilter: "completed" | "new" | "ongoing" | "all";
 }, "scheduleListView/fetchAccruedScheduleList", never, never>, fetchScheduleList: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[scheduleType: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue", timeframeAndCategory?: {
     selectedCategoryId: ID;
     selectedTimeframe: TimeframeTick;

package/lib/view/scheduleView/scheduleListView/scheduleListReducer.js

@@ -90,8 +90,8 @@ const scheduleListView = (0, toolkit_1.createSlice)({
     reducers: {
         fetchDownloadSchedules: {
             reducer(draft, action) {
+                // Accrued is not downloaded through this action -- see fetchDownloadSchedulesEpic for why.
                 if (action.payload.scheduleType !== 'accrued_expenses') {
-                    //if condition added for type narrowing
                     const state = getState(draft, action.payload.scheduleType);
                     const selectedTimeframe = action.payload.timeframeAndCategory.selectedTimeframe;
                     const selectedCategoryId = action.payload.timeframeAndCategory.selectedCategoryId;
@@ -115,13 +115,14 @@ const scheduleListView = (0, toolkit_1.createSlice)({
                     updateState(draft, action.payload.scheduleType, state);
                 }
             },
-            prepare(scheduleType, timeframeAndCategory, downloadCategories, cacheOverride = false) {
+            prepare(scheduleType, timeframeAndCategory, downloadCategories, statusFilter = 'all', cacheOverride = false) {
                 return {
                     payload: {
                         timeframeAndCategory,
                         scheduleType,
                         cacheOverride,
                         downloadCategories,
+                        statusFilter,
                     },
                 };
             },
@@ -157,12 +158,13 @@ const scheduleListView = (0, toolkit_1.createSlice)({
                     updateState(draft, action.payload.scheduleType, state);
                 }
             },
-            prepare(scheduleType, timeframeAndCategory, cacheOverride = false) {
+            prepare(scheduleType, timeframeAndCategory, cacheOverride = false, statusFilter = 'all') {
                 return {
                     payload: {
                         timeframeAndCategory,
                         scheduleType,
                         cacheOverride,
+                        statusFilter,
                     },
                 };
             },

package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewSelector.js

@@ -13,7 +13,7 @@ const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const userSelector_1 = require("../../../../entity/user/userSelector");
 const userRoleSelector_1 = require("../../../../entity/userRole/userRoleSelector");
 exports.getBillPaySetupApproverView = (0, toolkit_1.createSelector)((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (billPaySetupApproverViewState, approvalRuleState, userState) => {
-    const { approvalRulesDeleteStatusById, approvalRuleIds, fetchState, error, listeningToPusherEvent, newApprovalRuleId, } = billPaySetupApproverViewState;
+    const { approvalRulesDeleteStatusById, approvalRuleIds, approverListState, fetchState, error, listeningToPusherEvent, newApprovalRuleId, } = billPaySetupApproverViewState;
     const deleteStateList = Object.values(approvalRulesDeleteStatusById);
     const approvalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, approvalRuleIds);
     const allApprovalRules = approvalRules.map((approvalRule) => {
@@ -41,10 +41,15 @@ exports.getBillPaySetupApproverView = (0, toolkit_1.createSelector)((state) => s
             name: 'Require Info',
             code: 'require_info',
         };
+    const activeApproverIds = new Set(approverListState.approverIds);
+    const referencedApproverIds = new Set(allApprovalRules.flatMap((approvalRule) => approvalRule.steps.flatMap((step) => step.actors.map((actor) => actor.userId))));
+    const inactiveApproverIds = Array.from(referencedApproverIds).filter((userId) => !activeApproverIds.has(userId));
     return {
         allApprovalRules,
         deleteStatus: (0, reduceFetchState_1.reduceAnyFetchState)(deleteStateList),
         approvalRulesStatus,
+        approverListFetchStatus: approverListState.fetchStatus,
+        inactiveApproverIds,
         fetchState,
         error,
         listeningToPusherEvent,
@@ -63,6 +68,19 @@ exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((s
         };
     })
         .filter((approver) => approver.user != null);
+    const activeApproverIds = new Set(approverIds);
+    const currentRuleSteps = billPaySetupApproverViewUpdateData?.data?.steps ?? [];
+    const inactiveActorUserIds = new Set(currentRuleSteps
+        .flatMap((step) => step.actors.map((actor) => actor.userId))
+        .filter((userId) => userId != null && !activeApproverIds.has(userId)));
+    const inactiveActorApprovers = Array.from(inactiveActorUserIds)
+        .map((userId) => {
+        return {
+            user: (0, userSelector_1.getUserByUserId)(userState, userId),
+            role: (0, userRoleSelector_1.getUserRoleByUserId)(userRoleState, userId),
+        };
+    })
+        .filter((approver) => approver.user != null);
     const allAttributes = attributes;
     const filteredApprovers = (0, cloneDeep_1.default)(allApprovers);
     const filteredAttributes = (0, cloneDeep_1.default)(attributes);
@@ -96,6 +114,7 @@ exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((s
         allApprovalRules,
         allApprovers,
         filteredApprovers,
+        inactiveActorApprovers,
         allAttributes,
         filteredAttributes,
         billPaySetupApproverViewUpdateData,

package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewSelectorTypes.d.ts

@@ -49,7 +49,9 @@ export interface ApprovalRuleWithUser extends Omit<ApprovalRule, 'steps'> {
 export interface BillPaySetupApproverView extends SelectorView {
     allApprovalRules: ApprovalRuleWithUser[];
     approvalRulesStatus: AllowedValueWithCode;
+    approverListFetchStatus: FetchStateAndError;
     deleteStatus: FetchStateAndError;
+    inactiveApproverIds: ID[];
     listeningToPusherEvent?: boolean;
     newApprovalRuleId?: ID;
 }
@@ -61,6 +63,7 @@ export interface BillPaySetupApproverUpdateDataView extends SelectorView {
     approverListFetchStatus: FetchStateAndError;
     filteredApprovers: UserAndRole[];
     filteredAttributes: AttributeType[];
+    inactiveActorApprovers: UserAndRole[];
     affectedEntityIds?: ID[];
     billPaySetupApproverViewUpdateData?: ApproverViewUpdateData;
     listeningToPusherEvent?: boolean;

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

@@ -13,7 +13,7 @@ const userSelector_1 = require("../../../../entity/user/userSelector");
 const userRoleSelector_1 = require("../../../../entity/userRole/userRoleSelector");
 const getRemiSetupApproverView = (state, filterAdmins = true) => {
     const { remiSetupApproverViewState, approvalRuleState, userState } = state;
-    const { approvalRulesDeleteStatusById, approvalRuleIds, fetchState, error, listeningToPusherEvent, newApprovalRuleId, } = remiSetupApproverViewState;
+    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) => {
@@ -42,10 +42,15 @@ const getRemiSetupApproverView = (state, filterAdmins = true) => {
             name: 'Require Info',
             code: 'require_info',
         };
+    const activeApproverIds = new Set(approverListState.approverIds);
+    const referencedApproverIds = new Set(allApprovalRules.flatMap((approvalRule) => approvalRule.steps.flatMap((step) => step.actors.map((actor) => actor.userId))));
+    const inactiveApproverIds = Array.from(referencedApproverIds).filter((userId) => !activeApproverIds.has(userId));
     return {
         allApprovalRules,
         deleteStatus: (0, reduceFetchState_1.reduceAnyFetchState)(deleteStateList),
         approvalRulesStatus,
+        approverListFetchStatus: approverListState.fetchStatus,
+        inactiveApproverIds,
         fetchState,
         error,
         listeningToPusherEvent,
@@ -81,6 +86,19 @@ exports.getRemiSetupApproverUpdateDataView = (0, toolkit_1.createSelector)((stat
         };
     })
         .filter((approver) => approver.user != null);
+    const activeApproverIds = new Set(approverIds);
+    const currentRuleSteps = remiSetupApproverViewUpdateData?.data?.steps ?? [];
+    const inactiveActorUserIds = new Set(currentRuleSteps
+        .flatMap((step) => step.actors.map((actor) => actor.userId))
+        .filter((userId) => userId != null && !activeApproverIds.has(userId)));
+    const inactiveActorApprovers = Array.from(inactiveActorUserIds)
+        .map((userId) => {
+        return {
+            user: (0, userSelector_1.getUserByUserId)(userState, userId),
+            role: (0, userRoleSelector_1.getUserRoleByUserId)(userRoleState, userId),
+        };
+    })
+        .filter((approver) => approver.user != null);
     const allAttributes = attributes;
     const filteredApprovers = (0, cloneDeep_1.default)(allApprovers);
     const filteredAttributes = (0, cloneDeep_1.default)(attributes);
@@ -115,6 +133,7 @@ exports.getRemiSetupApproverUpdateDataView = (0, toolkit_1.createSelector)((stat
         allAttributes,
         filteredApprovers,
         filteredAttributes,
+        inactiveActorApprovers,
         allAccountingClasses,
         remiSetupApproverViewUpdateData,
         approversDetailsFetchStatus: (0, reduceFetchState_1.reduceAllFetchState)([

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

@@ -48,7 +48,9 @@ export interface ApprovalRuleWithUser extends Omit<ApprovalRule, 'steps'> {
 export interface RemiSetupApproverView extends SelectorView {
     allApprovalRules: ApprovalRuleWithUser[];
     approvalRulesStatus: AllowedValueWithCode;
+    approverListFetchStatus: FetchStateAndError;
     deleteStatus: FetchStateAndError;
+    inactiveApproverIds: ID[];
     listeningToPusherEvent?: boolean;
     newApprovalRuleId?: ID;
 }
@@ -60,6 +62,7 @@ export interface RemiSetupApproverUpdateDataView extends SelectorView {
     approversDetailsFetchStatus: FetchStateAndError;
     filteredApprovers: UserAndRole[];
     filteredAttributes: AttributeType[];
+    inactiveActorApprovers: UserAndRole[];
     affectedEntityIds?: ID[];
     listeningToPusherEvent?: boolean;
     remiSetupApproverViewUpdateData?: ApproverViewUpdateData;

package/package.json

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