@zeniai/client-epic-state 4.7.74 → 4.7.75

package/lib/view/spendManagement/helpers.d.ts

@@ -1,7 +1,17 @@
 import { ZeniDate } from '../../zeniDayJS';
 import { BillActivity } from './billPay/billDetailView/billDetailViewSelector';
-import { BusinessVerificationDetails, CompanyOfficersDetails } from './commonSetup/setupViewSelector';
 import { RemiActivity } from './reimbursement/remiDetailView/remiDetailViewSelector';
+import { BusinessVerificationDetails, CompanyOfficersDetails } from './commonSetup/setupViewSelector';
+import { RecurringBillConfigLocalData, RecurringBillInstance } from './billPay/editBillView/editBillViewState';
+import { RecurringBillConfig, RecurringBillFrequency } from '../../entity/billPay/recurringBills/recurringBillsState';
 export declare const getLatestApprovalDate: (allActivities: BillActivity[] | RemiActivity[]) => ZeniDate | undefined;
 export declare function getSpendManagementEffectiveListPeriod(): import("../..").TimePeriod;
 export declare const getSelectedCompanyOfficer: (verificationDetails: BusinessVerificationDetails) => CompanyOfficersDetails | undefined;
+export declare const getPaymentDateFromVendorReceiveDate: (vendorReceiveDate: ZeniDate, maxPaymentProcessingDays: number) => ZeniDate;
+export declare const updateRecurringBillDetails: (currentRecurringConfig: RecurringBillConfigLocalData, prevRecurringConfig?: RecurringBillConfigLocalData | undefined, currentInstances?: RecurringBillInstance[] | undefined, currentBillAmount?: number | undefined) => {
+    recurringConfig: RecurringBillConfigLocalData;
+    recurringInstances: RecurringBillInstance[] | undefined;
+};
+export declare const isRecurringConfigChanged: (recurringBillNewConfig: RecurringBillConfigLocalData, originalRecurringBillConfig: Partial<RecurringBillConfig>, checkApprovalChange: boolean) => boolean;
+export declare const getTotalPayments: (startDate: ZeniDate, endDate: ZeniDate, frequency: RecurringBillFrequency, currentInstance?: RecurringBillInstance | undefined) => number;
+export declare const getEndDate: (startDate: ZeniDate, frequency: RecurringBillFrequency, totalPayments: number, currentInstance?: RecurringBillInstance | undefined) => ZeniDate;

package/lib/view/spendManagement/helpers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSelectedCompanyOfficer = exports.getSpendManagementEffectiveListPeriod = exports.getLatestApprovalDate = void 0;
+exports.getEndDate = exports.getTotalPayments = exports.isRecurringConfigChanged = exports.updateRecurringBillDetails = exports.getPaymentDateFromVendorReceiveDate = exports.getSelectedCompanyOfficer = exports.getSpendManagementEffectiveListPeriod = exports.getLatestApprovalDate = void 0;
 const timeframeTick_1 = require("../../commonStateTypes/timeframeTick");
 const workingDayHelper_1 = require("../../commonStateTypes/workingDayHelper");
 const zeniDayJS_1 = require("../../zeniDayJS");
@@ -45,3 +45,136 @@ const getSelectedCompanyOfficer = (verificationDetails) => {
     return officer;
 };
 exports.getSelectedCompanyOfficer = getSelectedCompanyOfficer;
