Surface super user statuson user views. (#238)

* Surface super user statuson user views.
ansible · Nov 11, 2020 · d135913 · d135913
1 parent 084aea4
commit d135913
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 2 deletions.
diff --git a/src/api/response-types/user.ts b/src/api/response-types/user.ts
@@ -45,6 +45,7 @@ export class UserType {
   date_joined?: string;
   password?: string;
   model_permissions?: Permissions;
+  is_superuser?: boolean;
 }
 
 export class MeType {

diff --git a/src/components/user-form/user-form.tsx b/src/components/user-form/user-form.tsx
@@ -6,8 +6,12 @@ import {
   TextInput,
   ActionGroup,
   Button,
+  Tooltip,
+  Checkbox,
 } from '@patternfly/react-core';
 
+import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
+
 import { APISearchTypeAhead } from '../../components';
 
 import { UserType, GroupAPI } from '../../api';
@@ -147,6 +151,28 @@ export class UserForm extends React.Component<IProps, IState> {
           />
         </FormGroup>
 
+        <FormGroup
+          fieldId='is_superuser'
+          label='Super user'
+          labelIcon={
+            <Tooltip
+              content={
+                'Super users have all system permissions regardless of' +
+                ' their group. Adding new super users is not permitted.'
+              }
+            >
+              <OutlinedQuestionCircleIcon size='sm' />
+            </Tooltip>
+          }
+        >
+          <Checkbox
+            id='is_superuser'
+            isDisabled
+            isChecked={user.is_superuser}
+            label='Is super user'
+          />
+        </FormGroup>
+
         {!isReadonly && (
           <ActionGroup>
             <Button

diff --git a/src/containers/settings/user-profile.tsx b/src/containers/settings/user-profile.tsx
@@ -109,7 +109,7 @@ class UserProfile extends React.Component<RouteComponentProps, IState> {
         //redirect to login page when password is changed
         if (user.password) {
           this.props.history.push(Paths.login);
-        };
+        }
       })
       .catch(err => {
         this.setState({ errorMessages: mapErrorMessages(err) });

diff --git a/src/containers/user-management/user-list.tsx b/src/containers/user-management/user-list.tsx
@@ -20,9 +20,11 @@ import {
   Title,
   EmptyStateBody,
   EmptyStateVariant,
+  Label,
+  Tooltip,
 } from '@patternfly/react-core';
 
-import { WarningTriangleIcon } from '@patternfly/react-icons';
+import { WarningTriangleIcon, UserPlusIcon } from '@patternfly/react-icons';
 
 import { UserAPI, UserType } from '../../api';
 import { ParamHelper } from '../../utilities';
@@ -246,6 +248,11 @@ class UserList extends React.Component<RouteComponentProps, IState> {
           type: 'alpha',
           id: 'first_name',
         },
+        {
+          id: 'groups',
+          title: 'Groups',
+          type: 'none',
+        },
         {
           title: 'Created',
           type: 'numeric',
@@ -308,10 +315,23 @@ class UserList extends React.Component<RouteComponentProps, IState> {
           <Link to={formatPath(Paths.userDetail, { userID: user.id })}>
             {user.username}
           </Link>
+
+          {user.is_superuser && (
+            <Tooltip content='Super users have all system permissions regardless of what groups they are in.'>
+              <Label icon={<UserPlusIcon />} color='orange'>
+                Super user
+              </Label>
+            </Tooltip>
+          )}
         </td>
         <td>{user.email}</td>
         <td>{user.last_name}</td>
         <td>{user.first_name}</td>
+        <td>
+          {user.groups.map(g => (
+            <Label>{g.name}</Label>
+          ))}
+        </td>
         <td>{moment(user.date_joined).fromNow()}</td>
         <td>
           {dropdownItems.length > 0 ? (