From 6229327560f18ff216621c01324405106c5c6aa9 Mon Sep 17 00:00:00 2001
From: Mike Taylor <mike@indexdata.com>
Date: Wed, 18 Dec 2024 11:36:52 +0000
Subject: [PATCH 1/4] Move record-export code out into own function

---
 src/views/Records/Records.js | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/views/Records/Records.js b/src/views/Records/Records.js
index 04dd7c7..a1629f4 100644
--- a/src/views/Records/Records.js
+++ b/src/views/Records/Records.js
@@ -11,22 +11,25 @@ import ErrorMessage from '../../components/ErrorMessage';
 import packageInfo from '../../../package';
 
 
-function renderActionMenu(onToggle, intl, data, renderedColumnsMenu) {
+function exportAllRecords(data) {
+  const expanded = data.records.filter(r => r !== undefined).map(r => ({
+    ...r,
+    errors: errors2string(r.recordErrors),
+  }));
+  console.log('expanded =', expanded);
+  exportToCsv(expanded, {});
+}
+
+
+function renderActionMenu(onToggle, intl, data, resultCount, renderedColumnsMenu) {
   return (
     <div>
       <MenuSection label={intl.formatMessage({ id: 'ui-harvester-admin.reports' })}>
         <Button
           aria-label={intl.formatMessage({ id: 'ui-harvester-admin.export-csv' })}
-          disabled={data.records.length === 0}
+          disabled={!resultCount}
           buttonStyle="dropdownItem"
-          onClick={() => {
-            const expanded = data.records.map(r => ({
-              ...r,
-              errors: errors2string(r.recordErrors),
-            }));
-            exportToCsv(expanded, {});
-            onToggle();
-          }}
+          onClick={() => { exportAllRecords(data); onToggle(); }}
         >
           <Icon icon="download">
             <FormattedMessage id="ui-harvester-admin.export-csv" />
@@ -108,7 +111,7 @@ function Records({
                         padContent={false}
                         paneTitle={paneTitle}
                         paneSub={<FormattedMessage id="ui-harvester-admin.resultCount" values={{ count: resultCount }} />}
-                        actionMenu={({ onToggle }) => renderActionMenu(onToggle, intl, data, renderColumnsMenu)}
+                        actionMenu={({ onToggle }) => renderActionMenu(onToggle, intl, data, resultCount, renderColumnsMenu)}
                       >
                         <MultiColumnList
                           autosize

From eee92b5a5ade060fb4f0fa043def84c05f9d76fb Mon Sep 17 00:00:00 2001
From: Mike Taylor <mike@indexdata.com>
Date: Thu, 19 Dec 2024 22:21:26 +0000
Subject: [PATCH 2/4] Export CSV for failed records includes all records

When downloading Failed Records, provide all records in the result
set, not just the currently visible page.

Fixes UIHAADM-140.
---
 CHANGELOG.md                 |  1 +
 src/routes/RecordsRoute.js   |  4 ++++
 src/views/Records/Records.js | 32 ++++++++++++++++++++++----------
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 447379f..1c91455 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 * Explicit paging for list of failed records. Fixes UIHAADM-141.
 * Explicit paging for list of harvestables. Fixes UIHAADM-142.
+* When downloading Failed Records, provide all records in the result set, not just the currently visible page. Fixes UIHAADM-140.
 
 ## [2.2.0](https://github.com/folio-org/ui-harvester-admin/tree/v2.2.0) (2024-10-23)
 
diff --git a/src/routes/RecordsRoute.js b/src/routes/RecordsRoute.js
index f4f1ca6..4331687 100644
--- a/src/routes/RecordsRoute.js
+++ b/src/routes/RecordsRoute.js
@@ -41,6 +41,7 @@ const RecordsRoute = ({ stripes, resources, mutator, children }) => {
       hasLoaded={hasLoaded}
       error={error}
       onNeedMoreData={handleNeedMoreData}
+      getMoreRecords={mutator.records.GET}
     >
       {children}
     </Records>
@@ -102,6 +103,9 @@ RecordsRoute.propTypes = {
     query: PropTypes.shape({
       update: PropTypes.func.isRequired,
     }).isRequired,
+    records: PropTypes.shape({
+      GET: PropTypes.func.isRequired,
+    }).isRequired,
   }).isRequired,
   children: PropTypes.object, // XXX may need to add .isRequired later
 };
diff --git a/src/views/Records/Records.js b/src/views/Records/Records.js
index a1629f4..466ce3c 100644
--- a/src/views/Records/Records.js
+++ b/src/views/Records/Records.js
@@ -11,17 +11,27 @@ import ErrorMessage from '../../components/ErrorMessage';
 import packageInfo from '../../../package';
 
 
-function exportAllRecords(data) {
-  const expanded = data.records.filter(r => r !== undefined).map(r => ({
-    ...r,
-    errors: errors2string(r.recordErrors),
-  }));
-  console.log('expanded =', expanded);
-  exportToCsv(expanded, {});
+function exportAllRecords(resultCount, getMoreRecords) {
+  const RCI = 100;   // Probably keep in sync with RESULT_COUNT_INCREMENT from RecordsRoute.js
+
+  const p = [];
+  for (let offset = 0; offset < resultCount; offset += RCI) {
+    p.push(getMoreRecords({ params: { offset, limit: RCI } }));
+  }
+
+  Promise.all(p).then(res => {
+    const records = res.flat().filter(r => r !== undefined).map(r => ({
+      ...r,
+      errors: errors2string(r.recordErrors),
+      originalRecord: undefined,
+    }));
+
+    exportToCsv(records, {});
+  });
 }
 
 
-function renderActionMenu(onToggle, intl, data, resultCount, renderedColumnsMenu) {
+function renderActionMenu(onToggle, intl, data, resultCount, getMoreRecords, renderedColumnsMenu) {
   return (
     <div>
       <MenuSection label={intl.formatMessage({ id: 'ui-harvester-admin.reports' })}>
@@ -29,7 +39,7 @@ function renderActionMenu(onToggle, intl, data, resultCount, renderedColumnsMenu
           aria-label={intl.formatMessage({ id: 'ui-harvester-admin.export-csv' })}
           disabled={!resultCount}
           buttonStyle="dropdownItem"
-          onClick={() => { exportAllRecords(data); onToggle(); }}
+          onClick={() => { exportAllRecords(resultCount, getMoreRecords); onToggle(); }}
         >
           <Icon icon="download">
             <FormattedMessage id="ui-harvester-admin.export-csv" />
@@ -50,6 +60,7 @@ function Records({
   error,
   hasLoaded,
   onNeedMoreData,
+  getMoreRecords,
   children,
 }) {
   const intl = useIntl();
@@ -111,7 +122,7 @@ function Records({
                         padContent={false}
                         paneTitle={paneTitle}
                         paneSub={<FormattedMessage id="ui-harvester-admin.resultCount" values={{ count: resultCount }} />}
-                        actionMenu={({ onToggle }) => renderActionMenu(onToggle, intl, data, resultCount, renderColumnsMenu)}
+                        actionMenu={({ onToggle }) => renderActionMenu(onToggle, intl, data, resultCount, getMoreRecords, renderColumnsMenu)}
                       >
                         <MultiColumnList
                           autosize
@@ -167,6 +178,7 @@ Records.propTypes = {
   error: PropTypes.string,
   hasLoaded: PropTypes.bool.isRequired,
   onNeedMoreData: PropTypes.func.isRequired,
+  getMoreRecords: PropTypes.func.isRequired,
   children: PropTypes.oneOfType([
     PropTypes.object.isRequired,
     PropTypes.arrayOf(PropTypes.object.isRequired).isRequired,

From daeb0003665aa8292e548a04b1a51e640b47bd65 Mon Sep 17 00:00:00 2001
From: Mike Taylor <mike@indexdata.com>
Date: Fri, 20 Dec 2024 16:24:03 +0000
Subject: [PATCH 3/4] Use mutator.reset after fecthing records

---
 src/routes/RecordsRoute.js   |  2 +-
 src/views/Records/Records.js | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/routes/RecordsRoute.js b/src/routes/RecordsRoute.js
index 4331687..d534972 100644
--- a/src/routes/RecordsRoute.js
+++ b/src/routes/RecordsRoute.js
@@ -41,7 +41,7 @@ const RecordsRoute = ({ stripes, resources, mutator, children }) => {
       hasLoaded={hasLoaded}
       error={error}
       onNeedMoreData={handleNeedMoreData}
-      getMoreRecords={mutator.records.GET}
+      recordsMutator={mutator.records}
     >
       {children}
     </Records>
diff --git a/src/views/Records/Records.js b/src/views/Records/Records.js
index 466ce3c..3e6ec01 100644
--- a/src/views/Records/Records.js
+++ b/src/views/Records/Records.js
@@ -11,15 +11,16 @@ import ErrorMessage from '../../components/ErrorMessage';
 import packageInfo from '../../../package';
 
 
-function exportAllRecords(resultCount, getMoreRecords) {
+function exportAllRecords(resultCount, recordsMutator) {
   const RCI = 100;   // Probably keep in sync with RESULT_COUNT_INCREMENT from RecordsRoute.js
 
   const p = [];
   for (let offset = 0; offset < resultCount; offset += RCI) {
-    p.push(getMoreRecords({ params: { offset, limit: RCI } }));
+    p.push(recordsMutator.GET({ params: { offset, limit: RCI } }));
   }
 
   Promise.all(p).then(res => {
+    recordsMutator.reset();
     const records = res.flat().filter(r => r !== undefined).map(r => ({
       ...r,
       errors: errors2string(r.recordErrors),
@@ -31,7 +32,7 @@ function exportAllRecords(resultCount, getMoreRecords) {
 }
 
 
-function renderActionMenu(onToggle, intl, data, resultCount, getMoreRecords, renderedColumnsMenu) {
+function renderActionMenu(onToggle, intl, data, resultCount, recordsMutator, renderedColumnsMenu) {
   return (
     <div>
       <MenuSection label={intl.formatMessage({ id: 'ui-harvester-admin.reports' })}>
@@ -39,7 +40,7 @@ function renderActionMenu(onToggle, intl, data, resultCount, getMoreRecords, ren
           aria-label={intl.formatMessage({ id: 'ui-harvester-admin.export-csv' })}
           disabled={!resultCount}
           buttonStyle="dropdownItem"
-          onClick={() => { exportAllRecords(resultCount, getMoreRecords); onToggle(); }}
+          onClick={() => { exportAllRecords(resultCount, recordsMutator); onToggle(); }}
         >
           <Icon icon="download">
             <FormattedMessage id="ui-harvester-admin.export-csv" />
@@ -60,7 +61,7 @@ function Records({
   error,
   hasLoaded,
   onNeedMoreData,
-  getMoreRecords,
+  recordsMutator,
   children,
 }) {
   const intl = useIntl();
@@ -122,7 +123,7 @@ function Records({
                         padContent={false}
                         paneTitle={paneTitle}
                         paneSub={<FormattedMessage id="ui-harvester-admin.resultCount" values={{ count: resultCount }} />}
-                        actionMenu={({ onToggle }) => renderActionMenu(onToggle, intl, data, resultCount, getMoreRecords, renderColumnsMenu)}
+                        actionMenu={({ onToggle }) => renderActionMenu(onToggle, intl, data, resultCount, recordsMutator, renderColumnsMenu)}
                       >
                         <MultiColumnList
                           autosize
@@ -178,7 +179,10 @@ Records.propTypes = {
   error: PropTypes.string,
   hasLoaded: PropTypes.bool.isRequired,
   onNeedMoreData: PropTypes.func.isRequired,
-  getMoreRecords: PropTypes.func.isRequired,
+  recordsMutator: PropTypes.shape({
+    GET: PropTypes.func.isRequired,
+    reset: PropTypes.func.isRequired,
+  }).isRequired,
   children: PropTypes.oneOfType([
     PropTypes.object.isRequired,
     PropTypes.arrayOf(PropTypes.object.isRequired).isRequired,

From 6055fa396c27b007e2b6aa698b10152193390112 Mon Sep 17 00:00:00 2001
From: Mike Taylor <mike@indexdata.com>
Date: Fri, 20 Dec 2024 18:44:13 +0000
Subject: [PATCH 4/4] Rewrite CSV export to use okapiKy instead of
 stripes-connect

---
 src/routes/RecordsRoute.js   |  4 ----
 src/views/Records/Records.js | 35 +++++++++++++++++------------------
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/src/routes/RecordsRoute.js b/src/routes/RecordsRoute.js
index d534972..f4f1ca6 100644
--- a/src/routes/RecordsRoute.js
+++ b/src/routes/RecordsRoute.js
@@ -41,7 +41,6 @@ const RecordsRoute = ({ stripes, resources, mutator, children }) => {
       hasLoaded={hasLoaded}
       error={error}
       onNeedMoreData={handleNeedMoreData}
-      recordsMutator={mutator.records}
     >
       {children}
     </Records>
@@ -103,9 +102,6 @@ RecordsRoute.propTypes = {
     query: PropTypes.shape({
       update: PropTypes.func.isRequired,
     }).isRequired,
-    records: PropTypes.shape({
-      GET: PropTypes.func.isRequired,
-    }).isRequired,
   }).isRequired,
   children: PropTypes.object, // XXX may need to add .isRequired later
 };
diff --git a/src/views/Records/Records.js b/src/views/Records/Records.js
index 3e6ec01..a2e2924 100644
--- a/src/views/Records/Records.js
+++ b/src/views/Records/Records.js
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage, useIntl } from 'react-intl';
-import { AppIcon } from '@folio/stripes/core';
+import { AppIcon, useOkapiKy } from '@folio/stripes/core';
 import { MenuSection, Button, Icon, LoadingPane, Paneset, Pane, MultiColumnList, ErrorModal, exportToCsv, MCLPagingTypes } from '@folio/stripes/components';
 import { ColumnManager, SearchAndSortQuery } from '@folio/stripes/smart-components';
 import parseSort from '../../util/parseSort';
@@ -11,28 +11,31 @@ import ErrorMessage from '../../components/ErrorMessage';
 import packageInfo from '../../../package';
 
 
-function exportAllRecords(resultCount, recordsMutator) {
+function exportAllRecords(resultCount, okapiKy) {
   const RCI = 100;   // Probably keep in sync with RESULT_COUNT_INCREMENT from RecordsRoute.js
 
   const p = [];
   for (let offset = 0; offset < resultCount; offset += RCI) {
-    p.push(recordsMutator.GET({ params: { offset, limit: RCI } }));
+    p.push(okapiKy(`harvester-admin/previous-jobs/failed-records?offset=${offset}&limit=${RCI}`)
+      .then(res => res.json()));
   }
 
-  Promise.all(p).then(res => {
-    recordsMutator.reset();
-    const records = res.flat().filter(r => r !== undefined).map(r => ({
-      ...r,
-      errors: errors2string(r.recordErrors),
-      originalRecord: undefined,
-    }));
+  Promise.all(p).then(responses => {
+    const records = responses
+      .map(response => response.failedRecords)
+      .flat()
+      .filter(r => r !== undefined).map(r => ({
+        ...r,
+        errors: errors2string(r.recordErrors),
+        originalRecord: undefined,
+      }));
 
     exportToCsv(records, {});
   });
 }
 
 
-function renderActionMenu(onToggle, intl, data, resultCount, recordsMutator, renderedColumnsMenu) {
+function renderActionMenu(onToggle, intl, data, resultCount, okapiKy, renderedColumnsMenu) {
   return (
     <div>
       <MenuSection label={intl.formatMessage({ id: 'ui-harvester-admin.reports' })}>
@@ -40,7 +43,7 @@ function renderActionMenu(onToggle, intl, data, resultCount, recordsMutator, ren
           aria-label={intl.formatMessage({ id: 'ui-harvester-admin.export-csv' })}
           disabled={!resultCount}
           buttonStyle="dropdownItem"
-          onClick={() => { exportAllRecords(resultCount, recordsMutator); onToggle(); }}
+          onClick={() => { exportAllRecords(resultCount, okapiKy); onToggle(); }}
         >
           <Icon icon="download">
             <FormattedMessage id="ui-harvester-admin.export-csv" />
@@ -61,11 +64,11 @@ function Records({
   error,
   hasLoaded,
   onNeedMoreData,
-  recordsMutator,
   children,
 }) {
   const intl = useIntl();
   const [invalidSortKey, setInvalidSortKey] = useState();
+  const okapiKy = useOkapiKy();
 
   const columnMapping = {
     recordNumber: <FormattedMessage id="ui-harvester-admin.failed-records.recordNumber" />,
@@ -123,7 +126,7 @@ function Records({
                         padContent={false}
                         paneTitle={paneTitle}
                         paneSub={<FormattedMessage id="ui-harvester-admin.resultCount" values={{ count: resultCount }} />}
-                        actionMenu={({ onToggle }) => renderActionMenu(onToggle, intl, data, resultCount, recordsMutator, renderColumnsMenu)}
+                        actionMenu={({ onToggle }) => renderActionMenu(onToggle, intl, data, resultCount, okapiKy, renderColumnsMenu)}
                       >
                         <MultiColumnList
                           autosize
@@ -179,10 +182,6 @@ Records.propTypes = {
   error: PropTypes.string,
   hasLoaded: PropTypes.bool.isRequired,
   onNeedMoreData: PropTypes.func.isRequired,
-  recordsMutator: PropTypes.shape({
-    GET: PropTypes.func.isRequired,
-    reset: PropTypes.func.isRequired,
-  }).isRequired,
   children: PropTypes.oneOfType([
     PropTypes.object.isRequired,
     PropTypes.arrayOf(PropTypes.object.isRequired).isRequired,