From fe568ceaab996e6486c5eaad3cdf42e8801413db Mon Sep 17 00:00:00 2001
From: Alejandro De Maria Antolinos <demariaa@esrf.fr>
Date: Mon, 12 Sep 2022 07:17:58 +0200
Subject: [PATCH] Replaced dataset.name by dataset.parameters['name'] and added
 to the metadata list

---
 src/components/Dataset/DatasetMetadataTab.js |  7 ++++++-
 src/components/Dataset/DatasetTable.js       | 10 +++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/components/Dataset/DatasetMetadataTab.js b/src/components/Dataset/DatasetMetadataTab.js
index 06773415..25979f01 100644
--- a/src/components/Dataset/DatasetMetadataTab.js
+++ b/src/components/Dataset/DatasetMetadataTab.js
@@ -59,9 +59,14 @@ function DatasetMetadataTab(props) {
   const data = dataset.parameters.sort((a, b) =>
     a.name.localeCompare(b.name, undefined, { sensitivity: 'base' })
   );
+
   return (
     <div style={{ margin: 10, fontSize: 12 }}>
-      <ResponsiveTable keyField="name" data={data} columns={getColumns()} />
+      <ResponsiveTable
+        keyField="name"
+        data={[...data, { name: 'name', value: dataset.name }]}
+        columns={getColumns()}
+      />
     </div>
   );
 }
diff --git a/src/components/Dataset/DatasetTable.js b/src/components/Dataset/DatasetTable.js
index a60d4b61..a1025288 100644
--- a/src/components/Dataset/DatasetTable.js
+++ b/src/components/Dataset/DatasetTable.js
@@ -4,6 +4,7 @@ import { OverlayTrigger, Tooltip } from 'react-bootstrap';
 import { VOLUME } from '../../constants/parameterTypes';
 import ResponsiveTable from '../Table/ResponsiveTable';
 import DatasetWidgetFactory from './DatasetWidgetFactory';
+import { getDatasetParameterValueByName } from '../../helpers';
 import {
   dateFormatter,
   volumeFormatter,
@@ -76,9 +77,16 @@ function DatasetTable(props) {
       text: 'Dataset',
       dataField: 'name',
       formatter: (_, dataset) => {
+        let datasetName = getDatasetParameterValueByName(
+          dataset,
+          'datasetName'
+        );
+        if (!datasetName) {
+          datasetName = dataset.name;
+        }
         return (
           <>
-            <span id={dataset.id}>{dataset.name}</span>
+            <span id={dataset.id}>{datasetName}</span>
           </>
         );
       },
-- 
GitLab