@zeniai/client-epic-state 4.7.74 → 4.7.76

package/lib/view/settingsView/epic/fetchMyProfileEpic.d.ts

@@ -0,0 +1,43 @@
+import { ActionsObservable, StateObservable } from 'redux-observable';
+import { fetchMyProfile, updateMyProfileOnSuccess, updateMyProfileOnFailure } from '../settingsViewReducer';
+import { ZeniAPI } from '../../../zeniAPI';
+import { UserPayload } from '../../../entity/user/userPayload';
+import { RootState } from '../../../reducer';
+import { updateUserRoles } from '../../../entity/userRole/userRoleReducer';
+import { updateAllUsers } from '../../../entity/user/userReducer';
+import { updateUserIds } from '../../userListView/userListViewReducer';
+import { UserRolePayload } from '../../../entity/userRole/userRolePayload';
+import { ID } from '../../../commonStateTypes/common';
+export declare type ActionType = ReturnType<typeof fetchMyProfile> | ReturnType<typeof updateUserRoles> | ReturnType<typeof updateAllUsers> | ReturnType<typeof updateMyProfileOnSuccess> | ReturnType<typeof updateUserIds> | ReturnType<typeof updateMyProfileOnFailure>;
+export declare const fetchMyProfileEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => import("rxjs").Observable<{
+    payload: undefined;
+    type: string;
+} | {
+    payload: import("../../../responsePayload").ZeniAPIStatus<Record<string, unknown>>;
+    type: string;
+} | {
+    payload: {
+        users: UserPayload[];
+        updateType?: import("../../../commonStateTypes/common").UpdateType | undefined;
+    };
+    type: string;
+} | {
+    payload: UserRolePayload[];
+    type: string;
+} | {
+    payload: {
+        userType: import("../../userListView/userListViewState").UserListType;
+        usersPayload: UserPayload[];
+    };
+    type: string;
+} | {
+    payload: {
+        userId: string;
+    };
+    type: string;
+}>;
+/**
+ *  Helpers
+ */
+export declare function getUserPayloadByUserId(userId: ID | undefined, usersPayload: UserPayload[]): UserPayload[] | undefined;
+export declare function getManagerUserIdFromUserRolesPayloadByUserId(userId: ID | undefined, userRolesPayload: UserRolePayload[]): ID | undefined;

package/lib/view/settingsView/epic/fetchMyProfileEpic.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getManagerUserIdFromUserRolesPayloadByUserId = exports.getUserPayloadByUserId = exports.fetchMyProfileEpic = void 0;
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const settingsViewReducer_1 = require("../settingsViewReducer");
+const responsePayload_1 = require("../../../responsePayload");
+const userRoleReducer_1 = require("../../../entity/userRole/userRoleReducer");
+const userReducer_1 = require("../../../entity/user/userReducer");
+const userListViewReducer_1 = require("../../userListView/userListViewReducer");
+const fetchMyProfileEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(settingsViewReducer_1.fetchMyProfile.match), (0, operators_1.switchMap)(() => {
+    const URL = `${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/settings/user-profile`;
+    const loggedInUser = state$.value.tenantState.loggedInUser;
+    return zeniAPI.getJSON(URL).pipe((0, operators_1.mergeMap)((response) => {
+        if ((0, responsePayload_1.isSuccessResponse)(response) &&
+            response.data != null &&
+            (loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.userId) != null) {
+            const loggedInUserPayload = getUserPayloadByUserId(loggedInUser.userId, response.data.users);
+            const managerUserPayload = getUserPayloadByUserId(getManagerUserIdFromUserRolesPayloadByUserId(loggedInUser.userId, response.data.user_roles), response.data.users);
+            const updateActions = [];
+            updateActions.push((0, userRoleReducer_1.updateUserRoles)(response.data.user_roles), (0, userReducer_1.updateAllUsers)({ users: response.data.users }), (0, settingsViewReducer_1.updateMyProfileOnSuccess)(loggedInUser.userId));
+            if (managerUserPayload && loggedInUserPayload != null) {
+                updateActions.push((0, userListViewReducer_1.updateUserIds)({
+                    userType: 'manager',
+                    usersPayload: managerUserPayload,
+                }));
+            }
+            return (0, rxjs_1.of)(...updateActions);
+        }
+        else {
+            return (0, rxjs_1.of)((0, settingsViewReducer_1.updateMyProfileOnFailure)(response.status));
+        }
+    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, settingsViewReducer_1.updateMyProfileOnFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected error', 'Fetch My Profile REST API call errored out' +
+        JSON.stringify(error))))));
+}));
+exports.fetchMyProfileEpic = fetchMyProfileEpic;
+/**
+ *  Helpers
+ */
+function getUserPayloadByUserId(userId, usersPayload) {
+    const user = usersPayload.find((user) => user.user_id === userId);
+    return user ? [user] : undefined;
+}
+exports.getUserPayloadByUserId = getUserPayloadByUserId;
+function getManagerUserIdFromUserRolesPayloadByUserId(userId, userRolesPayload) {
+    const userRoles = userRolesPayload.find((user) => user.user_id === userId);
+    const manager_user_id = userRoles === null || userRoles === void 0 ? void 0 : userRoles.manager_user_id;
+    return manager_user_id !== null && manager_user_id !== void 0 ? manager_user_id : undefined;
+}
+exports.getManagerUserIdFromUserRolesPayloadByUserId = getManagerUserIdFromUserRolesPayloadByUserId;

