@zeniai/client-epic-state 5.1.53 → 5.1.54-betaRD1

package/lib/esm/view/recommendation/fetchEntityRecommendationsForLineUpdateEpic.js

@@ -5,7 +5,7 @@ import { getTransactionWithCOT, getTransactionWithCOTFromRecommendations, } from
 import { createZeniAPIStatus, isSuccessResponse } from '../../responsePayload';
 import { getUncategorizedAccounts } from '../accountList/accountListSelector';
 import { markCategoryClassRecommendationsCompletedForCategorization, markCategoryClassRecommendationsFailureForCategorization, markCategoryClassRecommendationsInProgressForCategorization, setEntityRecommendationForLineIdsForCategorization, } from '../expenseAutomationView/reducers/transactionsViewReducer';
-import { markCategoryClassRecommendationsCompletedForTransactionDetail, markCategoryClassRecommendationsFailureForTransactionDetail, markCategoryClassRecommendationsInProgressForTransactionDetail, setEntityRecommendationForLineIdsForTransactionDetail, } from '../transactionDetail/transactionDetailReducer';
+import { markCategoryClassRecommendationsCompletedForTransactionDetail, markCategoryClassRecommendationsFailureForTransactionDetail, markCategoryClassRecommendationsInProgressForTransactionDetail, setEntityRecommendationForLineIdsForTransactionDetail, updateVendorBulkRecommendationsFetchStatus, } from '../transactionDetail/transactionDetailReducer';
 import { buildRecommendationUrl, getRecommendationByLineIdWithCOTFromRecommendationPayloadWithCOT, } from './recommendationHelper';
 import { fetchEntityRecommendationsForLineUpdate } from './recommendationReducer';
 // Close the per-target groupBy bucket after this much idle time so inactive
