18123: Add isActive checkbox to group member list for user members

[arvados-workbench2.git] / src / views / group-details-panel / group-details-panel.tsx

diff --git a/src/views/group-details-panel/group-details-panel.tsx b/src/views/group-details-panel/group-details-panel.tsx
index f292b97ba1d7ed3389ae14a999d760e61a7de0bf..7b06a6933a9b9e220dbf615640580d3af0bc7e0d 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 { ResourceLinkHeadUuid, ResourceLinkTailUuid, ResourceLinkTailEmail, ResourceLinkTailUsername, ResourceLinkName, ResourceLinkHead, ResourceLinkTail, ResourceLinkDelete } from 'views-components/data-explorer/renderers';
+import { ResourceLinkHeadUuid, ResourceLinkTailUuid, ResourceLinkTailEmail, ResourceLinkTailUsername, ResourceLinkHeadPermissionLevel, ResourceLinkTailPermissionLevel, ResourceLinkHead, ResourceLinkTail, ResourceLinkDelete, ResourceLinkTailIsActive } from 'views-components/data-explorer/renderers';
 import { createTree } from 'models/tree';
 import { noop } from 'lodash/fp';
 import { RootState } from 'store/store';
@@ -21,10 +21,11 @@ import { AddIcon } from 'components/icon/icon';
 
 export enum GroupDetailsPanelMembersColumnNames {
     FULL_NAME = "Name",
-    UUID = "UUID",
-    EMAIL = "Email",
     USERNAME = "Username",
+    EMAIL = "Email",
+    ACTIVE = "User Active",
     PERMISSION = "Permission",
+    UUID = "UUID",
     REMOVE = "Remove",
 }
 
@@ -57,12 +58,19 @@ export const groupDetailsMembersPanelColumns: DataColumns<string> = [
         filters: createTree(),
         render: uuid => <ResourceLinkTailEmail uuid={uuid} />
     },
+    {
+        name: GroupDetailsPanelMembersColumnNames.ACTIVE,
+        selected: true,
+        configurable: true,
+        filters: createTree(),
+        render: uuid => <ResourceLinkTailIsActive uuid={uuid} />
+    },
     {
         name: GroupDetailsPanelMembersColumnNames.PERMISSION,
         selected: true,
         configurable: true,
         filters: createTree(),
-        render: uuid => <ResourceLinkName uuid={uuid} />
+        render: uuid => <ResourceLinkTailPermissionLevel uuid={uuid} />
     },
     {
         name: GroupDetailsPanelMembersColumnNames.UUID,
@@ -93,7 +101,7 @@ export const groupDetailsPermissionsPanelColumns: DataColumns<string> = [
         selected: true,
         configurable: true,
         filters: createTree(),
-        render: uuid => <ResourceLinkName uuid={uuid} />
+        render: uuid => <ResourceLinkHeadPermissionLevel uuid={uuid} />
     },
     {
         name: GroupDetailsPanelPermissionsColumnNames.UUID,
@@ -153,8 +161,8 @@ export const GroupDetailsPanel = connect(
                           id={GROUP_DETAILS_MEMBERS_PANEL_ID}
                           onRowClick={noop}
                           onRowDoubleClick={noop}
-                          onContextMenu={this.handleContextMenu}
-                          contextMenuColumn={true}
+                          onContextMenu={noop}
+                          contextMenuColumn={false}
                           hideColumnSelector
                           hideSearchInput
                           actions={
@@ -176,20 +184,10 @@ export const GroupDetailsPanel = connect(
                           id={GROUP_DETAILS_PERMISSIONS_PANEL_ID}
                           onRowClick={noop}
                           onRowDoubleClick={noop}
-                          onContextMenu={this.handleContextMenu}
-                          contextMenuColumn={true}
+                          onContextMenu={noop}
+                          contextMenuColumn={false}
                           hideColumnSelector
                           hideSearchInput
-                          actions={
-                              <Grid container justify='flex-end'>
-                                  <Button
-                                      variant="contained"
-                                      color="primary"
-                                      onClick={this.props.onAddUser}>
-                                      <AddIcon /> Add user
-                              </Button>
-                              </Grid>
-                          }
                           paperProps={{
                               elevation: 0,
                           }} />