18123: Fix incorrect label on role group members in groups.

Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen@curii.com>

diff --git a/src/common/labels.ts b/src/common/labels.ts
index f534bd2b4e30546bb8740a8e354cde6a0fef0903..682513fb165e31105363a71decf7c2b4a74fa8fe 100644 (file)
--- 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 11752a5a6ae4b1c4956e7bbde04b73f3e44039dd..901704d9feafc906acd4535fa3c980a2ff88c280 100644 (file)
--- 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 <Typography noWrap color="primary" style={{ 'cursor': 'pointer' }} onClick={() => dispatch<any>(navigateTo(item.uuid))}>
-        {resourceLabel(item.kind)}: {displayName || item.uuid}
+        {resourceLabel(item.kind, item && item.kind === ResourceKind.GROUP ? (item as GroupResource).groupClass || '' : '')}: {displayName || item.uuid}
     </Typography>;
 };