package/lib/view/settingsView/epic/fetchMyProfileViewEpic.d.ts

@@ -0,0 +1,7 @@
+import { ActionsObservable } from 'redux-observable';
+import { Observable } from 'rxjs';
+import { fetchMyProfile } from '../settingsViewReducer';
+import { fetchCompanyPassportView } from '../../companyView/companyViewReducer';
+import { fetchClassList } from '../../classList/classListReducer';
+export declare type ActionType = ReturnType<typeof fetchCompanyPassportView> | ReturnType<typeof fetchMyProfile> | ReturnType<typeof fetchClassList>;
+export declare const fetchMyProfileViewEpic: (actions$: ActionsObservable<ActionType>) => Observable<ActionType>;

package/lib/view/settingsView/epic/fetchMyProfileViewEpic.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchMyProfileViewEpic = void 0;
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const settingsViewReducer_1 = require("../settingsViewReducer");
+const companyViewReducer_1 = require("../../companyView/companyViewReducer");
+const classListReducer_1 = require("../../classList/classListReducer");
+const fetchMyProfileViewEpic = (actions$) => actions$.pipe((0, operators_1.filter)(settingsViewReducer_1.fetchMyProfileView.match), (0, operators_1.switchMap)((action) => {
+    const { companyId } = action.payload;
+    return (0, rxjs_1.from)([
+        (0, companyViewReducer_1.fetchCompanyPassportView)(companyId),
+        (0, classListReducer_1.fetchClassList)(),
+        (0, settingsViewReducer_1.fetchMyProfile)(),
+    ]);
+}));
+exports.fetchMyProfileViewEpic = fetchMyProfileViewEpic;

package/lib/view/settingsView/settingsViewPayload.d.ts

@@ -0,0 +1,8 @@
+import { UserPayload } from '../../entity/user/userPayload';
+import { UserRolePayload } from '../../entity/userRole/userRolePayload';
+import { ZeniAPIResponse } from '../../responsePayload';
+export interface MyProfilePeoplePayload {
+    user_roles: UserRolePayload[];
+    users: UserPayload[];
+}
+export declare type MyProfilePeopleResponse = ZeniAPIResponse<MyProfilePeoplePayload>;

package/lib/view/settingsView/settingsViewReducer.d.ts

@@ -0,0 +1,13 @@
+import { ZeniAPIStatus } from '../../responsePayload';
+import { SettingsViewState } from './settingsViewState';
+import { ID } from '../../commonStateTypes/common';
+export declare const initialState: SettingsViewState;
+export declare const fetchMyProfileView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[companyId: string], {
+    companyId: string;
+}, string, never, never>, fetchMyProfile: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, updateMyProfileOnSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[userId: string], {
+    userId: string;
+}, string, never, never>, updateMyProfileOnFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, string>, fetchBankConnectionsView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, updateBankConnectionOnSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    bankAccountIds: ID[];
+}, string>, updateBankConnectionOnFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, string>, fetchBankAccountsList: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, clearSettingsView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
+declare const _default: import("@reduxjs/toolkit").Reducer<SettingsViewState, import("@reduxjs/toolkit").AnyAction>;
+export default _default;

package/lib/view/settingsView/settingsViewReducer.js

