From 51ed3a4c2c4592a99c71c3f736b190896fb48823 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 19 Nov 2018 12:02:02 -0500 Subject: [PATCH] some of jake's feedback --- src/server/sparkd/user/UserServiceServer.cpp | 2 ++ src/web/ui/src/Controls/Button.fs | 8 ++++++++ src/web/ui/src/Users/View.fs | 13 +++++++++---- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/server/sparkd/user/UserServiceServer.cpp b/src/server/sparkd/user/UserServiceServer.cpp index 60fcbe60d..e1ffb1857 100644 --- a/src/server/sparkd/user/UserServiceServer.cpp +++ b/src/server/sparkd/user/UserServiceServer.cpp @@ -64,6 +64,8 @@ void UserServiceServer::authenticate_login(const api::user::AuthenticateLoginReq for (const auto& user : admin_data.result()->users()) { if (user.name() == req.login() && user.password() == req.password() && user.is_present()) { resp.set_is_valid(user.is_active()); + if(!resp.is_valid()) + resp.set_reason("User login privledges restricted, please contact your risk manager"); resp.set_user_id(user.id()); resp.mutable_token()->CopyFrom(api::auth::generate_token(user)); diff --git a/src/web/ui/src/Controls/Button.fs b/src/web/ui/src/Controls/Button.fs index 7caf22245..3352611a6 100644 --- a/src/web/ui/src/Controls/Button.fs +++ b/src/web/ui/src/Controls/Button.fs @@ -11,6 +11,14 @@ type IsDisabled = let isDisabled = function | Disabled -> true | Enabled -> false + +type IsHidden = + | Hidden + | Visible + +let isHidden = function + | Hidden -> true + | Visible -> false let boolToDisabledConverter d = match d with diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index d09196a38..131a72e2a 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -54,7 +54,8 @@ let generalTabView (model:Model) (dispatch:Msg->Unit) (readonly: bool)= |> List.map (fun a -> a.id.ToString(), a.name) |> Map.ofList - let can_create = model.can_create || model.this_username = Access.superuser + let can_create = model.can_create || (model.this_username = Access.superuser) + let can_login_disabled = readonly || (model.this_username = model.scratchUser.name) let modal = Modal.showCreate "Create User" (div [][ @@ -75,7 +76,7 @@ let generalTabView (model:Model) (dispatch:Msg->Unit) (readonly: bool)= Fields.password "Password" model.scratchUser.password [Disabled readonly] (Password >> UpdateField >> dispatch) Fields.text "Full Name" model.scratchUser.fullName [Disabled readonly] (FullName >> UpdateField >> dispatch) Fields.text "Company" model.scratchUser.company [Disabled readonly] (Company >> UpdateField >> dispatch) - Fields.checkbox "Can Login and Trade?" "Unchecking this stops the user from logging into Spark and entering orders" model.scratchUser.isActive [Disabled readonly] (IsActive >> UpdateField >> dispatch) + Fields.checkbox "Can Login and Trade?" "Unchecking this stops the user from logging into Spark and entering orders" model.scratchUser.isActive [Disabled can_login_disabled] (IsActive >> UpdateField >> dispatch) Fields.checkbox "Can Create?" "Checking this allows the user to create other users and accounts" model.scratchUser.canCreate [Disabled (readonly || not can_create)] (CanCreate >> UpdateField >> dispatch) (if (State.isNewUser model.scratchUser) then modal else span[][]) ] @@ -182,7 +183,8 @@ let MarketDataTabView (model:Model) (dispatch:Msg->Unit) (readonly:bool) = div [Style [Padding " .5em 1em"]] micList h3 [Class "is-size-4"] [ str "Designations" ] - Fields.enumSelect "Pro / Non-Pro" (toHuman false ProfessionalDesignation.values cmeData.proNonpro) (allToHuman false ProfessionalDesignation.values) [Disabled readonly] (fromHuman ProfessionalDesignation.values>>UserField.CMEProNonPro>>send) + //Pico recommends we hide this for the ICE + //Fields.enumSelect "Pro / Non-Pro" (toHuman false ProfessionalDesignation.values cmeData.proNonpro) (allToHuman false ProfessionalDesignation.values) [Disabled readonly] (fromHuman ProfessionalDesignation.values>>UserField.CMEProNonPro>>send) Fields.enumSelect "Display / Non-Display" (toHuman false DisplayDesignation.values cmeData.displayNondisplay) (allToHuman false DisplayDesignation.values) [Disabled readonly] (fromHuman DisplayDesignation.values>>UserField.CMEDisplayNonDisplay>>send) ] @@ -358,7 +360,10 @@ let NavRoot (usersList:BTSUser list) (currentUser:BTSUser) model (dispatch:Msg-> [ p [ Class "menu-label" ] [ span [Class "is-size-4"] [str "Users"] span [ Class "is-pulled-right circle-icon" ] - [ Button.fabutton "Add User" "plus-circle" "" Button.Enabled (fun _ -> dispatch AddUser) ] + [ Button.fabutton "Add User" "plus-circle" "" + ( if currentUser.canCreate then Button.Enabled else Button.Disabled) + (fun _ -> dispatch AddUser) + ] ] ul [ Class "menu-list" ]