From b432a12edd77620e0a646152698464d6574c0fe4 Mon Sep 17 00:00:00 2001 From: Alex P Date: Wed, 1 Nov 2017 16:32:01 -0700 Subject: [PATCH] Render SuperAdmin column in Chronograf Admin Table based on Authorization --- ui/src/admin/components/chronograf/OrgTableRow.js | 10 +++++++--- ui/src/admin/components/chronograf/UsersTable.js | 6 +++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ui/src/admin/components/chronograf/OrgTableRow.js b/ui/src/admin/components/chronograf/OrgTableRow.js index 6d37178e05..d8fbf0434c 100644 --- a/ui/src/admin/components/chronograf/OrgTableRow.js +++ b/ui/src/admin/components/chronograf/OrgTableRow.js @@ -1,5 +1,7 @@ import React, {PropTypes} from 'react' +import Authorized, {SUPERADMIN_ROLE} from 'src/auth/Authorized' + import Dropdown from 'shared/components/Dropdown' import { @@ -79,9 +81,11 @@ const OrgTableRow = ({ : 'N/A'} - - {user.superadmin ? 'Yes' : '--'} - + + + {user.superadmin ? 'Yes' : '--'} + + {user.provider} diff --git a/ui/src/admin/components/chronograf/UsersTable.js b/ui/src/admin/components/chronograf/UsersTable.js index ba584b88a5..f1d7f01cd9 100644 --- a/ui/src/admin/components/chronograf/UsersTable.js +++ b/ui/src/admin/components/chronograf/UsersTable.js @@ -2,6 +2,8 @@ import React, {Component, PropTypes} from 'react' import _ from 'lodash' +import Authorized, {SUPERADMIN_ROLE} from 'src/auth/Authorized' + import UsersTableRow from 'src/admin/components/chronograf/UsersTableRow' import OrgTableRow from 'src/admin/components/chronograf/OrgTableRow' @@ -54,7 +56,9 @@ class ChronografUsersTable extends Component { Username Organization Role - SuperAdmin + + SuperAdmin + Provider Scheme