@zeniai/client-epic-state 5.1.66 → 5.1.68-beta0GS

package/lib/view/invoicing/createInvoice/createInvoiceReducer.d.ts

@@ -5,6 +5,10 @@ import { CreateInvoiceState, InvoicingCreateInvoiceFormLocalData } from './creat
 export declare const initialState: CreateInvoiceState;
 export declare const createInvoice: import("@reduxjs/toolkit").ActionCreatorWithPayload<CreateInvoiceRequest, "invoicingCreateInvoice/createInvoice">, createInvoiceSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     invoiceId: ID;
-}, "invoicingCreateInvoice/createInvoiceSuccess">, createInvoiceFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "invoicingCreateInvoice/createInvoiceFailure">, resetCreateInvoice: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"invoicingCreateInvoice/resetCreateInvoice">, updateInvoicingCreateInvoiceFormDraft: import("@reduxjs/toolkit").ActionCreatorWithPayload<InvoicingCreateInvoiceFormLocalData, "invoicingCreateInvoice/updateInvoicingCreateInvoiceFormDraft">;
+}, "invoicingCreateInvoice/createInvoiceSuccess">, createInvoiceFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "invoicingCreateInvoice/createInvoiceFailure">, fetchCreateInvoiceFormPage: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: {
+    cacheOverride: boolean;
+}], {
+    cacheOverride: boolean;
+}, "invoicingCreateInvoice/fetchCreateInvoiceFormPage", never, never>, resetCreateInvoice: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"invoicingCreateInvoice/resetCreateInvoice">, updateInvoicingCreateInvoiceFormDraft: import("@reduxjs/toolkit").ActionCreatorWithPayload<InvoicingCreateInvoiceFormLocalData, "invoicingCreateInvoice/updateInvoicingCreateInvoiceFormDraft">;
 declare const _default: import("redux").Reducer<CreateInvoiceState>;
 export default _default;