+const getPaymentDateFromVendorReceiveDate = (vendorReceiveDate, maxPaymentProcessingDays) => {
+    let paymentDate = vendorReceiveDate.subtract(maxPaymentProcessingDays, 'day');
+    while ((0, workingDayHelper_1.isHoliday)(paymentDate.toDate()) === true) {
+        paymentDate = paymentDate.subtract(1, 'day');
+    }
+    return paymentDate;
+};
+exports.getPaymentDateFromVendorReceiveDate = getPaymentDateFromVendorReceiveDate;
+const updateRecurringBillDetails = (currentRecurringConfig, prevRecurringConfig, currentInstances, currentBillAmount) => {
+    var _a;
+    let updatedRecurringInstances = [];
+    const { startDate, endDate, frequency, totalPaymentCycles, endDateSelectorOptionType, } = currentRecurringConfig;
+    if (frequency == null ||
+        startDate == null ||
+        (totalPaymentCycles === 0 && endDate == null) ||
+        (prevRecurringConfig != null &&
+            prevRecurringConfig.isActive &&
+            !(0, exports.isRecurringConfigChanged)(currentRecurringConfig, prevRecurringConfig, false))) {
+        return {
+            recurringConfig: currentRecurringConfig,
+            recurringInstances: currentInstances,
+        };
+    }
+    let currentEndDate = endDate;
+    let currentTotalPayments = totalPaymentCycles;
+    const currentInstance = currentInstances === null || currentInstances === void 0 ? void 0 : currentInstances.find((instance) => Boolean(instance.readonly) === false);
+    //TBR check if endDate or totalPayments to be preserved for change in frequency/startDate
+    if (prevRecurringConfig != null &&
+        endDateSelectorOptionType == null &&
+        (0, exports.isRecurringConfigChanged)(currentRecurringConfig, prevRecurringConfig, false) &&
+        endDate != null &&
+        totalPaymentCycles !== 0) {
+        currentTotalPayments = (0, exports.getTotalPayments)(startDate, endDate, frequency, currentInstance);
+    }
+    else if (endDate == null || endDateSelectorOptionType === 'payments') {
+        currentEndDate = (0, exports.getEndDate)(startDate, frequency, totalPaymentCycles, currentInstance);
+    }
+    else if (totalPaymentCycles === 0 || endDateSelectorOptionType === 'date') {
+        currentTotalPayments = (0, exports.getTotalPayments)(startDate, endDate, frequency, currentInstance);
+    }
+    //editRecurringBill
+    if (currentRecurringConfig.isActive &&
+        currentInstances != null &&
+        currentInstances.length !== 0 &&
+        currentInstance != null) {
+        const pastInstances = currentInstances.filter((bill) => bill.readonly === true);
+        const futureTotalPayments = currentTotalPayments - pastInstances.length;
+        const billAmountForFutureInstances = (_a = currentInstances[pastInstances.length + 1]) === null || _a === void 0 ? void 0 : _a.amount;
+        updatedRecurringInstances = [
+            ...pastInstances,
+            currentInstance,
+            ...getRecurringBillInstances(currentInstances[pastInstances.length].vendorReceiveDate, frequency, futureTotalPayments, pastInstances.length + 1, billAmountForFutureInstances !== null && billAmountForFutureInstances !== void 0 ? billAmountForFutureInstances : currentBillAmount).slice(1),
+        ];
+    }
+    else {
+        //createRecurringBill
+        updatedRecurringInstances = getRecurringBillInstances(startDate, frequency, currentTotalPayments, 1, currentBillAmount);
+    }
+    return {
+        recurringConfig: Object.assign(Object.assign({}, currentRecurringConfig), { endDate: currentEndDate, totalPaymentCycles: currentTotalPayments }),
+        recurringInstances: updatedRecurringInstances,
+    };
+};
+exports.updateRecurringBillDetails = updateRecurringBillDetails;
+const isRecurringConfigChanged = (recurringBillNewConfig, originalRecurringBillConfig, checkApprovalChange) => {
+    const { isApprovalRequired: isApprovalRequiredNew, endDate: endDateNew, frequency: frequencyNew, totalPaymentCycles: totalPaymentCyclesNew, } = recurringBillNewConfig;
+    const { isApprovalRequired, endDate, frequency, totalPaymentCycles } = originalRecurringBillConfig;
+    return ((endDateNew === null || endDateNew === void 0 ? void 0 : endDateNew.toString()) !== (endDate === null || endDate === void 0 ? void 0 : endDate.toString()) ||
+        frequencyNew !== frequency ||
+        totalPaymentCyclesNew !== totalPaymentCycles ||
+        (checkApprovalChange ? isApprovalRequiredNew !== isApprovalRequired : false));
+};
+exports.isRecurringConfigChanged = isRecurringConfigChanged;
+const getTotalPayments = (startDate, endDate, frequency, currentInstance) => {
+    let currentStartDate = startDate;
+    let pastPayments = 0;
+    if ((currentInstance === null || currentInstance === void 0 ? void 0 : currentInstance.instance) != null && (currentInstance === null || currentInstance === void 0 ? void 0 : currentInstance.instance) > 1) {
+        currentStartDate = currentInstance.vendorReceiveDate;
+        pastPayments = currentInstance.instance - 1;
+    }
+    let totalPayments = 0;
+    const offSetValue = getRecurringFrequencyInDays(frequency);
+    totalPayments = endDate.diff(currentStartDate, 'day') / offSetValue;
+    return Math.floor(totalPayments + pastPayments) + 1; //+1 to include startDate
+};
+exports.getTotalPayments = getTotalPayments;
+const getEndDate = (startDate, frequency, totalPayments, currentInstance) => {
+    let currentStartDate = startDate;
+    let endDate = currentStartDate;
+    let currentTotalPayments = totalPayments;
+    if ((currentInstance === null || currentInstance === void 0 ? void 0 : currentInstance.instance) != null && (currentInstance === null || currentInstance === void 0 ? void 0 : currentInstance.instance) > 1) {
+        currentStartDate = currentInstance.vendorReceiveDate;
+        currentTotalPayments = totalPayments - currentInstance.instance + 1;
+    }
+    const offSetValue = getRecurringFrequencyInDays(frequency);
+    endDate = currentStartDate.add(offSetValue * (currentTotalPayments - 1), 'day');
+    return endDate;
+};
+exports.getEndDate = getEndDate;
+function getRecurringBillInstances(startDate, frequency, totalPayments, currentInstance, billAmount) {
+    const updatedInstances = [];
+    const offSetValue = getRecurringFrequencyInDays(frequency);
+    for (let i = 0; i < totalPayments; i++) {
+        updatedInstances.push(Object.assign({ instance: currentInstance + i, amount: billAmount }, checkIfHolidayAndGetNextDate(startDate.add(i * offSetValue, 'day'))));
+    }
+    return updatedInstances;
+}
+function getRecurringFrequencyInDays(frequency) {
+    switch (frequency) {
+        case 'weekly':
+            return 7;
+        case 'biweekly':
+            return 14;
+        case 'monthly':
+            return 30;
+        case 'quarterly':
+            return 90;
+    }
+}
+function checkIfHolidayAndGetNextDate(date) {
+    const isHolidayMessage = 'is a holiday';
+    let newDate = date;
+    while ((0, workingDayHelper_1.isHoliday)(newDate.toDate()) === true) {
+        newDate = newDate.subtract(1, 'day');
+    }
+    if (newDate !== date) {
+        return {
+            vendorReceiveDate: newDate,
+            vendorReceiveDateNotes: `${date.format('MMM DD, YYYY')} ${isHolidayMessage}`,
+        };
+    }
+    return { vendorReceiveDate: date, vendorReceiveDateNotes: '' };
+}

