18123: List all permission links in group members list & cleanup.

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

diff --git a/src/store/group-details-panel/group-details-panel-members-middleware-service.ts b/src/store/group-details-panel/group-details-panel-members-middleware-service.ts
index e295579a102dd22accd5d21953b7020afbbab2bf..23f0bbfd133da52062fcb99d67d2e92e8d306234 100644 (file)
--- a/src/store/group-details-panel/group-details-panel-members-middleware-service.ts
+++ b/src/store/group-details-panel/group-details-panel-members-middleware-service.ts
@@ -44,7 +44,7 @@ export class GroupDetailsPanelMembersMiddlewareService extends DataExplorerMiddl
 
                 api.dispatch(GroupMembersPanelActions.SET_ITEMS({
                     ...listResultsToDataExplorerItemsMeta(permissions),
-                    items: users.items.map(item => item.uuid),
+                    items: permissions.items.map(item => item.uuid),
                 }));
             } catch (e) {
                 api.dispatch(couldNotFetchGroupDetailsContents());

diff --git a/src/views-components/data-explorer/renderers.tsx b/src/views-components/data-explorer/renderers.tsx
index 99ca02d49aa97ec484128047377f7f7ec82914ff..05ae4ce29858833ab2377d7c3d15f2ad1d077ed5 100644 (file)
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@ -303,7 +303,7 @@ export const ResourceLinkClass = connect(
 const renderLink = (dispatch: Dispatch, item: Resource) => {
     var displayName = '';
 
-    if ((item as UserResource).kind == ResourceKind.USER
+    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);

diff --git a/src/views/group-details-panel/group-details-panel.tsx b/src/views/group-details-panel/group-details-panel.tsx
index 3baff57973544c6ef96c7d3c9e912147fc82aa91..5b1a884e0dff2ecb2c9d8306ecc5c72ee804476b 100644 (file)
--- a/src/views/group-details-panel/group-details-panel.tsx
+++ b/src/views/group-details-panel/group-details-panel.tsx
@@ -7,7 +7,7 @@ import { connect } from 'react-redux';
 
 import { DataExplorer } from "views-components/data-explorer/data-explorer";
 import { DataColumns } from 'components/data-table/data-table';
-import { ResourceFullName, ResourceUuid, ResourceEmail, ResourceUsername, ResourceLinkName, ResourceLinkHead, ResourceName } from 'views-components/data-explorer/renderers';
+import { ResourceUuid, ResourceEmail, ResourceUsername, ResourceLinkName, ResourceLinkHead, ResourceLinkTail } from 'views-components/data-explorer/renderers';
 import { createTree } from 'models/tree';
 import { noop } from 'lodash/fp';
 import { RootState } from 'store/store';
@@ -38,7 +38,7 @@ export const groupDetailsMembersPanelColumns: DataColumns<string> = [
         selected: true,
         configurable: true,
         filters: createTree(),
-        render: uuid => <ResourceFullName uuid={uuid} />
+        render: uuid => <ResourceLinkTail uuid={uuid} />
     },
     {
         name: GroupDetailsPanelMembersColumnNames.USERNAME,