@zeniai/client-epic-state 4.13.32 → 4.13.34

package/lib/view/expenseAutomationView/epics/jeSchedule/fetchJeSchedulesEpic.js

@@ -10,13 +10,10 @@ const jeSchedulesReducer_1 = require("../../../../entity/jeSchedules/jeSchedules
 const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const fetchJeSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(jeSchedulesViewReducer_1.fetchJeSchedules.match), (0, operators_1.switchMap)((action) => {
     const state = state$.value;
-    const { 
-    // expenseAutomationJESchedulesViewState: {fetchState},
-    expenseAutomationViewState: { selectedPeriodByTenantId }, } = state;
+    const { expenseAutomationViewState: { selectedPeriodByTenantId }, } = state;
     const { period } = action.payload;
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
-    // if (fetchState !== 'Not-Started') {
     const queryParam = {
         start_date: (0, timePeriod_1.toString)(period.start),
         end_date: (0, timePeriod_1.toString)(period.end),
@@ -52,8 +49,5 @@ const fetchJeSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, op
             JSON.stringify(error)),
         selectedPeriod,
     }))));
-    // } else {
-    //   return from([] as ActionType[]);
-    // }
 }));
 exports.fetchJeSchedulesEpic = fetchJeSchedulesEpic;

package/lib/view/expenseAutomationView/expenseAutomationViewReducer.js

@@ -47,7 +47,12 @@ const expenseAutomationView = (0, toolkit_1.createSlice)({
         },
         initializeSelectedPeriodForTenants(draft, action) {
             const { selectedPeriodByTenantId } = action.payload;
-            draft.selectedPeriodByTenantId = selectedPeriodByTenantId;
+            const tenantIds = Object.keys(selectedPeriodByTenantId);
+            tenantIds.forEach((tenantId) => {
+                var _a;
+                draft.selectedPeriodByTenantId[tenantId] =
+                    (_a = draft.selectedPeriodByTenantId[tenantId]) !== null && _a !== void 0 ? _a : selectedPeriodByTenantId[tenantId];
+            });
         },
         updateCurrentSelectedPeriod: {
             reducer(draft, action) {

package/lib/view/scheduleView/scheduleDetailView/epics/markAsCompleteScheduleDetailEpic.js

@@ -14,15 +14,19 @@ const markAsCompleteScheduleDetailEpic = (actions$, state$, zeniAPI) => actions$
     const { scheduleType, jeScheduleKey } = action.payload;
     const actions = [];
     const jeScheduleTransactionState = (0, jeSchedulesSelector_1.getJEScheduledTransactionByJEScheduleTransactionKey)(jeScheduleKey, state);
+    const scheduleDetailId = jeScheduleTransactionState.jeScheduleId;
     const vendorName = jeScheduleTransactionState.vendor.name;
-    const scheduleDetailsUpdated = state.scheduleDetailState.newScheduleState[scheduleType];
+    const scheduleDetailsUpdated = scheduleDetailId != null
+        ? state.scheduleDetailState.editScheduleStateByDetailId[scheduleType][scheduleDetailId]
+        : state.scheduleDetailState.newScheduleState[scheduleType];
     const payload = Object.assign({}, (0, scheduleDetailPayload_1.prepareScheduleDetailPayload)(state, scheduleDetailsUpdated, jeScheduleKey, scheduleType, false, true));
     const queryParam = {
         je_schedule_type: scheduleType,
     };
-    return zeniAPI
-        .postAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/schedules?query=${encodeURIComponent(JSON.stringify(queryParam))}`, payload)
-        .pipe((0, operators_1.mergeMap)((response) => {
+    const markAsCompleteApi = scheduleDetailId != null
+        ? zeniAPI.putAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/schedules/${scheduleDetailId}?query=${encodeURIComponent(JSON.stringify(queryParam))}`, payload)
+        : zeniAPI.postAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/schedules?query=${encodeURIComponent(JSON.stringify(queryParam))}`, payload);
+    return markAsCompleteApi.pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             actions.push((0, jeSchedulesReducer_1.updateJESchedulesDetails)(response.data.je_schedules, response.data.scheduled_journal_entries, 'replace'), (0, scheduleDetailReducer_1.markAsCompleteScheduleDetailSuccessOrFailure)('Completed'), (0, snackbarReducer_1.openSnackbar)({
                 messageSection: 'mark_as_complete_schedule',

package/lib/view/scheduleView/scheduleDetailView/scheduleDetailPayload.js

@@ -127,7 +127,7 @@ const mapJEScheduleTransactionToPayload = (jeScheduleTransactionState, vendorSta
         vendor_id: (_a = selectedVendor === null || selectedVendor === void 0 ? void 0 : selectedVendor.id) !== null && _a !== void 0 ? _a : '',
         vendor_name: (_b = selectedVendor === null || selectedVendor === void 0 ? void 0 : selectedVendor.name) !== null && _b !== void 0 ? _b : '',
     };
-    const payload = Object.assign(Object.assign({ status: updatedStatus, vendor: (selectedVendor === null || selectedVendor === void 0 ? void 0 : selectedVendor.id) !== ''
+    const payload = Object.assign(Object.assign({ status: updatedStatus, vendor: Boolean(selectedVendor) && Boolean(selectedVendor === null || selectedVendor === void 0 ? void 0 : selectedVendor.id) === true
             ? updatedVendor
             : (0, exports.mapVendorToVendorPayload)(vendorDetails), currency_code: currencyCode, currency_symbol: currencySymbol, period: selectedMonths !== null && selectedMonths !== void 0 ? selectedMonths : null, je_schedule_type: jeScheduleType, posting_date: postingDate, je_schedule_id: status.code === 'marked_as_completed' ? jeScheduleId : undefined, balance: getBalanceAmountAsOfToday({
             isMarkAsComplete,
@@ -177,7 +177,7 @@ const mapFixedAssetJEScheduleTransactionToPayload = (jeScheduleTransactionState,
         vendor_id: (_a = selectedVendor === null || selectedVendor === void 0 ? void 0 : selectedVendor.id) !== null && _a !== void 0 ? _a : '',
         vendor_name: (_b = selectedVendor === null || selectedVendor === void 0 ? void 0 : selectedVendor.name) !== null && _b !== void 0 ? _b : '',
     };
-    const payload = Object.assign(Object.assign({ status: updatedStatus, vendor: (selectedVendor === null || selectedVendor === void 0 ? void 0 : selectedVendor.id) !== ''
+    const payload = Object.assign(Object.assign({ status: updatedStatus, vendor: Boolean(selectedVendor) && Boolean(selectedVendor === null || selectedVendor === void 0 ? void 0 : selectedVendor.id) === true
             ? updatedVendor
             : (0, exports.mapVendorToVendorPayload)(vendorDetails), currency_code: currencyCode, currency_symbol: currencySymbol, period: selectedMonths !== null && selectedMonths !== void 0 ? selectedMonths : null, je_schedule_type: 'fixed_assets', posting_date: postingDate, je_schedule_id: status.code === 'marked_as_completed' ? jeScheduleId : undefined, balance: getBalanceAmountAsOfToday({
             isMarkAsComplete,

package/package.json

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