@zeniai/client-epic-state 5.3.21-betaAK1 → 5.3.22

package/lib/view/spendManagement/billPay/magicLinkView/magicLinkViewSelector.d.ts

@@ -1,15 +1,11 @@
+import { FetchState } from '../../../../commonStateTypes/common';
 import { RootState } from '../../../../rootStateTypes';
 import { AddressUpdatableInfo } from '../../../addressView/addressViewState';
 import { BankAccountSelectorView } from '../../../bankAccountView/bankAccountViewSelector';
-export declare const getMagicLinkView: (rootState: RootState) => {
-    authParams: import("../../../..").AuthParams;
-    companyName: string;
-    billAttachment: import("../../../..").Attachment | undefined;
-    currencySymbol: string;
-    amount: number;
-    billFetchState: import("../../../../commonStateTypes/common").FetchState;
-    fetchState: import("../../../../commonStateTypes/common").FetchState;
-};
-export type MagicLinkView = ReturnType<typeof getMagicLinkView>;
+import { MagicLinkViewState } from './magicLinkViewState';
+export interface MagicLinkView extends Pick<MagicLinkViewState, 'amount' | 'authParams' | 'billAttachment' | 'companyName' | 'currencySymbol' | 'error' | 'fetchState'> {
+    billFetchState: FetchState;
+}
+export declare const getMagicLinkView: (rootState: RootState) => MagicLinkView;
 export declare function getMagicLinkBankAccountView(state: RootState): BankAccountSelectorView;
 export declare function getMagicLinkCurrentAddressState(rootState: RootState): AddressUpdatableInfo | undefined;

package/lib/view/spendManagement/billPay/magicLinkView/magicLinkViewSelector.js

@@ -13,6 +13,7 @@ const getMagicLinkView = (rootState) => {
         amount: magicLinkViewState.amount,
         billFetchState: magicLinkViewState.billFetchStatus.fetchState,
         fetchState: magicLinkViewState.fetchState,
+        error: magicLinkViewState.error,
     };
 };
 exports.getMagicLinkView = getMagicLinkView;

package/lib/view/transactionList/fetchTransactionListByEntityEpic.js

@@ -8,6 +8,7 @@ const get_1 = __importDefault(require("lodash/get"));
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const timePeriod_1 = require("../../commonStateTypes/timePeriod");
+const customerWithSubCustomersId_1 = require("../../entity/genericEntity/customerWithSubCustomersId");
 const transactionReducer_1 = require("../../entity/transaction/transactionReducer");
 const responsePayload_1 = require("../../responsePayload");
 const transactionListReducer_1 = require("./transactionListReducer");
