@zeniai/client-epic-state 4.14.36 → 4.14.38

package/lib/entity/chargeCard/chargeCardReducer.d.ts

@@ -1,6 +1,9 @@
+import { UpdateType } from '../../commonStateTypes/common';
 import { ChargeCardState } from './chargeCard';
 import { ChargeCardPayload } from './chargeCardPayload';
 export declare const initialState: ChargeCardState;
-export declare const updateChargeCards: import("@reduxjs/toolkit").ActionCreatorWithPayload<ChargeCardPayload[], string>, updateChargeCard: import("@reduxjs/toolkit").ActionCreatorWithPayload<ChargeCardPayload, string>, removeChargeCard: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, clearAllChargeCards: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
+export declare const updateChargeCards: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[chargeCards: ChargeCardPayload[], updateType?: UpdateType | undefined], ChargeCardPayload[], string, never, {
+    updateType: UpdateType;
+}>, updateChargeCard: import("@reduxjs/toolkit").ActionCreatorWithPayload<ChargeCardPayload, string>, removeChargeCard: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, clearAllChargeCards: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
 declare const _default: import("@reduxjs/toolkit").Reducer<ChargeCardState, import("@reduxjs/toolkit").AnyAction>;
 export default _default;

package/lib/entity/chargeCard/chargeCardReducer.js