package/lib/view/spendManagement/reimbursement/remiDetailView/remiDetailViewSelector.d.ts

@@ -47,6 +47,7 @@ export interface ActorActivityWithUser extends Actor {
     userId: ID;
     type: string;
     subType?: string;
+    isRecurringAutoApprove: boolean;
 }
 export interface RemiActivity {
     approvalRuleId?: ID;

package/lib/view/spendManagement/zeniAccounts/zeniAccountsConfig/zeniAccountsConfigPayload.d.ts

@@ -2,6 +2,7 @@ import { AddressPayload } from '../../../../entity/address/addressPayload';
 import { ZeniAPIResponse } from '../../../../responsePayload';
 import { ZeniAccountsConfig, DepositProductConfig } from './zeniAccountsConfigState';
 export interface ZeniAccountsConfigPayload {
+    apy: string | null;
     bank_name: string;
     deposit_product_config: DepositProductConfigPayload;
     mailing_address: AddressPayload;

package/lib/view/spendManagement/zeniAccounts/zeniAccountsConfig/zeniAccountsConfigPayload.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapDepositProductConfigPayloadToDepositProductConfig = exports.mapZeniAccountsConfigPayloadToZeniAccountsConfigState = void 0;
 const mapZeniAccountsConfigPayloadToZeniAccountsConfigState = (payload) => ({
+    annualPercentageYield: payload.apy != null ? payload.apy : '',
     bankName: payload.bank_name,
     mailingAddressId: payload.mailing_address.address_id,
     bankAddressId: payload.bank_address.address_id,

package/lib/view/spendManagement/zeniAccounts/zeniAccountsConfig/zeniAccountsConfigReducer.js

@@ -6,6 +6,7 @@ const toolkit_1 = require("@reduxjs/toolkit");
 const zeniAccountsConfigPayload_1 = require("./zeniAccountsConfigPayload");
 exports.initialState = {
     zeniAccountsConfig: {
+        annualPercentageYield: '',
         bankName: '',
         mailingAddressId: '',
         bankAddressId: '',
@@ -28,8 +29,9 @@ const zeniAccountsConfig = (0, toolkit_1.createSlice)({
             draft.error = undefined;
         },
         updateZeniAccountsConfigSuccess(draft, action) {
-            const { bankName, mailingAddressId, bankAddressId, depositProductConfig } = (0, zeniAccountsConfigPayload_1.mapZeniAccountsConfigPayloadToZeniAccountsConfigState)(action.payload);
+            const { bankName, mailingAddressId, bankAddressId, depositProductConfig, annualPercentageYield, } = (0, zeniAccountsConfigPayload_1.mapZeniAccountsConfigPayloadToZeniAccountsConfigState)(action.payload);
             draft.zeniAccountsConfig = {
+                annualPercentageYield,
                 bankName,
                 mailingAddressId,
                 bankAddressId,

package/lib/view/spendManagement/zeniAccounts/zeniAccountsConfig/zeniAccountsConfigSelector.d.ts

@@ -4,6 +4,7 @@ import { RootState } from '../../../../reducer';
 import { DepositProductConfig } from './zeniAccountsConfigState';
 export interface ZeniAccountsConfigSelectorView extends SelectorView {
     zeniAccountsConfigDetail: {
+        annualPercentageYield: string;
         bankName: string;
         depositProductConfig: DepositProductConfig;
         mailingAddress?: Address;

package/lib/view/spendManagement/zeniAccounts/zeniAccountsConfig/zeniAccountsConfigSelector.js

@@ -4,11 +4,12 @@ exports.getZeniAccountsConfigDetail = void 0;
 const addressSelector_1 = require("../../../../entity/address/addressSelector");
 const getZeniAccountsConfigDetail = (state) => {
     const { zeniAccountsConfigState, addressState } = state;
-    const { bankName, depositProductConfig, bankAddressId, mailingAddressId } = zeniAccountsConfigState.zeniAccountsConfig;
+    const { bankName, depositProductConfig, bankAddressId, mailingAddressId, annualPercentageYield, } = zeniAccountsConfigState.zeniAccountsConfig;
     const mailingAddress = (0, addressSelector_1.getAddressByAddressId)(addressState, mailingAddressId);
     const bankAddress = (0, addressSelector_1.getAddressByAddressId)(addressState, bankAddressId);
     return {
         zeniAccountsConfigDetail: {
+            annualPercentageYield,
             bankName: bankName,
             depositProductConfig: depositProductConfig,
             mailingAddress,

package/lib/view/spendManagement/zeniAccounts/zeniAccountsConfig/zeniAccountsConfigState.d.ts

@@ -3,6 +3,7 @@ export interface ZeniAccountsConfigState extends FetchedState {
     zeniAccountsConfig: ZeniAccountsConfig;
 }
 export interface ZeniAccountsConfig {
+    annualPercentageYield: string;
     bankName: string;
     mailingAddressId: ID;
     bankAddressId: ID;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.7.74",
+  "version": "4.7.75",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -26,7 +26,7 @@
   "homepage": "https://github.com/zeni-ai/client-epic-state#readme",
   "devDependencies": {
     "@types/chai": "^4.2.11",
-    "@types/jest": "^27.0.1",
+    "@types/jest": "^29.4.0",
     "@types/lodash": "^4.14.178",
     "@types/node": "^17.0.34",
     "@types/url-parse": "^1.4.8",
@@ -37,10 +37,10 @@
     "concurrently": "^6.3.0",
     "eslint": "^7.9.0",
     "eslint-config-prettier": "^8.3.0",
-    "jest": "^27.2.0",
+    "jest": "^29.4.3",
     "prettier": "^2.3.2",
     "rimraf": "^3.0.2",
-    "ts-jest": "^27.1.3",
+    "ts-jest": "^29.0.5",
     "ts-prune": "^0.10.3",
     "ts-unused-exports": "^10.0.1",
     "typescript": "^4.6.2"
@@ -48,6 +48,7 @@
   "dependencies": {
     "@reduxjs/toolkit": "^1.6.2",
     "cross-fetch": "^3.1.2",
+    "date-holidays": "^3.23.8",
     "dayjs": "^1.10.7",
     "dayjs-business-time": "^1.0.4",
     "js-base64": "^3.6.0",