@@ -19,12 +20,20 @@ const fetchTransactionListByEntityEpic = (actions$, state$, zeniAPI) => actions$
     if (action.payload.cacheOverride === true ||
         entityTransactions == null ||
         entityTransactions.hasValidState() === false) {
+        // Customers tab rolled-up view: cached under its own id, sent as the customer id plus the flag
+        const { customerId: entityId, includeSubCustomers } = action.payload.entity.type === 'customer'
+            ? (0, customerWithSubCustomersId_1.fromCustomerEntityId)(action.payload.entity.id)
+            : {
+                customerId: action.payload.entity.id,
+                includeSubCustomers: false,
+            };
         const queryParam = {
             start_date: (0, timePeriod_1.toString)(action.payload.period.start),
             end_date: (0, timePeriod_1.toString)(action.payload.period.end),
             sort_by: 'create_time',
             sort_order: 'desc',
-            entity_id: action.payload.entity.id,
+            entity_id: entityId,
+            ...(includeSubCustomers ? { include_sub_customers: true } : {}),
             entity_name: action.payload.entity.name,
             entity_type: action.payload.entity.type,
             is_fetch_all_transactions: action.payload.isFetchAllTransactions === true
@@ -37,7 +46,7 @@ const fetchTransactionListByEntityEpic = (actions$, state$, zeniAPI) => actions$
             if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
                 const updateActions = [];
                 updateActions.push((0, transactionReducer_1.updateTransactions)(response.data.transactions, (value) => value.transaction_id));
-                updateActions.push((0, transactionListReducer_1.updateTransactionListByEntity)(response.data));
+                updateActions.push((0, transactionListReducer_1.updateTransactionListByEntity)(response.data, action.payload.entity.id));
                 return (0, rxjs_1.from)(updateActions);
             }
             else {

package/lib/view/transactionList/transactionListReducer.d.ts

@@ -38,7 +38,9 @@ export declare const parallelFetchAccountTransactionList: import("@reduxjs/toolk
     period: TimePeriod;
     cacheOverride: any;
     isFetchAllTransactions: any;
-}, "transactionList/fetchEntityTransactionList", never, never>, updateTransactionListByEntity: import("@reduxjs/toolkit").ActionCreatorWithPayload<TransactionListByEntityPayload, "transactionList/updateTransactionListByEntity">, updateTransactionListByEntityFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[entity: Entity, period: TimePeriod, error: ZeniAPIStatus<Record<string, unknown>>], {
+}, "transactionList/fetchEntityTransactionList", never, never>, updateTransactionListByEntity: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: TransactionListByEntityPayload, entityId?: string | undefined], TransactionListByEntityPayload, "transactionList/updateTransactionListByEntity", never, {
+    entityId: string | undefined;
+}>, updateTransactionListByEntityFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[entity: Entity, period: TimePeriod, error: ZeniAPIStatus<Record<string, unknown>>], {
     entity: Entity;
     period: TimePeriod;
     error: ZeniAPIStatus<Record<string, unknown>>;

package/lib/view/transactionList/transactionListReducer.js

@@ -168,21 +168,30 @@ const transactionList = (0, toolkit_1.createSlice)({
                 };
             },
         },
-        updateTransactionListByEntity(draft, action) {
-            const transactionIDs = action.payload.transactions.map((transactionPayload) => transactionPayload.transaction_id);
-            /* eslint-disable @typescript-eslint/no-non-null-assertion */
-            const entity = mapTransactionQueryMetaDataToEntity(action.payload.query);
-            const key = (0, transactionListState_1.getEntityTranKey)(entity, {
-                start: (0, timePeriod_1.toAbsoluteDay)(action.payload.query.start_date),
-                end: (0, timePeriod_1.toAbsoluteDay)(action.payload.query.end_date),
-            });
-            draft.byEntity.transactionListByEntityKey[key] = {
-                ...transactionListState_1.initialEntityTransactionState,
-                fetchState: 'Completed',
-                error: undefined,
-                entity: entity,
-                transactionIDs,
-            };
+        updateTransactionListByEntity: {
+            // `entityId`: the requested entity's id when it differs from the query's (a rolled-up customer)
+            prepare(payload, entityId) {
+                return { payload, meta: { entityId } };
+            },
+            reducer(draft, action) {
+                const transactionIDs = action.payload.transactions.map((transactionPayload) => transactionPayload.transaction_id);
+                /* eslint-disable @typescript-eslint/no-non-null-assertion */
+                const entity = {
+                    ...mapTransactionQueryMetaDataToEntity(action.payload.query),
+                    ...(action.meta.entityId != null && { id: action.meta.entityId }),
+                };
+                const key = (0, transactionListState_1.getEntityTranKey)(entity, {
+                    start: (0, timePeriod_1.toAbsoluteDay)(action.payload.query.start_date),
+                    end: (0, timePeriod_1.toAbsoluteDay)(action.payload.query.end_date),
+                });
+                draft.byEntity.transactionListByEntityKey[key] = {
+                    ...transactionListState_1.initialEntityTransactionState,
+                    fetchState: 'Completed',
+                    error: undefined,
+                    entity: entity,
+                    transactionIDs,
+                };
+            },
         },
         updateTransactionListByEntityFailure: {
             reducer(draft, action) {

package/lib/view/trend/fetchIncomeTrendEpic.js

@@ -6,6 +6,7 @@ const operators_1 = require("rxjs/operators");
 const timeframeTick_1 = require("../../commonStateTypes/timeframeTick");
 const customerIncomeTrendKey_1 = require("../../entity/customerIncome/customerIncomeTrendKey");
 const customerIncomeTrendReducer_1 = require("../../entity/customerIncome/customerIncomeTrendReducer");
+const customerWithSubCustomersId_1 = require("../../entity/genericEntity/customerWithSubCustomersId");
 const responsePayload_1 = require("../../responsePayload");
 const zeniDayJS_1 = require("../../zeniDayJS");
 const trendReducer_1 = require("./trendReducer");
@@ -28,11 +29,14 @@ const fetchIncomeTrendEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, op
             return (0, rxjs_1.of)((0, trendReducer_1.updateTrendSuccess)(requestedPeriod));
         }
     }
+    // The rolled-up view is cached under its own id; the API takes the customer id plus the flag
+    const { customerId: apiCustomerId, includeSubCustomers } = (0, customerWithSubCustomersId_1.fromCustomerEntityId)(customerId);
     const query = {
-        entity_id: customerId,
+        entity_id: apiCustomerId,
         entity_type: 'customer',
-        customer_id: customerId,
+        customer_id: apiCustomerId,
         customer_name: customerName,
+        ...(includeSubCustomers ? { include_sub_customers: true } : {}),
         ...(dateRange != null
             ? { start_date: dateRange.startDate, end_date: dateRange.endDate }
             : {}),

package/package.json

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