From 857b9529178950df565689d091704b8fc228f2c6 Mon Sep 17 00:00:00 2001 From: Lisa Knox Date: Thu, 14 Mar 2024 10:22:22 -0400 Subject: [PATCH] 21507: removed word wrap on collection owner field Arvados-DCO-1.1-Signed-off-by: Lisa Knox --- .../data-explorer/renderers.tsx | 29 +++++++++++++++++++ .../collection-panel/collection-panel.tsx | 4 +-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/services/workbench2/src/views-components/data-explorer/renderers.tsx b/services/workbench2/src/views-components/data-explorer/renderers.tsx index 4ecbc7e10b..478dd18601 100644 --- a/services/workbench2/src/views-components/data-explorer/renderers.tsx +++ b/services/workbench2/src/views-components/data-explorer/renderers.tsx @@ -921,6 +921,33 @@ const _resourceWithName = withStyles( ); }); +const _resourceWithNameWrap = withStyles( + {}, + { withTheme: true } +)((props: { uuid: string; userFullname: string; dispatch: Dispatch; theme: ArvadosTheme }) => { + const { uuid, userFullname, dispatch, theme } = props; + if (userFullname === "") { + dispatch(loadResource(uuid, false)); + return ( + + {uuid} + + ); + } + + return ( + + {userFullname} ({uuid}) + + ); +}); + const _resourceWithNameLink = withStyles( {}, { withTheme: true } @@ -949,6 +976,8 @@ export const ResourceOwnerWithName = ownerFromResourceId(_resourceWithName); export const ResourceWithName = userFromID(_resourceWithName); +export const ResourceWithNameWrap = userFromID(_resourceWithNameWrap); + export const UserNameFromID = compose(userFromID)((props: { uuid: string; displayAsText?: string; userFullname: string; dispatch: Dispatch }) => { const { uuid, userFullname, dispatch } = props; diff --git a/services/workbench2/src/views/collection-panel/collection-panel.tsx b/services/workbench2/src/views/collection-panel/collection-panel.tsx index 28983457e6..6a50442a34 100644 --- a/services/workbench2/src/views/collection-panel/collection-panel.tsx +++ b/services/workbench2/src/views/collection-panel/collection-panel.tsx @@ -34,7 +34,7 @@ import { UserResource } from 'models/user'; import { getUserUuid } from 'common/getuser'; import { Link } from 'react-router-dom'; import { Link as ButtonLink } from '@material-ui/core'; -import { ResourceWithName, ResponsiblePerson } from 'views-components/data-explorer/renderers'; +import { ResourceWithNameWrap, ResponsiblePerson } from 'views-components/data-explorer/renderers'; import { MPVContainer, MPVPanelContent, MPVPanelState } from 'components/multi-panel-view/multi-panel-view'; import { resourceIsFrozen } from 'common/frozen-resources'; import { NotFoundView } from 'views/not-found-panel/not-found-panel'; @@ -307,7 +307,7 @@ export const CollectionDetailsAttributes = (props: CollectionDetailsProps) => { } /> + uuidEnhancer={(uuid: string) => } />
-- 2.30.2