diff --git a/ui-admin/src/js/components/tools/common/PluginsGrid.jsx b/ui-admin/src/js/components/tools/common/PluginsGrid.jsx index 823b9a90eb018778a1fd1b356b0ef95267423fb3..176de73cf7bc0dc25bde99b80b90d5c4af40b191 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 c280fea6ebb05f56ed65d51b6a7d70e88b9a5d02..6aea2cdf426f4f188780699fd778119648aa5160 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 d163ea3f000d69842425aa5868900ec2bdbb47dc..60712c8a7da57a4e87f9f239bcddcb6bc976ec56 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 3ac995549720b26af7deade9454947340cc04fe0..199bce638a58b174e54bef4fafc143c84833e939 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