@@ -0,0 +1,71 @@
+"use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.clearSettingsView = exports.fetchBankAccountsList = exports.updateBankConnectionOnFailure = exports.updateBankConnectionOnSuccess = exports.fetchBankConnectionsView = exports.updateMyProfileOnFailure = exports.updateMyProfileOnSuccess = exports.fetchMyProfile = exports.fetchMyProfileView = exports.initialState = void 0;
+const toolkit_1 = require("@reduxjs/toolkit");
+exports.initialState = {
+    profile: {
+        fetchState: 'Not-Started',
+        error: undefined,
+        userId: null,
+    },
+    bankConnection: {
+        fetchState: 'Not-Started',
+        error: undefined,
+        bankAccountIds: [],
+    },
+};
+const settings = (0, toolkit_1.createSlice)({
+    name: 'settings',
+    initialState: exports.initialState,
+    reducers: {
+        fetchMyProfileView: {
+            reducer() {
+                // Do nothing.
+            },
+            // eslint-disable-next-line @typescript-eslint/no-inferrable-types
+            prepare(companyId) {
+                return { payload: { companyId } };
+            },
+        },
+        fetchMyProfile(draft) {
+            draft.profile.fetchState = 'In-Progress';
+            draft.profile.error = undefined;
+        },
+        updateMyProfileOnSuccess: {
+            prepare(userId) {
+                return { payload: { userId } };
+            },
+            reducer(draft, action) {
+                draft.profile.fetchState = 'Completed';
+                draft.profile.error = undefined;
+                draft.profile.userId = action.payload.userId;
+            },
+        },
+        updateMyProfileOnFailure(draft, action) {
+            draft.profile.fetchState = 'Error';
+            draft.profile.error = action.payload;
+        },
+        fetchBankConnectionsView() {
+            // Do nothing.
+        },
+        fetchBankAccountsList(draft) {
+            draft.bankConnection.fetchState = 'In-Progress';
+            draft.bankConnection.error = undefined;
+        },
+        updateBankConnectionOnSuccess(draft, action) {
+            draft.bankConnection.fetchState = 'Completed';
+            draft.bankConnection.error = undefined;
+            draft.bankConnection.bankAccountIds = action.payload.bankAccountIds;
+        },
+        updateBankConnectionOnFailure(draft, action) {
+            draft.bankConnection.fetchState = 'Error';
+            draft.bankConnection.error = action.payload;
+        },
+        clearSettingsView(draft) {
+            Object.assign(draft, exports.initialState);
+        },
+    },
+});
+_a = settings.actions, exports.fetchMyProfileView = _a.fetchMyProfileView, exports.fetchMyProfile = _a.fetchMyProfile, exports.updateMyProfileOnSuccess = _a.updateMyProfileOnSuccess, exports.updateMyProfileOnFailure = _a.updateMyProfileOnFailure, exports.fetchBankConnectionsView = _a.fetchBankConnectionsView, exports.updateBankConnectionOnSuccess = _a.updateBankConnectionOnSuccess, exports.updateBankConnectionOnFailure = _a.updateBankConnectionOnFailure, exports.fetchBankAccountsList = _a.fetchBankAccountsList, exports.clearSettingsView = _a.clearSettingsView;
+exports.default = settings.reducer;

package/lib/view/settingsView/settingsViewSelector.d.ts

@@ -0,0 +1,14 @@
+import { RootState } from '../../reducer';
+import { FetchStateAndError, ID } from '../../commonStateTypes/common';
+import { TenantExternalConnections } from '../../entity/tenant/tenantState';
+import { Company } from '../../entity/company/companyStateTypes';
+import { MyBankConnectionsView, BankConnectionsSetupView, MyProfileSelectorView } from './types/settingsViewSelectorTypes';
+export declare function getApprovalRuleViewDetails(state: RootState): FetchStateAndError;
+export declare function getBankConnectionsSetupViewDetails(state: RootState, companyId: ID): BankConnectionsSetupView;
+export declare function getMyBankConnectionsDetails(state: RootState, userId: ID): MyBankConnectionsView;
+export interface IntegrationsView {
+    externalConnections: TenantExternalConnections | undefined;
+    companyView: Company | undefined;
+}
+export declare function getIntegrationsView(state: RootState, companyId: ID): IntegrationsView;
+export declare const getMyProfileView: (state: RootState) => MyProfileSelectorView;

package/lib/view/settingsView/settingsViewSelector.js

