@zeniai/client-epic-state 5.1.68 → 5.1.69-betaAK0

package/lib/esm/view/invoicing/invoicingDunningCaseListView/invoicingDunningCaseListViewReducer.js

@@ -2,6 +2,7 @@ import { createSlice } from '@reduxjs/toolkit';
 export const initialState = {
     fetchState: 'Not-Started',
     error: undefined,
+    activeTab: 'all',
     ids: [],
     nextCursor: null,
     filters: {},
@@ -80,10 +81,15 @@ const invoicingDunningCaseListView = createSlice({
         updateInvoicingDunningCaseFilters(draft, action) {
             draft.filters = action.payload;
         },
+        // Select a status tab. The list API ignores `status` (returns all statuses),
+        // so the selector filters rows to this tab client-side — no refetch needed.
+        setInvoicingDunningCaseActiveTab(draft, action) {
+            draft.activeTab = action.payload;
+        },
         clearInvoicingDunningCaseListView(draft) {
             Object.assign(draft, initialState);
         },
     },
 });
-export const { fetchInvoicingDunningCaseList, fetchInvoicingDunningCaseListPage, updateInvoicingDunningCaseList, updateInvoicingDunningCaseListFailure, fetchInvoicingDunningCaseCounts, updateInvoicingDunningCaseCounts, updateInvoicingDunningCaseCountsFailure, updateInvoicingDunningCaseFilters, clearInvoicingDunningCaseListView, } = invoicingDunningCaseListView.actions;
+export const { fetchInvoicingDunningCaseList, fetchInvoicingDunningCaseListPage, updateInvoicingDunningCaseList, updateInvoicingDunningCaseListFailure, fetchInvoicingDunningCaseCounts, updateInvoicingDunningCaseCounts, updateInvoicingDunningCaseCountsFailure, updateInvoicingDunningCaseFilters, setInvoicingDunningCaseActiveTab, clearInvoicingDunningCaseListView, } = invoicingDunningCaseListView.actions;
 export default invoicingDunningCaseListView.reducer;

package/lib/esm/view/invoicing/invoicingDunningCaseListView/invoicingDunningCaseListViewSelector.js

@@ -6,16 +6,26 @@ import { INVOICING_DUNNING_CASE_COLUMNS, INVOICING_DUNNING_CASE_TABS, } from './
  * object) keep referential identity until the dunning-case entity slice or the
  * list-view slice actually change.
  */
-export const getInvoicingDunningCaseListView = createSelector((state) => state.invoicingDunningCaseState, (state) => state.invoicingDunningCaseListViewState, (dunningCaseState, listViewState) => ({
-    columns: INVOICING_DUNNING_CASE_COLUMNS,
-    dunningCases: getInvoicingDunningCasesByIds(dunningCaseState, listViewState.ids),
-    count: listViewState.counts,
-    countsFetchState: listViewState.countsFetchState,
-    filters: listViewState.filters,
-    nextCursor: listViewState.nextCursor,
-    fetchState: listViewState.fetchState,
-    error: listViewState.error,
-    tabIds: INVOICING_DUNNING_CASE_TABS,
-    sort: listViewState.sort,
-    version: 1.0,
-}));
+export const getInvoicingDunningCaseListView = createSelector((state) => state.invoicingDunningCaseState, (state) => state.invoicingDunningCaseListViewState, (dunningCaseState, listViewState) => {
+    const { activeTab } = listViewState;
+    const allDunningCases = getInvoicingDunningCasesByIds(dunningCaseState, listViewState.ids);
+    // The list API ignores `status`, so it returns every status; filter to the
+    // active tab client-side ('all' shows everything).
+    const dunningCases = activeTab === 'all'
+        ? allDunningCases
+        : allDunningCases.filter((dunningCase) => dunningCase.status === activeTab);
+    return {
+        activeTab,
+        columns: INVOICING_DUNNING_CASE_COLUMNS,
+        dunningCases,
+        count: listViewState.counts,
+        countsFetchState: listViewState.countsFetchState,
+        filters: listViewState.filters,
+        nextCursor: listViewState.nextCursor,
+        fetchState: listViewState.fetchState,
+        error: listViewState.error,
+        tabIds: INVOICING_DUNNING_CASE_TABS,
+        sort: listViewState.sort,
+        version: 1.0,
+    };
+});

