@zeniai/client-epic-state 4.7.96 → 4.7.98

package/lib/commonStateTypes/workingDayHelper.d.ts

@@ -1,3 +1,4 @@
+import { ZeniDate } from '../zeniDayJS';
 export declare const startDate = "2000-01-01";
 export declare const endDate = "2070-12-31";
 export declare const PAYMENT_BUSINESS_DAYS = 4;
@@ -8,4 +9,4 @@ export declare const getPreviousNthWorkingDay: (date: Date, filterDaysIndex: num
 export declare const isHolidayToday: (filterDaysIndex: number[]) => boolean;
 export declare const filterDays: (date: Date, filterDaysIndex: number[]) => boolean;
 export declare const getYearsList: (startYear?: number, endYear?: number) => number[];
-export declare const isHoliday: (date: Date) => boolean;
+export declare const isHoliday: (date: ZeniDate) => boolean;

package/lib/commonStateTypes/workingDayHelper.js

@@ -72,17 +72,25 @@ const getYearsList = (startYear = 2000, endYear = new Date().getFullYear()) => {
     return years;
 };
 exports.getYearsList = getYearsList;
+const getHolidaysListPerYear = (year) => {
+    return dateHolidays
+        .getHolidays(year)
+        .filter((holiday) => holiday.type === 'public' || holiday.type === 'bank')
+        .map((holiday) => (0, zeniDayJS_1.date)(holiday.date).toString());
+};
+const holidaysPerYear = {
+    [(0, zeniDayJS_1.dateNow)().year()]: getHolidaysListPerYear((0, zeniDayJS_1.dateNow)().year()),
+};
 const isHoliday = (date) => {
-    const holidayDetails = dateHolidays.isHoliday((0, zeniDayJS_1.dateInLocal)(date.toDateString()).toDate());
-    if (holidayDetails === false) {
-        return false;
-    }
-    else if (holidayDetails[0].type === 'bank' ||
-        holidayDetails[0].type === 'public') {
-        return true;
+    const currentYear = date.year();
+    let holidays = [];
+    if (holidaysPerYear[currentYear] != null) {
+        holidays = holidaysPerYear[currentYear];
     }
     else {
-        return false;
+        holidays = getHolidaysListPerYear(currentYear);
+        holidaysPerYear[currentYear] = holidays;
     }
+    return holidays.indexOf(date.toString()) >= 0;
 };
 exports.isHoliday = isHoliday;

package/lib/index.d.ts

@@ -610,7 +610,7 @@ import { fetchArAgingDetail, updateArAgingDetailUIState } from './view/arAgingVi
 import { ArAgingDetail, getArAgingDetailForCustomer } from './view/arAgingView/arAgingDetail/arAgingDetailSelector';
 export { fetchArAging, updateArAgingUIState, fetchArAgingDetail, updateArAgingDetailUIState, ArAgingReport, ArAgingDetail, AgingBalancesByCustomer, getArAgingReport, getArAgingDetailForCustomer, };
 import { toRecurringBillFrequency, toRecurringBillFrequencyStrict, RecurringBillFrequency, RecurringBillDetail, RecurringBillConfig, RecurringBillStatus, RecurringBillPaymentStatus } from './entity/billPay/recurringBills/recurringBillsState';
-export { toRecurringBillFrequency, toRecurringBillFrequencyStrict, RecurringBillFrequency, RecurringBillDetail, RecurringBillConfig, RecurringBillStatus, RecurringBillPaymentStatus };
+export { toRecurringBillFrequency, toRecurringBillFrequencyStrict, RecurringBillFrequency, RecurringBillDetail, RecurringBillConfig, RecurringBillStatus, RecurringBillPaymentStatus, };
 import { Task, TaskStatusCodeType, PriorityCodeType, TaskTagCodeType, TaskTag, TaskStatus, TaskPriority } from './entity/task/task';
 import { TaskListSelectorView, TaskWithUserDetails, getAllTasks } from './view/taskManager/taskListView/taskListSelector';
 import { TaskListViewSortKey, TaskListUIState, TaskListFilters, TASK_LIST_FILTER_CATEGORIES, TaskListFilterCategoryField, TaskFilterCategory } from './view/taskManager/taskListView/taskList';

package/lib/view/spendManagement/helpers.js

@@ -47,7 +47,7 @@ const getSelectedCompanyOfficer = (verificationDetails) => {
 exports.getSelectedCompanyOfficer = getSelectedCompanyOfficer;
 const getPaymentDateFromVendorReceiveDate = (vendorReceiveDate, maxPaymentProcessingDays) => {
     let paymentDate = vendorReceiveDate.subtract(maxPaymentProcessingDays, 'day');
-    while ((0, workingDayHelper_1.isHoliday)(paymentDate.toDate()) === true) {
+    while ((0, workingDayHelper_1.isHoliday)(paymentDate) === true) {
         paymentDate = paymentDate.subtract(1, 'day');
     }
     return paymentDate;
@@ -71,20 +71,18 @@ const updateRecurringBillDetails = (currentRecurringConfig, prevRecurringConfig,
     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) {
+    if (endDate != null &&
+        ((prevRecurringConfig != null &&
+            endDateSelectorOptionType == null &&
+            (0, exports.isRecurringConfigChanged)(currentRecurringConfig, prevRecurringConfig, false) &&
+            totalPaymentCycles !== 0) ||
+            totalPaymentCycles === 0 ||
+            endDateSelectorOptionType === 'date')) {
         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 &&
@@ -167,7 +165,7 @@ function getRecurringFrequencyInDays(frequency) {
 function checkIfHolidayAndGetNextDate(date) {
     const isHolidayMessage = 'is a holiday';
     let newDate = date;
-    while ((0, workingDayHelper_1.isHoliday)(newDate.toDate()) === true) {
+    while ((0, workingDayHelper_1.isHoliday)(newDate) === true) {
         newDate = newDate.subtract(1, 'day');
     }
     if (newDate !== date) {

package/package.json

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