@@ -0,0 +1,119 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMyProfileView = exports.getIntegrationsView = exports.getMyBankConnectionsDetails = exports.getBankConnectionsSetupViewDetails = exports.getApprovalRuleViewDetails = void 0;
+const toolkit_1 = require("@reduxjs/toolkit");
+const tenantSelector_1 = require("../../entity/tenant/tenantSelector");
+const companySelector_1 = require("../../entity/company/companySelector");
+const userRoleSelector_1 = require("../../entity/userRole/userRoleSelector");
+const userSelector_1 = require("../../entity/user/userSelector");
+const accountSelector_1 = require("../../entity/account/accountSelector");
+const paymentAccountSelector_1 = require("../../entity/paymentAccount/paymentAccountSelector");
+const classSelector_1 = require("../../entity/class/classSelector");
+const classSelectorV2_1 = require("../../entity/class/classSelectorV2");
+const userListViewSelector_1 = require("../userListView/userListViewSelector");
+const reduceFetchState_1 = require("../../commonStateTypes/reduceFetchState");
+const companyPassportViewSelector_1 = require("../companyView/selector/companyPassportViewSelector");
+const userFinancialAccountSelector_1 = require("../userFinancialAccount/userFinancialAccountSelector");
+const setupViewSelector_1 = require("../../view/spendManagement/commonSetup/setupViewSelector");
+function getApprovalRuleViewDetails(state) {
+    const { billPaySetupApproverViewState, remiSetupApproverViewState } = state;
+    const fetchState = (0, reduceFetchState_1.reduceAnyFetchState)([
+        billPaySetupApproverViewState,
+        remiSetupApproverViewState,
+    ]);
+    return {
+        fetchState: fetchState.fetchState,
+    };
+}
+exports.getApprovalRuleViewDetails = getApprovalRuleViewDetails;
+function getBankConnectionsSetupViewDetails(state, companyId) {
+    const { accountState, setupViewState, settingsViewState } = state;
+    const { bankConnection } = settingsViewState;
+    const allBankAccounts = bankConnection.bankAccountIds
+        .map((accountId) => (0, accountSelector_1.getAccountBase)(accountState, accountId, 'bill_pay'))
+        .filter((account) => account != null);
+    const fetchState = (0, reduceFetchState_1.reduceAnyFetchState)([
+        settingsViewState.bankConnection,
+        setupViewState.accountDetails.fetchStatus,
+    ]);
+    return {
+        setupView: Object.assign(Object.assign({}, (0, setupViewSelector_1.getCommonSetupViewDetails)(state, companyId, 'bill_pay')), { allBankAccounts }),
+        fetchState: fetchState.fetchState,
+    };
+}
+exports.getBankConnectionsSetupViewDetails = getBankConnectionsSetupViewDetails;
+function getMyBankConnectionsDetails(state, userId) {
+    var _a, _b;
+    const userFinancialAccount = (0, userFinancialAccountSelector_1.getUserFinancialAccount)(state, userId);
+    const paymentAccounts = (0, paymentAccountSelector_1.getPaymentAccountsByBankAccountIds)(state.paymentAccountState, (_b = (_a = state.userFinancialAccountState.financialAccountByUserId[userId]) === null || _a === void 0 ? void 0 : _a.bankAccountIds) !== null && _b !== void 0 ? _b : []);
+    return Object.assign(Object.assign({}, userFinancialAccount), { paymentAccounts });
+}
+exports.getMyBankConnectionsDetails = getMyBankConnectionsDetails;
+function getIntegrationsView(state, companyId) {
+    var _a;
+    const externalConnections = (0, tenantSelector_1.getCurrentTenantExternalConnections)(state.tenantState, state.companyState);
+    const companyView = (_a = (0, companySelector_1.getCompanyByCompanyId)(state.companyState, companyId)) === null || _a === void 0 ? void 0 : _a.company;
+    return {
+        externalConnections,
+        companyView,
+    };
+}
+exports.getIntegrationsView = getIntegrationsView;
+exports.getMyProfileView = (0, toolkit_1.createSelector)((state) => state.tenantState, (state) => state.userState, (state) => state.userRoleState, (state) => state.settingsViewState, (state) => state.classState, (state) => state.classListState, (state) => (0, companyPassportViewSelector_1.getCompanyPassportView)(state), (state) => (0, userListViewSelector_1.getUserList)(state, 'manager'), (tenantState, userState, userRoleState, settingsViewState, classState, classListState, companyPassportView, managersListView) => {
+    var _a, _b, _c, _d;
+    const userId = (_a = tenantState.loggedInUser) === null || _a === void 0 ? void 0 : _a.userId;
+    if (userId == null) {
+        throw new Error(`User not logged in`);
+    }
+    const user = (0, userSelector_1.getUserByUserId)(userState, userId);
+    const userRole = (0, userRoleSelector_1.getUserRoleByUserId)(userRoleState, userId);
+    const person = {
+        userId,
+        user,
+        userRole,
+    };
+    const isZeniUser = (_b = userRole === null || userRole === void 0 ? void 0 : userRole.isZeni) !== null && _b !== void 0 ? _b : true;
+    const departmentIds = (_c = userRole === null || userRole === void 0 ? void 0 : userRole.accountingClassIDs) !== null && _c !== void 0 ? _c : [];
+    const classList = (0, classSelectorV2_1.getClassesByIds)(classState, {
+        classIds: classListState.classIds,
+        reportId: 'class_list',
+    });
+    const department = departmentIds.length > 0
+        ? (0, classSelector_1.getClassById)(classState, {
+            classId: departmentIds[0],
+            reportId: 'class_list',
+        })
+        : undefined;
+    const fetchState = (0, reduceFetchState_1.reduceAnyFetchState)([
+        settingsViewState.profile,
+        companyPassportView,
+        classListState,
+    ]);
+    const controllersList = ((_d = companyPassportView.companyView) === null || _d === void 0 ? void 0 : _d.controllers) != null
+        ? companyPassportView.companyView.controllers.map((controller) => controller.user)
+        : [];
+    const myProfilePeopleView = {
+        fetchState: fetchState.fetchState,
+        error: fetchState.error,
+        isZeniUser,
+        person,
+        department,
+        classList,
+        controllersList,
+        managersList: managersListView.users,
+    };
+    const managerId = userRole === null || userRole === void 0 ? void 0 : userRole.managerUserId;
+    if (managerId != null) {
+        const managerUser = (0, userSelector_1.getUserByUserId)(userState, managerId);
+        const managerUserRole = (0, userRoleSelector_1.getUserRoleByUserId)(userRoleState, managerId);
+        if (managerUser != null) {
+            const manager = {
+                userId: managerId,
+                user: managerUser,
+                userRole: managerUserRole,
+            };
+            return Object.assign(Object.assign({}, myProfilePeopleView), { manager });
+        }
+    }
+    return myProfilePeopleView;
+});

package/lib/view/settingsView/settingsViewState.d.ts

