@zeniai/client-epic-state 5.1.62-betaRD5 → 5.1.62-betaRD7

package/lib/esm/view/expenseAutomationView/epics/jeSchedule/newSchedule/searchTransactionsForNewScheduleEpic.js

@@ -4,13 +4,14 @@ import { getJEScheduleTransactionKey } from '../../../../../entity/jeSchedules/j
 import { toTransactionType } from '../../../../../entity/transaction/stateTypes/transactionType';
 import { updateScheduleTransactions } from '../../../../../entity/transaction/transactionReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
-import { getAccountIdsForLabel } from '../../../../accountList/accountListSelector';
-import { getAccountLabelForScheduleType, getAccountsTypesForScheduleEpics, } from '../../../../scheduleView/scheduleListView/scheduleListHelper';
 import { searchTransactionsForNewSchedule, searchTransactionsForNewScheduleFailure, searchTransactionsForNewScheduleSuccess, } from '../../../reducers/jeSchedulesViewReducer';
 import { MIN_NEW_SCHEDULE_SEARCH_LENGTH } from '../../../types/jeSchedulesViewState';
 /** Dropdown-sized result set — no pagination for Base Transaction search. */
 const NEW_SCHEDULE_SEARCH_PAGE_SIZE = 10;
-export const searchTransactionsForNewScheduleEpic = (actions$, state$, zeniAPI) => {
+/** Fallback when the backend sends a null currency for a search result. */
+const DEFAULT_CURRENCY_CODE = 'USD';
+const DEFAULT_CURRENCY_SYMBOL = '$';
+export const searchTransactionsForNewScheduleEpic = (actions$, _state$, zeniAPI) => {
     const searchActions$ = actions$.pipe(filter(searchTransactionsForNewSchedule.match));
     /** No API for empty or 1-char queries; immediate merge so switchMap cancels any in-flight HTTP. */
     const newSearchTooShortOrClear$ = searchActions$.pipe(filter((action) => action.payload.query.trim().length < MIN_NEW_SCHEDULE_SEARCH_LENGTH));
@@ -20,20 +21,10 @@ export const searchTransactionsForNewScheduleEpic = (actions$, state$, zeniAPI)
         if (query.length < MIN_NEW_SCHEDULE_SEARCH_LENGTH) {
             return EMPTY;
         }
-        // The search is scoped to accounts eligible for the schedule type being
-        // searched for (e.g. accounts labeled prepaid_expenses/fixed_assets) —
-        // same resolution fetchScheduleListEpic already does for the schedules
-        // list screen. If the shared schedulesAccountList fetch hasn't
-        // completed yet, this resolves to [] (zero results until it has).
-        const { accountListState } = state$.value;
-        const accountLabel = getAccountLabelForScheduleType(action.payload.scheduleType);
-        const baseTxnAccountIds = accountLabel != null
-            ? getAccountIdsForLabel(accountListState, getAccountsTypesForScheduleEpics().accountListKey, accountLabel)
-            : [];
         const queryParam = {
             page_size: NEW_SCHEDULE_SEARCH_PAGE_SIZE,
             search_text: query,
-            base_txn_account_ids: baseTxnAccountIds,
+            je_schedule_type: action.payload.scheduleType,
         };
         return zeniAPI
             .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/schedules/base_transaction_search?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
@@ -43,15 +34,18 @@ export const searchTransactionsForNewScheduleEpic = (actions$, state$, zeniAPI)
                 const transactionsPerCurrency = {};
                 transactions.forEach((transaction) => {
                     const { currency_code, currency_symbol } = transaction;
-                    const existing = transactionsPerCurrency[currency_code];
-                    transactionsPerCurrency[currency_code] =
+                    const currencyCode = currency_code ?? DEFAULT_CURRENCY_CODE;
+                    const existing = transactionsPerCurrency[currencyCode];
+                    transactionsPerCurrency[currencyCode] =
                         existing != null
                             ? {
                                 currencySymbol: existing.currencySymbol,
                                 transactions: [...existing.transactions, transaction],
                             }
                             : {
-                                currencySymbol: currency_symbol,
+                                currencySymbol: currency_code == null
+                                    ? DEFAULT_CURRENCY_SYMBOL
+                                    : currency_symbol,
                                 transactions: [transaction],
                             };
                 });

package/lib/view/expenseAutomationView/epics/jeSchedule/newSchedule/searchTransactionsForNewScheduleEpic.d.ts

@@ -5,4 +5,4 @@ import { RootState } from '../../../../../reducer';
 import { ZeniAPI } from '../../../../../zeniAPI';
 import { searchTransactionsForNewSchedule, searchTransactionsForNewScheduleFailure, searchTransactionsForNewScheduleSuccess } from '../../../reducers/jeSchedulesViewReducer';
 export type ActionType = ReturnType<typeof searchTransactionsForNewSchedule> | ReturnType<typeof searchTransactionsForNewScheduleSuccess> | ReturnType<typeof searchTransactionsForNewScheduleFailure> | ReturnType<typeof updateScheduleTransactions>;
-export declare const searchTransactionsForNewScheduleEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
+export declare const searchTransactionsForNewScheduleEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/expenseAutomationView/epics/jeSchedule/newSchedule/searchTransactionsForNewScheduleEpic.js

@@ -7,13 +7,14 @@ const jeSchedulesTypes_1 = require("../../../../../entity/jeSchedules/jeSchedule
 const transactionType_1 = require("../../../../../entity/transaction/stateTypes/transactionType");
 const transactionReducer_1 = require("../../../../../entity/transaction/transactionReducer");
 const responsePayload_1 = require("../../../../../responsePayload");
-const accountListSelector_1 = require("../../../../accountList/accountListSelector");
-const scheduleListHelper_1 = require("../../../../scheduleView/scheduleListView/scheduleListHelper");
 const jeSchedulesViewReducer_1 = require("../../../reducers/jeSchedulesViewReducer");
 const jeSchedulesViewState_1 = require("../../../types/jeSchedulesViewState");
 /** Dropdown-sized result set — no pagination for Base Transaction search. */
 const NEW_SCHEDULE_SEARCH_PAGE_SIZE = 10;
-const searchTransactionsForNewScheduleEpic = (actions$, state$, zeniAPI) => {
+/** Fallback when the backend sends a null currency for a search result. */
+const DEFAULT_CURRENCY_CODE = 'USD';
+const DEFAULT_CURRENCY_SYMBOL = '$';
+const searchTransactionsForNewScheduleEpic = (actions$, _state$, zeniAPI) => {
     const searchActions$ = actions$.pipe((0, operators_1.filter)(jeSchedulesViewReducer_1.searchTransactionsForNewSchedule.match));
     /** No API for empty or 1-char queries; immediate merge so switchMap cancels any in-flight HTTP. */
     const newSearchTooShortOrClear$ = searchActions$.pipe((0, operators_1.filter)((action) => action.payload.query.trim().length < jeSchedulesViewState_1.MIN_NEW_SCHEDULE_SEARCH_LENGTH));
@@ -23,20 +24,10 @@ const searchTransactionsForNewScheduleEpic = (actions$, state$, zeniAPI) => {
         if (query.length < jeSchedulesViewState_1.MIN_NEW_SCHEDULE_SEARCH_LENGTH) {
             return rxjs_1.EMPTY;
         }
-        // The search is scoped to accounts eligible for the schedule type being
-        // searched for (e.g. accounts labeled prepaid_expenses/fixed_assets) —
-        // same resolution fetchScheduleListEpic already does for the schedules
-        // list screen. If the shared schedulesAccountList fetch hasn't
-        // completed yet, this resolves to [] (zero results until it has).
-        const { accountListState } = state$.value;
-        const accountLabel = (0, scheduleListHelper_1.getAccountLabelForScheduleType)(action.payload.scheduleType);
-        const baseTxnAccountIds = accountLabel != null
-            ? (0, accountListSelector_1.getAccountIdsForLabel)(accountListState, (0, scheduleListHelper_1.getAccountsTypesForScheduleEpics)().accountListKey, accountLabel)
-            : [];
         const queryParam = {
             page_size: NEW_SCHEDULE_SEARCH_PAGE_SIZE,
             search_text: query,
-            base_txn_account_ids: baseTxnAccountIds,
+            je_schedule_type: action.payload.scheduleType,
         };
         return zeniAPI
             .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/schedules/base_transaction_search?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
@@ -46,15 +37,18 @@ const searchTransactionsForNewScheduleEpic = (actions$, state$, zeniAPI) => {
                 const transactionsPerCurrency = {};
                 transactions.forEach((transaction) => {
                     const { currency_code, currency_symbol } = transaction;
-                    const existing = transactionsPerCurrency[currency_code];
-                    transactionsPerCurrency[currency_code] =
+                    const currencyCode = currency_code ?? DEFAULT_CURRENCY_CODE;
+                    const existing = transactionsPerCurrency[currencyCode];
+                    transactionsPerCurrency[currencyCode] =
                         existing != null
                             ? {
                                 currencySymbol: existing.currencySymbol,
                                 transactions: [...existing.transactions, transaction],
                             }
                             : {
-                                currencySymbol: currency_symbol,
+                                currencySymbol: currency_code == null
+                                    ? DEFAULT_CURRENCY_SYMBOL
+                                    : currency_symbol,
                                 transactions: [transaction],
                             };
                 });

package/package.json

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