package/lib/esm/view/invoicing/invoicingSubscriptionListView/epics/fetchInvoicingSubscriptionListEpic.js

@@ -8,9 +8,6 @@ import { INVOICING_LIST_PAGE_SIZE, applyListSortParams, withQuery, } from '../..
 import { fetchInvoicingSubscriptionList, updateInvoicingSubscriptionList, updateInvoicingSubscriptionListFailure, } from '../invoicingSubscriptionListViewReducer';
 const buildQuery = (filters, cursor, sort) => {
     const params = new URLSearchParams();
-    if (filters.status != null && filters.status.length > 0) {
-        params.set('status', filters.status);
-    }
     if (filters.customerId != null) {
         params.set('customer_id', filters.customerId);
     }

package/lib/esm/view/invoicing/invoicingSubscriptionListView/invoicingSubscriptionListViewReducer.js

@@ -2,6 +2,7 @@ import { createSlice } from '@reduxjs/toolkit';
 export const initialState = {
     fetchState: 'Not-Started',
     error: undefined,
+    activeTab: 'all',
     ids: [],
     nextCursor: null,
     filters: {},
@@ -80,6 +81,11 @@ const invoicingSubscriptionListView = createSlice({
         updateInvoicingSubscriptionFilters(draft, action) {
             draft.filters = action.payload;
         },
+        // Select a status tab. The list API ignores `status` (returns all statuses),
+        // so the selector filters rows to this tab client-side — no refetch needed.
+        setInvoicingSubscriptionActiveTab(draft, action) {
+            draft.activeTab = action.payload;
+        },
         // Reflect a newly created subscription in the cached list + tab counts so the
         // subscription page shows it without refetching from the server. The status
         // doubles as the per-tab count key (tab ids mirror InvoicingSubscriptionStatus).
@@ -99,5 +105,5 @@ const invoicingSubscriptionListView = createSlice({
         },
     },
 });
-export const { fetchInvoicingSubscriptionList, fetchInvoicingSubscriptionListPage, updateInvoicingSubscriptionList, updateInvoicingSubscriptionListFailure, fetchInvoicingSubscriptionCounts, updateInvoicingSubscriptionCounts, updateInvoicingSubscriptionCountsFailure, updateInvoicingSubscriptionFilters, addInvoicingSubscriptionToList, clearInvoicingSubscriptionListView, } = invoicingSubscriptionListView.actions;
+export const { fetchInvoicingSubscriptionList, fetchInvoicingSubscriptionListPage, updateInvoicingSubscriptionList, updateInvoicingSubscriptionListFailure, fetchInvoicingSubscriptionCounts, updateInvoicingSubscriptionCounts, updateInvoicingSubscriptionCountsFailure, updateInvoicingSubscriptionFilters, setInvoicingSubscriptionActiveTab, addInvoicingSubscriptionToList, clearInvoicingSubscriptionListView, } = invoicingSubscriptionListView.actions;
 export default invoicingSubscriptionListView.reducer;

package/lib/esm/view/invoicing/invoicingSubscriptionListView/invoicingSubscriptionListViewSelector.js

@@ -8,15 +8,25 @@ import { INVOICING_SUBSCRIPTION_COLUMNS, INVOICING_SUBSCRIPTION_TABS, } from './
  * re-rendered on every unrelated redux action because a fresh array was built
  * each call.
  */
-export const getInvoicingSubscriptionListView = createSelector((state) => state.invoicingSubscriptionState, (state) => state.invoicingSubscriptionListViewState, (subscriptionState, listViewState) => ({
-    columns: INVOICING_SUBSCRIPTION_COLUMNS,
-    subscriptions: getInvoicingSubscriptionsByIds(subscriptionState, listViewState.ids),
-    fetchState: listViewState.fetchState,
-    error: listViewState.error,
-    nextCursor: listViewState.nextCursor,
-    filters: listViewState.filters,
-    count: listViewState.counts,
-    countsFetchState: listViewState.countsFetchState,
-    tabIds: INVOICING_SUBSCRIPTION_TABS,
-    sort: listViewState.sort,
-}));
+export const getInvoicingSubscriptionListView = createSelector((state) => state.invoicingSubscriptionState, (state) => state.invoicingSubscriptionListViewState, (subscriptionState, listViewState) => {
+    const { activeTab } = listViewState;
+    const allSubscriptions = getInvoicingSubscriptionsByIds(subscriptionState, listViewState.ids);
+    // The list API ignores `status`, so it returns every status; filter to the
+    // active tab client-side ('all' shows everything).
+    const subscriptions = activeTab === 'all'
+        ? allSubscriptions
+        : allSubscriptions.filter((subscription) => subscription.status === activeTab);
+    return {
+        activeTab,
+        columns: INVOICING_SUBSCRIPTION_COLUMNS,
+        subscriptions,
+        fetchState: listViewState.fetchState,
+        error: listViewState.error,
+        nextCursor: listViewState.nextCursor,
+        filters: listViewState.filters,
+        count: listViewState.counts,
+        countsFetchState: listViewState.countsFetchState,
+        tabIds: INVOICING_SUBSCRIPTION_TABS,
+        sort: listViewState.sort,
+    };
+});

package/lib/esm/view/invoicing/invoicingTransactionListView/epics/fetchInvoicingTransactionListEpic.js

@@ -4,13 +4,13 @@ import { updateInvoicingTransactions } from '../../../../entity/invoicing/invoic
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { INVOICING_LIST_PAGE_SIZE, applyListSortParams, withQuery, } from '../../invoicingApiHelper';
 import { fetchInvoicingTransactionList, updateInvoicingTransactionList, updateInvoicingTransactionListFailure, } from '../invoicingTransactionListViewReducer';
-const buildQuery = (filters, cursor, sort) => {
+const buildQuery = (filters, type, cursor, sort) => {
     const params = new URLSearchParams();
     if (filters.status != null && filters.status.length > 0) {
         params.set('status', filters.status);
     }
-    if (filters.type != null && filters.type.length > 0) {
-        params.set('type', filters.type);
+    if (type != null && type.length > 0) {
+        params.set('type', type);
     }
     if (filters.customerId != null) {
         params.set('customer_id', filters.customerId);
@@ -25,9 +25,11 @@ const buildQuery = (filters, cursor, sort) => {
     applyListSortParams(params, sort);
     return params;
 };
-export const fetchInvoicingTransactionListEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchInvoicingTransactionList.match), switchMap((action) => {
+export const fetchInvoicingTransactionListEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchInvoicingTransactionList.match), switchMap((action) => {
     const { filters, cursor, keepExistingListItems, sort } = action.payload;
-    const apiUrl = withQuery(`${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/payments`, buildQuery(filters, cursor, sort));
+    const { activeTab } = state$.value.invoicingTransactionListViewState;
+    const type = activeTab !== 'all' ? activeTab : undefined;
+    const apiUrl = withQuery(`${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/payments`, buildQuery(filters, type, cursor, sort));
     return zeniAPI.getJSON(apiUrl).pipe(switchMap((response) => {
         if (isSuccessResponse(response)) {
             const items = response.data?.items ?? [];

package/lib/esm/view/invoicing/invoicingTransactionListView/epics/fetchInvoicingTransactionListPageEpic.js

@@ -16,8 +16,9 @@ const shouldFetch = (fetchStateAndError, cacheOverride) => cacheOverride ||
 export const fetchInvoicingTransactionListPageEpic = (actions$, state$) => actions$.pipe(filter(fetchInvoicingTransactionListPage.match), mergeMap((action) => {
     const { cacheOverride, filters, sort } = action.payload;
     const state = state$.value.invoicingTransactionListViewState;
+    const activeTabState = state.byTab[state.activeTab];
     const pageActions = [];
-    if (shouldFetch({ fetchState: state.fetchState, error: state.error }, cacheOverride)) {
+    if (shouldFetch({ fetchState: activeTabState.fetchState, error: activeTabState.error }, cacheOverride)) {
         pageActions.push(fetchInvoicingTransactionList({ filters, sort }));
     }
     return concat(from(pageActions));

package/lib/esm/view/invoicing/invoicingTransactionListView/invoicingTransactionListViewReducer.js

@@ -1,13 +1,19 @@
 import { createSlice } from '@reduxjs/toolkit';
+import { makeInvoicingTransactionIdsByTab, } from './invoicingTransactionListViewState';
+/**
+ * Whether two transaction-list queries share the same base (tab-independent)
+ * query. When the base query changes (search / customer / status / sort) every
+ * per-tab cache is stale, so the reducer resets them all.
+ */
+const sameTransactionBaseQuery = (a, b) => a.filters.customerId === b.filters.customerId &&
+    a.filters.status === b.filters.status &&
+    a.filters.search === b.filters.search &&
+    a.sort?.field === b.sort?.field &&
+    a.sort?.dir === b.sort?.dir;
 export const initialState = {
-    fetchState: 'Not-Started',
-    error: undefined,
-    ids: [],
-    nextCursor: null,
+    activeTab: 'all',
+    byTab: makeInvoicingTransactionIdsByTab(),
     filters: {},
-    hasValidState() {
-        return this.fetchState === 'Completed';
-    },
 };
 const invoicingTransactionListView = createSlice({
     name: 'invoicingTransactionListView',
@@ -15,14 +21,15 @@ const invoicingTransactionListView = createSlice({
     reducers: {
         fetchInvoicingTransactionList: {
             reducer(draft, action) {
+                const tab = draft.byTab[draft.activeTab];
                 if (!action.payload.keepExistingListItems) {
-                    draft.ids = [];
-                    draft.nextCursor = null;
+                    tab.ids = [];
+                    tab.nextCursor = null;
                 }
                 draft.filters = action.payload.filters;
                 draft.sort = action.payload.sort;
-                draft.fetchState = 'In-Progress';
-                draft.error = undefined;
+                tab.fetchState = 'In-Progress';
+                tab.error = undefined;
             },
             prepare(payload) {
                 return {
@@ -37,6 +44,12 @@ const invoicingTransactionListView = createSlice({
         },
         fetchInvoicingTransactionListPage: {
             reducer(draft, action) {
+                // A different base query invalidates every tab's cache — reset so the
+                // page epic's shouldFetch refetches the active tab instead of showing
+                // rows fetched under a stale search/customer/status/sort.
+                if (!sameTransactionBaseQuery(draft, action.payload)) {
+                    draft.byTab = makeInvoicingTransactionIdsByTab();
+                }
                 draft.filters = action.payload.filters;
                 draft.sort = action.payload.sort;
             },
@@ -51,34 +64,52 @@ const invoicingTransactionListView = createSlice({
             },
         },
         updateInvoicingTransactionList(draft, action) {
-            draft.ids = action.payload.keepExistingListItems
-                ? [...new Set([...draft.ids, ...action.payload.ids])]
+            const tab = draft.byTab[draft.activeTab];
+            tab.ids = action.payload.keepExistingListItems
+                ? [...new Set([...tab.ids, ...action.payload.ids])]
                 : action.payload.ids;
-            draft.nextCursor = action.payload.nextCursor;
-            draft.fetchState = 'Completed';
-            draft.error = undefined;
+            tab.nextCursor = action.payload.nextCursor;
+            tab.fetchState = 'Completed';
+            tab.error = undefined;
         },
         updateInvoicingTransactionListFailure(draft, action) {
-            draft.fetchState = 'Error';
-            draft.error = action.payload;
+            const tab = draft.byTab[draft.activeTab];
+            tab.fetchState = 'Error';
+            tab.error = action.payload;
         },
         updateInvoicingTransactionFilters(draft, action) {
             draft.filters = action.payload;
         },
+        // Select a type tab. The view dispatches the follow-up
+        // fetchInvoicingTransactionListPage so the page epic fetches the tab when
+        // its cache is empty and reuses it when already loaded.
+        setInvoicingTransactionActiveTab(draft, action) {
+            draft.activeTab = action.payload;
+        },
         // Reflect a newly recorded payment's transaction in the cached list so the
-        // payments page shows it without refetching. The list view has no counts
-        // slice, so we only prepend the id (dedup/no-op if already present).
+        // payments page shows it without refetching. The payload carries no type,
+        // so prepend to the 'all' tab and the tab currently in view (dedup/no-op if
+        // already present); other tabs refetch fresh on their next visit.
         addInvoicingTransactionToList(draft, action) {
             const id = action.payload;
-            if (draft.ids.includes(id)) {
-                return;
+            const prependTo = (tabId) => {
+                const tab = draft.byTab[tabId];
+                if (!tab.ids.includes(id)) {
+                    tab.ids = [id, ...tab.ids];
+                }
+            };
+            prependTo('all');
+            if (draft.activeTab !== 'all') {
+                prependTo(draft.activeTab);
             }
-            draft.ids = [id, ...draft.ids];
         },
         clearInvoicingTransactionListView(draft) {
-            Object.assign(draft, initialState);
+            draft.activeTab = 'all';
+            draft.byTab = makeInvoicingTransactionIdsByTab();
+            draft.filters = {};
+            draft.sort = undefined;
         },
     },
 });
-export const { fetchInvoicingTransactionList, fetchInvoicingTransactionListPage, updateInvoicingTransactionList, updateInvoicingTransactionListFailure, updateInvoicingTransactionFilters, addInvoicingTransactionToList, clearInvoicingTransactionListView, } = invoicingTransactionListView.actions;
+export const { fetchInvoicingTransactionList, fetchInvoicingTransactionListPage, updateInvoicingTransactionList, updateInvoicingTransactionListFailure, updateInvoicingTransactionFilters, setInvoicingTransactionActiveTab, addInvoicingTransactionToList, clearInvoicingTransactionListView, } = invoicingTransactionListView.actions;
 export default invoicingTransactionListView.reducer;

package/lib/esm/view/invoicing/invoicingTransactionListView/invoicingTransactionListViewSelector.js

@@ -6,14 +6,18 @@ import { INVOICING_TRANSACTION_COLUMNS, INVOICING_TRANSACTION_TABS, } from './in
  * object) keep referential identity until the transaction entity slice or the
  * list-view slice actually change.
  */
-export const getInvoicingTransactionListView = createSelector((state) => state.invoicingTransactionState, (state) => state.invoicingTransactionListViewState, (transactionState, listViewState) => ({
-    columns: INVOICING_TRANSACTION_COLUMNS,
-    transactions: getInvoicingTransactionsByIds(transactionState, listViewState.ids),
-    filters: listViewState.filters,
-    nextCursor: listViewState.nextCursor,
-    fetchState: listViewState.fetchState,
-    error: listViewState.error,
-    tabIds: INVOICING_TRANSACTION_TABS,
-    sort: listViewState.sort,
-    version: 1.0,
-}));
+export const getInvoicingTransactionListView = createSelector((state) => state.invoicingTransactionState, (state) => state.invoicingTransactionListViewState, (transactionState, listViewState) => {
+    const activeTabState = listViewState.byTab[listViewState.activeTab];
+    return {
+        activeTab: listViewState.activeTab,
+        columns: INVOICING_TRANSACTION_COLUMNS,
+        transactions: getInvoicingTransactionsByIds(transactionState, activeTabState.ids),
+        filters: listViewState.filters,
+        nextCursor: activeTabState.nextCursor,
+        fetchState: activeTabState.fetchState,
+        error: activeTabState.error,
+        tabIds: INVOICING_TRANSACTION_TABS,
+        sort: listViewState.sort,
+        version: 1.0,
+    };
+});

package/lib/esm/view/invoicing/invoicingTransactionListView/invoicingTransactionListViewState.js

@@ -37,3 +37,13 @@ export const toInvoicingTransactionTabId = (v) => stringToUnion(v, ALL_INVOICING
 export const INVOICING_TRANSACTION_TABS = [
     ...ALL_INVOICING_TRANSACTION_TAB_IDS,
 ];
+export const makeInvoicingTransactionTabState = () => ({
+    ids: [],
+    nextCursor: null,
+    fetchState: 'Not-Started',
+    error: undefined,
+});
+export const makeInvoicingTransactionIdsByTab = () => ALL_INVOICING_TRANSACTION_TAB_IDS.reduce((acc, tabId) => {
+    acc[tabId] = makeInvoicingTransactionTabState();
+    return acc;
+}, {});

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/index.d.ts

@@ -1014,7 +1014,7 @@ export type { InvoicingDataImportStatusRow, FetchInvoicingMigrationDiagnosticsPa
 export type { StripeConnectCredentials } from './view/invoicing/settingsView/settingsViewPayload';
 export { clearAllInvoices, removeInvoice, updateInvoices, } from './entity/invoicing/invoice/invoiceReducer';
 export { getInvoiceById, getInvoicesByIds, } from './entity/invoicing/invoice/invoiceSelector';
-export { clearInvoiceList, fetchInvoiceCounts, fetchInvoiceKPIs, fetchInvoiceList, fetchInvoiceListPage, updateInvoiceListFilters, } from './view/invoicing/invoiceList/invoiceListReducer';
+export { clearInvoiceList, fetchInvoiceCounts, fetchInvoiceKPIs, fetchInvoiceList, fetchInvoiceListPage, setInvoiceActiveTab, updateInvoiceListFilters, } from './view/invoicing/invoiceList/invoiceListReducer';
 export { ALL_INVOICING_INVOICE_TAB_IDS, INVOICING_INVOICE_TABS, } from './view/invoicing/invoiceList/invoiceListState';
 export type { InvoiceListFilters, InvoiceListState, InvoicingInvoiceTabId, } from './view/invoicing/invoiceList/invoiceListState';
 export { getInvoiceListView } from './view/invoicing/invoiceList/invoiceListSelector';
@@ -1116,7 +1116,7 @@ export { getInvoicingDataImportActionState } from './view/invoicing/dataImportAc
 export { INVOICING_LIST_PAGE_SIZE } from './view/invoicing/invoicingApiHelper';
 export type { InvoicingListSort } from './view/invoicing/invoicingApiHelper';
 export { clearAllInvoicingCustomers, removeInvoicingCustomer, updateInvoicingCustomers, } from './entity/invoicing/invoicingCustomer/invoicingCustomerReducer';
-export { clearInvoicingCustomerListView, fetchInvoicingCustomerCounts, fetchInvoicingCustomerList, fetchInvoicingCustomerListPage, updateInvoicingCustomerFilters, } from './view/invoicing/invoicingCustomerListView/invoicingCustomerListViewReducer';
+export { clearInvoicingCustomerListView, fetchInvoicingCustomerCounts, fetchInvoicingCustomerList, fetchInvoicingCustomerListPage, setInvoicingCustomerActiveTab, updateInvoicingCustomerFilters, } from './view/invoicing/invoicingCustomerListView/invoicingCustomerListViewReducer';
 export { ALL_INVOICING_CUSTOMER_SORT_KEYS, ALL_INVOICING_CUSTOMER_TAB_IDS, INVOICING_CUSTOMER_COLUMNS, INVOICING_CUSTOMER_TABS, } from './view/invoicing/invoicingCustomerListView/invoicingCustomerListViewState';
 export type { InvoicingCustomerColumnConfig, InvoicingCustomerFilters, InvoicingCustomerSortKey, InvoicingCustomerTabId, } from './view/invoicing/invoicingCustomerListView/invoicingCustomerListViewState';
 export { getInvoicingCustomerListView } from './view/invoicing/invoicingCustomerListView/invoicingCustomerListViewSelector';
@@ -1130,7 +1130,7 @@ export { getInvoicingPaymentLinkSendState, getInvoicingPaymentMethodSaveState, g
 export { submitAddPromotionalCredits, resetPromotionalCreditAction, } from './view/invoicing/promotionalCreditAction/promotionalCreditActionReducer';
 export type { PromotionalCreditActionState } from './view/invoicing/promotionalCreditAction/promotionalCreditActionState';
 export { clearAllInvoicingSubscriptions, removeInvoicingSubscription, updateInvoicingSubscriptions, } from './entity/invoicing/invoicingSubscription/invoicingSubscriptionReducer';
-export { clearInvoicingSubscriptionListView, fetchInvoicingSubscriptionCounts, fetchInvoicingSubscriptionList, fetchInvoicingSubscriptionListPage, updateInvoicingSubscriptionFilters, } from './view/invoicing/invoicingSubscriptionListView/invoicingSubscriptionListViewReducer';
+export { clearInvoicingSubscriptionListView, fetchInvoicingSubscriptionCounts, fetchInvoicingSubscriptionList, fetchInvoicingSubscriptionListPage, setInvoicingSubscriptionActiveTab, updateInvoicingSubscriptionFilters, } from './view/invoicing/invoicingSubscriptionListView/invoicingSubscriptionListViewReducer';
 export { ALL_INVOICING_SUBSCRIPTION_SORT_KEYS, ALL_INVOICING_SUBSCRIPTION_TAB_IDS, INVOICING_SUBSCRIPTION_COLUMNS, INVOICING_SUBSCRIPTION_TABS, } from './view/invoicing/invoicingSubscriptionListView/invoicingSubscriptionListViewState';
 export type { InvoicingSubscriptionColumnConfig, InvoicingSubscriptionFilters, InvoicingSubscriptionSortKey, InvoicingSubscriptionTabId, } from './view/invoicing/invoicingSubscriptionListView/invoicingSubscriptionListViewState';
 export { getInvoicingSubscriptionListView } from './view/invoicing/invoicingSubscriptionListView/invoicingSubscriptionListViewSelector';
@@ -1139,7 +1139,7 @@ export { clearInvoicingSubscriptionDetailView, fetchInvoicingSubscriptionDetail,
 export { getInvoicingSubscriptionById, getInvoicingSubscriptionDetail, } from './view/invoicing/invoicingSubscriptionDetailView/invoicingSubscriptionDetailViewSelector';
 export type { InvoicingSubscriptionDetailView } from './view/invoicing/invoicingSubscriptionDetailView/invoicingSubscriptionDetailViewSelector';
 export { clearAllInvoicingTransactions, removeInvoicingTransaction, updateInvoicingTransactions, } from './entity/invoicing/invoicingTransaction/invoicingTransactionReducer';
-export { clearInvoicingTransactionListView, fetchInvoicingTransactionList, fetchInvoicingTransactionListPage, updateInvoicingTransactionFilters, } from './view/invoicing/invoicingTransactionListView/invoicingTransactionListViewReducer';
+export { clearInvoicingTransactionListView, fetchInvoicingTransactionList, fetchInvoicingTransactionListPage, setInvoicingTransactionActiveTab, updateInvoicingTransactionFilters, } from './view/invoicing/invoicingTransactionListView/invoicingTransactionListViewReducer';
 export { ALL_INVOICING_TRANSACTION_SORT_KEYS, ALL_INVOICING_TRANSACTION_TAB_IDS, INVOICING_TRANSACTION_COLUMNS, INVOICING_TRANSACTION_TABS, } from './view/invoicing/invoicingTransactionListView/invoicingTransactionListViewState';
 export type { InvoicingTransactionColumnConfig, InvoicingTransactionFilters, InvoicingTransactionSortKey, InvoicingTransactionTabId, } from './view/invoicing/invoicingTransactionListView/invoicingTransactionListViewState';
 export { getInvoicingTransactionListView } from './view/invoicing/invoicingTransactionListView/invoicingTransactionListViewSelector';
@@ -1148,7 +1148,7 @@ export { clearInvoicingTransactionDetailView, fetchInvoicingTransactionDetail, }
 export { getInvoicingTransactionById, getInvoicingTransactionDetail, } from './view/invoicing/invoicingTransactionDetailView/invoicingTransactionDetailViewSelector';
 export type { InvoicingTransactionDetailView } from './view/invoicing/invoicingTransactionDetailView/invoicingTransactionDetailViewSelector';
 export { clearAllInvoicingCreditNotes, removeInvoicingCreditNote, updateInvoicingCreditNotes, } from './entity/invoicing/creditNote/creditNoteReducer';
-export { clearInvoicingCreditNoteListView, fetchInvoicingCreditNoteCounts, fetchInvoicingCreditNoteList, fetchInvoicingCreditNoteListPage, updateInvoicingCreditNoteFilters, } from './view/invoicing/invoicingCreditNoteListView/invoicingCreditNoteListViewReducer';
+export { clearInvoicingCreditNoteListView, fetchInvoicingCreditNoteCounts, fetchInvoicingCreditNoteList, fetchInvoicingCreditNoteListPage, setInvoicingCreditNoteActiveTab, updateInvoicingCreditNoteFilters, } from './view/invoicing/invoicingCreditNoteListView/invoicingCreditNoteListViewReducer';
 export { ALL_INVOICING_CREDIT_NOTE_SORT_KEYS, ALL_INVOICING_CREDIT_NOTE_TAB_IDS, INVOICING_CREDIT_NOTE_COLUMNS, INVOICING_CREDIT_NOTE_TABS, } from './view/invoicing/invoicingCreditNoteListView/invoicingCreditNoteListViewState';
 export type { InvoicingCreditNoteColumnConfig, InvoicingCreditNoteFilters, InvoicingCreditNoteSortKey, InvoicingCreditNoteTabId, } from './view/invoicing/invoicingCreditNoteListView/invoicingCreditNoteListViewState';
 export { getInvoicingCreditNoteListView } from './view/invoicing/invoicingCreditNoteListView/invoicingCreditNoteListViewSelector';
@@ -1157,7 +1157,7 @@ export { clearInvoicingCreditNoteDetailView, fetchInvoicingCreditNoteDetail, } f
 export { getInvoicingCreditNoteById, getInvoicingCreditNoteDetail, } from './view/invoicing/invoicingCreditNoteDetailView/invoicingCreditNoteDetailViewSelector';
 export type { InvoicingCreditNoteDetailView } from './view/invoicing/invoicingCreditNoteDetailView/invoicingCreditNoteDetailViewSelector';
 export { clearAllInvoicingCoupons, removeInvoicingCoupon, updateInvoicingCoupons, } from './entity/invoicing/coupon/couponReducer';
-export { clearInvoicingCouponView, fetchInvoicingCouponCounts, fetchInvoicingCouponList, fetchInvoicingCouponListPage, updateInvoicingCouponFilters, } from './view/invoicing/couponView/couponViewReducer';
+export { clearInvoicingCouponView, fetchInvoicingCouponCounts, fetchInvoicingCouponList, fetchInvoicingCouponListPage, setInvoicingCouponActiveTab, updateInvoicingCouponFilters, } from './view/invoicing/couponView/couponViewReducer';
 export { ALL_INVOICING_COUPON_SORT_KEYS, ALL_INVOICING_COUPON_TAB_IDS, INVOICING_COUPON_COLUMNS, INVOICING_COUPON_TABS, } from './view/invoicing/couponView/couponViewState';
 export type { InvoicingCouponColumnConfig, InvoicingCouponFilters, InvoicingCouponSortKey, InvoicingCouponTabId, } from './view/invoicing/couponView/couponViewState';
 export { getInvoicingCouponCounts, getInvoicingCouponListFetchState, getInvoicingCouponListFilters, getInvoicingCouponListHasMore, getInvoicingCouponListItems, getInvoicingCouponListNextCursor, getInvoicingCouponListView, } from './view/invoicing/couponView/couponViewSelector';
@@ -1167,7 +1167,7 @@ export { clearInvoicingCouponDetailView, fetchInvoicingCouponDetail, } from './v
 export { getInvoicingCouponDetail } from './view/invoicing/invoicingCouponDetailView/invoicingCouponDetailViewSelector';
 export type { InvoicingCouponDetailView } from './view/invoicing/invoicingCouponDetailView/invoicingCouponDetailViewSelector';
 export { clearAllInvoicingDunningCases, removeInvoicingDunningCase, updateInvoicingDunningCases, } from './entity/invoicing/dunningCase/dunningCaseReducer';
-export { clearInvoicingDunningCaseListView, fetchInvoicingDunningCaseCounts, fetchInvoicingDunningCaseList, fetchInvoicingDunningCaseListPage, updateInvoicingDunningCaseFilters, } from './view/invoicing/invoicingDunningCaseListView/invoicingDunningCaseListViewReducer';
+export { clearInvoicingDunningCaseListView, fetchInvoicingDunningCaseCounts, fetchInvoicingDunningCaseList, fetchInvoicingDunningCaseListPage, setInvoicingDunningCaseActiveTab, updateInvoicingDunningCaseFilters, } from './view/invoicing/invoicingDunningCaseListView/invoicingDunningCaseListViewReducer';
 export { ALL_INVOICING_DUNNING_CASE_SORT_KEYS, ALL_INVOICING_DUNNING_CASE_TAB_IDS, INVOICING_DUNNING_CASE_COLUMNS, INVOICING_DUNNING_CASE_TABS, } from './view/invoicing/invoicingDunningCaseListView/invoicingDunningCaseListViewState';
 export type { InvoicingDunningCaseColumnConfig, InvoicingDunningCaseFilters, InvoicingDunningCaseSortKey, InvoicingDunningCaseTabId, } from './view/invoicing/invoicingDunningCaseListView/invoicingDunningCaseListViewState';
 export { getInvoicingDunningCaseListView } from './view/invoicing/invoicingDunningCaseListView/invoicingDunningCaseListViewSelector';