@@ -0,0 +1,12 @@
+import { ID, FetchStateAndError } from '../../commonStateTypes/common';
+interface MyProfile extends FetchStateAndError {
+    userId: ID | null;
+}
+interface BankConnection extends FetchStateAndError {
+    bankAccountIds: ID[];
+}
+export interface SettingsViewState {
+    profile: MyProfile;
+    bankConnection: BankConnection;
+}
+export {};

package/lib/view/settingsView/settingsViewState.js

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

package/lib/view/settingsView/types/settingsViewSelectorTypes.d.ts

@@ -0,0 +1,29 @@
+import { ID, FetchStateAndError } from '../../../commonStateTypes/common';
+import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
+import { Class } from '../../../entity/class/classState';
+import { PaymentAccount } from '../../../entity/paymentAccount/paymentAccountState';
+import { User } from '../../../entity/user/userState';
+import { UserRole } from '../../../entity/userRole/userRoleState';
+import { Person } from '../../people/peopleSelectorTypes';
+import { SetupView } from '../../spendManagement/commonSetup/setupViewSelector';
+import { UserFinancialAccountSelectorView } from '../../userFinancialAccount/userFinancialAccountSelector';
+export interface MyProfileSelectorView extends SelectorView {
+    isZeniUser: boolean;
+    person: MyProfile;
+    classList: Class[];
+    managersList: Person[];
+    controllersList: User[];
+    manager?: MyProfile;
+    department?: Class;
+}
+export interface MyProfile {
+    userId: ID;
+    user: User | undefined;
+    userRole: UserRole | undefined;
+}
+export interface MyBankConnectionsView extends UserFinancialAccountSelectorView {
+    paymentAccounts: PaymentAccount[];
+}
+export interface BankConnectionsSetupView extends FetchStateAndError {
+    setupView: SetupView;
+}

package/lib/view/settingsView/types/settingsViewSelectorTypes.js

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

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

@@ -8,6 +8,7 @@ import { UserPayload } from '../../../../entity/user/userPayload';
 import { ZeniAPIResponse } from '../../../../responsePayload';
 import { VendorPayload } from '../../../../entity/vendor/vendorPayload';
 import { PaymentInstrumentPayload } from '../../../../entity/paymentInstrument/paymentInstrumentPayload';