@@ -1,8 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clearAllChargeCards = exports.removeChargeCard = exports.updateChargeCard = exports.updateChargeCards = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
+const assignWith_1 = __importDefault(require("lodash/assignWith"));
 const chargeCardPayload_1 = require("./chargeCardPayload");
 exports.initialState = {
     chargeCardByID: {},
@@ -11,11 +15,25 @@ const chargeCard = (0, toolkit_1.createSlice)({
     name: 'chargeCard',
     initialState: exports.initialState,
     reducers: {
-        updateChargeCards(draft, action) {
-            action.payload.forEach((chargeCardPayload) => {
-                const latestChargeCard = (0, chargeCardPayload_1.mapChargeCardPayloadToChargeCard)(chargeCardPayload);
-                draft.chargeCardByID[latestChargeCard.id] = latestChargeCard;
-            });
+        updateChargeCards: {
+            reducer(draft, action) {
+                action.payload.forEach((chargeCardPayload) => {
+                    const latestChargeCard = (0, chargeCardPayload_1.mapChargeCardPayloadToChargeCard)(chargeCardPayload);
+                    if (latestChargeCard.id in draft.chargeCardByID &&
+                        action.meta.updateType === 'merge') {
+                        (0, assignWith_1.default)(draft.chargeCardByID[latestChargeCard.id], latestChargeCard, (objValue, srcValue) => (srcValue == null ? objValue : srcValue));
+                    }
+                    else {
+                        draft.chargeCardByID = Object.assign(Object.assign({}, draft.chargeCardByID), { [latestChargeCard.id]: latestChargeCard });
+                    }
+                });
+            },
+            prepare(chargeCards, updateType = 'merge') {
+                return {
+                    payload: chargeCards,
+                    meta: { updateType },
+                };
+            },
         },
         updateChargeCard(draft, action) {
             const latestChargeCard = (0, chargeCardPayload_1.mapChargeCardPayloadToChargeCard)(action.payload);

package/lib/view/spendManagement/chargeCards/chargeCardDetail/chargeCardDetailReducer.d.ts

@@ -6,8 +6,9 @@ import { ZeniAPIStatus } from '../../../../responsePayload';
 import { ChargeCardDetailState, ChargeCardDetailUiState } from './chargeCardDetail';
 import { ChargeCardTransactionListPayload } from './chargeCardDetailPayload';
 export declare const initialState: ChargeCardDetailState;
-export declare const fetchChargeCardDetailPage: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[chargeCardId: string, cacheOverride?: any], {
+export declare const fetchChargeCardDetailPage: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[chargeCardId: string, doFetchCreditAccounts: boolean, cacheOverride?: any], {
     chargeCardId: string;
+    doFetchCreditAccounts: boolean;
     cacheOverride: any;
 }, string, never, never>, fetchChargeCardDetail: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[chargeCardId: string, cacheOverride?: any], {
     chargeCardId: string;

package/lib/view/spendManagement/chargeCards/chargeCardDetail/chargeCardDetailReducer.js

@@ -17,9 +17,9 @@ const chargeCardDetail = (0, toolkit_1.createSlice)({
             reducer() {
                 //do nothing
             },
-            prepare(chargeCardId, cacheOverride = false) {
+            prepare(chargeCardId, doFetchCreditAccounts, cacheOverride = false) {
                 return {
-                    payload: { chargeCardId, cacheOverride },
+                    payload: { chargeCardId, doFetchCreditAccounts, cacheOverride },
                 };
             },
         },

package/lib/view/spendManagement/chargeCards/chargeCardDetail/chargeCardDetailSelector.d.ts

@@ -24,7 +24,7 @@ export interface ChargeCardDetailSelectorView extends SelectorView {
     updateChargeCardLimitFetchState: FetchStateAndError;
     chargeCard?: ChargeCardWithUser;
 }
-export declare const getChargeCardDetailView: (state: RootState, chargeCardId: ID) => ChargeCardDetailSelectorView;
+export declare const getChargeCardDetailView: (state: RootState, chargeCardId: ID, includeCreditAccountInfo: boolean) => ChargeCardDetailSelectorView;
 export interface ChargeCardCVVActivateSelectorView extends SelectorView {
     updatePhysicalChargeCardAttemptFetchState: FetchStateAndError;
     updateStatus: FetchStateAndError;

package/lib/view/spendManagement/chargeCards/chargeCardDetail/chargeCardDetailSelector.js

@@ -14,7 +14,7 @@ const userSelector_1 = require("../../../../entity/user/userSelector");
 const userRoleSelector_1 = require("../../../../entity/userRole/userRoleSelector");
 const twoFactorAuthenticationSelector_1 = require("../../../twoFactorAuthentication/twoFactorAuthenticationSelector");
 const chargeCardDetail_1 = require("./chargeCardDetail");
-const getChargeCardDetailView = (state, chargeCardId) => {
+const getChargeCardDetailView = (state, chargeCardId, includeCreditAccountInfo) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     const { tenantState, addressState, chargeCardDetailState, chargeCardState, classState, userState, userRoleState, chargeCardConfigState, chargeCardTransactionState, chargeCardListState, } = state;
     const twoFactorAuthenticationView = (0, twoFactorAuthenticationSelector_1.getTwoFactorAuthenticationView)(state);
@@ -34,11 +34,13 @@ const getChargeCardDetailView = (state, chargeCardId) => {
         error: undefined,
     };
     if (chargeCardDetail) {
-        reducedFetchState = (0, reduceFetchState_1.reduceFetchState)([
-            chargeCardDetail,
-            chargeCardConfigState,
-            chargeCardListState.creditAccount,
-        ]);
+        reducedFetchState = includeCreditAccountInfo
+            ? (0, reduceFetchState_1.reduceFetchState)([
+                chargeCardDetail,
+                chargeCardConfigState,
+                chargeCardListState.creditAccount,
+            ])
+            : (0, reduceFetchState_1.reduceFetchState)([chargeCardDetail, chargeCardConfigState]);
     }
     if (chargeCardDetail &&
         chargeCardDetail.fetchState === 'Completed' &&

package/lib/view/spendManagement/chargeCards/chargeCardDetail/fetchChargeCardDetailPageEpic.js

@@ -7,7 +7,7 @@ const chargeCardConfigReducer_1 = require("../chargeCardConfig/chargeCardConfigR
 const chargeCardListReducer_1 = require("../chargeCardList/chargeCardListReducer");
 const chargeCardDetailReducer_1 = require("./chargeCardDetailReducer");
 const fetchChargeCardDetailPageEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(chargeCardDetailReducer_1.fetchChargeCardDetailPage.match), (0, operators_1.mergeMap)((action) => {
-    const { chargeCardId, cacheOverride } = action.payload;
+    const { chargeCardId, cacheOverride, doFetchCreditAccounts } = action.payload;
     const chargeCardTransactionListAction = [];
     const state = state$.value;
     const exsitingChargeCardDetail = state.chargeCardDetailState.detailById[chargeCardId];
@@ -22,7 +22,9 @@ const fetchChargeCardDetailPageEpic = (actions$, state$) => actions$.pipe((0, op
         //latest transactions need to be fetched hence removing pageToken and pageTokenType
         chargeCardTransactionListAction.push((0, chargeCardDetailReducer_1.fetchChargeCardTransactionList)(chargeCardId, null, null));
         chargeCardTransactionListAction.push((0, chargeCardConfigReducer_1.fetchChargeCardConfig)());
-        chargeCardTransactionListAction.push((0, chargeCardListReducer_1.fetchCreditAccount)());
+        if (doFetchCreditAccounts) {
+            chargeCardTransactionListAction.push((0, chargeCardListReducer_1.fetchCreditAccount)());
+        }
     }
     else {
         const chargeCardDetail = state.chargeCardDetailState.detailById[chargeCardId];
@@ -43,9 +45,9 @@ const fetchChargeCardDetailPageEpic = (actions$, state$) => actions$.pipe((0, op
             chargeCardTransactionListAction.push((0, chargeCardConfigReducer_1.fetchChargeCardConfig)());
         }
         const chargeCardList = state.chargeCardListState;
-        if (cacheOverride === true ||
-            (chargeCardList.creditAccount.fetchState !== 'Completed' &&
-                chargeCardList.creditAccount.fetchState !== 'In-Progress')) {
+        if (chargeCardList.creditAccount.fetchState !== 'Completed' &&
+            chargeCardList.creditAccount.fetchState !== 'In-Progress' &&
+            doFetchCreditAccounts) {
             chargeCardTransactionListAction.push((0, chargeCardListReducer_1.fetchCreditAccount)());
         }
     }

package/package.json

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