@@ -38,6 +38,16 @@ export const fetchEntityRecommendationsForLineUpdateEpic = (actions$, state$, ze
     const payload = action.payload;
     const { transactionId, transaction, lineIds } = payload.transactionDetails;
     const { entity, amount, isFetchCOT, isUncategorizedExpenseCategoryEnabled, } = payload;
+    // The vendor "Update all lines" popup on the detail page watches
+    // its own transaction-level fetch status, separate from the
+    // per-line statuses below — surface completion/failure there too
+    // when this fetch was triggered by that bulk action, or the popup
+    // hangs until its own 60s timeout regardless of how this request
+    // resolves.
+    const isBulkDetailFetch = payload.flowType === 'detail' && payload.isBulkFetch === true;
+    const emitWithBulkStatus = (primaryAction, bulkAction) => isBulkDetailFetch && bulkAction != null
+        ? of(primaryAction, bulkAction)
+        : of(primaryAction);
     // Synchronously emit the start arm so the per-line skeleton +
     // row uncheck happen before the HTTP request begins. The
     // discriminated-union payload narrows `payload.selectedTab` to
@@ -51,9 +61,9 @@ export const fetchEntityRecommendationsForLineUpdateEpic = (actions$, state$, ze
         .getJSON(url)
         .pipe(mergeMap((response) => {
         if (!isSuccessResponse(response) || response.data == null) {
-            return of(payload.flowType === 'categorization'
+            return emitWithBulkStatus(payload.flowType === 'categorization'
                 ? markCategoryClassRecommendationsFailureForCategorization(payload.selectedTab, transactionId, lineIds, response.status)
-                : markCategoryClassRecommendationsFailureForTransactionDetail(transactionId, lineIds, response.status));
+                : markCategoryClassRecommendationsFailureForTransactionDetail(transactionId, lineIds, response.status), updateVendorBulkRecommendationsFetchStatus(transactionId, 'Error', response.status));
         }
         const recommendationWithCOTByLineId = getRecommendationByLineIdWithCOTFromRecommendationPayloadWithCOT(response.data.recommendations, lineIds);
         // HTTP 200 with no per-line recommendations: NOT an error.
@@ -61,9 +71,9 @@ export const fetchEntityRecommendationsForLineUpdateEpic = (actions$, state$, ze
         // downstream UI can treat this as "we tried, nothing to
         // apply".
         if (recommendationWithCOTByLineId == null) {
-            return of(payload.flowType === 'categorization'
+            return emitWithBulkStatus(payload.flowType === 'categorization'
                 ? markCategoryClassRecommendationsCompletedForCategorization(payload.selectedTab, transactionId, lineIds)
-                : markCategoryClassRecommendationsCompletedForTransactionDetail(transactionId, lineIds));
+                : markCategoryClassRecommendationsCompletedForTransactionDetail(transactionId, lineIds), updateVendorBulkRecommendationsFetchStatus(transactionId, 'Completed'));
         }
         const transactionWithCOT = isFetchCOT === true
             ? getTransactionWithCOTFromRecommendations(transaction, recommendationWithCOTByLineId)
@@ -72,16 +82,16 @@ export const fetchEntityRecommendationsForLineUpdateEpic = (actions$, state$, ze
         if (payload.flowType === 'categorization') {
             return of(setEntityRecommendationForLineIdsForCategorization(payload.selectedTab, transactionId, transactionWithCOT, lineIds, entity, amount, recommendationWithCOTByLineId, uncategorizedIncomeExpense, isUncategorizedExpenseCategoryEnabled, getIsAccountingClassesEnabled(state$.value)));
         }
-        return of(setEntityRecommendationForLineIdsForTransactionDetail(transactionId, transactionWithCOT, lineIds, entity, amount, recommendationWithCOTByLineId, uncategorizedIncomeExpense));
+        return emitWithBulkStatus(setEntityRecommendationForLineIdsForTransactionDetail(transactionId, transactionWithCOT, lineIds, entity, amount, recommendationWithCOTByLineId, uncategorizedIncomeExpense), updateVendorBulkRecommendationsFetchStatus(transactionId, 'Completed'));
     }), catchError((error) => {
         const errorMessage = 'fetchEntityRecommendationsForLineUpdate failed: ' +
             (error instanceof Error
                 ? error.message
                 : JSON.stringify(error));
         const status = createZeniAPIStatus('Unexpected Error', errorMessage);
-        return of(payload.flowType === 'categorization'
+        return emitWithBulkStatus(payload.flowType === 'categorization'
             ? markCategoryClassRecommendationsFailureForCategorization(payload.selectedTab, transactionId, lineIds, status)
-            : markCategoryClassRecommendationsFailureForTransactionDetail(transactionId, lineIds, status));
+            : markCategoryClassRecommendationsFailureForTransactionDetail(transactionId, lineIds, status), updateVendorBulkRecommendationsFetchStatus(transactionId, 'Error', status));
     }));
     return concat(of(startAction), httpStream$);
 }))));

package/lib/view/recommendation/fetchEntityRecommendationsForLineUpdateEpic.d.ts

@@ -3,7 +3,7 @@ import { Observable } from 'rxjs';
 import { RootState } from '../../reducer';
 import { ZeniAPI } from '../../zeniAPI';
 import { markCategoryClassRecommendationsCompletedForCategorization, markCategoryClassRecommendationsFailureForCategorization, markCategoryClassRecommendationsInProgressForCategorization, setEntityRecommendationForLineIdsForCategorization } from '../expenseAutomationView/reducers/transactionsViewReducer';
-import { markCategoryClassRecommendationsCompletedForTransactionDetail, markCategoryClassRecommendationsFailureForTransactionDetail, markCategoryClassRecommendationsInProgressForTransactionDetail, setEntityRecommendationForLineIdsForTransactionDetail } from '../transactionDetail/transactionDetailReducer';
+import { markCategoryClassRecommendationsCompletedForTransactionDetail, markCategoryClassRecommendationsFailureForTransactionDetail, markCategoryClassRecommendationsInProgressForTransactionDetail, setEntityRecommendationForLineIdsForTransactionDetail, updateVendorBulkRecommendationsFetchStatus } from '../transactionDetail/transactionDetailReducer';
 import { fetchEntityRecommendationsForLineUpdate } from './recommendationReducer';
