[ARVADOS-WORKBENCH2] updated: 2.3.0-55-gdfac252e

Git user git at public.arvados.org
Tue Dec 14 15:01:51 UTC 2021


Summary of changes:
 src/common/labels.ts                             | 2 ++
 src/views-components/data-explorer/renderers.tsx | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

       via  dfac252e5d6639c0bc6f106f1985fcdcd7402376 (commit)
      from  311448f71e5a5cc1ffcfe6d5b7c5214fa196f1b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit dfac252e5d6639c0bc6f106f1985fcdcd7402376
Author: Stephen Smith <stephen at curii.com>
Date:   Tue Dec 14 10:01:32 2021 -0500

    18123: Fix incorrect label on role group members in groups.
    
    Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>

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 <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>;
 };
 

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list