package/lib/view/invoicing/createInvoice/createInvoiceReducer.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateInvoicingCreateInvoiceFormDraft = exports.resetCreateInvoice = exports.createInvoiceFailure = exports.createInvoiceSuccess = exports.createInvoice = exports.initialState = void 0;
+exports.updateInvoicingCreateInvoiceFormDraft = exports.resetCreateInvoice = exports.fetchCreateInvoiceFormPage = exports.createInvoiceFailure = exports.createInvoiceSuccess = exports.createInvoice = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const createInvoiceFormConfig_1 = require("./createInvoiceFormConfig");
 exports.initialState = {
@@ -18,6 +18,20 @@ const createInvoiceSlice = (0, toolkit_1.createSlice)({
     name: 'invoicingCreateInvoice',
     initialState: exports.initialState,
     reducers: {
+        /**
+         * Trigger-only action for {@link fetchCreateInvoiceFormPageEpic}: fans out to
+         * the customer/plan/product/settings fetches, skipping any already cached
+         * unless `cacheOverride` is set. Holds no state of its own.
+         */
+        fetchCreateInvoiceFormPage: {
+            reducer() {
+                // No state mutation; fetchCreateInvoiceFormPageEpic fans out to the
+                // customer/plan/product/settings fetches in response to this action.
+            },
+            prepare(payload) {
+                return { payload };
+            },
+        },
         updateInvoicingCreateInvoiceFormDraft(draft, action) {
             draft.formDraft = action.payload;
         },
@@ -41,5 +55,5 @@ const createInvoiceSlice = (0, toolkit_1.createSlice)({
         },
     },
 });
-_a = createInvoiceSlice.actions, exports.createInvoice = _a.createInvoice, exports.createInvoiceSuccess = _a.createInvoiceSuccess, exports.createInvoiceFailure = _a.createInvoiceFailure, exports.resetCreateInvoice = _a.resetCreateInvoice, exports.updateInvoicingCreateInvoiceFormDraft = _a.updateInvoicingCreateInvoiceFormDraft;
+_a = createInvoiceSlice.actions, exports.createInvoice = _a.createInvoice, exports.createInvoiceSuccess = _a.createInvoiceSuccess, exports.createInvoiceFailure = _a.createInvoiceFailure, exports.fetchCreateInvoiceFormPage = _a.fetchCreateInvoiceFormPage, exports.resetCreateInvoice = _a.resetCreateInvoice, exports.updateInvoicingCreateInvoiceFormDraft = _a.updateInvoicingCreateInvoiceFormDraft;
 exports.default = createInvoiceSlice.reducer;

package/lib/view/invoicing/createInvoice/createInvoiceSelector.d.ts

@@ -8,6 +8,7 @@ import { InvoicingCreateInvoiceFormLocalData } from './createInvoiceState';
 export interface CreateInvoiceFormView extends SelectorView {
     customers: InvoicingCustomer[];
     localData: InvoicingCreateInvoiceFormLocalData;
+    planNames: string[];
     plans: InvoicingProduct[];
     products: InvoicingProduct[];
     savedInvoiceId?: ID;

package/lib/view/invoicing/createInvoice/createInvoiceSelector.js

@@ -15,10 +15,14 @@ const settingsViewSelector_1 = require("../settingsView/settingsViewSelector");
 const getCreateInvoiceFormView = (state) => {
     const createInvoiceState = state.invoicingCreateInvoiceState;
     const catalogListView = (0, invoicingCatalogListViewSelector_1.getInvoicingCatalogListView)(state);
+    const plans = (0, invoicingCatalogListViewSelector_1.getInvoicingCatalogPrices)(catalogListView.plans);
     return {
         customers: (0, invoicingCustomerListViewSelector_1.getInvoicingCustomerListView)(state).customers,
         localData: createInvoiceState.formDraft,
-        plans: (0, invoicingCatalogListViewSelector_1.getInvoicingCatalogPrices)(catalogListView.plans),
+        planNames: plans
+            .map((plan) => plan.name ?? '')
+            .filter((name) => name !== ''),
+        plans,
         products: (0, invoicingCatalogListViewSelector_1.getInvoicingCatalogPrices)(catalogListView.products),
         savedInvoiceId: createInvoiceState.createdInvoiceId,
         settings: (0, settingsViewSelector_1.getInvoicingSettings)(state),

package/lib/view/invoicing/createInvoice/epics/fetchCreateInvoiceFormPageEpic.d.ts

@@ -0,0 +1,15 @@
+import { ActionsObservable, StateObservable } from 'redux-observable';
+import { Observable } from 'rxjs';
+import { RootState } from '../../../../reducer';
+import { fetchInvoicingCatalogPlanList, fetchInvoicingCatalogProductList } from '../../invoicingCatalogListView/invoicingCatalogListViewReducer';
+import { fetchInvoicingCustomerList } from '../../invoicingCustomerListView/invoicingCustomerListViewReducer';
+import { fetchInvoicingSettings } from '../../settingsView/settingsViewReducer';
+import { fetchCreateInvoiceFormPage } from '../createInvoiceReducer';
+export type ActionType = ReturnType<typeof fetchCreateInvoiceFormPage> | ReturnType<typeof fetchInvoicingCustomerList> | ReturnType<typeof fetchInvoicingCatalogPlanList> | ReturnType<typeof fetchInvoicingCatalogProductList> | ReturnType<typeof fetchInvoicingSettings>;
+/**
+ * Orchestrates the create-invoice form's option sources: on
+ * `fetchCreateInvoiceFormPage`, fans out to the customer, catalog plan, catalog
+ * product and settings fetches, skipping any already cached unless
+ * `cacheOverride` is set.
+ */
+export declare const fetchCreateInvoiceFormPageEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

package/lib/view/invoicing/createInvoice/epics/fetchCreateInvoiceFormPageEpic.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchCreateInvoiceFormPageEpic = void 0;
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const invoicingCatalogListViewReducer_1 = require("../../invoicingCatalogListView/invoicingCatalogListViewReducer");
+const invoicingCustomerListViewReducer_1 = require("../../invoicingCustomerListView/invoicingCustomerListViewReducer");
+const settingsViewReducer_1 = require("../../settingsView/settingsViewReducer");
+const createInvoiceReducer_1 = require("../createInvoiceReducer");
+/**
+ * Fetch unless the resource is already loaded or in flight — or always when the
+ * caller forces a refresh via `cacheOverride` (false on a plain page open, true
+ * to force a reload).
+ */
+const shouldFetch = (fetchStateAndError, cacheOverride) => cacheOverride ||
+    (fetchStateAndError.fetchState !== 'Completed' &&
+        fetchStateAndError.fetchState !== 'In-Progress');
+/**
+ * Orchestrates the create-invoice form's option sources: on
+ * `fetchCreateInvoiceFormPage`, fans out to the customer, catalog plan, catalog
+ * product and settings fetches, skipping any already cached unless
+ * `cacheOverride` is set.
+ */
+const fetchCreateInvoiceFormPageEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(createInvoiceReducer_1.fetchCreateInvoiceFormPage.match), (0, operators_1.mergeMap)((action) => {
+    const { cacheOverride } = action.payload;
+    const state = state$.value;
+    const customerState = state.invoicingCustomerListViewState;
+    const catalogState = state.invoicingCatalogListViewState;
+    const settingsState = state.invoicingSettingsViewState;
+    const pageActions = [];
+    if (shouldFetch({ fetchState: customerState.fetchState, error: customerState.error }, cacheOverride)) {
+        pageActions.push((0, invoicingCustomerListViewReducer_1.fetchInvoicingCustomerList)({
+            filters: {},
+            keepExistingListItems: false,
+        }));
+    }
+    if (shouldFetch({ fetchState: catalogState.fetchState, error: catalogState.error }, cacheOverride)) {
+        pageActions.push((0, invoicingCatalogListViewReducer_1.fetchInvoicingCatalogPlanList)({
+            filters: { type: 'plan' },
+            keepExistingListItems: false,
+        }));
+    }
+    if (shouldFetch(catalogState.productFetchState, cacheOverride)) {
+        pageActions.push((0, invoicingCatalogListViewReducer_1.fetchInvoicingCatalogProductList)({
+            filters: { type: 'addon|charge' },
+            keepExistingListItems: false,
+        }));
+    }
+    if (shouldFetch({ fetchState: settingsState.fetchState, error: settingsState.error }, cacheOverride)) {
+        pageActions.push((0, settingsViewReducer_1.fetchInvoicingSettings)());
+    }
+    return (0, rxjs_1.from)(pageActions);
+}));
+exports.fetchCreateInvoiceFormPageEpic = fetchCreateInvoiceFormPageEpic;

package/lib/view/invoicing/editInvoicingCouponDetailView/editInvoicingCouponDetailViewPayload.js

@@ -12,7 +12,6 @@ const localDataToSaveInvoicingCouponPayload = (localData, isCreate) => {
         discount_type: localData.discountType,
         duration_type: localData.durationType,
         name: localData.name.trim(),
-        status: 'active',
     };
     if (isCreate) {
         data.id = localData.couponId.trim();

package/lib/view/settings/jeScheduleApprovalRules/epic/fetchJEScheduleApprovalRulesEpic.d.ts

@@ -0,0 +1,7 @@
+import { ActionsObservable, StateObservable } from 'redux-observable';
+import { Observable } from 'rxjs';
+import { RootState } from '../../../../reducer';
+import { ZeniAPI } from '../../../../zeniAPI';
+import { fetchJEScheduleApprovalRules, fetchJEScheduleApprovalRulesFailure, fetchJEScheduleApprovalRulesSuccess } from '../jeScheduleApprovalRulesReducer';
+export type ActionType = ReturnType<typeof fetchJEScheduleApprovalRules> | ReturnType<typeof fetchJEScheduleApprovalRulesSuccess> | ReturnType<typeof fetchJEScheduleApprovalRulesFailure>;
+export declare const fetchJEScheduleApprovalRulesEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/settings/jeScheduleApprovalRules/epic/fetchJEScheduleApprovalRulesEpic.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchJEScheduleApprovalRulesEpic = void 0;
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const responsePayload_1 = require("../../../../responsePayload");
+const jeScheduleApprovalRulesReducer_1 = require("../jeScheduleApprovalRulesReducer");
+const fetchJEScheduleApprovalRulesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(jeScheduleApprovalRulesReducer_1.fetchJEScheduleApprovalRules.match), (0, operators_1.switchMap)((action) => {
+    const { cacheOverride } = action.payload;
+    const { jeScheduleApprovalRulesState } = state$.value;
+    const cachedSettings = jeScheduleApprovalRulesState.settings;
+    if (cacheOverride !== true &&
+        jeScheduleApprovalRulesState.hasValidState() === true &&
+        cachedSettings != null) {
+        return (0, rxjs_1.of)((0, jeScheduleApprovalRulesReducer_1.fetchJEScheduleApprovalRulesSuccess)(cachedSettings));
+    }
+    const endpoint = `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/je-schedules/approval-rules`;
+    return zeniAPI.getJSON(endpoint).pipe((0, operators_1.mergeMap)((response) => {
+        if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
+            return (0, rxjs_1.of)((0, jeScheduleApprovalRulesReducer_1.fetchJEScheduleApprovalRulesSuccess)(response.data.settings));
+        }
+        return (0, rxjs_1.of)((0, jeScheduleApprovalRulesReducer_1.fetchJEScheduleApprovalRulesFailure)(response.status));
+    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, jeScheduleApprovalRulesReducer_1.fetchJEScheduleApprovalRulesFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Fetch JE approval rules errored out' + JSON.stringify(error))))));
+}));
+exports.fetchJEScheduleApprovalRulesEpic = fetchJEScheduleApprovalRulesEpic;

package/lib/view/settings/jeScheduleApprovalRules/epic/saveJEScheduleApprovalRulesEpic.d.ts

@@ -0,0 +1,6 @@
+import { ActionsObservable } from 'redux-observable';
+import { Observable } from 'rxjs';
+import { ZeniAPI } from '../../../../zeniAPI';
+import { saveJEScheduleApprovalRules, saveJEScheduleApprovalRulesConflict, saveJEScheduleApprovalRulesFailure, saveJEScheduleApprovalRulesSuccess } from '../jeScheduleApprovalRulesReducer';
+export type ActionType = ReturnType<typeof saveJEScheduleApprovalRules> | ReturnType<typeof saveJEScheduleApprovalRulesSuccess> | ReturnType<typeof saveJEScheduleApprovalRulesConflict> | ReturnType<typeof saveJEScheduleApprovalRulesFailure>;
+export declare const saveJEScheduleApprovalRulesEpic: (actions$: ActionsObservable<ActionType>, _state$: unknown, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/settings/jeScheduleApprovalRules/epic/saveJEScheduleApprovalRulesEpic.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.saveJEScheduleApprovalRulesEpic = void 0;
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const responsePayload_1 = require("../../../../responsePayload");
+const jeScheduleApprovalRulesReducer_1 = require("../jeScheduleApprovalRulesReducer");
+const HTTP_CONFLICT = 409;
+const saveJEScheduleApprovalRulesEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(jeScheduleApprovalRulesReducer_1.saveJEScheduleApprovalRules.match), (0, operators_1.mergeMap)((action) => {
+    const { body } = action.payload;
+    const endpoint = `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/je-schedules/approval-rules`;
+    return zeniAPI
+        .postAndGetJSON(endpoint, body)
+        .pipe((0, operators_1.mergeMap)((response) => {
+        if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
+            return (0, rxjs_1.of)((0, jeScheduleApprovalRulesReducer_1.saveJEScheduleApprovalRulesSuccess)(response.data.settings, response.data.reevaluation_triggered));
+        }
+        if (response.status.code === HTTP_CONFLICT) {
+            return (0, rxjs_1.of)((0, jeScheduleApprovalRulesReducer_1.saveJEScheduleApprovalRulesConflict)(response.status));
+        }
+        return (0, rxjs_1.of)((0, jeScheduleApprovalRulesReducer_1.saveJEScheduleApprovalRulesFailure)(response.status));
+    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, jeScheduleApprovalRulesReducer_1.saveJEScheduleApprovalRulesFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Save JE approval rules errored out' + JSON.stringify(error))))));
+}));
+exports.saveJEScheduleApprovalRulesEpic = saveJEScheduleApprovalRulesEpic;

package/lib/view/settings/jeScheduleApprovalRules/jeScheduleApprovalRulesPayload.d.ts

@@ -0,0 +1,29 @@
+import { ZeniAPIResponse } from '../../../responsePayload';
+export type JEScheduleType = 'prepaid_expenses' | 'fixed_assets' | 'accrued_expenses';
+export interface JEApprovalThresholdRow {
+    account_id: string;
+    account_name: string;
+    max_auto_post_amount: number | null;
+    schedule_type: JEScheduleType;
+}
+export interface JEApprovalSettings {
+    approver_roles: string[];
+    reevaluate_ongoing_on_threshold_change: boolean;
+    thresholds: JEApprovalThresholdRow[];
+    version: number;
+}
+export interface JEScheduleApprovalRulesResponseData {
+    exists: boolean;
+    settings: JEApprovalSettings;
+}
+export type JEScheduleApprovalRulesResponse = ZeniAPIResponse<JEScheduleApprovalRulesResponseData>;
+export interface SaveJEScheduleApprovalRulesResponseData extends JEScheduleApprovalRulesResponseData {
+    reevaluation_triggered: boolean;
+}
+export type SaveJEScheduleApprovalRulesResponse = ZeniAPIResponse<SaveJEScheduleApprovalRulesResponseData>;
+export interface SaveJEScheduleApprovalRulesRequestBody extends Record<string, unknown> {
+    approver_roles: string[];
+    reevaluate_ongoing_on_threshold_change: boolean;
+    thresholds: JEApprovalThresholdRow[];
+    expected_version?: number;
+}

package/lib/view/settings/jeScheduleApprovalRules/jeScheduleApprovalRulesPayload.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/view/settings/jeScheduleApprovalRules/jeScheduleApprovalRulesReducer.d.ts

@@ -0,0 +1,16 @@
+import { ZeniAPIStatus } from '../../../responsePayload';
+import { JEApprovalSettings, SaveJEScheduleApprovalRulesRequestBody } from './jeScheduleApprovalRulesPayload';
+import { JEScheduleApprovalRulesState } from './jeScheduleApprovalRulesState';
+export declare const initialState: JEScheduleApprovalRulesState;
+export declare const fetchJEScheduleApprovalRules: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: any], {
+    cacheOverride: any;
+}, "jeScheduleApprovalRules/fetchJEScheduleApprovalRules", never, never>, fetchJEScheduleApprovalRulesSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[settings: JEApprovalSettings], {
+    settings: JEApprovalSettings;
+}, "jeScheduleApprovalRules/fetchJEScheduleApprovalRulesSuccess", never, never>, fetchJEScheduleApprovalRulesFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "jeScheduleApprovalRules/fetchJEScheduleApprovalRulesFailure">, saveJEScheduleApprovalRules: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[body: SaveJEScheduleApprovalRulesRequestBody], {
+    body: SaveJEScheduleApprovalRulesRequestBody;
+}, "jeScheduleApprovalRules/saveJEScheduleApprovalRules", never, never>, saveJEScheduleApprovalRulesSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[settings: JEApprovalSettings, reevaluationTriggered: boolean], {
+    settings: JEApprovalSettings;
+    reevaluationTriggered: boolean;
+}, "jeScheduleApprovalRules/saveJEScheduleApprovalRulesSuccess", never, never>, saveJEScheduleApprovalRulesConflict: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "jeScheduleApprovalRules/saveJEScheduleApprovalRulesConflict">, saveJEScheduleApprovalRulesFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "jeScheduleApprovalRules/saveJEScheduleApprovalRulesFailure">, clearJEScheduleApprovalRules: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"jeScheduleApprovalRules/clearJEScheduleApprovalRules">;
+declare const _default: import("redux").Reducer<JEScheduleApprovalRulesState>;
+export default _default;

package/lib/view/settings/jeScheduleApprovalRules/jeScheduleApprovalRulesReducer.js

@@ -0,0 +1,80 @@
+"use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.clearJEScheduleApprovalRules = exports.saveJEScheduleApprovalRulesFailure = exports.saveJEScheduleApprovalRulesConflict = exports.saveJEScheduleApprovalRulesSuccess = exports.saveJEScheduleApprovalRules = exports.fetchJEScheduleApprovalRulesFailure = exports.fetchJEScheduleApprovalRulesSuccess = exports.fetchJEScheduleApprovalRules = exports.initialState = void 0;
+const toolkit_1 = require("@reduxjs/toolkit");
+exports.initialState = {
+    fetchState: 'Not-Started',
+    error: undefined,
+    saveStatus: { fetchState: 'Not-Started', error: undefined },
+    settings: undefined,
+    hadVersionConflict: false,
+    reevaluationTriggered: false,
+    hasValidState() {
+        return this.fetchState === 'Completed';
+    },
+};
+const jeScheduleApprovalRules = (0, toolkit_1.createSlice)({
+    name: 'jeScheduleApprovalRules',
+    initialState: exports.initialState,
+    reducers: {
+        fetchJEScheduleApprovalRules: {
+            reducer(draft) {
+                draft.fetchState = 'In-Progress';
+                draft.error = undefined;
+            },
+            prepare(cacheOverride = false) {
+                return { payload: { cacheOverride } };
+            },
+        },
+        fetchJEScheduleApprovalRulesSuccess: {
+            reducer(draft, action) {
+                draft.fetchState = 'Completed';
+                draft.error = undefined;
+                draft.settings = action.payload.settings;
+            },
+            prepare(settings) {
+                return { payload: { settings } };
+            },
+        },
+        fetchJEScheduleApprovalRulesFailure(draft, action) {
+            draft.fetchState = 'Error';
+            draft.error = action.payload;
+        },
+        saveJEScheduleApprovalRules: {
+            reducer(draft) {
+                draft.saveStatus = { fetchState: 'In-Progress', error: undefined };
+                draft.hadVersionConflict = false;
+                draft.reevaluationTriggered = false;
+            },
+            prepare(body) {
+                return { payload: { body } };
+            },
+        },
+        saveJEScheduleApprovalRulesSuccess: {
+            reducer(draft, action) {
+                draft.saveStatus = { fetchState: 'Completed', error: undefined };
+                draft.settings = action.payload.settings;
+                draft.reevaluationTriggered = action.payload.reevaluationTriggered;
+                draft.hadVersionConflict = false;
+            },
+            prepare(settings, reevaluationTriggered) {
+                return { payload: { settings, reevaluationTriggered } };
+            },
+        },
+        // 409 — the stored version moved under us. The screen should re-fetch and
+        // ask the user to re-apply. Kept distinct from a generic save failure.
+        saveJEScheduleApprovalRulesConflict(draft, action) {
+            draft.saveStatus = { fetchState: 'Error', error: action.payload };
+            draft.hadVersionConflict = true;
+        },
+        saveJEScheduleApprovalRulesFailure(draft, action) {
+            draft.saveStatus = { fetchState: 'Error', error: action.payload };
+        },
+        clearJEScheduleApprovalRules() {
+            return exports.initialState;
+        },
+    },
+});
+_a = jeScheduleApprovalRules.actions, exports.fetchJEScheduleApprovalRules = _a.fetchJEScheduleApprovalRules, exports.fetchJEScheduleApprovalRulesSuccess = _a.fetchJEScheduleApprovalRulesSuccess, exports.fetchJEScheduleApprovalRulesFailure = _a.fetchJEScheduleApprovalRulesFailure, exports.saveJEScheduleApprovalRules = _a.saveJEScheduleApprovalRules, exports.saveJEScheduleApprovalRulesSuccess = _a.saveJEScheduleApprovalRulesSuccess, exports.saveJEScheduleApprovalRulesConflict = _a.saveJEScheduleApprovalRulesConflict, exports.saveJEScheduleApprovalRulesFailure = _a.saveJEScheduleApprovalRulesFailure, exports.clearJEScheduleApprovalRules = _a.clearJEScheduleApprovalRules;
+exports.default = jeScheduleApprovalRules.reducer;

package/lib/view/settings/jeScheduleApprovalRules/jeScheduleApprovalRulesSelector.d.ts

@@ -0,0 +1,12 @@
+import { FetchState, FetchStateAndError } from '../../../commonStateTypes/common';
+import { RootState } from '../../../reducer';
+import { JEApprovalSettings } from './jeScheduleApprovalRulesPayload';
+export interface JEScheduleApprovalRulesView {
+    error: FetchStateAndError['error'];
+    fetchState: FetchState;
+    hadVersionConflict: boolean;
+    reevaluationTriggered: boolean;
+    saveStatus: FetchStateAndError;
+    settings?: JEApprovalSettings;
+}
+export declare const getJEScheduleApprovalRulesView: (state: RootState) => JEScheduleApprovalRulesView;

package/lib/view/settings/jeScheduleApprovalRules/jeScheduleApprovalRulesSelector.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getJEScheduleApprovalRulesView = void 0;
+const toolkit_1 = require("@reduxjs/toolkit");
+exports.getJEScheduleApprovalRulesView = (0, toolkit_1.createSelector)((state) => state.jeScheduleApprovalRulesState, (jeScheduleApprovalRulesState) => ({
+    fetchState: jeScheduleApprovalRulesState.fetchState,
+    error: jeScheduleApprovalRulesState.error,
+    saveStatus: jeScheduleApprovalRulesState.saveStatus,
+    settings: jeScheduleApprovalRulesState.settings,
+    hadVersionConflict: jeScheduleApprovalRulesState.hadVersionConflict ?? false,
+    reevaluationTriggered: jeScheduleApprovalRulesState.reevaluationTriggered ?? false,
+}));

package/lib/view/settings/jeScheduleApprovalRules/jeScheduleApprovalRulesState.d.ts

@@ -0,0 +1,8 @@
+import { FetchStateAndError, FetchedState } from '../../../commonStateTypes/common';
+import { JEApprovalSettings } from './jeScheduleApprovalRulesPayload';
+export interface JEScheduleApprovalRulesState extends FetchedState {
+    saveStatus: FetchStateAndError;
+    hadVersionConflict?: boolean;
+    reevaluationTriggered?: boolean;
+    settings?: JEApprovalSettings;
+}

package/lib/view/settings/jeScheduleApprovalRules/jeScheduleApprovalRulesState.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -54,6 +54,7 @@ export interface BillDetailViewSelector extends SelectorView {
 export interface StepWithStatus extends StepWithUser {
     actorsActivity: ActorActivityWithUser[];
     isOriginalApprovalStep: boolean;
+    displayPendingApproverAsAdmin?: boolean;
 }
 export interface ActorActivityWithUser {
     activity: ActivityStatus;
@@ -62,6 +63,7 @@ export interface ActorActivityWithUser {
     type: string;
     userId: ID;
     actor?: User;
+    isImplicitActor?: boolean;
     lastUpdateTime?: ZeniDate;
     subType?: string;
 }
@@ -77,6 +79,7 @@ export interface BillActivity {
     currentPendingStepIndex?: number;
     entityApprovalId?: ID;
     isAdminFallbackApprover?: boolean;
+    sodExcludedApproverUserId?: ID;
 }
 export declare const getBillActivities: (state: RootState, billId: ID, billStageCode?: BillStageCodeType) => BillActivity[];
 export declare const getBillDetailView: (state: RootState, billId: ID) => BillDetailViewSelector;

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

@@ -63,7 +63,7 @@ const getBillActivities = (state, billId, billStageCode) => {
             const approvalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, billDetail.approvalRuleIds);
             const entityApprovalStatusByIds = (0, entityApprovalStatusSelector_1.getEntityApprovalStatusByIds)(entityApprovalStatusState, billDetail.entityApprovalIds);
             billActivities = entityApprovalStatusByIds.map((entityApprovalStatus) => {
-                const { approvalRuleId, entityType, createTime, updateTime, stepsApprovalStatus, areApprovalsSerialized, isAdminFallbackApprover, isRealTimeApprovalEnabled, currentPendingStepIndex, } = entityApprovalStatus;
+                const { approvalRuleId, entityType, createTime, updateTime, stepsApprovalStatus, areApprovalsSerialized, isAdminFallbackApprover, isRealTimeApprovalEnabled, currentPendingStepIndex, sodExcludedApproverUserId, } = entityApprovalStatus;
                 const approvalRule = approvalRules.find((rule) => rule.approvalRuleId === approvalRuleId);
                 return {
                     approvalRuleId,
@@ -75,21 +75,22 @@ const getBillActivities = (state, billId, billStageCode) => {
                     isAdminFallbackApprover,
                     isRealTimeApprovalEnabled,
                     currentPendingStepIndex,
+                    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),
                         };
                     }),
                 };
@@ -256,7 +257,7 @@ const checkApproveRejectBtnShow = (billActivities, isUserAdmin, signedInUser) =>
     let isMarkAsPaidBtnVisible = false;
     let rejectedId = -1;
     const stepsWithStatusData = billActivities[0].stepsWithStatus;
-    const { areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, } = billActivities[0];
+    const { areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, sodExcludedApproverUserId, } = billActivities[0];
     for (const [index, stepWithStatus] of stepsWithStatusData.entries()) {
         if (stepWithStatus.action === 'require_approval') {
             for (const actorActivity of stepWithStatus.actorsActivity) {
@@ -297,23 +298,42 @@ const checkApproveRejectBtnShow = (billActivities, isUserAdmin, signedInUser) =>
                         break;
                     }
                 }
-                for (const actorActivity of pendingStep.actorsActivity) {
-                    if (actorActivity.actor?.userId === signedInUser?.userId &&
-                        isAllActivitiesPending) {
-                        isApprovalorRejectBtnVisible = true;
-                        isMarkAsPaidBtnVisible = isLastApprovalStep;
+                const sodBlocked = (0, helpers_1.isSodExcludedViewerBlocked)(sodExcludedApproverUserId, signedInUser?.userId, pendingStep.actorsActivity);
+                if (isAllActivitiesPending) {
+                    for (const actorActivity of pendingStep.actorsActivity) {
+                        if (!sodBlocked &&
+                            actorActivity.actor?.userId === signedInUser?.userId) {
+                            isApprovalorRejectBtnVisible = true;
+                            isMarkAsPaidBtnVisible = isLastApprovalStep;
+                            break;
+                        }
                     }
-                    // admin will be fallback approver if vendor-owner/manager are not assigned any user id
-                    if (actorActivity.type === 'attribute' &&
-                        (actorActivity.subType === 'manager' ||
-                            actorActivity.subType === 'vendor_owner') &&
-                        actorActivity.userId === null &&
-                        isAdminFallbackApprover === true &&
-                        isUserAdmin === true) {
-                        isApprovalorRejectBtnVisible = true;
-                        isMarkAsPaidBtnVisible = isLastApprovalStep;
+                }
+                if (!isApprovalorRejectBtnVisible) {
+                    for (const actorActivity of pendingStep.actorsActivity) {
+                        // admin will be fallback approver if vendor-owner/manager are not assigned any user id
+                        if (actorActivity.type === 'attribute' &&
+                            (actorActivity.subType === 'manager' ||
+                                actorActivity.subType === 'vendor_owner') &&
+                            actorActivity.userId === null &&
+                            isAdminFallbackApprover === true &&
+                            isUserAdmin &&
+                            signedInUser?.userId != null &&
+                            signedInUser.userId !== sodExcludedApproverUserId) {
+                            isApprovalorRejectBtnVisible = true;
+                            isMarkAsPaidBtnVisible = isLastApprovalStep;
+                            break;
+                        }
                     }
                 }
+                if (!isApprovalorRejectBtnVisible &&
+                    isUserAdmin &&
+                    signedInUser?.userId != null &&
+                    signedInUser.userId !== sodExcludedApproverUserId &&
+                    pendingStep.displayPendingApproverAsAdmin === true) {
+                    isApprovalorRejectBtnVisible = true;
+                    isMarkAsPaidBtnVisible = isLastApprovalStep;
+                }
             }
         }
     }
@@ -327,23 +347,42 @@ const checkApproveRejectBtnShow = (billActivities, isUserAdmin, signedInUser) =>
                         break;
                     }
                 }
-                for (const actorActivity of stepWithStatus.actorsActivity) {
-                    if (actorActivity.actor?.userId === signedInUser?.userId &&
-                        isAllActivitiesPending) {
-                        isApprovalorRejectBtnVisible = true;
-                        isMarkAsPaidBtnVisible = true;
+                const sodBlocked = (0, helpers_1.isSodExcludedViewerBlocked)(sodExcludedApproverUserId, signedInUser?.userId, stepWithStatus.actorsActivity);
+                if (isAllActivitiesPending) {
+                    for (const actorActivity of stepWithStatus.actorsActivity) {
+                        if (!sodBlocked &&
+                            actorActivity.actor?.userId === signedInUser?.userId) {
+                            isApprovalorRejectBtnVisible = true;
+                            isMarkAsPaidBtnVisible = true;
+                            break;
+                        }
                     }
-                    // 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.userId === null &&
-                        isAdminFallbackApprover === true &&
-                        isUserAdmin === true) {
-                        isApprovalorRejectBtnVisible = true;
-                        isMarkAsPaidBtnVisible = true;
+                }
+                if (!isApprovalorRejectBtnVisible) {
+                    for (const actorActivity of stepWithStatus.actorsActivity) {
+                        // admin will be fallback approver if vendor-owner/manager are not assigned any user id
+                        if (actorActivity.type === 'attribute' &&
+                            (actorActivity.subType === 'manager' ||
+                                actorActivity.subType === 'vendor_owner') &&
+                            actorActivity.userId === null &&
+                            isAdminFallbackApprover === true &&
+                            isUserAdmin &&
+                            signedInUser?.userId != null &&
+                            signedInUser.userId !== sodExcludedApproverUserId) {
+                            isApprovalorRejectBtnVisible = true;
+                            isMarkAsPaidBtnVisible = true;
+                            break;
+                        }
                     }
                 }
+                if (!isApprovalorRejectBtnVisible &&
+                    isUserAdmin &&
+                    signedInUser?.userId != null &&
+                    signedInUser.userId !== sodExcludedApproverUserId &&
+                    stepWithStatus.displayPendingApproverAsAdmin === true) {
+                    isApprovalorRejectBtnVisible = true;
+                    isMarkAsPaidBtnVisible = true;
+                }
             }
             if (isApprovalorRejectBtnVisible) {
                 break;