From: Stephen Smith Date: Wed, 13 Oct 2021 21:07:27 +0000 (-0400) Subject: 18123: List all permission links in group members list & cleanup. X-Git-Tag: 2.4.0~22^2~38 X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/8a6c5e3b1ac52cdd6e7e07f8349da92b31216c76 18123: List all permission links in group members list & cleanup. Arvados-DCO-1.1-Signed-off-by: Stephen Smith --- 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 e295579a..23f0bbfd 100644 --- 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 99ca02d4..05ae4ce2 100644 --- 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 3baff579..5b1a884e 100644 --- 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 = [ selected: true, configurable: true, filters: createTree(), - render: uuid => + render: uuid => }, { name: GroupDetailsPanelMembersColumnNames.USERNAME,