@zeniai/client-epic-state 4.19.37-betaVR16 → 4.19.37-betaVR17

package/lib/esm/view/expenseAutomationView/epics/missingReceipts/fetchMultipleBatchDetailsEpic.js

@@ -9,6 +9,7 @@ export function fetchBatchDetailsByIds(batchIds, zeniAPI) {
     if (batchIds.length === 0) {
         return EMPTY;
     }
+    console.log('fetchBatchDetailsByIds', batchIds);
     return from(batchIds).pipe(mergeMap((batchId) => zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/batches/${batchId}`)
         .pipe(mergeMap((response) => {

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

@@ -56,12 +56,15 @@ export function getExpenseAutomationMissingReceiptsView(state) {
     const batchList = monthYearPeriodId != null
         ? bulkUpload.batchListByPeriod[monthYearPeriodId] ?? []
         : [];
+    /** API returns newest-first (`sort_order: desc`); primary batch uses oldest-first order. */
+    const batchListChronological = orderBy(batchList, (b) => new Date(b.createdAt).valueOf(), 'asc');
     /**
-     * Primary "Unmatched" batch = first batch in batch list order whose stored batchDetails
-     * has status `completed`. If an earlier batch has no details yet (still loading), we return
-     * undefined so we do not assign a later batch until ordering is known (avoids async reorder bugs).
+     * Primary "Unmatched" batch = first completed batch in chronological order, preferring the
+     * first batch that still has un_matched/no_match work when any completed batch has such work
+     * (so a newer fully-matched batch does not hide older unmatched receipts). If an earlier batch
+     * in that order has no details yet (still loading), we return undefined until it resolves.
      */
-    const primaryBatchIdFromDetailsOrder = getPrimaryBatchIdFromBatchListOrder(batchList, bulkUpload.batchDetailsById, bulkUpload.failedBatchDetailIds);
+    const primaryBatchIdFromDetailsOrder = getPrimaryBatchIdFromBatchListOrder(batchListChronological, bulkUpload.batchDetailsById, bulkUpload.failedBatchDetailIds);
     /** During upload/matching, the in-flight batch may not appear in batchList yet — prefer currentBatchId. */
     const unmatchedSectionBatchId = bulkUpload.phase === 'matching' || bulkUpload.phase === 'uploading'
         ? bulkUpload.currentBatchId ?? primaryBatchIdFromDetailsOrder
@@ -183,14 +186,26 @@ export function getExpenseAutomationMissingReceiptsView(state) {
         },
     };
 }
+function batchDetailsHasUnmatchedWork(details) {
+    return details.files.some((f) => f.status === 'un_matched' || f.status === 'no_match');
+}
 /**
- * First batch in `batchList` order with `batchDetailsById[id].status === 'completed'`.
- * Skips failed detail fetches. Stops at the first batch with no details yet (still loading)
- * so a later batch is never chosen as primary until earlier list rows are resolved.
+ * `batchList` must be in chronological order (oldest first). Picks the primary batch for the
+ * top "Unmatched" section. Skips failed detail fetches. Stops at the first batch with no details
+ * yet (still loading) so we do not choose a later batch until earlier chronological rows resolve.
  */
-function getPrimaryBatchIdFromBatchListOrder(batchList, batchDetailsById, failedBatchDetailIds) {
+function getPrimaryBatchIdFromBatchListOrder(batchListChronological, batchDetailsById, failedBatchDetailIds) {
     const failedIds = new Set(failedBatchDetailIds);
-    for (const batch of batchList) {
+    const anyCompletedBatchHasUnmatchedWork = batchListChronological.some((b) => {
+        if (failedIds.has(b.batchId)) {
+            return false;
+        }
+        const d = batchDetailsById[b.batchId];
+        return (d != null &&
+            d.status === 'completed' &&
+            batchDetailsHasUnmatchedWork(d));
+    });
+    for (const batch of batchListChronological) {
         if (failedIds.has(batch.batchId)) {
             continue;
         }
@@ -198,9 +213,16 @@ function getPrimaryBatchIdFromBatchListOrder(batchList, batchDetailsById, failed
         if (details == null) {
             return undefined;
         }
-        if (details.status === 'completed') {
-            return batch.batchId;
+        if (details.status !== 'completed') {
+            continue;
+        }
+        if (anyCompletedBatchHasUnmatchedWork) {
+            if (batchDetailsHasUnmatchedWork(details)) {
+                return batch.batchId;
+            }
+            continue;
         }
+        return batch.batchId;
     }
     return undefined;
 }

package/lib/view/expenseAutomationView/epics/missingReceipts/fetchMultipleBatchDetailsEpic.js

@@ -13,6 +13,7 @@ function fetchBatchDetailsByIds(batchIds, zeniAPI) {
     if (batchIds.length === 0) {
         return rxjs_1.EMPTY;
     }
+    console.log('fetchBatchDetailsByIds', batchIds);
     return (0, rxjs_1.from)(batchIds).pipe((0, operators_1.mergeMap)((batchId) => zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/batches/${batchId}`)
         .pipe((0, operators_1.mergeMap)((response) => {

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

@@ -62,12 +62,15 @@ function getExpenseAutomationMissingReceiptsView(state) {
     const batchList = monthYearPeriodId != null
         ? bulkUpload.batchListByPeriod[monthYearPeriodId] ?? []
         : [];
+    /** API returns newest-first (`sort_order: desc`); primary batch uses oldest-first order. */
+    const batchListChronological = (0, orderBy_1.default)(batchList, (b) => new Date(b.createdAt).valueOf(), 'asc');
     /**
-     * Primary "Unmatched" batch = first batch in batch list order whose stored batchDetails
-     * has status `completed`. If an earlier batch has no details yet (still loading), we return
-     * undefined so we do not assign a later batch until ordering is known (avoids async reorder bugs).
+     * Primary "Unmatched" batch = first completed batch in chronological order, preferring the
+     * first batch that still has un_matched/no_match work when any completed batch has such work
+     * (so a newer fully-matched batch does not hide older unmatched receipts). If an earlier batch
+     * in that order has no details yet (still loading), we return undefined until it resolves.
      */
-    const primaryBatchIdFromDetailsOrder = getPrimaryBatchIdFromBatchListOrder(batchList, bulkUpload.batchDetailsById, bulkUpload.failedBatchDetailIds);
+    const primaryBatchIdFromDetailsOrder = getPrimaryBatchIdFromBatchListOrder(batchListChronological, bulkUpload.batchDetailsById, bulkUpload.failedBatchDetailIds);
     /** During upload/matching, the in-flight batch may not appear in batchList yet — prefer currentBatchId. */
     const unmatchedSectionBatchId = bulkUpload.phase === 'matching' || bulkUpload.phase === 'uploading'
         ? bulkUpload.currentBatchId ?? primaryBatchIdFromDetailsOrder
@@ -189,14 +192,26 @@ function getExpenseAutomationMissingReceiptsView(state) {
         },
     };
 }
+function batchDetailsHasUnmatchedWork(details) {
+    return details.files.some((f) => f.status === 'un_matched' || f.status === 'no_match');
+}
 /**
- * First batch in `batchList` order with `batchDetailsById[id].status === 'completed'`.
- * Skips failed detail fetches. Stops at the first batch with no details yet (still loading)
- * so a later batch is never chosen as primary until earlier list rows are resolved.
+ * `batchList` must be in chronological order (oldest first). Picks the primary batch for the
+ * top "Unmatched" section. Skips failed detail fetches. Stops at the first batch with no details
+ * yet (still loading) so we do not choose a later batch until earlier chronological rows resolve.
  */
-function getPrimaryBatchIdFromBatchListOrder(batchList, batchDetailsById, failedBatchDetailIds) {
+function getPrimaryBatchIdFromBatchListOrder(batchListChronological, batchDetailsById, failedBatchDetailIds) {
     const failedIds = new Set(failedBatchDetailIds);
-    for (const batch of batchList) {
+    const anyCompletedBatchHasUnmatchedWork = batchListChronological.some((b) => {
+        if (failedIds.has(b.batchId)) {
+            return false;
+        }
+        const d = batchDetailsById[b.batchId];
+        return (d != null &&
+            d.status === 'completed' &&
+            batchDetailsHasUnmatchedWork(d));
+    });
+    for (const batch of batchListChronological) {
         if (failedIds.has(batch.batchId)) {
             continue;
         }
@@ -204,9 +219,16 @@ function getPrimaryBatchIdFromBatchListOrder(batchList, batchDetailsById, failed
         if (details == null) {
             return undefined;
         }
-        if (details.status === 'completed') {
-            return batch.batchId;
+        if (details.status !== 'completed') {
+            continue;
+        }
+        if (anyCompletedBatchHasUnmatchedWork) {
+            if (batchDetailsHasUnmatchedWork(details)) {
+                return batch.batchId;
+            }
+            continue;
         }
+        return batch.batchId;
     }
     return undefined;
 }

package/package.json

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