From 115355455ec564144cf04362f3822ebb369624d5 Mon Sep 17 00:00:00 2001
From: rbisson <remi.bisson@inrae.fr>
Date: Tue, 23 Jul 2024 16:32:17 +0200
Subject: [PATCH 1/2] [Results][ResultsDownload] added query text in JSON
results download file
---
src/pages/results/Results.js | 1 +
src/pages/results/ResultsDownload.js | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/pages/results/Results.js b/src/pages/results/Results.js
index 9fb3123..fc639b0 100644
--- a/src/pages/results/Results.js
+++ b/src/pages/results/Results.js
@@ -24,6 +24,7 @@ const Results = ({ searchResults, searchQuery, selectedRowsIds, setSelectedRowsI
</EuiFlexItem>
<EuiFlexItem grow={false}>
<ResultsDownload
+ query={searchQuery}
searchResults={searchResults}
selectedRowsIds={selectedRowsIds}
/>
diff --git a/src/pages/results/ResultsDownload.js b/src/pages/results/ResultsDownload.js
index 1a750b4..92b0a82 100644
--- a/src/pages/results/ResultsDownload.js
+++ b/src/pages/results/ResultsDownload.js
@@ -3,14 +3,14 @@ import { EuiButton, EuiFlexGroup, EuiSelect, EuiToolTip } from '@elastic/eui';
import download from 'downloadjs';
import { useTranslation } from 'react-i18next';
-const ResultsDownload = ({ searchResults, selectedRowsIds }) => {
+const ResultsDownload = ({ query, searchResults, selectedRowsIds }) => {
const { t } = useTranslation('results');
const [resultsRowsSelection, setResultsRowsSelection] = useState('all');
const [format, setFormat] = useState('json');
const downloadJSON = (content) => {
download(
- `{"metadataRecords": ${JSON.stringify(content, null, '\t')}}`,
+ `{"query": ${JSON.stringify(query)}, "metadataRecords": ${JSON.stringify(content, null, '\t')}}`,
`InSylvaSearchResults.json`,
'application/json'
);
--
GitLab
From ad9449db2bcb1e2cb29b9f3416167abf0dc024cb Mon Sep 17 00:00:00 2001
From: rbisson <remi.bisson@inrae.fr>
Date: Tue, 23 Jul 2024 16:34:16 +0200
Subject: [PATCH 2/2] [ResultsDownload] changed function to arrow function
---
src/pages/results/ResultsDownload.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pages/results/ResultsDownload.js b/src/pages/results/ResultsDownload.js
index 92b0a82..9461052 100644
--- a/src/pages/results/ResultsDownload.js
+++ b/src/pages/results/ResultsDownload.js
@@ -16,7 +16,7 @@ const ResultsDownload = ({ query, searchResults, selectedRowsIds }) => {
);
};
- function JSONtoCSV(jsonData) {
+ const JSONtoCSV = (jsonData) => {
let csv = '';
let headers = Object.keys(jsonData[0]);
csv += headers.join(',') + '\n';
@@ -25,7 +25,7 @@ const ResultsDownload = ({ query, searchResults, selectedRowsIds }) => {
csv += data + '\n';
});
return csv;
- }
+ };
const downloadCSV = (content) => {
download(JSONtoCSV(content), `InSylvaSearchResults.csv`, 'text/csv');
--
GitLab