From bfa4100c65e42b217aa88a508ca9d97aa540937c Mon Sep 17 00:00:00 2001
From: Markus Scheidgen <markus.scheidgen@gmail.com>
Date: Wed, 12 Feb 2020 11:45:34 +0100
Subject: [PATCH] Order and selection of ids/metadata in repo entry details and
view.
---
gui/src/components/entry/RepoEntryView.js | 8 ++++----
gui/src/components/search/EntryList.js | 14 +++-----------
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/gui/src/components/entry/RepoEntryView.js b/gui/src/components/entry/RepoEntryView.js
index dfacf94057..1ed9e22d1a 100644
--- a/gui/src/components/entry/RepoEntryView.js
+++ b/gui/src/components/entry/RepoEntryView.js
@@ -132,16 +132,16 @@ class RepoEntryView extends React.Component {
<Quantity column style={{maxWidth: 350}}>
<Quantity quantity="calc_id" label={`${domain.entryLabel} id`} noWrap withClipboard {...quantityProps} />
<Quantity quantity="pid" label='PID' loading={loading} placeholder="not yet assigned" noWrap {...quantityProps} withClipboard />
+ <Quantity quantity="raw_id" label='raw id' loading={loading} noWrap {...quantityProps} withClipboard />
+ <Quantity quantity="external_id" label='external id' loading={loading} noWrap {...quantityProps} withClipboard />
+ <Quantity quantity="mainfile" loading={loading} noWrap ellipsisFront {...quantityProps} withClipboard />
+ <Quantity quantity="calc_hash" label={`${domain.entryLabel} hash`} loading={loading} noWrap {...quantityProps} />
<Quantity quantity="upload_id" label='upload id' {...quantityProps} noWrap withClipboard />
<Quantity quantity="upload_time" label='upload time' noWrap {...quantityProps} >
<Typography noWrap>
{new Date(calcData.upload_time * 1000).toLocaleString()}
</Typography>
</Quantity>
- <Quantity quantity='mainfile' loading={loading} noWrap ellipsisFront {...quantityProps} withClipboard />
- <Quantity quantity="calc_hash" label={`${domain.entryLabel} hash`} loading={loading} noWrap {...quantityProps} />
- <Quantity quantity="raw_id" label='raw id' loading={loading} noWrap {...quantityProps} withClipboard />
- <Quantity quantity="external_id" label='external id' loading={loading} noWrap {...quantityProps} withClipboard />
<Quantity quantity="last_processing" label='last processing' loading={loading} placeholder="not processed" noWrap {...quantityProps}>
<Typography noWrap>
{new Date(calcData.last_processing * 1000).toLocaleString()}
diff --git a/gui/src/components/search/EntryList.js b/gui/src/components/search/EntryList.js
index 391739a814..6fea8de227 100644
--- a/gui/src/components/search/EntryList.js
+++ b/gui/src/components/search/EntryList.js
@@ -264,18 +264,10 @@ export class EntryListUnstyled extends React.Component {
<Quantity column >
{/* <Quantity quantity="pid" label='PID' placeholder="not yet assigned" noWrap data={row} withClipboard /> */}
<Quantity quantity="calc_id" label={`${domain.entryLabel} id`} noWrap withClipboard data={row} />
- <Quantity quantity="upload_id" label='upload id' data={row} noWrap withClipboard />
+ <Quantity quantity="raw_id" label={`raw id`} noWrap withClipboard data={row} />
+ <Quantity quantity="external_id" label={`external id`} noWrap withClipboard data={row} />
<Quantity quantity='mainfile' noWrap ellipsisFront data={row} withClipboard />
- <Quantity quantity="upload_time" label='upload time' noWrap data={row} >
- <Typography noWrap>
- {new Date(row.upload_time * 1000).toLocaleString()}
- </Typography>
- </Quantity>
- <Quantity quantity="last_processing" label='processing version' noWrap placeholder="not processed" data={row}>
- <Typography noWrap>
- {row.nomad_version}/{row.nomad_commit}
- </Typography>
- </Quantity>
+ <Quantity quantity="upload_id" label='upload id' data={row} noWrap withClipboard />
</Quantity>
</div>
</div>
--
GitLab