From dfac252e5d6639c0bc6f106f1985fcdcd7402376 Mon Sep 17 00:00:00 2001 From: Stephen Smith Date: Tue, 14 Dec 2021 10:01:32 -0500 Subject: [PATCH] 18123: Fix incorrect label on role group members in groups. Arvados-DCO-1.1-Signed-off-by: Stephen Smith --- src/common/labels.ts | 2 ++ src/views-components/data-explorer/renderers.tsx | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/common/labels.ts b/src/common/labels.ts index f534bd2b..682513fb 100644 --- a/src/common/labels.ts +++ b/src/common/labels.ts @@ -11,6 +11,8 @@ export const resourceLabel = (type: string, subtype = '') => { case ResourceKind.PROJECT: if (subtype === "filter") { return "Filter group"; + } else if (subtype === "role") { + return "Group"; } return "Project"; case ResourceKind.PROCESS: diff --git a/src/views-components/data-explorer/renderers.tsx b/src/views-components/data-explorer/renderers.tsx index 11752a5a..901704d9 100644 --- a/src/views-components/data-explorer/renderers.tsx +++ b/src/views-components/data-explorer/renderers.tsx @@ -366,7 +366,7 @@ const renderResourceLink = (dispatch: Dispatch, item: Resource) => { var displayName = getResourceDisplayName(item); return dispatch(navigateTo(item.uuid))}> - {resourceLabel(item.kind)}: {displayName || item.uuid} + {resourceLabel(item.kind, item && item.kind === ResourceKind.GROUP ? (item as GroupResource).groupClass || '' : '')}: {displayName || item.uuid} ; }; -- 2.30.2