Merge branch 'main' of github.com:indexdata/ui-harvester-admin

indexdata · Sep 22, 2023 · acd1f9a · acd1f9a
2 parents 69f19a7 + 999fa5d
commit acd1f9a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@
 * Fix duplicate-step operation (previously failed with "Provided object contains unexpected additional property: virtualName"). Fixes UIHAADM-86.
 * Duplication of records includes fields from full record, not just summary. Fixes UIHAADM-88.
 * Changes made when editing a record in settings now immediately appear in the right pane. Fixes UIHAADM-85.
+* `summarizeLine` now correctly includes "failed" counts. Fixes UIHAADM-91.
 
 ## [1.0.3](https://github.com/folio-org/ui-harvester-admin/tree/v1.0.3) (2023-05-26)
 

diff --git a/src/search/renderNumericFilterPair.js b/src/search/renderNumericFilterPair.js
@@ -22,7 +22,6 @@ function renderSingleNumericFilter(intl, filterStruct, updateQuery, field, bound
         }
         updateQuery({ filters: deparseFilters(fs2) });
       }}
-      useInput
     />
   );
 }

diff --git a/src/util/message2stats.js b/src/util/message2stats.js
@@ -1,6 +1,6 @@
 function message2stats(message) {
   const stats = {};
-  if (!message) return stats;
+  if (!message || message === 'No records harvested') return stats;
 
   message.split(' ').forEach(row => {
     const matchData = row.match(/(.*?)_.*:_+([^_]*)_+([^_]*)_+([^_]*)_+([^_]*)/);
@@ -10,7 +10,7 @@ function message2stats(message) {
       stats[name.toLowerCase()] = { processed, loaded, deleted, failed };
     } else {
       // eslint-disable-next-line no-console
-      console.warn('message2stats: no match for row:', row);
+      if (row) console.warn('message2stats: no match for row:', row);
     }
   });
 
@@ -25,7 +25,7 @@ console.log(stats);
 */
 
 function summarizeLine(statLine) {
-  return ['processed', 'loaded', 'deleted', ',failed']
+  return ['processed', 'loaded', 'deleted', 'failed']
     .map(entry => statLine?.[entry] || '')
     .join('/');
 }

diff --git a/src/views/HarvestableLog/HarvestableLogPlainText.js b/src/views/HarvestableLog/HarvestableLogPlainText.js
@@ -41,7 +41,7 @@ const HarvestableLogPlainText = ({ record, log, refreshLog }) => {
 
       &nbsp;&nbsp;
 
-      <Download file="harvester-log.txt" content={log}>
+      <Download file="harvester-log.txt" content={log || ''}>
         <Button
           data-test-download-logs
           id="clickable-download-logs"
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             updateQuery({ filters: deparseFilters(fs2) });
           }}
-          useInput
         />
       );
     }
@@ Expand Down @@