@zeniai/client-epic-state 5.1.37-betaRD3 → 5.1.37

package/lib/esm/view/expenseAutomationView/epics/transactionCategorization/fetchTransactionCategorizationViewEpic.js

@@ -12,7 +12,7 @@ export const fetchTransactionCategorizationViewEpic = (actions$, state$) => acti
     const { selectedTab, cacheOverride, keepExistingListItems, pageToken, period, refreshViewInBackground, searchString, resetListItems, isUncategorizedExpenseCategoryEnabled, } = action.payload;
     const updateActions = [];
     const { expenseAutomationTransactionsViewState } = state$.value;
-    const { fetchState, transactionIdsBySelectedPeriod, uiState } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTab];
+    const { fetchState, transactionIdsBySelectedPeriod } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTab];
     const monthYearPeriod = {
         month: period.start.month,
         year: period.start.year,
@@ -43,8 +43,7 @@ export const fetchTransactionCategorizationViewEpic = (actions$, state$) => acti
     if (searchString === '' ||
         cacheOverride === true ||
         fetchState === 'Not-Started' ||
-        transactionIds.length === 0 ||
-        uiState.searchString !== '') {
+        transactionIds.length === 0) {
         updateActions.push(fetchTransactionCategorization(selectedTab, period, cacheOverride, keepExistingListItems, searchString, pageToken, refreshViewInBackground, resetListItems, isUncategorizedExpenseCategoryEnabled));
     }
     // On the initial load of a tab (searchString undefined = non-search fetch),

package/lib/esm/view/expenseAutomationView/selectors/transactionCategorizationSelector.js

@@ -188,28 +188,15 @@ export function getExpenseAutomationTransactionView(state) {
     };
     // Parent-tab badge counts. Sourced from `parent_tab_total_count` in the
     // listing response and used exclusively by the navbar / tab strip badges.
-    // When a search or filter is active the badge switches to the filtered count
-    // so the number tracks what the user is looking at.
-    const autoCatTabView = expenseAutomationTransactionsViewState.transactionCategorizationView
-        .autoCategorized;
-    const reviewTabView = expenseAutomationTransactionsViewState.transactionCategorizationView.review;
-    const autoCatSubTabCache = expenseAutomationTransactionsViewState.autoCategorizedSubTabCache;
-    const autoCatFilterActive = autoCatTabView.uiState.searchString !== '' ||
-        autoCatTabView.filters.categories.length > 0;
-    const reviewFilterActive = reviewTabView.uiState.searchString !== '' ||
-        reviewTabView.filters.categories.length > 0;
+    // Independent of which Completed sub-tab is active so the badge stays
+    // stable across sub-tab switches.
     const parentTotalCountByTab = expenseAutomationTransactionsViewState.parentTotalCountByTab;
     const parentTabTotalCountByTab = {
         review: monthYearPeriodId != null
-            ? reviewFilterActive
-                ? totalCountByReview[monthYearPeriodId]
-                : (parentTotalCountByTab.review[monthYearPeriodId] ?? 0)
+            ? (parentTotalCountByTab.review[monthYearPeriodId] ?? 0)
             : 0,
         autoCategorized: monthYearPeriodId != null
-            ? autoCatFilterActive
-                ? (autoCatSubTabCache['all']?.totalCount[monthYearPeriodId] ??
-                    totalCountByAutoCat[monthYearPeriodId])
-                : (parentTotalCountByTab.autoCategorized[monthYearPeriodId] ?? 0)
+            ? (parentTotalCountByTab.autoCategorized[monthYearPeriodId] ?? 0)
             : 0,
     };
     const fetchStateByTab = {
@@ -252,13 +239,7 @@ export function getExpenseAutomationTransactionView(state) {
         isAccountingProjectsEnabled,
         projectList,
         transactionLocalData: filteredTransactionLocalData,
-        // When a client-side category filter is active the server pageToken is
-        // misleading — the server has more pages but the filter already reduces
-        // what's visible. Masking pageToken here prevents the skeleton "loading"
-        // row from appearing when the user is looking at a filtered result set.
-        uiState: filters.categories.length > 0
-            ? { ...uiState, pageToken: null }
-            : uiState,
+        uiState,
         refreshStatus,
         saveStatus,
         markAsNotMiscategorizedStatus,

package/lib/view/expenseAutomationView/epics/transactionCategorization/fetchTransactionCategorizationViewEpic.js

@@ -15,7 +15,7 @@ const fetchTransactionCategorizationViewEpic = (actions$, state$) => actions$.pi
     const { selectedTab, cacheOverride, keepExistingListItems, pageToken, period, refreshViewInBackground, searchString, resetListItems, isUncategorizedExpenseCategoryEnabled, } = action.payload;
     const updateActions = [];
     const { expenseAutomationTransactionsViewState } = state$.value;
-    const { fetchState, transactionIdsBySelectedPeriod, uiState } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTab];
+    const { fetchState, transactionIdsBySelectedPeriod } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTab];
     const monthYearPeriod = {
         month: period.start.month,
         year: period.start.year,
@@ -46,8 +46,7 @@ const fetchTransactionCategorizationViewEpic = (actions$, state$) => actions$.pi
     if (searchString === '' ||
         cacheOverride === true ||
         fetchState === 'Not-Started' ||
-        transactionIds.length === 0 ||
-        uiState.searchString !== '') {
+        transactionIds.length === 0) {
         updateActions.push((0, transactionsViewReducer_1.fetchTransactionCategorization)(selectedTab, period, cacheOverride, keepExistingListItems, searchString, pageToken, refreshViewInBackground, resetListItems, isUncategorizedExpenseCategoryEnabled));
     }
     // On the initial load of a tab (searchString undefined = non-search fetch),

package/lib/view/expenseAutomationView/selectors/transactionCategorizationSelector.js

@@ -198,28 +198,15 @@ function getExpenseAutomationTransactionView(state) {
     };
     // Parent-tab badge counts. Sourced from `parent_tab_total_count` in the
     // listing response and used exclusively by the navbar / tab strip badges.
-    // When a search or filter is active the badge switches to the filtered count
-    // so the number tracks what the user is looking at.
-    const autoCatTabView = expenseAutomationTransactionsViewState.transactionCategorizationView
-        .autoCategorized;
-    const reviewTabView = expenseAutomationTransactionsViewState.transactionCategorizationView.review;
-    const autoCatSubTabCache = expenseAutomationTransactionsViewState.autoCategorizedSubTabCache;
-    const autoCatFilterActive = autoCatTabView.uiState.searchString !== '' ||
-        autoCatTabView.filters.categories.length > 0;
-    const reviewFilterActive = reviewTabView.uiState.searchString !== '' ||
-        reviewTabView.filters.categories.length > 0;
+    // Independent of which Completed sub-tab is active so the badge stays
+    // stable across sub-tab switches.
     const parentTotalCountByTab = expenseAutomationTransactionsViewState.parentTotalCountByTab;
     const parentTabTotalCountByTab = {
         review: monthYearPeriodId != null
-            ? reviewFilterActive
-                ? totalCountByReview[monthYearPeriodId]
-                : (parentTotalCountByTab.review[monthYearPeriodId] ?? 0)
+            ? (parentTotalCountByTab.review[monthYearPeriodId] ?? 0)
             : 0,
         autoCategorized: monthYearPeriodId != null
-            ? autoCatFilterActive
-                ? (autoCatSubTabCache['all']?.totalCount[monthYearPeriodId] ??
-                    totalCountByAutoCat[monthYearPeriodId])
-                : (parentTotalCountByTab.autoCategorized[monthYearPeriodId] ?? 0)
+            ? (parentTotalCountByTab.autoCategorized[monthYearPeriodId] ?? 0)
             : 0,
     };
     const fetchStateByTab = {
@@ -262,13 +249,7 @@ function getExpenseAutomationTransactionView(state) {
         isAccountingProjectsEnabled,
         projectList,
         transactionLocalData: filteredTransactionLocalData,
-        // When a client-side category filter is active the server pageToken is
-        // misleading — the server has more pages but the filter already reduces
-        // what's visible. Masking pageToken here prevents the skeleton "loading"
-        // row from appearing when the user is looking at a filtered result set.
-        uiState: filters.categories.length > 0
-            ? { ...uiState, pageToken: null }
-            : uiState,
+        uiState,
         refreshStatus,
         saveStatus,
         markAsNotMiscategorizedStatus,

package/package.json

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