From d5f18198d2750fb2a4613846a9885f7b74b6ca93 Mon Sep 17 00:00:00 2001 From: Laurence Maultsby Date: Tue, 9 May 2017 12:33:00 -0400 Subject: [PATCH] User Management Dashboard: User info row striping Added status colum to user table Edit mode shows only editable things Update button moved to right hand side Added cancel button to create user Signed-off-by: Laurence Maultsby --- .../framework/widgets/form_controls/input.jsx | 3 -- .../src/dashboard/dashboard.jsx | 29 +++++++++++++------ .../src/dashboard/userMgmt.scss | 10 ++++++- .../src/dashboard/userMgmtStore.js | 3 ++ 4 files changed, 32 insertions(+), 13 deletions(-) diff --git a/skyquake/framework/widgets/form_controls/input.jsx b/skyquake/framework/widgets/form_controls/input.jsx index 9b5e685bb..df0759731 100644 --- a/skyquake/framework/widgets/form_controls/input.jsx +++ b/skyquake/framework/widgets/form_controls/input.jsx @@ -95,9 +95,6 @@ export default class Input extends Component { function buildRadioButtons(props) { let className = 'sqCheckBox'; - if (props.className) { - className = `${className} ${props.className}`; - } return(
{ diff --git a/skyquake/plugins/user_management/src/dashboard/dashboard.jsx b/skyquake/plugins/user_management/src/dashboard/dashboard.jsx index 30ee04d0f..7af061421 100644 --- a/skyquake/plugins/user_management/src/dashboard/dashboard.jsx +++ b/skyquake/plugins/user_management/src/dashboard/dashboard.jsx @@ -224,13 +224,14 @@ class UserManagementDashboard extends React.Component { state.isEdit ? ( -
{state.users && state.users.map((u, k) => { let platformRoles = []; @@ -269,6 +273,9 @@ class UserManagementDashboard extends React.Component {
{u['user-domain']}
+
+ {u['disabled'] ? "DISABLED" : "ENABLED"} +
@@ -288,14 +295,18 @@ class UserManagementDashboard extends React.Component { style={{marginBottom: 0}} hasCloseButton={this.closePanel} no-corners> - - { - this.state.isEdit ? - null - : - } - - + { + (!state.isEditUser || state.isReadOnly) ? + + : null + } + { + (!state.isEditUser || state.isReadOnly) ? + + : null + } +