now just need to filter accounts and users in the webui
This commit is contained in:
1 parent
49ba2e72a9
commit
1dc87de975
3 files changed
+37
-18
No files matched your search
@@ -16,14 +16,13 @@ namespace mbts.spark
|
||||
{
|
||||
_admin_data = admin_data;
|
||||
_user_name = user_name ?? string.Empty;
|
||||
_allowed_accounts = search_admin(u => u.Name == _user_name).Select(x => x.Item1).ToList();
|
||||
foreach(var val in _allowed_accounts)
|
||||
_allowed_accounts = search_admin(u => u.Name == _user_name).Where(x =>
|
||||
{
|
||||
return x.Item2.HasPermissions || x.Item3.HasPermissions;
|
||||
}).Select(xx => xx.Item1).ToList();
|
||||
foreach (var val in _allowed_accounts)
|
||||
_allowed_account_dict[val.Name] = val.Name;
|
||||
}
|
||||
public IEnumerable<Tuple<BTSAccountImmutable, TradingPermissionUnitImmutable>> get_trading_permissions(UInt32 user_id)
|
||||
{
|
||||
return search_admin(u => u.Id == user_id);
|
||||
}
|
||||
public IEnumerable<BTSAccountImmutable> viewable_accounts()
|
||||
{
|
||||
return _allowed_accounts;
|
||||
@@ -33,9 +32,10 @@ namespace mbts.spark
|
||||
return _allowed_account_dict.ContainsKey(account) || _user_name.ToLower().Contains("bts");
|
||||
}
|
||||
|
||||
IEnumerable<Tuple<BTSAccountImmutable, TradingPermissionUnitImmutable>> search_admin(Func<BTSUserImmutable, bool> predicate)
|
||||
IEnumerable<Tuple<BTSAccountImmutable, TradingPermissionUnit, AdminPermissionUnit>>
|
||||
search_admin(Func<BTSUserImmutable, bool> predicate)
|
||||
{
|
||||
var rv = new List<Tuple<BTSAccountImmutable, TradingPermissionUnitImmutable>>();
|
||||
var rv = new List<Tuple<BTSAccountImmutable, TradingPermissionUnit, AdminPermissionUnit>>();
|
||||
if (_admin_data.HasValue)
|
||||
{
|
||||
var users = _admin_data.Value.Users.Where(predicate);
|
||||
@@ -51,9 +51,7 @@ namespace mbts.spark
|
||||
if (accounts != null && accounts.Count() == 1)
|
||||
{
|
||||
var account = accounts.ElementAt(0);
|
||||
var tp = kv.Value.TradingPermission;
|
||||
var rv_val = new TradingPermissionUnitImmutable(tp);
|
||||
rv.Add(Tuple.Create(account, rv_val));
|
||||
rv.Add(Tuple.Create(account, kv.Value.TradingPermission, kv.Value.AdminPermission));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -177,6 +177,24 @@ let updateExchangeMdEntitlementDataCMEData user dta :BTSUser = { user with userD
|
||||
let updateCMEExchangeUserData user dta = { user with userData = { user.userData with exchangeUserData = { user.userData.exchangeUserData with cmeData = dta }}}
|
||||
let updateSIMExchangeUserData user dta = { user with userData = { user.userData with exchangeUserData = { user.userData.exchangeUserData with simData = dta }}}
|
||||
|
||||
let default_user_account = {
|
||||
tradingPermission = {
|
||||
hasPermissions = false
|
||||
submitMarketOrders = false
|
||||
submitGtcOrders = false
|
||||
algoTradingPermission = {
|
||||
submitIcebergOrders = false
|
||||
submitTimeBoxOrders = false
|
||||
submitSpreaderOrders = false
|
||||
}
|
||||
}
|
||||
adminPermission = {
|
||||
hasPermissions = false
|
||||
hasMdPermissions = false
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
let applyUpdate (field:UserField) (user:BTSUser) =
|
||||
match field with
|
||||
| Name n -> { user with name = n }
|
||||
@@ -205,19 +223,22 @@ let applyUpdate (field:UserField) (user:BTSUser) =
|
||||
| None -> Array.concat [[|mic|]; mdperm]
|
||||
updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with mdPermissions = micArr }
|
||||
| TradingPerm (id:string, can_trade:bool) ->
|
||||
let current = JSMap.find id user.userData.accountPermissions.accountPermissions
|
||||
let find = JSMap.tryFind id user.userData.accountPermissions.accountPermissions
|
||||
let current = if find.IsNone then default_user_account else find.Value
|
||||
let updated = { current with tradingPermission = { current.tradingPermission with hasPermissions = can_trade } }
|
||||
let newAccountPermissions = JSMap.add id updated user.userData.accountPermissions.accountPermissions
|
||||
let newUserData = { user.userData with accountPermissions = { user.userData.accountPermissions with accountPermissions = newAccountPermissions } }
|
||||
{ user with userData = newUserData }
|
||||
| RiskAdmin (id, admin) ->
|
||||
let current = JSMap.find id user.userData.accountPermissions.accountPermissions
|
||||
let find = JSMap.tryFind id user.userData.accountPermissions.accountPermissions
|
||||
let current = if find.IsNone then default_user_account else find.Value
|
||||
let updated = { current with adminPermission = { current.adminPermission with hasPermissions = admin } }
|
||||
let newAccountPermissions = JSMap.add id updated user.userData.accountPermissions.accountPermissions
|
||||
let newUserData = { user.userData with accountPermissions = { user.userData.accountPermissions with accountPermissions = newAccountPermissions } }
|
||||
{ user with userData = newUserData }
|
||||
| MDAdmin (id, admin) ->
|
||||
let current = JSMap.find id user.userData.accountPermissions.accountPermissions
|
||||
let find = JSMap.tryFind id user.userData.accountPermissions.accountPermissions
|
||||
let current = if find.IsNone then default_user_account else find.Value
|
||||
let updated = { current with adminPermission = { current.adminPermission with hasMdPermissions = admin } }
|
||||
let newAccountPermissions = JSMap.add id updated user.userData.accountPermissions.accountPermissions
|
||||
let newUserData = { user.userData with accountPermissions = { user.userData.accountPermissions with accountPermissions = newAccountPermissions } }
|
||||
|
||||
@@ -96,10 +96,10 @@ let accountsTabView (model:Model) (dispatch:Msg->Unit) =
|
||||
let rows:TableControl.row list =
|
||||
[for acc in realAccList do
|
||||
let string_id = acc.id.ToString()
|
||||
let perm = JSMap.find string_id accountPermissions
|
||||
let hasTradeAdmin = perm.tradingPermission.hasPermissions
|
||||
let hasRiskAdmin = perm.adminPermission.hasPermissions
|
||||
let hasMdAdmin = perm.adminPermission.hasMdPermissions
|
||||
let perm = JSMap.tryFind string_id accountPermissions
|
||||
let hasTradeAdmin = if perm.IsNone then false else perm.Value.tradingPermission.hasPermissions
|
||||
let hasRiskAdmin = if perm.IsNone then false else perm.Value.adminPermission.hasPermissions
|
||||
let hasMdAdmin = if perm.IsNone then false else perm.Value.adminPermission.hasMdPermissions
|
||||
let update permission value _ = permission (string_id, not value) |> UpdateField |> dispatch
|
||||
yield {
|
||||
cells = [
|
||||
|
||||
Reference in new issue
Block a user