@zeniai/client-epic-state 4.10.53 → 4.10.55

package/lib/entity/vendorExpense/vendorExpenseTrend.js

@@ -139,7 +139,8 @@ const getYTDSpend = (months, firstMonthOfFY) => {
         startYear = -1;
     }
     const startDate = (0, zeniDayJS_1.dateFromYearMonthDate)(startYear, firstMonthOfFY - 1, 1);
-    const YTDMonths = months.filter((month) => month.endDate.isAfter(startDate) && month.endDate.isBefore(currentDate));
+    const YTDMonths = months.filter((month) => month.endDate.isAfter(startDate) &&
+        month.endDate.isSameOrBefore(currentDate));
     return YTDMonths;
 };
 exports.getYTDSpend = getYTDSpend;

package/lib/view/commonVendorView/vendorsTabVendorView/vendorsTabVendorViewReducer.js

@@ -13,7 +13,7 @@ exports.initialVendorDetailLocalData = {
 exports.initialState = {
     vendorStateById: {},
     selectedTabType: 'spend_transactions',
-    vendorSpendTrendFilterTabValue: 'last_12_months',
+    vendorSpendTrendFilterTabValue: 'YTD_spend',
 };
 const vendorsTabVendorView = (0, toolkit_1.createSlice)({
     name: 'vendorsTabVendorView',
@@ -28,7 +28,7 @@ const vendorsTabVendorView = (0, toolkit_1.createSlice)({
                         fetchState: 'Not-Started',
                         error: undefined,
                     } });
-                draft.vendorSpendTrendFilterTabValue = 'last_12_months';
+                draft.vendorSpendTrendFilterTabValue = 'YTD_spend';
             },
             prepare(vendorId, cacheOverride = false) {
                 return { payload: { cacheOverride, vendorId } };

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

@@ -13,7 +13,7 @@ const reimbursementConfigReducer_1 = require("../reimbursementConfig/reimburseme
 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 } = action.payload;
+    const { period, cacheOverride, isShowDeletedReimbursementEnabled, isIncludeLineItems, } = 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)));
+        tabIds.forEach((tab) => fetchRemiListActions.push((0, remiListReducer_1.fetchRemiListPerTab)(period, tab, isShowDeletedReimbursementEnabled, isIncludeLineItems)));
     }
     else {
         if (state.reimbursementConfigState.fetchState !== 'Completed' &&
@@ -31,9 +31,9 @@ const fetchRemiListEpic = (actions$, state$) => actions$.pipe((0, operators_1.fi
         }
         tabIds.forEach((tab) => {
             const key = (0, remiListState_1.getRemiListKey)(period, tab);
-            const bills = (0, get_1.default)(state.billListState.byBillListKey, key, undefined);
-            if (bills == null || bills.hasValidState() === false) {
-                fetchRemiListActions.push((0, remiListReducer_1.fetchRemiListPerTab)(period, tab, isShowDeletedReimbursementEnabled));
+            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));
             }
         });
     }

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

@@ -10,7 +10,7 @@ const reimbursementReducer_1 = require("../../../../entity/reimbursement/reimbur
 const userReducer_1 = require("../../../../entity/user/userReducer");
 const entityApprovalStatusReducer_1 = require("../../../../entity/entityApprovalStatus/entityApprovalStatusReducer");
 const fetchRemiListPerTabEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(remiListReducer_1.fetchRemiListPerTab.match), (0, operators_1.mergeMap)((action) => {
-    const { period, tab, isShowDeletedReimbursementEnabled } = action.payload;
+    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),
@@ -25,6 +25,7 @@ const fetchRemiListPerTabEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0
         is_include_deleted: isShowDeletedReimbursementEnabled
             ? tab !== 'draft'
             : false,
+        is_include_line_items: isIncludeLineItems ? tab !== 'draft' : false,
     };
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/reimbursements/transactions?query=${encodeURIComponent(JSON.stringify(queryParam))}`)

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

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

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

@@ -34,9 +34,14 @@ const remiList = (0, toolkit_1.createSlice)({
             reducer() {
                 //do nothing
             },
-            prepare(period, tab, isShowDeletedReimbursementEnabled) {
+            prepare(period, tab, isShowDeletedReimbursementEnabled, isIncludeLineItems) {
                 return {
-                    payload: { period, tab, isShowDeletedReimbursementEnabled },
+                    payload: {
+                        period,
+                        tab,
+                        isShowDeletedReimbursementEnabled,
+                        isIncludeLineItems,
+                    },
                 };
             },
         },
@@ -63,9 +68,14 @@ const remiList = (0, toolkit_1.createSlice)({
                             : 'In-Progress', error: undefined });
                 });
             },
-            prepare(period, cacheOverride = false, isShowDeletedReimbursementEnabled) {
+            prepare(period, cacheOverride = false, isShowDeletedReimbursementEnabled, isIncludeLineItems) {
                 return {
-                    payload: { period, cacheOverride, isShowDeletedReimbursementEnabled },
+                    payload: {
+                        period,
+                        cacheOverride,
+                        isShowDeletedReimbursementEnabled,
+                        isIncludeLineItems,
+                    },
                 };
             },
         },

package/lib/view/vendorList/vendorListReducer.js

@@ -18,11 +18,11 @@ exports.initialState = {
     },
     lastRefreshSuccessTime: undefined,
     uiState: {
-        sortKey: 'last_90_days_spend',
+        sortKey: 'year_to_date_spend',
         sortOrder: 'descending',
         pageToken: null,
         scrollYOffset: 0,
-        ytdSpendSelection: 'last_90_days_spend',
+        ytdSpendSelection: 'year_to_date_spend',
     },
     fetchStateBillsTab: { fetchState: 'Not-Started', error: undefined },
 };

package/package.json

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