-export type ActionType = ReturnType<typeof fetchEntityRecommendationsForLineUpdate> | ReturnType<typeof markCategoryClassRecommendationsInProgressForCategorization> | ReturnType<typeof markCategoryClassRecommendationsCompletedForCategorization> | ReturnType<typeof markCategoryClassRecommendationsFailureForCategorization> | ReturnType<typeof markCategoryClassRecommendationsInProgressForTransactionDetail> | ReturnType<typeof markCategoryClassRecommendationsCompletedForTransactionDetail> | ReturnType<typeof markCategoryClassRecommendationsFailureForTransactionDetail> | ReturnType<typeof setEntityRecommendationForLineIdsForCategorization> | ReturnType<typeof setEntityRecommendationForLineIdsForTransactionDetail>;
+export type ActionType = ReturnType<typeof fetchEntityRecommendationsForLineUpdate> | ReturnType<typeof markCategoryClassRecommendationsInProgressForCategorization> | ReturnType<typeof markCategoryClassRecommendationsCompletedForCategorization> | ReturnType<typeof markCategoryClassRecommendationsFailureForCategorization> | ReturnType<typeof markCategoryClassRecommendationsInProgressForTransactionDetail> | ReturnType<typeof markCategoryClassRecommendationsCompletedForTransactionDetail> | ReturnType<typeof markCategoryClassRecommendationsFailureForTransactionDetail> | ReturnType<typeof setEntityRecommendationForLineIdsForCategorization> | ReturnType<typeof setEntityRecommendationForLineIdsForTransactionDetail> | ReturnType<typeof updateVendorBulkRecommendationsFetchStatus>;
 export declare const fetchEntityRecommendationsForLineUpdateEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/recommendation/fetchEntityRecommendationsForLineUpdateEpic.js

@@ -41,6 +41,16 @@ const fetchEntityRecommendationsForLineUpdateEpic = (actions$, state$, zeniAPI)
     const payload = action.payload;
     const { transactionId, transaction, lineIds } = payload.transactionDetails;
     const { entity, amount, isFetchCOT, isUncategorizedExpenseCategoryEnabled, } = payload;
+    // The vendor "Update all lines" popup on the detail page watches
+    // its own transaction-level fetch status, separate from the
+    // per-line statuses below — surface completion/failure there too
+    // when this fetch was triggered by that bulk action, or the popup
+    // hangs until its own 60s timeout regardless of how this request
+    // resolves.
+    const isBulkDetailFetch = payload.flowType === 'detail' && payload.isBulkFetch === true;
+    const emitWithBulkStatus = (primaryAction, bulkAction) => isBulkDetailFetch && bulkAction != null
+        ? (0, rxjs_1.of)(primaryAction, bulkAction)
+        : (0, rxjs_1.of)(primaryAction);
     // Synchronously emit the start arm so the per-line skeleton +
     // row uncheck happen before the HTTP request begins. The
     // discriminated-union payload narrows `payload.selectedTab` to
