diff --git a/src/client/spark/Admin/AdminModel.cs b/src/client/spark/Admin/AdminModel.cs index ebf235a1c..da1ae42f4 100644 --- a/src/client/spark/Admin/AdminModel.cs +++ b/src/client/spark/Admin/AdminModel.cs @@ -36,7 +36,7 @@ namespace mbts.spark { IEnumerable active_accounts = from admin_data in update.all from bts_account in admin_data.Accounts - where bts_account.IsPresent + where bts_account.IsPresent && _wrapper_subject.Value.can_view_account(bts_account.Name) join account_id in ( from bts_user in active_users from account_id in bts_user.UserData.AccountPermissions.AccountPermissions.Keys diff --git a/src/client/spark/Orders/OrderTypeVMs/LeanOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/LeanOrderVM.cs index 0c436a742..3b884d8ff 100644 --- a/src/client/spark/Orders/OrderTypeVMs/LeanOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/LeanOrderVM.cs @@ -25,7 +25,7 @@ namespace mbts.spark cross_threshold = new InlineUserProperty( new bts.spark.QuantityMeasure() { Ratio = 1.0, Absolute = 1}, false); max_chase_ticks = new InlineUserProperty(2, false); - trade_toward_behavior = new InlineUserProperty(LeanOrderDefinition.Types.OnToward.Cancel, false); + trade_toward_behavior = new InlineUserProperty(LeanOrderDefinition.Types.OnToward.NoChange, false); } public readonly InlineUserProperty selected_child_order_type; public readonly InlineUserProperty> child_order_types; @@ -47,7 +47,7 @@ namespace mbts.spark public bts.spark.QuantityMeasure cross_threshold { get; set; } = new bts.spark.QuantityMeasure() { Ratio = 1.0, Absolute = 1 }; public uint max_chase_ticks { get; set; } = 2; - public LeanOrderDefinition.Types.OnToward trade_toward_behavior { get; set; } = LeanOrderDefinition.Types.OnToward.Cancel; + public LeanOrderDefinition.Types.OnToward trade_toward_behavior { get; set; } = LeanOrderDefinition.Types.OnToward.NoChange; public LeanOrderVM(OrdersModel model, IObservable security_md_source, string id, string display_name) : this(model, security_md_source, security_md_source.Select(smd => diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 90ed995df..68432d9c3 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -125,4 +125,4 @@ if (WIN32) include(${CMAKE_SOURCE_DIR}/tools/vs_filters.cmake) endif() - + \ No newline at end of file diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index fd6a904d0..7898aa5b1 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -57,6 +57,7 @@ message BTSUser{ string full_name = 42; string company = 44; bool is_active = 50; + bool can_create = 55; LicenseData license_data = 60; //unused LicenseEntitlements license_entitlements = 70; //unused BTSUserDerivableData user_data = 80; @@ -306,7 +307,9 @@ message CMEUserData{ string location = 90; ProfessionalDesignation pro_nonpro = 100; DisplayDesignation display_nondisplay = 110; - // add suff here + + enum AdminDisplay { All = 0; MD = 1; Routing = 2; None = 100; } + AdminDisplay admin_display_flag = 120; repeated CMEMicData md_permissions = 1000; } @@ -449,6 +452,10 @@ message AdminServiceCreateAccountResult { uint32 new_id = 30; } +message FilteredAdminDataRequest { + string token = 1; +} + service AdminService { option (bts.api.service_description) = "Provides a management interface to the user model"; // account @@ -462,6 +469,7 @@ service AdminService { // subscription rpc admin_data(bts.api.VoidMessage) returns (stream AdminData); rpc get_admin_data(bts.api.VoidMessage) returns (AdminData); + rpc get_filtered_admin_data(FilteredAdminDataRequest) returns (AdminData); // orders rpc get_order_summary(bts.api.VoidMessage) returns (OrdersSummary); rpc cancel_orders(OrderCancelRequest) returns (bts.api.VoidMessage); diff --git a/src/lib/api/services/UserService.proto b/src/lib/api/services/UserService.proto index cdfeee04b..f5aff089a 100644 --- a/src/lib/api/services/UserService.proto +++ b/src/lib/api/services/UserService.proto @@ -40,11 +40,6 @@ message GetUsersResponse { repeated User users = 1; string error = 2; } message AddOrUpdateUserRequest {AuthToken token = 1; User user = 2;} message RemoveUserRequest {AuthToken token = 1; string login = 2;} message UserOperationResponse { bool is_valid = 1; string reason = 2;} -message AdminAuthenticationData { - repeated string risk_admin_target_users = 1; - repeated string risk_admin_target_accounts = 2; - repeated string md_admin_target_users = 3; -} message AuthenticateLoginRequest {string login = 1; string password = 2;} message AuthenticateLoginResponse { @@ -52,7 +47,6 @@ message AuthenticateLoginResponse { string reason = 2; AuthToken token = 3; uint32 user_id = 4; - AdminAuthenticationData admin_data = 5; } message AuthenticateTokenRequest {AuthToken token = 1;} message AuthenticateTokenResponse {bool is_valid = 1; string reason = 2; User user = 3;} diff --git a/src/lib/utils/AuthToken.cpp b/src/lib/utils/AuthToken.cpp index e53c53eb9..5a10fa63c 100644 --- a/src/lib/utils/AuthToken.cpp +++ b/src/lib/utils/AuthToken.cpp @@ -12,6 +12,8 @@ user::AuthToken generate_token(const admin::BTSUser& user) { api::user::TokenPayload payload; payload.set_date(datetime::ll_now()); payload.set_id(user.id()); + if(user.name() == "bts") + payload.set_wheel(true); auto token = websocketpp::base64_encode(payload.SerializeAsString()); user::AuthToken result; result.set_token(token); diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index 528cfecff..f8cabe337 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -7,7 +7,9 @@ #include "lib/api/service_helpers/AdminServiceUtils.h" #include "lib/orderman/orderman_utils/orderman_utils.h" #include "lib/utils/TimeStamp.h" +#include "lib/utils/AuthToken.h" +#include #include #include #include @@ -120,6 +122,80 @@ void AdminServiceServer::get_admin_data(const bts::api::VoidMessage&, const api::Response& reply){ reply(_state); } + +void AdminServiceServer::get_filtered_admin_data(const bts::api::admin::FilteredAdminDataRequest& req, + const api::Response& reply) +{ + bts::api::user::TokenPayload toke; + if(bts::api::auth::decode_token(req.token(), &toke)) + { + if(toke.wheel()) + reply(_state); + else + { + const BTSUser* admin_user = AdminServiceUtils::find_user(_state, toke.id()); + AdminData filtered(_state); + boost::container::flat_map added_accounts, added_users; + filtered.clear_users(); + filtered.clear_accounts(); + if(admin_user && admin_user->has_user_data()) + { + const auto& permis = admin_user->user_data().account_permissions(); + for(const auto& map_entry : permis.account_permissions()) + { + auto acct_id = map_entry.first; + const bts::api::admin::UserAccountPermissionUnit& unit = map_entry.second; + const bts::api::admin::BTSAccount* acct = AdminServiceUtils::find_account(_state, acct_id, false); + if(!acct) + continue; + + std::vector users_for_account; + admin::AdminServiceUtils::find_users_for_trading_account(_state, acct_id, users_for_account); + if(unit.admin_permission().has_permissions()) + { + if(added_accounts.find(acct->name()) == added_accounts.end()) + { + added_accounts[acct->name()] = 0; + filtered.add_accounts()->CopyFrom(*acct); + for(const auto& acctuser : users_for_account) + { + if(added_users.find(acctuser->name()) == added_users.end()) + { + added_users[acctuser->name()] = 0; + const auto newuser = filtered.add_users(); + newuser->CopyFrom(*acctuser); + if(!unit.admin_permission().has_md_permissions()) + newuser->mutable_user_data()->mutable_exchange_user_data()-> + mutable_cme_data()->set_admin_display_flag(bts::api::admin::CMEUserData_AdminDisplay::CMEUserData_AdminDisplay_Routing); + else + newuser->mutable_user_data()->mutable_exchange_user_data()-> + mutable_cme_data()->set_admin_display_flag(bts::api::admin::CMEUserData_AdminDisplay::CMEUserData_AdminDisplay_All); + } + } + } + } + else if(unit.admin_permission().has_md_permissions()) + { + for(const auto& acctuser : users_for_account) + { + if(added_users.find(acctuser->name()) == added_users.end()) + { + added_users[acctuser->name()] = 0; + const auto newuser = filtered.add_users(); + newuser->CopyFrom(*acctuser); + newuser->mutable_user_data()->mutable_exchange_user_data()-> + mutable_cme_data()->set_admin_display_flag(bts::api::admin::CMEUserData_AdminDisplay::CMEUserData_AdminDisplay_MD); + } + } + } + } + } + reply(filtered); + } + } +} + + void AdminServiceServer::delete_user( const IDAPIArgument& id, const api::Response& reply){ diff --git a/src/server/sparkd/user/AdminServiceServer.h b/src/server/sparkd/user/AdminServiceServer.h index 32bbe126c..39e67eaea 100644 --- a/src/server/sparkd/user/AdminServiceServer.h +++ b/src/server/sparkd/user/AdminServiceServer.h @@ -52,6 +52,9 @@ public: void get_admin_data(const bts::api::VoidMessage& request, const api::Response& reply) override; + void get_filtered_admin_data(const bts::api::admin::FilteredAdminDataRequest& request, + const api::Response& reply) override; + void delete_user( const IDAPIArgument& request, const api::Response& reply) override; diff --git a/src/server/sparkd/user/UserServiceServer.cpp b/src/server/sparkd/user/UserServiceServer.cpp index 7b4e7fae9..e90d6644f 100644 --- a/src/server/sparkd/user/UserServiceServer.cpp +++ b/src/server/sparkd/user/UserServiceServer.cpp @@ -66,7 +66,6 @@ void UserServiceServer::authenticate_login(const api::user::AuthenticateLoginReq resp.set_is_valid(user.is_active()); resp.set_user_id(user.id()); resp.mutable_token()->CopyFrom(api::auth::generate_token(user)); - set_admin_data(resp, *admin_data.result(), user); respond(resp); return; } @@ -80,67 +79,6 @@ void UserServiceServer::authenticate_login(const api::user::AuthenticateLoginReq }); } -void UserServiceServer::set_admin_data(api::user::AuthenticateLoginResponse& resp, - bts::api::admin::AdminData admin_data, const bts::api::admin::BTSUser& admin_user) -{ - std::vector risk_accounts, risk_users, md_users; - if(!check_superuser(admin_data, admin_user, risk_accounts, risk_users, md_users)) - { - const auto& permis = admin_user.user_data().account_permissions(); - for(const auto& map_entry : permis.account_permissions()) - { - auto acct_id = map_entry.first; - const bts::api::admin::UserAccountPermissionUnit& unit = map_entry.second; - const bts::api::admin::BTSAccount* acct = admin::AdminServiceUtils::find_account(admin_data, acct_id, false); - if(!acct) - continue; - - std::vector users_for_account; - admin::AdminServiceUtils::find_users_for_trading_account(admin_data, acct_id, users_for_account); - if(unit.admin_permission().has_permissions()) - { - risk_accounts.push_back(acct->name()); - for(const auto& acctuser : users_for_account) - risk_users.push_back(acctuser->name()); - } - if(unit.admin_permission().has_md_permissions()) - { - for(const auto& acctuser : users_for_account) - md_users.push_back(acctuser->name()); - } - } - } - - resp.mutable_admin_data(); - for(const auto& ra : risk_accounts) - resp.mutable_admin_data()->add_risk_admin_target_accounts(ra); - for(const auto& ru : risk_users) - resp.mutable_admin_data()->add_risk_admin_target_users(ru); - for(const auto& mu : md_users) - resp.mutable_admin_data()->add_md_admin_target_users(mu); -} - -bool UserServiceServer::check_superuser(const bts::api::admin::AdminData& admin_data, const bts::api::admin::BTSUser& admin_user, - std::vector& risk_accounts, std::vector& risk_users, std::vector& md_users) -{ - if(admin_user.name() == "bts") - { - for(const auto& acc : admin::AdminServiceUtils::accounts(admin_data, false)) - { - risk_accounts.push_back(acc->name()); - std::vector users_for_account; - admin::AdminServiceUtils::find_users_for_trading_account(admin_data, acc->id(), users_for_account); - for(const auto& acctuser : users_for_account) - { - risk_users.push_back(acctuser->name()); - md_users.push_back(acctuser->name()); - } - } - return true; - } - else - return false; -} } } diff --git a/src/server/sparkd/user/UserServiceServer.h b/src/server/sparkd/user/UserServiceServer.h index 967e44003..431f6bf27 100644 --- a/src/server/sparkd/user/UserServiceServer.h +++ b/src/server/sparkd/user/UserServiceServer.h @@ -20,12 +20,6 @@ public: void authenticate_login(const api::user::AuthenticateLoginRequest& , const std::function& ) override; -private: - void set_admin_data(api::user::AuthenticateLoginResponse& resp, - bts::api::admin::AdminData admin_data, const bts::api::admin::BTSUser& user); - bool check_superuser(const bts::api::admin::AdminData& admin_data, const bts::api::admin::BTSUser& admin_user, - std::vector& risk_accounts, std::vector& risk_users, std::vector& md_users); - private: struct PImpl; std::unique_ptr me; diff --git a/src/web/ui/src/Access.fs b/src/web/ui/src/Access.fs index 9d3ba6411..a236143bc 100644 --- a/src/web/ui/src/Access.fs +++ b/src/web/ui/src/Access.fs @@ -5,10 +5,9 @@ open bts.api open Elmish open bts.api.orderman -let getAdminData (admin:IAdminService) (fsuc) (ffail) = +let getAdminData (admin:IAdminService) (token) (fsuc) (ffail) = Cmd.ofPromise - admin.get_admin_data - () + admin.get_filtered_admin_data { token = token } fsuc (fun e -> ffail e.Message) diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index e1d11ae06..4b43374d7 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -32,7 +32,8 @@ let init (context:ServiceContext.ServiceContext) = ConfirmModal = "", (Msg.SelectTab General) SelectedClipLimits = [] SelectedPositionLimits = [] - }, Access.getAdminData admin UpdateAdminData NoAdminData + token = context.token + }, Access.getAdminData admin context.token UpdateAdminData NoAdminData let existingSelection (scratch:BTSAccount) (previousScratch:BTSAccount) (data:AdminData) = List.choose id [ @@ -69,39 +70,39 @@ let applySIMUpdate (data:SIMAccountData) = function | ClearingAccount v -> { data with clearingAccount = v } | _ -> data -let saveAccount (admin:IAdminService) (account:BTSAccount) = promise { +let saveAccount (admin:IAdminService) (account:BTSAccount) (model:Model) = promise { let! result = admin.update_account { completeData = account } if result.isSuccess then - let! data = admin.get_admin_data() + let! data = admin.get_filtered_admin_data {token = model.token} return UpdateAdminData data else return ErrorOccured (sprintf "Error saving account: %s" result.errorText) } -let createAccount (admin:IAdminService) (account:BTSAccount) = promise { +let createAccount (admin:IAdminService) (account:BTSAccount) (model:Model) = promise { let args = { parentAccountId = 0u; accountName = account.name; description = account.description } let! result = admin.create_account args if result.isSuccess then - return! saveAccount admin { account with id = result.newId } + return! saveAccount admin { account with id = result.newId } model else return ErrorOccured (sprintf "Error creating account: %s" result.errorText) } -let deleteAccount (admin:IAdminService) (account:BTSAccount) = promise { +let deleteAccount (admin:IAdminService) (account:BTSAccount) (model:Model) = promise { let! result = admin.delete_account { id = account.id } if result.isSuccess then - let! data = admin.get_admin_data() + let! data = admin.get_filtered_admin_data {token = model.token} return UpdateAdminData data else return ErrorOccured (sprintf "Error deleting account: %s" result.errorText) } -let cancelOrders (admin:IAdminService) (accountName:string) (orders:OrdersSummaryUnit list) = promise { +let cancelOrders (admin:IAdminService) (accountName:string) (orders:OrdersSummaryUnit list) (model:Model) = promise { let users = (Array.map (fun (ord:OrdersSummaryUnit) -> ord.user) (Array.ofList orders)) let accounts = [| accountName |] let! result = admin.cancel_orders {accounts = accounts; users = users } - let! data = admin.get_admin_data() + let! data = admin.get_filtered_admin_data {token = model.token} return UpdateAdminData data } @@ -172,7 +173,7 @@ let update msg (model:Model) : Model * Cmd = | UpdateOrdersData summary -> {model with ordersData = List.ofArray summary.units}, Cmd.Empty | CancelOrders orders -> - model, Cmd.ofExistingPromise (cancelOrders model.admin model.scratch.name orders) id (box>>ErrorOccured) + model, Cmd.ofExistingPromise (cancelOrders model.admin model.scratch.name orders model ) id (box>>ErrorOccured) | SelectOrder (chckd, orders) -> let so = match chckd, orders.Length > 1 with | true, false -> (orders.[0]::model.SelectedOrders) @@ -185,15 +186,15 @@ let update msg (model:Model) : Model * Cmd = | DeleteAccount account -> let mdl = { model with OptionsMenuOpen = ""} match Fable.Import.Browser.window.confirm (sprintf "Are you sure you want to delete '%s'" account.name) with - | true -> mdl, Cmd.ofExistingPromise (deleteAccount model.admin account) id (box>>ErrorOccured) + | true -> mdl, Cmd.ofExistingPromise (deleteAccount model.admin account model ) id (box>>ErrorOccured) | false -> mdl, Cmd.Empty | AddAccount -> // Create a new scratch account. Send to server after user has filled in details { model with previousScratch = model.scratch; scratch = { emptyAccount with name = "New Account" } }, Cmd.ofMsg <| SelectTab General | SaveScratch -> match isNewAccount model.scratch with - | true -> model, Cmd.ofExistingPromise (createAccount model.admin model.scratch) id (box>>ErrorOccured) - | false -> model, Cmd.ofExistingPromise (saveAccount model.admin model.scratch) id (box>>ErrorOccured) + | true -> model, Cmd.ofExistingPromise (createAccount model.admin model.scratch model ) id (box>>ErrorOccured) + | false -> model, Cmd.ofExistingPromise (saveAccount model.admin model.scratch model ) id (box>>ErrorOccured) | ErrorOccured msg -> Global.alert Global.Error (string msg) Browser.console.log msg diff --git a/src/web/ui/src/Accounts/Types.fs b/src/web/ui/src/Accounts/Types.fs index a4eb88d62..6b64c0cd9 100644 --- a/src/web/ui/src/Accounts/Types.fs +++ b/src/web/ui/src/Accounts/Types.fs @@ -103,4 +103,5 @@ type Model = { SelectedPositionLimits: AccountProductPositionLimitUnit list OptionsMenuOpen:string ConfirmModal: string * Msg + token: string } \ No newline at end of file diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index ed74b8a34..de892c05b 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -729,13 +729,15 @@ let exchangeSettings model dispatch = let tabContent model dispatch = div [Key (string model.scratch.id); ClassName "is-tab-content"] [ - (match model.tab with - | General -> generalView model dispatch - | LimitsTab -> LimitsView model dispatch - | ConnectionsTab -> ConnectionsView model dispatch - | CreditLimitsTab -> creditLimitsView model dispatch - | ExchangeSettingsTab -> exchangeSettings model dispatch - | OrdersTab -> ordersView model dispatch) + // (match model.tab with + (match model.tab, (selectedAccount model ) with + | _ , None -> p [Style [ Color "Red" ]] [ str "Select an Account" ] + | General, _ -> generalView model dispatch + | LimitsTab, _ -> LimitsView model dispatch + | ConnectionsTab, _ -> ConnectionsView model dispatch + | CreditLimitsTab, _ -> creditLimitsView model dispatch + | ExchangeSettingsTab, _ -> exchangeSettings model dispatch + | OrdersTab, _ -> ordersView model dispatch) ] let isActive account = function @@ -801,31 +803,6 @@ let accountSelectionGrid (accountList:BTSAccount list) (currentAccount:BTSAccoun ] - -let selectionPageContent (adminData:AdminData) (model:Model) (dispatch:Msg->Unit) = - let account = model.scratch - - let revertFun = - match model.adminData with - | Some data -> fun _ -> (dispatch <| SelectAccount (State.existingSelection model.scratch model.previousScratch data)) - | None -> fun _ -> (dispatch <| SelectAccount emptyAccount) - - let modal = Modal.showCreate - "Create Account" - (div [] [ - Fields.text "Name" account.name [] (AccountName >> Update >> dispatch) - Fields.text "Description" account.description [] (Description >> Update >> dispatch) - Fields.checkbox "Can Trade Into Account" "Unchecking this stops all users from entering orders into the account" account.isActive [] (IsActive >> Update >> dispatch) - ]) - (fun _ -> dispatch SaveScratch) - revertFun - - div [] [ - accountSelectionGrid (Array.toList adminData.accounts) model.scratch dispatch - //NavRoot data.accounts (selectedAccount model) dispatch - (if State.isNewAccount model.scratch then modal else span[][]) - ] - let menuItem account selectedAccount model dispatch = a [ ClassName (isActive account selectedAccount) OnClick (fun _ -> SelectAccount account |> dispatch) diff --git a/src/web/ui/src/Controls/Fields.fs b/src/web/ui/src/Controls/Fields.fs index 91961a3f6..2d96d8722 100644 --- a/src/web/ui/src/Controls/Fields.fs +++ b/src/web/ui/src/Controls/Fields.fs @@ -173,7 +173,10 @@ let checkbox (lbl:string) (description:string) (dv:bool) (attrs:IHTMLProp list) ] ] -let mapSelect (lbl:string) (options:Map) (defaultText:string option) (defaultValue:string option) (onchange:'a->unit) = +let mapSelectEx (lbl:string) (options:Map) (defaultText:string option) (defaultValue:string option) (onchange:'a->unit) (is_disabled:bool option) = + let dis = match is_disabled with + | None -> false + | Some a -> a let optList:ReactElement list = match defaultText with | None -> ([ for opt in options do yield option [ Value opt.Key ] [ str (opt.Value) ] ]) @@ -190,17 +193,21 @@ let mapSelect (lbl:string) (options:Map) (defaultText:string opti Label lbl div [ ClassName "control" ] [ - div [ ClassName "select" ] + div [ ClassName "select"] [ select [ Value dv OnChange (fun ev -> !!ev.target?value |> onchange) + Disabled dis ] optList ] ] ] +let mapSelect (lbl:string) (options:Map) (defaultText:string option) (defaultValue:string option) (onchange:'a->unit) = + mapSelectEx lbl options defaultText defaultValue onchange (Some false) + let simpleSelect (lbl:string) (options:string list) (defaultValue:string) (onchange:'a->unit) = div [ ClassName "field" ] diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index 7f0c19c92..38d3e140b 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -20,10 +20,15 @@ let SMPInstructionMap:Map = Map.empty let isNewUser (user:BTSUser) = user.id = 0u && user.isPresent -let getAdminData (admin:IAdminService) = +// let getUserData (user:IUserService) username password = +// Cmd.ofPromise +// user.authenticate_login { login = username; password = password} +// (fun u -> UpdateAdminAuthData u.adminData) +// (fun _ -> RpcResponse "Error getting admin auth data") + +let getAdminData (admin:IAdminService) (token:string) = Cmd.ofPromise - admin.get_admin_data - () + admin.get_filtered_admin_data { token = token } UpdateAdminData (fun _ -> RpcResponse "Error getting admin data") @@ -32,6 +37,7 @@ let defaultScratchUser = { id = 0u parentGroupId = 1u isActive = true + canCreate = false name = "" password = "" fullName = "" @@ -54,6 +60,7 @@ let defaultScratchUser = { exchangeUserData = { cmeData = { + adminDisplayFlag = bts.api.admin.CMEUserData.AdminDisplay.All operatorId = "" atsOperatorId = "" smpId = "" @@ -95,6 +102,7 @@ let defaultScratchUser = { } let init (context:ServiceContext.ServiceContext) : Model * Cmd = + //let user = UserService.Create context "" let admin = AdminService.Create context "" { userList = [] @@ -106,7 +114,8 @@ let init (context:ServiceContext.ServiceContext) : Model * Cmd = adminData = None OptionsMenuOpen = "" ConfirmModal = "", (Msg.SwitchTab Tab.General) - }, getAdminData admin + token = context.token + }, getAdminData admin context.token let rec removeUser (user:BTSUser) (userList:BTSUser list) = match userList with @@ -142,19 +151,19 @@ let userIsdirty (initialState:BTSUser) (scratch:BTSUser) (existing:BTSUser) = (s let userIsSelected (initialState:BTSUser) (scratch:BTSUser) = scratch <> initialState -let saveUser (admin:IAdminService) (user:BTSUser) = promise { +let saveUser (admin:IAdminService) (user:BTSUser) (model:Model) = promise { let! result = admin.update_user { completeData = user } if (result.isSuccess) then - let! data = admin.get_admin_data() + let! data = admin.get_filtered_admin_data {token = model.token} return UpdateAdminData data else return ErrorOccured (sprintf "Error saving user: %s" result.errorText) } -let deleteUser (admin:IAdminService) (user:BTSUser) = promise { +let deleteUser (admin:IAdminService) (user:BTSUser) (model:Model) = promise { let! result = admin.delete_user { id = user.id } if (result.isSuccess) then - let! data = admin.get_admin_data() + let! data = admin.get_filtered_admin_data {token = model.token} return UpdateAdminData data else return ErrorOccured (sprintf "Error deleting user: %s" result.errorText) @@ -206,6 +215,7 @@ let applyUpdate (field:UserField) (user:BTSUser) = | FullName fn -> { user with fullName = fn } | Company cc -> { user with company = cc } | IsActive ia -> { user with isActive = ia } + | CanCreate cr -> { user with canCreate = cr } | CMEOperatorID oid -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with operatorId = oid } | CMEATSOperatorID atsoid -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with atsOperatorId = atsoid } | SimOperatorID oid -> updateSIMExchangeUserData user { user.userData.exchangeUserData.simData with operatorId = oid } @@ -286,7 +296,7 @@ let update msg (model:Users.Types.Model) : Model * Cmd = | Delete usr -> let mdl = { model with OptionsMenuOpen = "" } match Fable.Import.Browser.window.confirm (sprintf "Are you sure you want to delete '%s'" usr.name) with - | true -> mdl, Cmd.ofExistingPromise (deleteUser model.admin usr) id (box>>ErrorOccured) + | true -> mdl, Cmd.ofExistingPromise (deleteUser model.admin usr model) id (box>>ErrorOccured) | false -> mdl, Cmd.Empty | AddUser -> @@ -302,7 +312,7 @@ let update msg (model:Users.Types.Model) : Model * Cmd = // match on id = 0 to see if it's a new user match model.scratchUser.id with | 0u -> { model with PreviousScratchUser = model.scratchUser}, Cmd.ofExistingPromise (createUser model.admin {model.scratchUser with name = model.scratchUser.name.ToLower() }) id (box>>ErrorOccured) - | _ -> model, Cmd.ofExistingPromise (saveUser model.admin {model.scratchUser with name = model.scratchUser.name.ToLower() }) id (box>>ErrorOccured) + | _ -> model, Cmd.ofExistingPromise (saveUser model.admin {model.scratchUser with name = model.scratchUser.name.ToLower() } model) id (box>>ErrorOccured) | ErrorOccured msg -> //Browser.console.log msg Global.alert Global.Error (string msg) diff --git a/src/web/ui/src/Users/Types.fs b/src/web/ui/src/Users/Types.fs index 7d92f61cc..8c33cf2f9 100644 --- a/src/web/ui/src/Users/Types.fs +++ b/src/web/ui/src/Users/Types.fs @@ -15,6 +15,7 @@ type UserField = | FullName of string | Company of string | IsActive of bool +| CanCreate of bool | CMEOperatorID of string | CMEATSOperatorID of string | SimOperatorID of string @@ -59,6 +60,7 @@ type Model = { adminData : AdminData option OptionsMenuOpen: string ConfirmModal: string * Msg + token: string } diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index 8b511caeb..ca79619fd 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -39,26 +39,28 @@ let saveButton (model:Users.Types.Model) dispatch = let flavor = if dirty then "is-success" else "" Button.button buttonText flavor "" enabled (fun _ -> dispatch SaveUser) -let generalTabView (model:Model) (dispatch:Msg->Unit) = +let generalTabView (model:Model) (dispatch:Msg->Unit) (readonly: bool)= let modal = Modal.showCreate "Create User" (div [][ - Fields.text "Login" model.scratchUser.name [ ] (Name >> UpdateField >> dispatch) - Fields.password "Password" model.scratchUser.password [ ] (Password >> UpdateField >> dispatch) - Fields.text "Full Name" model.scratchUser.fullName [ ] (FullName >> UpdateField >> dispatch) - Fields.text "Company" model.scratchUser.company [ ] (Company >> UpdateField >> dispatch) - Fields.checkbox "Active" "Unchecking this stops the user from entering orders" model.scratchUser.isActive [] (IsActive >> UpdateField >> dispatch) + Fields.text "Login" model.scratchUser.name [] (Name >> UpdateField >> dispatch) + Fields.password "Password" model.scratchUser.password [] (Password >> UpdateField >> dispatch) + Fields.text "Full Name" model.scratchUser.fullName [] (FullName >> UpdateField >> dispatch) + Fields.text "Company" model.scratchUser.company [] (Company >> UpdateField >> dispatch) + Fields.checkbox "Can Login?" "Unchecking this stops the user from logging in and entering orders" model.scratchUser.isActive [] (IsActive >> UpdateField >> dispatch) + Fields.checkbox "Can Create?" "Checking this allows the user to create other users and accounts" model.scratchUser.canCreate [] (CanCreate >> UpdateField >> dispatch) ]) (fun _ -> dispatch SaveUser) (fun _ -> SwitchUser (State.getCurrentUser model) |> dispatch) div [] [ p [ Style [FontWeight "Bold"] ] [ str ("ID: " + model.scratchUser.id.ToString())] br [] - Fields.text "Login" model.scratchUser.name [ ] (Name >> UpdateField >> dispatch) - Fields.password "Password" model.scratchUser.password [ ] (Password >> UpdateField >> dispatch) - Fields.text "Full Name" model.scratchUser.fullName [ ] (FullName >> UpdateField >> dispatch) - Fields.text "Company" model.scratchUser.company [ ] (Company >> UpdateField >> dispatch) - Fields.checkbox "Can Login?" "Unchecking this stops the user from logging into Spark and entering orders" model.scratchUser.isActive [] (IsActive >> UpdateField >> dispatch) + Fields.text "Login" model.scratchUser.name [Disabled readonly] (Name >> UpdateField >> dispatch) + 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?" "Unchecking this stops the user from logging into Spark and entering orders" model.scratchUser.isActive [Disabled readonly] (IsActive >> UpdateField >> dispatch) + Fields.checkbox "Can Create?" "Checking this allows the user to create other users and accounts" model.scratchUser.canCreate [Disabled readonly] (CanCreate >> UpdateField >> dispatch) (if State.isNewUser model.scratchUser then modal else span[][]) ] @@ -68,7 +70,7 @@ let accountNameLookup (accountsList:BTSAccount list) (id:string) = | None -> "Account Not Found" -let accountsTabView (model:Model) (dispatch:Msg->Unit) = +let accountsTabView (model:Model) (dispatch:Msg->Unit) (readonly:bool) = let accountPermissions = model.scratchUser.userData.accountPermissions.accountPermissions let keys = @@ -109,17 +111,17 @@ let accountsTabView (model:Model) (dispatch:Msg->Unit) = yield { cells = [ TableControl.Cell(str acc.name) - { content = Fields.checkbox "" "" hasTradeAdmin [] (update TradingPerm hasTradeAdmin) + { content = Fields.checkbox "" "" hasTradeAdmin [Disabled readonly] (update TradingPerm hasTradeAdmin) className = ""; isHeader = false; colSpan = 0 } - { content = Fields.checkbox "" "" hasRiskAdmin [Disabled is_bts] (update RiskAdmin hasRiskAdmin) + { content = Fields.checkbox "" "" hasRiskAdmin [Disabled (is_bts || readonly)] (update RiskAdmin hasRiskAdmin) className = ""; isHeader = false; colSpan = 0 } - { content = Fields.checkbox "" "" hasMdAdmin [Disabled is_bts] (update MDAdmin hasMdAdmin) + { content = Fields.checkbox "" "" hasMdAdmin [Disabled (is_bts || readonly)] (update MDAdmin hasMdAdmin) className = ""; isHeader = false; colSpan = 0 @@ -135,7 +137,7 @@ let accountsTabView (model:Model) (dispatch:Msg->Unit) = TableControl.createSelectorTable (Some headerRow) rows ] -let MarketDataTabView (model:Model) (dispatch:Msg->Unit) = +let MarketDataTabView (model:Model) (dispatch:Msg->Unit) (readonly:bool) = let cmeData = model.scratchUser.userData.exchangeUserData.cmeData let findCheckedValue (value:bts.api.CMEMics) = @@ -151,7 +153,7 @@ let MarketDataTabView (model:Model) (dispatch:Msg->Unit) = (sprintf "%O" micPair.Key) "" (findCheckedValue micPair.Value) - [] + [Disabled readonly] (fun chk -> (({enabled = chk; mic = micPair.Value}:CMEMicData) |> (CMEMic >> UpdateField >> dispatch))) ) ] @@ -165,38 +167,40 @@ let MarketDataTabView (model:Model) (dispatch:Msg->Unit) = 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) [] (fromHuman ProfessionalDesignation.values>>UserField.CMEProNonPro>>send) - Fields.enumSelect "Display / Non-Display" (toHuman false DisplayDesignation.values cmeData.displayNondisplay) (allToHuman false DisplayDesignation.values) [] (fromHuman DisplayDesignation.values>>UserField.CMEDisplayNonDisplay>>send) - ] + 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) + ] -let orderRoutingTabView (model:Model) (dispatch:Msg->Unit) = + +let orderRoutingTabView (model:Model) (dispatch:Msg->Unit) (readonly:bool) = let cmeData = model.scratchUser.userData.exchangeUserData.cmeData - let simData = model.scratchUser.userData.exchangeUserData.simData - - + let simData = model.scratchUser.userData.exchangeUserData.simData div [] - [ - h2 [Class "is-size-3"] [ str "CME" ] - div [] - [ - Fields.text "Operator ID" cmeData.operatorId [ MaxLength 18.0 ] (CMEOperatorID >> UpdateField >> dispatch) - //Fields.text "ATS Operator ID" cmeData.atsOperatorId [] (ATSOperatorID >> UpdateField >> dispatch) - Fields.text "SMP ID" cmeData.smpId [] (SMPID >> UpdateField >> dispatch) - Fields.mapSelect "SMP Instruction" State.SMPInstructionMap None (Some cmeData.smpInstruction) (SMPInstruction >> UpdateField >> dispatch) - Fields.text "Location" cmeData.location [] (CMELocation >> UpdateField >> dispatch) - //Fields.text "Max Order Rate Per Connection" cmeData.maxOrderRatePerConnection [] (MaxOrderRatePerConnection >> UpdateField >> dispatch) - //Fields.map "Misc Tag Mapping" cmeData.miscTags [] (MiscTags >> UpdateField >> dispatch) - ] - br [] - h2 [Class "is-size-3"] [ str "Sim" ] - div [] - [ - Fields.text "Operator ID" simData.operatorId [ MaxLength 18.0 ] (SimOperatorID >> UpdateField >> dispatch) - Fields.text "Location" simData.location [] (SimLocation >> UpdateField >> dispatch) + [ + h2 [Class "is-size-3"] [ str "CME" ] + div [] + [ + Fields.text "Operator ID" cmeData.operatorId [ MaxLength 18.0 ; Disabled readonly ] (CMEOperatorID >> UpdateField >> dispatch) + //Fields.text "ATS Operator ID" cmeData.atsOperatorId [] (ATSOperatorID >> UpdateField >> dispatch) + Fields.text "SMP ID" cmeData.smpId [Disabled readonly] (SMPID >> UpdateField >> dispatch) + Fields.mapSelectEx "SMP Instruction" State.SMPInstructionMap None (Some cmeData.smpInstruction) (SMPInstruction >> UpdateField >> dispatch) (Some readonly) + Fields.text "Location" cmeData.location [Disabled readonly] (CMELocation >> UpdateField >> dispatch) + //Fields.text "Max Order Rate Per Connection" cmeData.maxOrderRatePerConnection [] (MaxOrderRatePerConnection >> UpdateField >> dispatch) + //Fields.map "Misc Tag Mapping" cmeData.miscTags [] (MiscTags >> UpdateField >> dispatch) + ] + br [] + h2 [Class "is-size-3"] [ str "Sim" ] + div [] + [ + Fields.text "Operator ID" simData.operatorId [ MaxLength 18.0 ; Disabled readonly] (SimOperatorID >> UpdateField >> dispatch) + Fields.text "Location" simData.location [Disabled readonly] (SimLocation >> UpdateField >> dispatch) - ] - ] + ] + ] + + + let userControls (model:Model) (dispatch:Msg->Unit) = let currentUser = State.getCurrentUser model @@ -210,13 +214,16 @@ let userControls (model:Model) (dispatch:Msg->Unit) = let tabContent (model:Model) (dispatch:Msg->Unit) = + let adminDisplay = model.scratchUser.userData.exchangeUserData.cmeData.adminDisplayFlag + let md_edit = adminDisplay = bts.api.admin.CMEUserData.AdminDisplay.All || adminDisplay = bts.api.admin.CMEUserData.AdminDisplay.MD + let risk_edit = adminDisplay = bts.api.admin.CMEUserData.AdminDisplay.All || adminDisplay = bts.api.admin.CMEUserData.AdminDisplay.Routing div [Key (string model.scratchUser.id); ClassName "is-tab-content"] [ - (match model.currentTab, (State.userIsSelected model.scratchUser State.defaultScratchUser) with + (match model.currentTab, ( State.userIsSelected model.scratchUser State.defaultScratchUser) with | _, false -> p [Style [ Color "Red" ]] [ str "Select a User" ] - | Tab.General, true -> generalTabView model dispatch - | Tab.Accounts, true -> accountsTabView model dispatch - | Tab.MarketData, true -> MarketDataTabView model dispatch - | Tab.OrderRouting, true -> orderRoutingTabView model dispatch) + | Tab.General, true -> generalTabView model dispatch (not risk_edit) + | Tab.Accounts, true -> accountsTabView model dispatch (not risk_edit) + | Tab.MarketData, true -> MarketDataTabView model dispatch (not md_edit) + | Tab.OrderRouting, true -> orderRoutingTabView model dispatch (not risk_edit)) userControls model dispatch ] @@ -346,23 +353,6 @@ let NavRoot (usersList:BTSUser list) (currentUser:BTSUser) model (dispatch:Msg-> ] ] -let selectionPageContent (model:Model) (dispatch:Msg->Unit) = - let modal = Modal.showCreate - "Create User" - (div [][ - Fields.text "Name" model.scratchUser.name [ ] (Name >> UpdateField >> dispatch) - Fields.password "Password" model.scratchUser.password [ ] (Password >> UpdateField >> dispatch) - Fields.text "Full Name" model.scratchUser.fullName [ ] (FullName >> UpdateField >> dispatch) - Fields.text "Company" model.scratchUser.company [ ] (Company >> UpdateField >> dispatch) - Fields.checkbox "Active" "Unchecking this stops the user from entering orders" model.scratchUser.isActive [] (IsActive >> UpdateField >> dispatch) - ]) - (fun _ -> dispatch SaveUser) - //(fun _ -> SwitchUser (State.getCurrentUser model) |> dispatch) - (fun _ -> CancelAddUser |> dispatch) - div [] [ - userSelectionGrid model.userList model.scratchUser dispatch - (if State.isNewUser model.scratchUser then modal else span[][]) - ] let root (model:Model) (dispatch:Msg->Unit) = (*