+import { RecurringBillConfigResponsePayload, RecurringBillDataPayload } from '../../../../entity/billPay/recurringBills/recurringBillsPayload';
 export interface ApproveOrRejectBillPayload {
     approval_rules: ApprovalRulePayload[];
     users: UserPayload[];
@@ -20,6 +21,8 @@ export interface BillDetailViewPayload extends ApproveOrRejectBillPayload {
     payment_accounts: PaymentAccountPayload[];
     accounts: AccountPayload[];
     vendors: VendorPayload[];
+    recurring_bill_configs: RecurringBillConfigResponsePayload[];
+    recurring_bills: RecurringBillDataPayload[];
     query: BillDetailQuery;
     query_definitions: Record<string, unknown>;
 }

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

@@ -18,6 +18,7 @@ import { ActivityRealTimeApprovalSelectorView } from '../../realTimeApprovalView
 import { UserAndRole } from '../../../companyView/types/userAndRole';
 import { Class } from '../../../../entity/class/classState';
 import { PaymentInstrument } from '../../../../entity/paymentInstrument/paymentInstrument';
+import { RecurringBillConfig, RecurringBillData } from '../../../../entity/billPay/recurringBills/recurringBillsState';
 export interface BillDetailViewSelector extends SelectorView {
     transactionDetails: BillTransaction | undefined;
     createdBy: User | undefined;
@@ -43,6 +44,9 @@ export interface BillDetailViewSelector extends SelectorView {
     approvalType?: BillApprovalType;
     paymentMethodType?: BillPayConfig;
     latestApprovedDate?: ZeniDate;
+    isRecurring: boolean;
+    recurringBillInstances?: RecurringBillData[];
+    recurringBillConfigDetail?: RecurringBillConfig;
 }
 export interface StepWithStatus extends StepWithUser {
     actorsActivity: ActorActivityWithUser[];
@@ -56,6 +60,7 @@ export interface ActorActivityWithUser {
     userId: ID;
     type: string;
     subType?: string;
+    isRecurringAutoApprove: boolean;
 }
 export interface BillActivity {
     approvalRuleId?: ID;

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

@@ -83,8 +83,8 @@ const getBillActivities = (state, billId, billStageCode) => {
 };
 exports.getBillActivities = getBillActivities;
 const getBillDetailView = (state, billId) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-    const { accountState, bankAccountState, paymentInstrumentState, billDetailViewState, billTransactionState, paymentAccountState, userState, billPayConfigState, userRoleState, classListState, classState, commonHistoryState, realTimeApprovalState, entityApprovalStatusState, billPaySetupApproverViewState, vendorState, } = state;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+    const { accountState, bankAccountState, paymentInstrumentState, billDetailViewState, billTransactionState, paymentAccountState, userState, billPayConfigState, userRoleState, classListState, classState, commonHistoryState, realTimeApprovalState, entityApprovalStatusState, billPaySetupApproverViewState, vendorState, recurringBillState, } = state;
     const { approverListState } = billPaySetupApproverViewState;
     const detailKey = (0, billDetailViewState_1.getBillTransactionDetailKey)(billId !== null && billId !== void 0 ? billId : '');
     const billTransactionDetails = (0, get_1.default)(billDetailViewState.billDetailById, detailKey, undefined);
@@ -184,6 +184,14 @@ const getBillDetailView = (state, billId) => {
         reportId: 'class_list',
     });
     const currentVendorDetails = (0, get_1.default)(vendorState.vendorByID, (_o = billTransactionDetails === null || billTransactionDetails === void 0 ? void 0 : billTransactionDetails.vendorId) !== null && _o !== void 0 ? _o : '', undefined);
+    const isRecurring = (_p = transaction === null || transaction === void 0 ? void 0 : transaction.isRecurring) !== null && _p !== void 0 ? _p : false;
+    let recurringBillConfigDetail = undefined;
+    let recurringBillInstances = undefined;
+    if (isRecurring && (transaction === null || transaction === void 0 ? void 0 : transaction.recurringBillConfigId) != null) {
+        const recurringBillDetail = (0, get_1.default)(recurringBillState.recurringBillDetailByConfigId, transaction === null || transaction === void 0 ? void 0 : transaction.recurringBillConfigId, undefined);
+        recurringBillConfigDetail = recurringBillDetail === null || recurringBillDetail === void 0 ? void 0 : recurringBillDetail.recurringBillConfig;
+        recurringBillInstances = recurringBillDetail === null || recurringBillDetail === void 0 ? void 0 : recurringBillDetail.recurringBillInstances;
+    }
     return {
         fetchState: fetchState.fetchState,
         error: fetchState.error,
@@ -212,6 +220,9 @@ const getBillDetailView = (state, billId) => {
         approvalType,
         paymentMethodType: paymentMethodWithBillFees,
         latestApprovedDate: (0, helpers_1.getLatestApprovalDate)(billActivities),
+        isRecurring,
+        recurringBillInstances,
+        recurringBillConfigDetail,
     };
 };
 exports.getBillDetailView = getBillDetailView;

package/lib/view/spendManagement/billPay/billDetailView/epics/cancelAndDeleteBillEpic.d.ts

@@ -5,7 +5,8 @@ import { cancelAndDeleteBill, cancelAndDeleteBillSuccessOrFailure } from '../bil
 import { removeTransactionIdFromBillTabList } from '../../billList/billListReducer';
 import { removeBillTransaction } from '../../../../../entity/billPay/billTransaction/billTransactionReducer';
 import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
-export declare type ActionType = ReturnType<typeof cancelAndDeleteBill> | ReturnType<typeof removeBillTransaction> | ReturnType<typeof openSnackbar> | ReturnType<typeof cancelAndDeleteBillSuccessOrFailure> | ReturnType<typeof removeTransactionIdFromBillTabList>;
+import { removeRecurringBill } from '../../../../../entity/billPay/recurringBills/recurringBillsReducer';
+export declare type ActionType = ReturnType<typeof cancelAndDeleteBill> | ReturnType<typeof removeBillTransaction> | ReturnType<typeof openSnackbar> | ReturnType<typeof cancelAndDeleteBillSuccessOrFailure> | ReturnType<typeof removeTransactionIdFromBillTabList> | ReturnType<typeof removeRecurringBill>;
 export declare const cancelAndDeleteBillEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => import("rxjs").Observable<{
     payload: import("../../../../../entity/billPay/billTransaction/billTransactionPayload").BillTransactionPayload;
     type: string;

package/lib/view/spendManagement/billPay/billDetailView/epics/cancelAndDeleteBillEpic.js

@@ -9,22 +9,30 @@ const responsePayload_1 = require("../../../../../responsePayload");
 const billTransactionReducer_1 = require("../../../../../entity/billPay/billTransaction/billTransactionReducer");
 const billDetailViewState_1 = require("../billDetailViewState");
 const snackbarReducer_1 = require("../../../../../entity/snackbar/snackbarReducer");
+const recurringBillsReducer_1 = require("../../../../../entity/billPay/recurringBills/recurringBillsReducer");
 const cancelAndDeleteBillEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(billDetailViewReducer_1.cancelAndDeleteBill.match), (0, operators_1.mergeMap)((action) => {
+    var _a;
     const query = {
         bill_pay_provider: 'zeni',
         is_delete_bill: action.payload.isDeleteBill,
     };
     const { billTransactionState } = state$.value;
     const transaction = billTransactionState.transactionById[action.payload.billId];
-    return zeniAPI
-        .putAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bills/transactions/${action.payload.billId}/cancel-payment`, query)
-        .pipe((0, operators_1.mergeMap)((response) => {
-        var _a, _b;
+    const isRecurring = (_a = transaction === null || transaction === void 0 ? void 0 : transaction.isRecurring) !== null && _a !== void 0 ? _a : false;
+    const recurringConfigId = transaction === null || transaction === void 0 ? void 0 : transaction.recurringBillConfigId;
+    let cancelApiUrl = `${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bills/transactions/${action.payload.billId}`;
+    if (isRecurring === true) {
+        cancelApiUrl = `${cancelApiUrl}/recurring/cancel-payment`;
+    }
+    else {
+        cancelApiUrl = `${cancelApiUrl}/cancel-payment`;
+    }
+    return zeniAPI.putAndGetJSON(cancelApiUrl, query).pipe((0, operators_1.mergeMap)((response) => {
+        var _a;
         if (action.payload.isDeleteBill === true &&
             (0, responsePayload_1.isSuccessStatus)(response)) {
-            const actions = [
-                (0, billDetailViewReducer_1.cancelAndDeleteBillSuccessOrFailure)('Completed', action.payload.billId, action.payload.isDeleteBill),
-            ];
+            const actions = [];
+            actions.push((0, billDetailViewReducer_1.cancelAndDeleteBillSuccessOrFailure)('Completed', action.payload.billId, action.payload.isDeleteBill));
             if (transaction != null) {
                 actions.push((0, billListReducer_1.removeTransactionIdFromBillTabList)({
                     billId: action.payload.billId,
@@ -32,6 +40,9 @@ const cancelAndDeleteBillEpic = (actions$, state$, zeniAPI) => actions$.pipe((0,
                 }));
             }
             actions.push((0, billTransactionReducer_1.removeBillTransaction)((0, billDetailViewState_1.getBillTransactionDetailKey)(action.payload.billId)));
+            if (isRecurring === true && recurringConfigId != null) {
+                actions.push((0, recurringBillsReducer_1.removeRecurringBill)(recurringConfigId));
+            }
             actions.push((0, snackbarReducer_1.openSnackbar)({
                 messageSection: 'bill_pay_cancelled_deleted',
                 messageText: 'success',
@@ -41,7 +52,7 @@ const cancelAndDeleteBillEpic = (actions$, state$, zeniAPI) => actions$.pipe((0,
         }
         else if ((0, responsePayload_1.isSuccessResponse)(response) &&
             response.data != null &&
-            ((_b = (_a = response.data) === null || _a === void 0 ? void 0 : _a.transactions[0]) === null || _b === void 0 ? void 0 : _b.transaction_id) != null) {
+            ((_a = response.data.transactions[0]) === null || _a === void 0 ? void 0 : _a.transaction_id) != null) {
             return (0, rxjs_1.of)((0, billTransactionReducer_1.updateBillTransaction)(response.data.transactions[0]), (0, billDetailViewReducer_1.cancelAndDeleteBillSuccessOrFailure)('Completed', action.payload.billId, action.payload.isDeleteBill), (0, snackbarReducer_1.openSnackbar)({
                 messageSection: 'bill_pay_cancelled',
                 messageText: 'success',

package/lib/view/spendManagement/billPay/billDetailView/epics/deleteBillEpic.d.ts

@@ -5,5 +5,6 @@ import { deleteBill, deleteBillSuccessOrFailure } from '../billDetailViewReducer
 import { removeTransactionIdFromBillTabList } from '../../billList/billListReducer';
 import { removeBillTransaction } from '../../../../../entity/billPay/billTransaction/billTransactionReducer';
 import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
-export declare type ActionType = ReturnType<typeof deleteBill> | ReturnType<typeof removeBillTransaction> | ReturnType<typeof openSnackbar> | ReturnType<typeof removeTransactionIdFromBillTabList> | ReturnType<typeof deleteBillSuccessOrFailure>;
+import { removeRecurringBill } from '../../../../../entity/billPay/recurringBills/recurringBillsReducer';
+export declare type ActionType = ReturnType<typeof deleteBill> | ReturnType<typeof removeBillTransaction> | ReturnType<typeof openSnackbar> | ReturnType<typeof removeTransactionIdFromBillTabList> | ReturnType<typeof deleteBillSuccessOrFailure> | ReturnType<typeof removeRecurringBill>;
 export declare const deleteBillEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => import("rxjs").Observable<ActionType>;

package/lib/view/spendManagement/billPay/billDetailView/epics/deleteBillEpic.js

@@ -9,20 +9,27 @@ const responsePayload_1 = require("../../../../../responsePayload");
 const billTransactionReducer_1 = require("../../../../../entity/billPay/billTransaction/billTransactionReducer");
 const billDetailViewState_1 = require("../billDetailViewState");
 const snackbarReducer_1 = require("../../../../../entity/snackbar/snackbarReducer");
+const recurringBillsReducer_1 = require("../../../../../entity/billPay/recurringBills/recurringBillsReducer");
 const deleteBillEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(billDetailViewReducer_1.deleteBill.match), (0, operators_1.mergeMap)((action) => {
+    var _a;
     const query = {
         transaction_type: 'bill',
         bill_pay_provider: 'zeni',
     };
     const { billTransactionState } = state$.value;
     const transaction = billTransactionState.transactionById[action.payload.billId];
+    const isRecurring = (_a = transaction === null || transaction === void 0 ? void 0 : transaction.isRecurring) !== null && _a !== void 0 ? _a : false;
+    const recurringConfigId = transaction === null || transaction === void 0 ? void 0 : transaction.recurringBillConfigId;
+    let deleteApiUrl = `${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bills/transactions/${action.payload.billId}`;
+    if (isRecurring === true) {
+        deleteApiUrl = `${deleteApiUrl}/recurring`;
+    }
     return zeniAPI
-        .deleteAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bills/transactions/${action.payload.billId}?query=${encodeURIComponent(JSON.stringify(query))}`)
+        .deleteAndGetJSON(`${deleteApiUrl}?query=${encodeURIComponent(JSON.stringify(query))}`)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessStatus)(response)) {
-            const actions = [
-                (0, billDetailViewReducer_1.deleteBillSuccessOrFailure)('Completed', action.payload.billId),
-            ];
+            const actions = [];
+            actions.push((0, billDetailViewReducer_1.deleteBillSuccessOrFailure)('Completed', action.payload.billId));
             if (transaction != null) {
                 actions.push((0, billListReducer_1.removeTransactionIdFromBillTabList)({
                     billId: action.payload.billId,
@@ -30,6 +37,9 @@ const deleteBillEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operator
                 }));
             }
             actions.push((0, billTransactionReducer_1.removeBillTransaction)((0, billDetailViewState_1.getBillTransactionDetailKey)(action.payload.billId)));
+            if (isRecurring === true && recurringConfigId != null) {
+                actions.push((0, recurringBillsReducer_1.removeRecurringBill)(recurringConfigId));
+            }
             actions.push((0, snackbarReducer_1.openSnackbar)({
                 messageSection: 'bill_pay_deleted',
                 messageText: 'success',

package/lib/view/spendManagement/billPay/billDetailView/epics/fetchBillDetailEpic.d.ts

@@ -20,7 +20,8 @@ import { fetchVendorsList } from '../../../../vendorList/vendorListReducer';
 import { fetchDuplicateBill } from '../../billPayReview/billPayReviewReducer';
 import { updatePaymentInstruments } from '../../../../../entity/paymentInstrument/paymentInstrumentReducer';
 import { convertAmountToHomeCurrency } from '../../editBillView/editBillViewReducer';
-export declare type ActionType = ReturnType<typeof fetchBillDetail> | ReturnType<typeof updateBillTransaction> | ReturnType<typeof updateBankAccounts> | ReturnType<typeof updatePaymentInstruments> | ReturnType<typeof updateBillDetailFetchState> | ReturnType<typeof removeBillTransaction> | ReturnType<typeof removeBillDetail> | ReturnType<typeof updatePaymentAccounts> | ReturnType<typeof updateAccounts> | ReturnType<typeof updateAllUsers> | ReturnType<typeof updateApprovalRules> | ReturnType<typeof updateEntityApprovalStatus> | ReturnType<typeof fetchPreviousBills> | ReturnType<typeof updateBillDetail> | ReturnType<typeof updateClasses> | ReturnType<typeof updateVendors> | ReturnType<typeof updateContacts> | ReturnType<typeof updateAddresses> | ReturnType<typeof fetchEntityHistory> | ReturnType<typeof fetchVendorsList> | ReturnType<typeof fetchDuplicateBill> | ReturnType<typeof convertAmountToHomeCurrency> | ReturnType<typeof waitForVendorByNameThenUpdateBillDetail>;
+import { updateRecurringBillConfigs, updateRecurringBills } from '../../../../../entity/billPay/recurringBills/recurringBillsReducer';
+export declare type ActionType = ReturnType<typeof fetchBillDetail> | ReturnType<typeof updateBillTransaction> | ReturnType<typeof updateBankAccounts> | ReturnType<typeof updatePaymentInstruments> | ReturnType<typeof updateBillDetailFetchState> | ReturnType<typeof removeBillTransaction> | ReturnType<typeof removeBillDetail> | ReturnType<typeof updatePaymentAccounts> | ReturnType<typeof updateAccounts> | ReturnType<typeof updateAllUsers> | ReturnType<typeof updateApprovalRules> | ReturnType<typeof updateEntityApprovalStatus> | ReturnType<typeof fetchPreviousBills> | ReturnType<typeof updateBillDetail> | ReturnType<typeof updateClasses> | ReturnType<typeof updateVendors> | ReturnType<typeof updateContacts> | ReturnType<typeof updateAddresses> | ReturnType<typeof fetchEntityHistory> | ReturnType<typeof fetchVendorsList> | ReturnType<typeof fetchDuplicateBill> | ReturnType<typeof convertAmountToHomeCurrency> | ReturnType<typeof waitForVendorByNameThenUpdateBillDetail> | ReturnType<typeof updateRecurringBillConfigs> | ReturnType<typeof updateRecurringBills>;
 export declare const fetchBillDetailEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
 export declare const waitForVendorByNameThenUpdateBillDetailEpic: (actions$: ActionsObservable<ActionType>, _: StateObservable<RootState>) => Observable<{
     payload: {