@@ -54,9 +64,9 @@ const fetchEntityRecommendationsForLineUpdateEpic = (actions$, state$, zeniAPI)
         .getJSON(url)
         .pipe((0, operators_1.mergeMap)((response) => {
         if (!(0, responsePayload_1.isSuccessResponse)(response) || response.data == null) {
-            return (0, rxjs_1.of)(payload.flowType === 'categorization'
+            return emitWithBulkStatus(payload.flowType === 'categorization'
                 ? (0, transactionsViewReducer_1.markCategoryClassRecommendationsFailureForCategorization)(payload.selectedTab, transactionId, lineIds, response.status)
-                : (0, transactionDetailReducer_1.markCategoryClassRecommendationsFailureForTransactionDetail)(transactionId, lineIds, response.status));
+                : (0, transactionDetailReducer_1.markCategoryClassRecommendationsFailureForTransactionDetail)(transactionId, lineIds, response.status), (0, transactionDetailReducer_1.updateVendorBulkRecommendationsFetchStatus)(transactionId, 'Error', response.status));
         }
         const recommendationWithCOTByLineId = (0, recommendationHelper_1.getRecommendationByLineIdWithCOTFromRecommendationPayloadWithCOT)(response.data.recommendations, lineIds);
         // HTTP 200 with no per-line recommendations: NOT an error.
@@ -64,9 +74,9 @@ const fetchEntityRecommendationsForLineUpdateEpic = (actions$, state$, zeniAPI)
         // downstream UI can treat this as "we tried, nothing to
         // apply".
         if (recommendationWithCOTByLineId == null) {
-            return (0, rxjs_1.of)(payload.flowType === 'categorization'
+            return emitWithBulkStatus(payload.flowType === 'categorization'
                 ? (0, transactionsViewReducer_1.markCategoryClassRecommendationsCompletedForCategorization)(payload.selectedTab, transactionId, lineIds)
-                : (0, transactionDetailReducer_1.markCategoryClassRecommendationsCompletedForTransactionDetail)(transactionId, lineIds));
+                : (0, transactionDetailReducer_1.markCategoryClassRecommendationsCompletedForTransactionDetail)(transactionId, lineIds), (0, transactionDetailReducer_1.updateVendorBulkRecommendationsFetchStatus)(transactionId, 'Completed'));
         }
         const transactionWithCOT = isFetchCOT === true
             ? (0, transactionHelper_1.getTransactionWithCOTFromRecommendations)(transaction, recommendationWithCOTByLineId)
@@ -75,16 +85,16 @@ const fetchEntityRecommendationsForLineUpdateEpic = (actions$, state$, zeniAPI)
         if (payload.flowType === 'categorization') {
             return (0, rxjs_1.of)((0, transactionsViewReducer_1.setEntityRecommendationForLineIdsForCategorization)(payload.selectedTab, transactionId, transactionWithCOT, lineIds, entity, amount, recommendationWithCOTByLineId, uncategorizedIncomeExpense, isUncategorizedExpenseCategoryEnabled, (0, tenantSelector_1.getIsAccountingClassesEnabled)(state$.value)));
         }
-        return (0, rxjs_1.of)((0, transactionDetailReducer_1.setEntityRecommendationForLineIdsForTransactionDetail)(transactionId, transactionWithCOT, lineIds, entity, amount, recommendationWithCOTByLineId, uncategorizedIncomeExpense));
+        return emitWithBulkStatus((0, transactionDetailReducer_1.setEntityRecommendationForLineIdsForTransactionDetail)(transactionId, transactionWithCOT, lineIds, entity, amount, recommendationWithCOTByLineId, uncategorizedIncomeExpense), (0, transactionDetailReducer_1.updateVendorBulkRecommendationsFetchStatus)(transactionId, 'Completed'));
     }), (0, operators_1.catchError)((error) => {
         const errorMessage = 'fetchEntityRecommendationsForLineUpdate failed: ' +
             (error instanceof Error
                 ? error.message
                 : JSON.stringify(error));
         const status = (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', errorMessage);
-        return (0, rxjs_1.of)(payload.flowType === 'categorization'
+        return emitWithBulkStatus(payload.flowType === 'categorization'
             ? (0, transactionsViewReducer_1.markCategoryClassRecommendationsFailureForCategorization)(payload.selectedTab, transactionId, lineIds, status)
-            : (0, transactionDetailReducer_1.markCategoryClassRecommendationsFailureForTransactionDetail)(transactionId, lineIds, status));
+            : (0, transactionDetailReducer_1.markCategoryClassRecommendationsFailureForTransactionDetail)(transactionId, lineIds, status), (0, transactionDetailReducer_1.updateVendorBulkRecommendationsFetchStatus)(transactionId, 'Error', status));
     }));
     return (0, rxjs_1.concat)((0, rxjs_1.of)(startAction), httpStream$);
 }))));

package/lib/view/recommendation/recommendationReducer.d.ts

@@ -15,6 +15,7 @@ type FetchEntityRecommendationsForLineUpdateCommonPayload = {
         transaction: SupportedTransaction;
         transactionId: TransactionID;
     };
+    isBulkFetch?: boolean;
     isFetchCOT?: boolean;
     isUncategorizedExpenseCategoryEnabled?: boolean;
 };

package/package.json

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