From 9b708f412ccc9779f67ee0cd85aca4b0f39d2070 Mon Sep 17 00:00:00 2001
From: pkupczyk <piotr.kupczyk@id.ethz.ch>
Date: Thu, 16 Mar 2023 17:12:43 +0100
Subject: [PATCH] SSDM-13133 : Add info to Admin UI : registrator,
registrationDate for plugins and queries
---
.../js/components/tools/common/PluginsGrid.jsx | 6 ++++++
.../js/components/tools/common/QueriesGrid.jsx | 6 ++++++
.../js/components/tools/search/ToolSearch.jsx | 6 ++++++
.../tools/search/ToolSearchComponentLoad.test.js | 16 ++++++++++++++++
4 files changed, 34 insertions(+)
diff --git a/ui-admin/src/js/components/tools/common/PluginsGrid.jsx b/ui-admin/src/js/components/tools/common/PluginsGrid.jsx
index 823b9a90eb0..176de73cf7b 100644
--- a/ui-admin/src/js/components/tools/common/PluginsGrid.jsx
+++ b/ui-admin/src/js/components/tools/common/PluginsGrid.jsx
@@ -4,6 +4,7 @@ import GridExportOptions from '@src/js/components/common/grid/GridExportOptions.
import PluginLink from '@src/js/components/common/link/PluginLink.jsx'
import UserLink from '@src/js/components/common/link/UserLink.jsx'
import EntityKind from '@src/js/components/common/dto/EntityKind.js'
+import date from '@src/js/common/date.js'
import openbis from '@src/js/services/openbis.js'
import messages from '@src/js/common/messages.js'
import logger from '@src/js/common/logger.js'
@@ -68,6 +69,11 @@ class PluginsGrid extends React.PureComponent {
renderValue: ({ value }) => {
return <UserLink userId={value} />
}
+ },
+ {
+ name: 'registrationDate',
+ label: messages.get(messages.REGISTRATION_DATE),
+ getValue: ({ row }) => date.format(row.registrationDate.value)
}
]}
rows={rows}
diff --git a/ui-admin/src/js/components/tools/common/QueriesGrid.jsx b/ui-admin/src/js/components/tools/common/QueriesGrid.jsx
index c280fea6ebb..6aea2cdf426 100644
--- a/ui-admin/src/js/components/tools/common/QueriesGrid.jsx
+++ b/ui-admin/src/js/components/tools/common/QueriesGrid.jsx
@@ -4,6 +4,7 @@ import GridExportOptions from '@src/js/components/common/grid/GridExportOptions.
import QueryLink from '@src/js/components/common/link/QueryLink.jsx'
import UserLink from '@src/js/components/common/link/UserLink.jsx'
import QueryType from '@src/js/components/common/dto/QueryType.js'
+import date from '@src/js/common/date.js'
import messages from '@src/js/common/messages.js'
import logger from '@src/js/common/logger.js'
@@ -62,6 +63,11 @@ class QueriesGrid extends React.PureComponent {
renderValue: ({ value }) => {
return <UserLink userId={value} />
}
+ },
+ {
+ name: 'registrationDate',
+ label: messages.get(messages.REGISTRATION_DATE),
+ getValue: ({ row }) => date.format(row.registrationDate.value)
}
]}
rows={rows}
diff --git a/ui-admin/src/js/components/tools/search/ToolSearch.jsx b/ui-admin/src/js/components/tools/search/ToolSearch.jsx
index d163ea3f000..60712c8a7da 100644
--- a/ui-admin/src/js/components/tools/search/ToolSearch.jsx
+++ b/ui-admin/src/js/components/tools/search/ToolSearch.jsx
@@ -115,6 +115,9 @@ class ToolSearch extends React.Component {
script: FormUtil.createField({ value: _.get(plugin, 'script') }),
registrator: FormUtil.createField({
value: _.get(plugin, 'registrator.userId')
+ }),
+ registrationDate: FormUtil.createField({
+ value: _.get(plugin, 'registrationDate')
})
}
})
@@ -158,6 +161,9 @@ class ToolSearch extends React.Component {
}),
registrator: FormUtil.createField({
value: _.get(query, 'registrator.userId')
+ }),
+ registrationDate: FormUtil.createField({
+ value: _.get(query, 'registrationDate')
})
}))
diff --git a/ui-admin/srcTest/js/components/tools/search/ToolSearchComponentLoad.test.js b/ui-admin/srcTest/js/components/tools/search/ToolSearchComponentLoad.test.js
index 3ac99554972..199bce638a5 100644
--- a/ui-admin/srcTest/js/components/tools/search/ToolSearchComponentLoad.test.js
+++ b/ui-admin/srcTest/js/components/tools/search/ToolSearchComponentLoad.test.js
@@ -80,6 +80,10 @@ async function testLoadWithSearchText(resultsFound) {
{
name: 'registrator',
label: 'Registrator'
+ },
+ {
+ name: 'registrationDate',
+ label: 'Registration Date'
}
],
rows: [
@@ -124,6 +128,10 @@ async function testLoadWithSearchText(resultsFound) {
{
name: 'registrator',
label: 'Registrator'
+ },
+ {
+ name: 'registrationDate',
+ label: 'Registration Date'
}
],
rows: [
@@ -167,6 +175,10 @@ async function testLoadWithSearchText(resultsFound) {
{
name: 'registrator',
label: 'Registrator'
+ },
+ {
+ name: 'registrationDate',
+ label: 'Registration Date'
}
],
rows: [
@@ -230,6 +242,10 @@ async function testLoadWithObjectType(resultsFound) {
{
name: 'registrator',
label: 'Registrator'
+ },
+ {
+ name: 'registrationDate',
+ label: 'Registration Date'
}
],
rows: resultsFound
--
GitLab