@zeniai/client-epic-state 4.11.3 → 4.11.4

package/lib/view/spendManagement/chargeCards/cashbackDetail/cashbackDetailReducer.js

@@ -19,6 +19,9 @@ exports.initialState = {
         cashbackAvailable: { amount: 0, currencyCode: 'USD', currencySymbol: '$' },
     },
     insightId: '',
+    hasValidState() {
+        return this.fetchState == 'Completed';
+    },
 };
 const cashbackDetail = (0, toolkit_1.createSlice)({
     name: 'cashbackDetail',

package/lib/view/spendManagement/chargeCards/cashbackDetail/cashbackDetailState.d.ts

@@ -1,7 +1,7 @@
 import { Amount } from '../../../../commonStateTypes/amount';
-import { FetchStateAndError, ID } from '../../../../commonStateTypes/common';
+import { ID, FetchedState } from '../../../../commonStateTypes/common';
 import { SortOrder } from '../../../../commonStateTypes/selectorTypes/sortOrderTypes';
-export interface CashbackDetailState extends FetchStateAndError {
+export interface CashbackDetailState extends FetchedState {
     uiState: CashbackDetailUIState;
     cashbackByPeriod: CashbackPeriod[];
     cashbackSummary: {

package/lib/view/spendManagement/chargeCards/chargeCardList/chargeCardListReducer.d.ts

@@ -3,8 +3,8 @@ import { ChargeCardListPayload, CreditAccountPayload } from './chargeCardListPay
 import { ChargeCardListState, ChargeCardListUIState, ChargeCardLocalData, CreditAccount } from './chargeCardList';
 import { FetchState } from '../../../../commonStateTypes/common';
 export declare const initialState: ChargeCardListState;
-export declare const fetchChargeCardListPage: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[doFetchCreditAccounts: boolean, cacheOverride?: any], {
-    doFetchCreditAccounts: boolean;
+export declare const fetchChargeCardListPage: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[doFetchCreditAccountsAndCashback: boolean, cacheOverride?: any], {
+    doFetchCreditAccountsAndCashback: boolean;
     cacheOverride: any;
 }, string, never, never>, fetchCreditAccount: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, updateCreditAccount: import("@reduxjs/toolkit").ActionCreatorWithPayload<CreditAccountPayload[], string>, updateCreditAccountFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, string>, fetchChargeCardList: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, updateChargeCardList: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     chargeCardListPayload: ChargeCardListPayload;

package/lib/view/spendManagement/chargeCards/chargeCardList/chargeCardListReducer.js

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

package/lib/view/spendManagement/chargeCards/chargeCardList/chargeCardListSelector.d.ts

@@ -17,6 +17,7 @@ export interface ChargeCardWithUser extends ChargeCard {
     address?: Address;
 }
 export interface ChargeCardListSelectorView extends SelectorView {
+    totalCashback: Amount;
     cards: ChargeCardWithUser[];
     creditAccount: CreditAccount;
     chargeCardConfig: ChargeCardConfigState;
@@ -28,4 +29,4 @@ export interface ChargeCardListSelectorView extends SelectorView {
     searchText: string;
     unAssignedCredits?: Amount;
 }
-export declare const getChargeCardListView: (state: RootState, includeCreditAccount: boolean) => ChargeCardListSelectorView;
+export declare const getChargeCardListView: (state: RootState, includeCreditAccountAndCashbackInfo: boolean) => ChargeCardListSelectorView;

package/lib/view/spendManagement/chargeCards/chargeCardList/chargeCardListSelector.js

@@ -13,8 +13,8 @@ const classSelector_1 = require("../../../../entity/class/classSelector");
 const userSelector_1 = require("../../../../entity/user/userSelector");
 const userRoleSelector_1 = require("../../../../entity/userRole/userRoleSelector");
 const userListViewSelector_1 = require("../../../userListView/userListViewSelector");
-const getChargeCardListView = (state, includeCreditAccount) => {
-    const { addressState, chargeCardListState, chargeCardState, classState, userState, userRoleState, chargeCardConfigState, classListState, } = state;
+const getChargeCardListView = (state, includeCreditAccountAndCashbackInfo) => {
+    const { addressState, chargeCardListState, chargeCardState, classState, userState, userRoleState, chargeCardConfigState, classListState, cashbackDetailState, } = state;
     const searchText = chargeCardListState.searchText.toLowerCase();
     const cards = (0, chargeCardSelector_1.getChargeCardsByIds)(chargeCardState, chargeCardListState.cardIds)
         .map((chargeCard) => {
@@ -56,11 +56,12 @@ const getChargeCardListView = (state, includeCreditAccount) => {
     }, sortOrder);
     const userListSelectorView = (0, userListViewSelector_1.getUserList)(state, 'cardHolderCandidate');
     const userList = userListSelectorView.users;
-    const fetchState = includeCreditAccount === true
+    const fetchState = includeCreditAccountAndCashbackInfo === true
         ? (0, reduceFetchState_1.reduceFetchState)([
             chargeCardListState,
             chargeCardListState.creditAccount,
             chargeCardConfigState,
+            cashbackDetailState,
         ]).fetchState
         : (0, reduceFetchState_1.reduceFetchState)([chargeCardListState, chargeCardConfigState])
             .fetchState;
@@ -76,6 +77,7 @@ const getChargeCardListView = (state, includeCreditAccount) => {
     return {
         fetchState,
         error: chargeCardListState.error,
+        totalCashback: cashbackDetailState.cashbackSummary.cashbackEarned,
         cards: cardsInOrder,
         unAssignedCredits: chargeCardListState.unAssignedCredits,
         creditAccount: chargeCardListState.creditAccount,

package/lib/view/spendManagement/chargeCards/chargeCardList/fetchChargeCardListPageEpic.d.ts

@@ -1,9 +1,10 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { RootState } from '../../../../reducer';
-import { fetchChargeCardConfig } from '../chargeCardConfig/chargeCardConfigReducer';
-import { fetchChargeCardListPage, fetchCreditAccount, fetchChargeCardList } from './chargeCardListReducer';
 import { fetchUserListByType } from '../../../userListView/userListViewReducer';
 import { fetchClassList } from '../../../classList/classListReducer';
-export declare type ActionType = ReturnType<typeof fetchChargeCardListPage> | ReturnType<typeof fetchCreditAccount> | ReturnType<typeof fetchChargeCardList> | ReturnType<typeof fetchChargeCardConfig> | ReturnType<typeof fetchUserListByType> | ReturnType<typeof fetchClassList>;
+import { fetchChargeCardConfig } from '../chargeCardConfig/chargeCardConfigReducer';
+import { fetchCashbackDetail } from '../cashbackDetail/cashbackDetailReducer';
+import { fetchChargeCardListPage, fetchCreditAccount, fetchChargeCardList } from './chargeCardListReducer';
+export declare type ActionType = ReturnType<typeof fetchChargeCardListPage> | ReturnType<typeof fetchCreditAccount> | ReturnType<typeof fetchChargeCardList> | ReturnType<typeof fetchChargeCardConfig> | ReturnType<typeof fetchUserListByType> | ReturnType<typeof fetchCashbackDetail> | ReturnType<typeof fetchClassList>;
 export declare const fetchChargeCardListPageEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

package/lib/view/spendManagement/chargeCards/chargeCardList/fetchChargeCardListPageEpic.js

@@ -3,17 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchChargeCardListPageEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const chargeCardConfigReducer_1 = require("../chargeCardConfig/chargeCardConfigReducer");
-const chargeCardListReducer_1 = require("./chargeCardListReducer");
 const userListViewReducer_1 = require("../../../userListView/userListViewReducer");
 const classListReducer_1 = require("../../../classList/classListReducer");
+const chargeCardConfigReducer_1 = require("../chargeCardConfig/chargeCardConfigReducer");
+const cashbackDetailReducer_1 = require("../cashbackDetail/cashbackDetailReducer");
+const chargeCardListReducer_1 = require("./chargeCardListReducer");
 const fetchChargeCardListPageEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(chargeCardListReducer_1.fetchChargeCardListPage.match), (0, operators_1.mergeMap)((action) => {
-    const { doFetchCreditAccounts, cacheOverride } = action.payload;
+    const { doFetchCreditAccountsAndCashback, cacheOverride } = action.payload;
     const chargeCardListPageAction = [];
     const state = state$.value;
+    const cashbackDetailState = state.cashbackDetailState;
     if (cacheOverride === true) {
-        if (doFetchCreditAccounts === true) {
-            chargeCardListPageAction.push((0, chargeCardListReducer_1.fetchCreditAccount)());
+        if (doFetchCreditAccountsAndCashback === true) {
+            chargeCardListPageAction.push((0, chargeCardListReducer_1.fetchCreditAccount)(), (0, cashbackDetailReducer_1.fetchCashbackDetail)());
         }
         chargeCardListPageAction.push((0, chargeCardListReducer_1.fetchChargeCardList)());
         chargeCardListPageAction.push((0, chargeCardConfigReducer_1.fetchChargeCardConfig)());
@@ -22,11 +24,16 @@ const fetchChargeCardListPageEpic = (actions$, state$) => actions$.pipe((0, oper
     }
     else {
         const chargeCardList = state.chargeCardListState;
-        if (doFetchCreditAccounts === true &&
+        if (doFetchCreditAccountsAndCashback === true &&
             chargeCardList.creditAccount.fetchState !== 'Completed' &&
             chargeCardList.creditAccount.fetchState !== 'In-Progress') {
             chargeCardListPageAction.push((0, chargeCardListReducer_1.fetchCreditAccount)());
         }
+        if (doFetchCreditAccountsAndCashback &&
+            cashbackDetailState.fetchState !== 'In-Progress' &&
+            cashbackDetailState.hasValidState() === false) {
+            chargeCardListPageAction.push((0, cashbackDetailReducer_1.fetchCashbackDetail)());
+        }
         if (chargeCardList.fetchState !== 'In-Progress' &&
             chargeCardList.hasValidState() === false) {
             chargeCardListPageAction.push((0, chargeCardListReducer_1.fetchChargeCardList)());

package/package.json

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