[ARVADOS-WORKBENCH2] updated: 2.2.1-110-g947756fb

[Git user]

Summary of changes:
 src/views-components/data-explorer/renderers.tsx | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

       via  947756fba487bd88f7b010424787a7409361f372 (commit)
      from  d49c6b766b22d3fe340f72346b5bd142822be976 (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 947756fba487bd88f7b010424787a7409361f372
Author: Stephen Smith <stephen at curii.com>
Date:   Wed Oct 13 13:56:10 2021 -0400

    18123: Improve checking of group permission head type for permissions list
    
    Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>

diff --git a/src/views-components/data-explorer/renderers.tsx b/src/views-components/data-explorer/renderers.tsx
index 6766d4c0..99ca02d4 100644
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@ -301,11 +301,18 @@ export const ResourceLinkClass = connect(
 // };
 
 const renderLink = (dispatch: Dispatch, item: Resource) => {
-    const name = (item as LinkResource).name;
-    const fullName = getUserDisplayName(item as UserResource);
+    var displayName = '';
+
+    if ((item as UserResource).kind == ResourceKind.USER
+          && typeof (item as UserResource).firstName !== 'undefined') {
+        // We can be sure the resource is UserResource
+        displayName = getUserDisplayName(item as UserResource);
+    } else {
+        displayName = (item as GroupContentsResource).name;
+    }
 
     return <Typography noWrap color="primary" style={{ 'cursor': 'pointer' }} onClick={() => dispatch<any>(navigateTo(item.uuid))}>
-        {resourceLabel(item.kind)}: {name || fullName || item.uuid}
+        {resourceLabel(item.kind)}: {displayName || item.uuid}
     </Typography>;
 }
 

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


hooks/post-receive
--