@zeniai/client-epic-state 4.19.1 → 4.19.2-betaAS10

package/lib/view/recommendation/fetchEntityRecommendationsByTransactionIdEpic.js

@@ -23,8 +23,15 @@ const fetchEntityRecommendationsByTransactionIdEpic = (actions$, state$, zeniAPI
     if (isFetchCOT === true) {
         query.include_cot = true;
     }
+    const entityQuery = {
+        entity_name: entity.name,
+        entity_type: entity.type,
+    };
+    const recommendationUrl = entity.qboId === entity.name // eneity id null case handle here
+        ? `${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/recommendations?query=${encodeURIComponent(JSON.stringify(entityQuery))}`
+        : `${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/${(0, exports.toEntityTypeURL)(entity.type)}/${entity.qboId}/recommendations?query=${encodeURIComponent(JSON.stringify(query))}`;
     return zeniAPI
-        .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/${(0, exports.toEntityTypeURL)(entity.type)}/${entity.qboId}/recommendations?query=${encodeURIComponent(JSON.stringify(query))}`)
+        .getJSON(recommendationUrl)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             const actions = [];

package/lib/view/spendManagement/reimbursement/remiListView/fetchRemiListEpic.js

@@ -13,7 +13,7 @@ const remiListState_1 = require("./remiListState");
 const fetchRemiListEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(remiListReducer_1.fetchRemiList.match), (0, operators_1.mergeMap)((action) => {
     const fetchRemiListActions = [];
     const state = state$.value;
-    const { period, cacheOverride, isShowDeletedReimbursementEnabled, isIncludeLineItems, } = action.payload;
+    const { period, cacheOverride, isShowDeletedReimbursementEnabled, isIncludeLineItems, isRefreshAccountAndAccountingClass, } = action.payload;
     const tabIds = [
         'draft',
         'pending_approval',
@@ -22,7 +22,7 @@ const fetchRemiListEpic = (actions$, state$) => actions$.pipe((0, operators_1.fi
     ];
     if (cacheOverride === true) {
         fetchRemiListActions.push((0, reimbursementConfigReducer_1.fetchReimbursementConfig)());
-        tabIds.forEach((tab) => fetchRemiListActions.push((0, remiListReducer_1.fetchRemiListPerTab)(period, tab, isShowDeletedReimbursementEnabled, isIncludeLineItems)));
+        tabIds.forEach((tab) => fetchRemiListActions.push((0, remiListReducer_1.fetchRemiListPerTab)(period, tab, isShowDeletedReimbursementEnabled, isIncludeLineItems, isRefreshAccountAndAccountingClass)));
     }
     else {
         if (state.reimbursementConfigState.fetchState !== 'Completed' &&
@@ -33,7 +33,7 @@ const fetchRemiListEpic = (actions$, state$) => actions$.pipe((0, operators_1.fi
             const key = (0, remiListState_1.getRemiListKey)(period, tab);
             const remis = (0, get_1.default)(state.remiListState.byRemiListKey, key, undefined);
             if (remis == null || remis.hasValidState() === false) {
-                fetchRemiListActions.push((0, remiListReducer_1.fetchRemiListPerTab)(period, tab, isShowDeletedReimbursementEnabled, isIncludeLineItems));
+                fetchRemiListActions.push((0, remiListReducer_1.fetchRemiListPerTab)(period, tab, isShowDeletedReimbursementEnabled, isIncludeLineItems, isRefreshAccountAndAccountingClass));
             }
         });
     }

package/lib/view/spendManagement/reimbursement/remiListView/fetchRemiListPerTabEpic.js

@@ -10,23 +10,13 @@ const userReducer_1 = require("../../../../entity/user/userReducer");
 const responsePayload_1 = require("../../../../responsePayload");
 const remiListReducer_1 = require("./remiListReducer");
 const fetchRemiListPerTabEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(remiListReducer_1.fetchRemiListPerTab.match), (0, operators_1.mergeMap)((action) => {
-    const { period, tab, isShowDeletedReimbursementEnabled, isIncludeLineItems, } = action.payload;
-    const queryParam = {
-        start_date: (0, timePeriod_1.toString)(period.start),
-        end_date: (0, timePeriod_1.toString)(period.end),
-        sort_by: 'reimbursement_date',
-        sort_order: 'desc',
-        reimbursement_provider: 'zeni',
-        reimbursement_stage_code: tab,
-        is_include_reimbursee_users_info: true,
-        is_include_approval_info: tab === 'pending_approval',
-        is_include_pending_approval_transaction_ids_for_user: tab === 'pending_approval',
-        transaction_type: 'reimbursement',
-        is_include_deleted: isShowDeletedReimbursementEnabled
+    const { period, tab, isShowDeletedReimbursementEnabled, isIncludeLineItems, isRefreshAccountAndAccountingClass, } = action.payload;
+    console.log('***************  from epic isRefreshAccountAndAccountingClass *****************', isRefreshAccountAndAccountingClass);
+    const queryParam = Object.assign({ start_date: (0, timePeriod_1.toString)(period.start), end_date: (0, timePeriod_1.toString)(period.end), sort_by: 'reimbursement_date', sort_order: 'desc', reimbursement_provider: 'zeni', reimbursement_stage_code: tab, is_include_reimbursee_users_info: true, is_include_approval_info: tab === 'pending_approval', is_include_pending_approval_transaction_ids_for_user: tab === 'pending_approval', transaction_type: 'reimbursement', is_include_deleted: isShowDeletedReimbursementEnabled
             ? tab !== 'draft'
-            : false,
-        is_include_line_items: isIncludeLineItems ? tab !== 'draft' : false,
-    };
+            : false, is_include_line_items: isIncludeLineItems ? tab !== 'draft' : false }, (isRefreshAccountAndAccountingClass === false && {
+        is_refresh_account_and_accounting_class: false,
+    }));
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/reimbursements/transactions?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
         .pipe((0, operators_1.mergeMap)((response) => {

package/lib/view/spendManagement/reimbursement/remiListView/remiListReducer.d.ts

@@ -4,17 +4,19 @@ import { ZeniAPIStatus } from '../../../../responsePayload';
 import { RemiListPayload } from './remiListPayload';
 import { ReimbursementFilters, RemiListDownloadUIState, RemiListState, RemiListUIState, RemiTabType, SaveRemiStageCode } from './remiListState';
 export declare const initialState: RemiListState;
-export declare const fetchRemiList: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[period: TimePeriod, cacheOverride: any, isShowDeletedReimbursementEnabled: boolean, isIncludeLineItems: boolean, isBulkActionCompleteRefresh?: any], {
+export declare const fetchRemiList: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[period: TimePeriod, cacheOverride: any, isShowDeletedReimbursementEnabled: boolean, isIncludeLineItems: boolean, isBulkActionCompleteRefresh: any, isRefreshAccountAndAccountingClass: boolean], {
     period: TimePeriod;
     cacheOverride: any;
     isShowDeletedReimbursementEnabled: boolean;
     isIncludeLineItems: boolean;
     isBulkActionCompleteRefresh: any;
-}, "remiList/fetchRemiList", never, never>, fetchRemiListPerTab: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[period: TimePeriod, tab: "paid" | "pending_approval" | "scheduled" | "draft", isShowDeletedReimbursementEnabled: boolean, isIncludeLineItems: boolean], {
+    isRefreshAccountAndAccountingClass: boolean;
+}, "remiList/fetchRemiList", never, never>, fetchRemiListPerTab: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[period: TimePeriod, tab: "paid" | "pending_approval" | "scheduled" | "draft", isShowDeletedReimbursementEnabled: boolean, isIncludeLineItems: boolean, isRefreshAccountAndAccountingClass: boolean], {
     period: TimePeriod;
     tab: "paid" | "pending_approval" | "scheduled" | "draft";
     isShowDeletedReimbursementEnabled: boolean;
     isIncludeLineItems: boolean;
+    isRefreshAccountAndAccountingClass: boolean;
 }, "remiList/fetchRemiListPerTab", never, never>, updateRemiListByStatus: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     remiList: RemiListPayload;
     tab: RemiTabType;

package/lib/view/spendManagement/reimbursement/remiListView/remiListReducer.js

@@ -34,13 +34,15 @@ const remiList = (0, toolkit_1.createSlice)({
             reducer() {
                 //do nothing
             },
-            prepare(period, tab, isShowDeletedReimbursementEnabled, isIncludeLineItems) {
+            prepare(period, tab, isShowDeletedReimbursementEnabled, isIncludeLineItems, isRefreshAccountAndAccountingClass) {
+                console.log('*************** called fetchRemiListPerTab prepare isRefreshAccountAndAccountingClass *****************', isRefreshAccountAndAccountingClass);
                 return {
                     payload: {
                         period,
                         tab,
                         isShowDeletedReimbursementEnabled,
                         isIncludeLineItems,
+                        isRefreshAccountAndAccountingClass,
                     },
                 };
             },
@@ -69,7 +71,15 @@ const remiList = (0, toolkit_1.createSlice)({
                             : 'In-Progress', error: undefined });
                 });
             },
-            prepare(period, cacheOverride = false, isShowDeletedReimbursementEnabled, isIncludeLineItems, isBulkActionCompleteRefresh = false) {
+            prepare(period, cacheOverride = false, isShowDeletedReimbursementEnabled, isIncludeLineItems, isBulkActionCompleteRefresh = false, isRefreshAccountAndAccountingClass) {
+                console.log('*************** called fetchRemiList prepare isRefreshAccountAndAccountingClass *****************', {
+                    cacheOverride,
+                    isBulkActionCompleteRefresh,
+                    isIncludeLineItems,
+                    isShowDeletedReimbursementEnabled,
+                    period,
+                    isRefreshAccountAndAccountingClass,
+                });
                 return {
                     payload: {
                         period,
@@ -77,6 +87,7 @@ const remiList = (0, toolkit_1.createSlice)({
                         isShowDeletedReimbursementEnabled,
                         isIncludeLineItems,
                         isBulkActionCompleteRefresh,
+                        isRefreshAccountAndAccountingClass,
                     },
                 };
             },

package/package.json

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