From 81d67f640bc299eacd2aeac349784c3cfa3e545c Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 31 Oct 2018 17:26:34 -0400 Subject: [PATCH 01/24] my head hurts from the f# --- src/client/spark_api/md/Authenticator.cs | 23 +++++ src/client/spark_api/md/LazyAsync.cs | 17 ++++ src/client/spark_api/md/Locator.cs | 16 ++++ src/client/spark_api/md/MarketDataClient.cs | 35 ++++--- src/client/spark_excel/ExcelAddin.cs | 16 ++++ .../extensions/OrderService_Excel.cs | 4 +- ...MDFormatter.cs => TopOfBookMDFormatter.cs} | 4 +- .../rtd/formatting/TopicMDFormatter.cs | 90 ++++++++++++++++++ .../rtd/subscriptions/MDSubscribe.cs | 43 ++++++++- .../spark_excel/spark_excel_example.xlsm | Bin 23817 -> 23893 bytes src/client/spark_sdk/samples/OrderSample.cs | 13 +-- src/lib/CMakeDeps.cmake | 2 +- .../templates/excel/excel.pb.cs | 23 +++-- .../api/service_helpers/AdminServiceUtils.cpp | 7 +- .../api/service_helpers/AdminServiceUtils.h | 2 +- src/lib/api/services/AdminService.proto | 15 +++ src/lib/domain_model/Security.proto | 6 +- src/lib/md/relay/QueryServer.cpp | 47 +++++---- src/server/sparkd/user/AdminServiceServer.cpp | 16 ++-- src/web/ui/src/Accounts/Types.fs | 5 +- src/web/ui/src/Users/State.fs | 4 + src/web/ui/src/Users/Types.fs | 2 + src/web/ui/src/Users/View.fs | 3 +- 23 files changed, 316 insertions(+), 77 deletions(-) create mode 100644 src/client/spark_api/md/Authenticator.cs create mode 100644 src/client/spark_api/md/LazyAsync.cs create mode 100644 src/client/spark_api/md/Locator.cs rename src/client/spark_excel/rtd/formatting/{TopMDFormatter.cs => TopOfBookMDFormatter.cs} (88%) create mode 100644 src/client/spark_excel/rtd/formatting/TopicMDFormatter.cs diff --git a/src/client/spark_api/md/Authenticator.cs b/src/client/spark_api/md/Authenticator.cs new file mode 100644 index 000000000..34aca3bfc --- /dev/null +++ b/src/client/spark_api/md/Authenticator.cs @@ -0,0 +1,23 @@ +using System; +using System.Threading.Tasks; +using bts.api; +using bts.api.core; + +namespace bts.api +{ + public class Authenticator + { + readonly static Lazy _auth = new Lazy(() => Locator.locate(), true); + user.AuthToken _token = null; + public Authenticator() { } + + public user.AuthToken last_token => _token; + public async Task login(string login, string password) + { + var res = await _auth.Value.authenticate_login_async(new user.AuthenticateLoginRequest { Login = login, Password = password }); + if (res.success) + _token = res.value.Token; + return _token; + } + } +} \ No newline at end of file diff --git a/src/client/spark_api/md/LazyAsync.cs b/src/client/spark_api/md/LazyAsync.cs new file mode 100644 index 000000000..c83dd4095 --- /dev/null +++ b/src/client/spark_api/md/LazyAsync.cs @@ -0,0 +1,17 @@ + +using System; +using System.Threading.Tasks; + +namespace bts +{ + public class AsyncLazy : Lazy> + { + public AsyncLazy(Func valueFactory) : + base(() => Task.Factory.StartNew(valueFactory)) + { } + + public AsyncLazy(Func> taskFactory) : + base(() => Task.Factory.StartNew(() => taskFactory()).Unwrap()) + { } + } +} \ No newline at end of file diff --git a/src/client/spark_api/md/Locator.cs b/src/client/spark_api/md/Locator.cs new file mode 100644 index 000000000..e86c98a05 --- /dev/null +++ b/src/client/spark_api/md/Locator.cs @@ -0,0 +1,16 @@ +using System; +using System.Threading.Tasks; +using bts.api; +using bts.api.core; + +namespace bts.api +{ + public static class Locator + { + readonly static Lazy _context = new Lazy(() => new ServiceContext(), true); + public static T locate(string qualifier="") where T : class, IApiClient + { + return _context.Value.locate(qualifier); + } + } +} diff --git a/src/client/spark_api/md/MarketDataClient.cs b/src/client/spark_api/md/MarketDataClient.cs index 748ffdea8..9f06f6aeb 100644 --- a/src/client/spark_api/md/MarketDataClient.cs +++ b/src/client/spark_api/md/MarketDataClient.cs @@ -33,49 +33,48 @@ namespace bts.api.md readonly ConcurrentDictionary _data = new ConcurrentDictionary(); readonly ConcurrentDictionary _security_key_to_desc= new ConcurrentDictionary(); readonly ConcurrentDictionary _security_desc_to_key = new ConcurrentDictionary(); - readonly Lazy _subscription; + readonly MDRequest _subscription; readonly Venue _venue; - readonly static Lazy _md = new Lazy(() => locate(), true); + readonly static Lazy _md = new Lazy(() => Locator.locate(), true); readonly static ConcurrentDictionary _venue_cache = new ConcurrentDictionary(); static readonly List _all_products; static MarketDataClient() { _all_products = _md.Value.request_products(new VoidMessage()).Products.ToList(); } - public static bool create_or_get(api.Venue exchange, out MarketDataClient md) + + public static IEnumerable cached_exchanges => _venue_cache.Keys; + public static bool create_or_get(api.Venue exchange, out MarketDataClient md, user.AuthToken token = null) { if (!_venue_cache.TryGetValue(exchange, out md)) { - _venue_cache[exchange] = md = new MarketDataClient(exchange); + _venue_cache[exchange] = md = new MarketDataClient(exchange, token); return true; } return false; } - public MarketDataClient(bts.api.Venue exchange = Venue.Unset) + public MarketDataClient(bts.api.Venue exchange = Venue.Unset, user.AuthToken token = null) { _venue = exchange; - _subscription = new Lazy(() => load_request(exchange)); + _subscription = load_request(exchange, token); } - MDRequest load_request(bts.api.Venue exchange) + public void set_auth_token(user.AuthToken toke) { - var req = new MDRequest(); + _subscription.Token = toke?.Token ?? string.Empty; + } + + MDRequest load_request(bts.api.Venue exchange, user.AuthToken token) + { + var req = new MDRequest() { Token = token?.Token ?? string.Empty } ; var prods = _all_products.Where(x=>x.Exchange == exchange || exchange == bts.api.Venue.Unset); foreach(var prod in prods) req.Channels.Add(new SecurityChannel() { Exchange = prod.Exchange, Type = prod.Type, Symbol = prod.Symbol, Flags = 0 }); return req; } - static MarketDataRelay locate() - { - using (var ctx = new api.core.ServiceContext()) - { - return ctx.locate(); - } - } - public Security lookup(security_key key) { Data value; @@ -217,7 +216,7 @@ namespace bts.api.md bool check_subscriptions(uint flags, Func selector) { - foreach (var sub in _subscription.Value.Channels) + foreach (var sub in _subscription.Channels) { if (selector(sub)) { @@ -251,7 +250,7 @@ namespace bts.api.md while (!rep.success && count++ < 5); while (true) { - var reply = await _md.Value.requestmd_async(_subscription.Value); + var reply = await _md.Value.requestmd_async(_subscription); if (reply.success) { foreach (var channel in reply.value.Channels) diff --git a/src/client/spark_excel/ExcelAddin.cs b/src/client/spark_excel/ExcelAddin.cs index 60e03aa99..421639146 100644 --- a/src/client/spark_excel/ExcelAddin.cs +++ b/src/client/spark_excel/ExcelAddin.cs @@ -69,5 +69,21 @@ namespace bts.excel Utilities.bts_load_assembly(ass); } } + + public static void calculate_full_rebuild() + { + object app = ExcelDnaUtil.Application; + var mi = app?.GetType().GetMethod("CalculateFullRebuild", BindingFlags.Instance | BindingFlags.Public); + if(mi != null) + mi.Invoke(app, null); + } + + public static void calculate_full() + { + object app = ExcelDnaUtil.Application; + var mi = app?.GetType().GetMethod("CalculateFull", BindingFlags.Instance | BindingFlags.Public); + if (mi != null) + mi.Invoke(app, null); + } } } \ No newline at end of file diff --git a/src/client/spark_excel/extensions/OrderService_Excel.cs b/src/client/spark_excel/extensions/OrderService_Excel.cs index 399369e46..dcdb0dec6 100644 --- a/src/client/spark_excel/extensions/OrderService_Excel.cs +++ b/src/client/spark_excel/extensions/OrderService_Excel.cs @@ -14,8 +14,8 @@ namespace bts.api.orderman { public partial class OrderService_Excel { - readonly static Lazy _users = new Lazy(() => locate(), true); - readonly static Lazy _admin = new Lazy(() => locate(), true); + readonly static Lazy _users = new Lazy(() => Locator.locate(), true); + readonly static Lazy _admin = new Lazy(() => Locator.locate(), true); [ExcelFunction(Category = "BTS", Description = "Cancel an Order by Order ID", IsMacroType = true)] diff --git a/src/client/spark_excel/rtd/formatting/TopMDFormatter.cs b/src/client/spark_excel/rtd/formatting/TopOfBookMDFormatter.cs similarity index 88% rename from src/client/spark_excel/rtd/formatting/TopMDFormatter.cs rename to src/client/spark_excel/rtd/formatting/TopOfBookMDFormatter.cs index 5a8e65fb7..82cb46be8 100644 --- a/src/client/spark_excel/rtd/formatting/TopMDFormatter.cs +++ b/src/client/spark_excel/rtd/formatting/TopOfBookMDFormatter.cs @@ -3,10 +3,10 @@ using System; namespace bts.excel.rtd { - class TopMDFormatter : IExcelFormatter + class TopOfBookMDFormatter : IExcelFormatter { readonly co2.ChannelUpdate _update; - public TopMDFormatter(co2.ChannelUpdate upd) + public TopOfBookMDFormatter(co2.ChannelUpdate upd) { _update = upd; } diff --git a/src/client/spark_excel/rtd/formatting/TopicMDFormatter.cs b/src/client/spark_excel/rtd/formatting/TopicMDFormatter.cs new file mode 100644 index 000000000..92af1f8a3 --- /dev/null +++ b/src/client/spark_excel/rtd/formatting/TopicMDFormatter.cs @@ -0,0 +1,90 @@ + +using System; + +namespace bts.excel.rtd +{ + class TopicMDFormatter : IExcelFormatter + { + readonly co2.ChannelUpdate _update; + readonly string _topic; + public TopicMDFormatter(co2.ChannelUpdate upd, string topic) + { + _update = upd; + _topic = topic; + } + + public object[,] format(bool include_headers = false) + { + var retval = new object[1, 1]; + switch (_topic.ToLower()) + { + case "bid": + case "bidprice": + retval[0, 0] = BookMDFormatter.format_md(_update?.Direct?.Bids?[0]?.Mantissa ?? 0, _update?.Direct?.Bids?[0]?.Exponent ?? 0); + break; + case "ask": + case "askprice": + retval[0, 0] = BookMDFormatter.format_md(_update?.Direct?.Asks?[0]?.Mantissa ?? 0, _update?.Direct?.Asks?[0]?.Exponent ?? 0); + break; + case "bidsize": + case "bidqty": + retval[0, 0] = _update?.Direct?.Bids?[0]?.Size; + break; + case "asksize": + case "askqty": + retval[0, 0] = _update?.Direct?.Asks?[0]?.Size; + break; + case "impliedbid": + case "impliedbidprice": + retval[0, 0] = BookMDFormatter.format_md(_update?.Implied?.Bids?[0]?.Mantissa ?? 0, _update?.Implied?.Bids?[0]?.Exponent ?? 0); + break; + case "impliedask": + case "impliedaskprice": + retval[0, 0] = BookMDFormatter.format_md(_update?.Implied?.Asks?[0]?.Mantissa ?? 0, _update?.Implied?.Asks?[0]?.Exponent ?? 0); + break; + case "impliedbidsize": + case "impliedbidqty": + retval[0, 0] = _update?.Implied?.Bids?[0]?.Size; + break; + case "impliedasksize": + case "impliedaskqty": + retval[0, 0] = _update?.Implied?.Asks?[0]?.Size; + break; + case "settlement": + case "settlementprice": + retval[0, 0] = BookMDFormatter.format_md(_update?.Misc?.Settlement?.Mantissa ?? 0, _update?.Misc?.Settlement?.Exponent ?? 0); + break; + case "previoussettlement": + case "previoussettlementprice": + retval[0, 0] = BookMDFormatter.format_md(_update?.Misc?.PreviousSettlementPrice?.Mantissa ?? 0, _update?.Misc?.PreviousSettlementPrice?.Exponent ?? 0); + break; + case "open": + case "openprice": + retval[0, 0] = _update?.Misc?.OpenPrice; + break; + case "close": + case "closeprice": + retval[0, 0] = _update?.Misc?.ClosePrice; + break; + case "high": + case "highprice": + retval[0, 0] = _update?.Misc?.SessionHigh; + break; + case "low": + case "lowprice": + retval[0, 0] = _update?.Misc?.SessionLow; + break; + case "last": + case "lastprice": + retval[0, 0] = BookMDFormatter.format_md(_update?.LastTrade?.Mantissa ?? 0, _update?.LastTrade?.Exponent ?? 0); + break; + case "lastsize": + case "lastqty": + retval[0, 0] = _update?.LastTrade?.Size; + break; + } + return retval; + } + } + +} \ No newline at end of file diff --git a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs index 88f408c7e..8b60cdcfd 100644 --- a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs +++ b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs @@ -14,6 +14,25 @@ namespace bts.excel.rtd { public class MDSubscribe { + static Authenticator _auth = new Authenticator(); + async public static void spark_login(string login, string password, ExcelAsyncHandle handle) + { + try + { + var toke = await _auth.login(login, password); + foreach (var ven in MarketDataClient.cached_exchanges) + { + MarketDataClient.create_or_get(ven, out MarketDataClient md); + md?.set_auth_token(toke); + } + handle.SetResult(toke?.Token ?? "Could not log in check user/pass"); + } + catch(Exception ex) + { + handle.SetException(ex); + } + } + public static MarketDataClient market_data(api.Venue exchange) { var newc = MarketDataClient.create_or_get(exchange, out MarketDataClient md); @@ -83,18 +102,18 @@ namespace bts.excel.rtd [ExcelFunction(Category = "BTS", Description = "Subscribe to BTS Spark top of book market data")] - public static object spark_md_top( + public static object spark_md_top_of_book( [ExcelArgument("Required. The specific contract, GCZ8 or ZNU8-ZNZ8, etc")] string contract, [ExcelArgument("Required. The symbol, GC or ZN, etc")] string symbol, [ExcelArgument("Optional. The type, Future or Spread, default = Future")] string security_type = null, [ExcelArgument("Optional. The exchange, default = GLBX")] string exchange = null) { var param = new object[] { contract, symbol, security_type, exchange }; - return ObservableRtdUtil.Observe(nameof(spark_md_top), param, + return ObservableRtdUtil.Observe(nameof(spark_md_top_of_book), param, () => md_observable(contract, symbol, security_type, exchange).Select(x => { if (x is co2.ChannelUpdate upd) - return new TopMDFormatter(upd).format(); + return new TopOfBookMDFormatter(upd).format(); return x; })); } @@ -116,5 +135,23 @@ namespace bts.excel.rtd })); } + + [ExcelFunction(Category = "BTS", Description = "Subscribe to BTS Spark top of book market data")] + public static object spark_md( + [ExcelArgument("Required. The 'Topic' string, 'bid', 'ask', etc")] string topic, + [ExcelArgument("Required. The specific contract, GCZ8 or ZNU8-ZNZ8, etc")] string contract, + [ExcelArgument("Required. The symbol, GC or ZN, etc")] string symbol, + [ExcelArgument("Optional. The type, Future or Spread, default = Future")] string security_type = null, + [ExcelArgument("Optional. The exchange, default = GLBX")] string exchange = null) + { + var param = new object[] { topic, contract, symbol, security_type, exchange }; + return ObservableRtdUtil.Observe(nameof(spark_md), param, + () => md_observable(contract, symbol, security_type, exchange).Select(x => + { + if (x is co2.ChannelUpdate upd) + return new TopicMDFormatter(upd, topic).format(); + return x; + })); + } } } \ No newline at end of file diff --git a/src/client/spark_excel/spark_excel_example.xlsm b/src/client/spark_excel/spark_excel_example.xlsm index ebca73ad1a009ad185b4561bdfb6eddbba82d739..c7cd7d17df092735c29ee1d960b01ce4bdff677a 100644 GIT binary patch delta 15886 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�f7@U~(Wwwybkc(3q;vamMkyWqaakqOig(pIn5|UO#??7ndZAMf zvr+64Y+fV=yOpsluWKj1;Yw*gK*==zNvMQ>2`ZR@w*+Bif=kz-)!we`MBV@lUFgW; zNjTwC<4oE+*iQg$HveK)V&t2orsMVLrb3iiknJ!bt2fM&J6xbgeqREmhkLLwqA722 zvp>o_lKhAcna7vCE$F;jc~-RUv-K=o@5S^~SHBOrDvrBJTgvNGpk*$c{X}sQfpex$ ze+-IqIr0>*!70Gw*-rTUsSyf5lYXRV)X>yzvQl~}STYqi1kLVxKy@2W1%duf@1sw< z4buqTu{v5bmXI0YvjDS!8XNDWTuISG6A1da>fhf| z1*%tHa+tEoWJPMm^MN5YexH7XMm^=fNqSfzKhc?smWZEDE!aoYG+6p_MiXZ-+9g7c z2#rKB4>D;rLc$1HX5w6h>*11OVdTrclJx$eXkKSK?qNjR>#-cgOw>rb%a11IFqf`I z>B&xbjFSB_6*FpWssPFg$-i(8cM`T2Ry>+2#@H$TV8Y;3mo3>LX_3z;03!pKYVP9+ zxubF1WZvdOE^&rT`;f91gkpU08J4Rq)&z5NIh@3F*mpl^rfD9N;*Og-3YOAmF$#2@ ztIK){4?^si*PCCPTHDGhv-&t9Bhc2q<#aq%eYdkVTA$Jv%mAj`DYty6Xw`h56;kf1 z+fq*6^$I58q@|4NWg|`MhrrEiu7BnwcdMZcvE~h+B{VoU->tuV-u|Sc-RdUvY^9~Z zm)-V2mn*wo)Gqi9dFm3nMpxdGK&@~}Q*iGHI$@RC_&9tiJ}e1SQrewgdF@pHsJA|^ zsm`X_U-7fbPZ%hN^yxB3gQqJPG)#h zY=;@a#CF*;n@JvnB+wwn+aT~b7O@~#iBoNk@>obaK*$~MPWw*iBvlquryM`dPOgSr zF_y|&fI?t_o6KVz$GxN|B}lcB5(il=Bk`TaZQqHU&3p)_fO%;Ko0&>&j=A&|hQPuV zUs?0FTQ)FjEmuh*9s?tPs+Hh>nH*)1lk6|?n$4<)oS9%FQ#ntCG00hbkYbmFmZ>7v z9}*UF6vIX8C;l20C(47V7f17EBUTfHLZv21;U|vrZ*|d&V@U947puC{Wt+c>LmaEX*F{Shz7?6|Y}^=T5k(3|Y4wf5gR z&dS=8|C>jfOrgV%_diLVU?3paApf@^m?>l19HjQdZhn-nn@1O!vG6bOit4y!~fsC7zE@W%>OBnD#-;Z a1ei*)kpH&o|1d=X@%-oPjcWa;_5T6V#1k1& znOT|39l#MCz;&b0U~B}J%t@2b_yD_2M!3*h&}aC-n;P3;_C!MYd6QoolZ^S6&MUOs z=+rWyf2OEHyFVy9@0D%BawH>{N_PdiJNQ~7KY=d)%#+F4BTEZvh)ep?oEl;)X7R!OQ#O zUhN-#&FnCNN61(VFD*$AfTkAZ&d6gCloZ`pd@;<20&~vcjLz%jD3^SSv?H& z{*dLI^)w3;iYRr1AHr?ye8avR_QgHcD%U~bn6%tQA=#8r%EPH)*A=WE>(y5;OBBBi zV(Y!3?g?*9`2n^2@`vEHblFkOFM>7zur5b{ECEFkv{V$#>9HfU-n>;rax_I+j|>)R z0MGBiN|)xAT&iZpr{5|wTM^0RF7Ru^8&pIbm>`+XOYv`l7*hGkw&w&DF5qU(MLOjweA) z#WwT8{c(G5Mt*>_+j(1GP()0mDh3Y};WX%dHBj+)FrK|8PC|MeD z%Xh-)rPMsAjLwh%wPG|{rE9n~hd@pX)BHEzA|5~qmMiRxWb3voXh;dkkT{@~8`qoC zT-@|>qcABe)rBAwrF`a!zij}g8rQ2zSeVlh`%&vbb_y)v#IrZdebi$8j{MitYxE_q zGt;ch|AbZT?*9W;^#31N^GJ)R{=wS#w+*b;qFIzjntV}aw-_$5FQ;l>twT$DR;%p2 zO5*>(Dj{sg2*!F^M)VLME1$&lzhTY%0sfDPz)bMx+7@B}0Z}?6{h(qcb)!Q9Z0)fp z6Tkh6KL|8$zT!!a*ZSaUrG1Y34C)|11MeNXw1@&n*9pqqA@Ot{*R2{H;1M z`ZuGEZ!&jWKQx*rKdz52y}p2VCVd}$e(-*3NO*?H*|*Z=i)KfUwrpPT*~8=hPc{$W zW5XT~{Mx(AgL{X!4ychA!=lr5!*azkT>iLHhPQAL<9gV*x4}UdZ%ẉG?Ed|8zfl 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 f#iT _orders = new Lazy(() => locate(), true); - readonly static Lazy _users = new Lazy(() => locate(), true); - readonly static Lazy _admin = new Lazy(() => locate(), true); - static T locate() where T : class, IApiClient - { - using (var ctx = new api.core.ServiceContext()) - { - return ctx.locate(); - } - } + readonly static Lazy _orders = new Lazy(() => Locator.locate(), true); + readonly static Lazy _users = new Lazy(() => Locator.locate(), true); + readonly static Lazy _admin = new Lazy(() => Locator.locate(), true); void print_update(T update) { diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 5022d6833..255a29c21 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/dynamic_orders.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/dynamic_orders.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPriceLantencyTester.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPriceLantencyTester.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/api/service_compiler/templates/excel/excel.pb.cs b/src/lib/api/service_compiler/templates/excel/excel.pb.cs index 1ed7feef3..c3c2f3b5c 100644 --- a/src/lib/api/service_compiler/templates/excel/excel.pb.cs +++ b/src/lib/api/service_compiler/templates/excel/excel.pb.cs @@ -25,14 +25,21 @@ namespace {{package}} // {{comment}} public partial class {{name}}_Excel : IDisposable { - readonly static Lazy<{{name}}> _service = new Lazy<{{name}}>(() => locate<{{name}}>(), true); - static T locate() where T : class, IApiClient - { - using (var ctx = new api.core.ServiceContext()) - { - return ctx.locate(); - } - } + readonly static object _lock = new object(); + readonly static Lazy<{{name}}> _service = new Lazy<{{name}}>(() => bts.api.Locator.locate<{{name}}>(), true); + // volatile static api.core.ServiceContext _ctx; + // static T locate() where T : class, IApiClient + // { + // if(_ctx == null) + // { + // lock(_lock) + // { + // if (_ctx == null) + // _ctx = new api.core.ServiceContext(); + // } + // } + // return _ctx.locate(); + // } public void Dispose() { diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index ea073db71..2c0c0106d 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -883,7 +883,7 @@ void AdminServiceUtils::get_md_entitlement_report(const AdminData& admin_data, admin_data); if(cme_data!=nullptr){ for (const auto& cme_mic_data : cme_data->md_permissions()){ - MDEntitlementReportUnit rv=get_cme_md_entitlement_unit(user.name(), + MDEntitlementReportUnit rv=get_cme_md_entitlement_unit(user, cme_mic_data); entitlements.push_back(rv); } @@ -891,10 +891,11 @@ void AdminServiceUtils::get_md_entitlement_report(const AdminData& admin_data, } } MDEntitlementReportUnit AdminServiceUtils::get_cme_md_entitlement_unit( - const std::string& user, + const BTSUser& user, const CMEMicData& cme_mic_data){ MDEntitlementReportUnit rv; - rv.set_user(user); + rv.set_user(user.name()); + rv.set_user_id(user.id()); rv.set_exchange("GLBX"); switch(cme_mic_data.mic()) { diff --git a/src/lib/api/service_helpers/AdminServiceUtils.h b/src/lib/api/service_helpers/AdminServiceUtils.h index 9836c65ee..5e001ebf0 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.h +++ b/src/lib/api/service_helpers/AdminServiceUtils.h @@ -230,7 +230,7 @@ public: std::vector& entitlements); // Gets a reporting unit out of CMEMicData static MDEntitlementReportUnit get_cme_md_entitlement_unit( - const std::string& user, + const BTSUser& user, const CMEMicData& cme_mic_data); static void get_user_symbol_permissions( const AdminData& data, diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index f77a11eb8..e9df474d8 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -277,6 +277,18 @@ message SIMAccountData { string clearing_account = 40; } +enum ProfessionalDesignation +{ + PROFESSIONALDESIGNATION_PRO = 0; + PROFESSIONALDESIGNATION_NONPRO = 1; +} + +enum DisplayDesignation +{ + DISPLAYDESIGNATION_DISPLAY = 0; + DISPLAYDESIGNATION_NONDISPLAY = 1; +} + message CMEUserData{ string operator_id = 10; string ats_operator_id = 20; @@ -287,6 +299,8 @@ message CMEUserData{ string smp_instruction = 70; string max_order_rate_per_connection = 80; string location = 90; + ProfessionalDesignation pro_nonpro = 100; + DisplayDesignation display_nondisplay = 110; // add suff here repeated CMEMicData md_permissions = 1000; } @@ -371,6 +385,7 @@ message OrderCancelRequest{ message MDEntitlementReportUnit{ string record_id = 1 [(bts.api.key)=true]; string user = 10; + uint32 user_id=11; string exchange = 20; string mic = 30; bool enabled = 40; diff --git a/src/lib/domain_model/Security.proto b/src/lib/domain_model/Security.proto index 3d2b5f738..5e921021e 100644 --- a/src/lib/domain_model/Security.proto +++ b/src/lib/domain_model/Security.proto @@ -53,7 +53,11 @@ enum CMEMics { } enum ICEMics{ - ICE_FUTURES_CANADA=0; + ICE_UNSET=0; + ICE_US = 1; + ICE_EU = 2; + ICE_LIFFE = 3; + ICE_CA = 4; } enum Side { diff --git a/src/lib/md/relay/QueryServer.cpp b/src/lib/md/relay/QueryServer.cpp index 6cbfcfc08..e5fc8c2c4 100644 --- a/src/lib/md/relay/QueryServer.cpp +++ b/src/lib/md/relay/QueryServer.cpp @@ -17,6 +17,8 @@ #include "lib/api/services/MarketDataRelay.server.pb.h" #include "lib/api/public/ServiceContext.h" #include "lib/api/services/AdminService.client.pb.h" +#include "lib/api/service_helpers/AdminServiceUtils.h" +#include "lib/config/protos/cme_reference_data.pb.h" #ifndef _WIN32 #include "lib/metrics/metrics.h" #endif @@ -357,7 +359,7 @@ public: if (groupiter != _groups.end()) { auto& group = groupiter->second; bool is_entitled = bypass_entitlement || - ch.exchange() == api::VENUE_SIM || + /*ch.exchange() == api::VENUE_SIM || */ ch.exchange() == api::VENUE_BTS || (entitlements && entitlements->count(ch.symbol())); fill(ch, *group, reply->add_channels(), is_entitled); @@ -517,28 +519,39 @@ QueryServerPtr run_query_server(const bts::api::ServiceContext& ctx, std::shared db.check_heartbeats(threadpool); }); container->health_timer->start(); - + // Subscribe to entitlement data container->entitlement_sub = - container->admin_client.subscribe_md_permissions_data().subscribe([=](const api::admin::Md_permissions_dataUpdate& update) { - auto entitlements = std::make_shared>(); - for (const auto& row : update.all()) { - if (row && row->enabled()) { - auto iter = entitlements->find(row->user_id()); - if (iter == entitlements->end()) { - Entitlements ents; - ents.insert(row->symbol()); - entitlements->insert(iter, std::make_pair(row->user_id(), std::move(ents))); - } - else { - iter->second.insert(row->symbol()); + container->admin_client.subscribe_md_entitlement_data().subscribe([=](const api::admin::Md_entitlement_dataUpdate& update) { + const auto& all_updates = update.all(); + utils::Dispatcher::background().post([all_updates, container]() + { + const auto& cme_symb_mics = config::get().cme_mic(); + auto entitlements = std::make_shared>(); + for (const auto& row : all_updates) { + if (row && row->enabled()) { + for(auto mic=cme_symb_mics.begin();mic!=cme_symb_mics.end();mic++){ + if(api::CMEMics_Name(mic->second) == row->mic()) { + const auto& symbol = mic->first; + auto iter = entitlements->find(row->user_id()); + if (iter == entitlements->end()) { + Entitlements ents; + ents.insert(symbol); + ents.insert("SIM:" + symbol); + entitlements->insert(iter, std::make_pair(row->user_id(), std::move(ents))); + } + else { + iter->second.insert(symbol); + iter->second.insert("SIM:" + symbol); + } + } + } } } - } - container->relay.update_entitlements(entitlements); + container->relay.update_entitlements(entitlements); + }); }); - // Add a few threads to keep md latency low for (int x = 1; x < std::min(4, os::num_cores()); ++x) { threadpool.add_thread(); diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index ff1505cb9..526ff3804 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -241,12 +241,12 @@ void AdminServiceServer::_publish_md_entitlements(){ _md_entit_publisher.add_or_update(e); _md_entit_publisher.flush(); } -void AdminServiceServer::_publish_md_permissions(){ - std::vector perms; - for (const BTSUser* user : AdminServiceUtils::users(_state,false)) - AdminServiceUtils::get_user_symbol_permissions(_state,*user,perms); - for (const auto& p : perms) - _md_perm_publisher.add_or_update(p); - _md_perm_publisher.flush(); -} +// void AdminServiceServer::_publish_md_permissions(){ +// std::vector perms; +// for (const BTSUser* user : AdminServiceUtils::users(_state,false)) +// AdminServiceUtils::get_user_symbol_permissions(_state,*user,perms); +// for (const auto& p : perms) +// _md_perm_publisher.add_or_update(p); +// _md_perm_publisher.flush(); +// } }} diff --git a/src/web/ui/src/Accounts/Types.fs b/src/web/ui/src/Accounts/Types.fs index 402f009e8..a4eb88d62 100644 --- a/src/web/ui/src/Accounts/Types.fs +++ b/src/web/ui/src/Accounts/Types.fs @@ -14,8 +14,9 @@ type Tab = | ConnectionsTab | OrdersTab -let venues = Venue.values |> Array.skip 1 -let securityTypes = SecurityType.values |> Array.skip 1 +let venues = [| Venue.GLBX; Venue.SIM |] + +let securityTypes = [| SecurityType.FUTURE; SecurityType.SPREAD |] let emptyAccount = Access.Accounts.empty diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index e8b73011e..e4ee5b4c9 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -62,6 +62,8 @@ let defaultScratchUser = { smpInstruction = "" maxOrderRatePerConnection = "" location = "" + proNonpro = ProfessionalDesignation.PRO + displayNondisplay = DisplayDesignation.DISPLAY mdPermissions = [||] } simData = { @@ -186,6 +188,8 @@ let applyUpdate (field:UserField) (user:BTSUser) = | SimOperatorID oid -> updateSIMExchangeUserData user { user.userData.exchangeUserData.simData with operatorId = oid } | SMPID smpid -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with smpId = smpid } | CMELocation loc -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with location = loc } + | CMEProNonPro loc -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with proNonpro = loc } + | CMEDisplayNonDisplay loc -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with displayNondisplay = loc } | SimLocation loc -> updateSIMExchangeUserData user { user.userData.exchangeUserData.simData with location = loc } | SMPInstruction smpi -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with smpInstruction = smpi } | MaxOrderRatePerConnection morpc -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with maxOrderRatePerConnection = morpc } diff --git a/src/web/ui/src/Users/Types.fs b/src/web/ui/src/Users/Types.fs index 1beeb47f8..5f58e4854 100644 --- a/src/web/ui/src/Users/Types.fs +++ b/src/web/ui/src/Users/Types.fs @@ -25,6 +25,8 @@ type UserField = | AddAccount of string | RemoveAccount of string | CMEMic of CMEMicData +| CMEProNonPro of ProfessionalDesignation +| CMEDisplayNonDisplay of DisplayDesignation type Msg = diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index 5388afa8c..9ed2fba4c 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -142,7 +142,8 @@ let MarketDataTabView (model:Model) (dispatch:Msg->Unit) = let micList = [ for micValue in bts.api.CMEMics.values do yield ( - if (micValue = bts.api.CMEMics.UNSET) |> not then + if (micValue = bts.api.CMEMics.UNSET || micValue = bts.api.CMEMics.MGE || + micValue = bts.api.CMEMics.DME || micValue = bts.api.CMEMics.NYMSW || micValue = bts.api.CMEMics.FXS) |> not then Fields.checkbox (sprintf "%O" micValue) "" From 4939b85819ef5c123de61a11bfbc8591f33e5662 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 31 Oct 2018 18:01:54 -0400 Subject: [PATCH 02/24] I think I got it --- src/web/ui/src/Users/View.fs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index 9ed2fba4c..053f77b21 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -11,6 +11,7 @@ open Users open bts.api.admin open Users open bts.api +open EnumUtils let isActiveTab tab currentTab = let ia = "is-active" @@ -155,12 +156,16 @@ let MarketDataTabView (model:Model) (dispatch:Msg->Unit) = ) ] - + let send = UpdateField>>dispatch div [] [ h2 [Class "is-size-3"] [ str "CME" ] h3 [Class "is-size-4"] [ str "Entitlements" ] div [Style [Padding " .5em 1em"]] micList + + h2 [Class "is-size-3"] [ 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) ] let orderRoutingTabView (model:Model) (dispatch:Msg->Unit) = From ec43039b9462d4ac2aa1d82eef9c0d8f60d844be Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 31 Oct 2018 18:05:39 -0400 Subject: [PATCH 03/24] ok michael, all yours --- src/web/ui/src/Users/View.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index 053f77b21..f67c55941 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -163,7 +163,7 @@ let MarketDataTabView (model:Model) (dispatch:Msg->Unit) = h3 [Class "is-size-4"] [ str "Entitlements" ] div [Style [Padding " .5em 1em"]] micList - h2 [Class "is-size-3"] [ str "Designations" ] + 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) ] From b9aaaa7d37b9543aaf192d1e507200e713c19c5a Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 1 Nov 2018 10:37:09 -0400 Subject: [PATCH 04/24] mic mapping for brian --- src/web/ui/src/Users/State.fs | 1 - src/web/ui/src/Users/Types.fs | 7 +++++++ src/web/ui/src/Users/View.fs | 34 +++++++++++++++++++++++----------- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index e4ee5b4c9..23323d096 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -17,7 +17,6 @@ let SMPInstructionMap:Map = Map.empty .Add("N", "Cancel Aggressing") .Add("", "Undefined") - let isNewUser (user:BTSUser) = user.id = 0u && user.isPresent diff --git a/src/web/ui/src/Users/Types.fs b/src/web/ui/src/Users/Types.fs index 5f58e4854..fee416ef7 100644 --- a/src/web/ui/src/Users/Types.fs +++ b/src/web/ui/src/Users/Types.fs @@ -56,3 +56,10 @@ type Model = { OptionsMenuOpen: string ConfirmModal: string * Msg } + + +let CMEMicMap:Map = Map.empty + .Add("XCME", bts.api.CMEMics.CME) + .Add("XNYM", bts.api.CMEMics.NYMEX) + .Add("XCBT", bts.api.CMEMics.CBT) + .Add("XCEC", bts.api.CMEMics.COMEX) \ No newline at end of file diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index f67c55941..ad95c803a 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -140,21 +140,33 @@ let MarketDataTabView (model:Model) (dispatch:Msg->Unit) = | None -> false - let micList = [ - for micValue in bts.api.CMEMics.values do + // let micList = [ + // for micValue in bts.api.CMEMics.values do + // yield ( + // if (micValue = bts.api.CMEMics.UNSET || micValue = bts.api.CMEMics.MGE || + // micValue = bts.api.CMEMics.DME || micValue = bts.api.CMEMics.NYMSW || micValue = bts.api.CMEMics.FXS) |> not then + // Fields.checkbox + // (sprintf "%O" micValue) + // "" + // (findCheckedValue micValue) + // [] + // (fun chk -> (({enabled = chk; mic = micValue }:CMEMicData) |> (CMEMic >> UpdateField >> dispatch))) + // else + // str "" + // ) + // ] + + let micList = [ + for micPair in CMEMicMap do yield ( - if (micValue = bts.api.CMEMics.UNSET || micValue = bts.api.CMEMics.MGE || - micValue = bts.api.CMEMics.DME || micValue = bts.api.CMEMics.NYMSW || micValue = bts.api.CMEMics.FXS) |> not then Fields.checkbox - (sprintf "%O" micValue) + (sprintf "%O" micPair.Key) "" - (findCheckedValue micValue) + (findCheckedValue micPair.Value) [] - (fun chk -> (({enabled = chk; mic = micValue }:CMEMicData) |> (CMEMic >> UpdateField >> dispatch))) - else - str "" - ) - ] + (fun chk -> (({enabled = chk; mic = micPair.Value}:CMEMicData) |> (CMEMic >> UpdateField >> dispatch))) + ) + ] let send = UpdateField>>dispatch div [] From 47dc0d579bca788201679d63e91a45e2ef4a1b87 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 1 Nov 2018 12:18:10 -0400 Subject: [PATCH 05/24] mic aliases --- .../spark_excel/spark_excel_example.xlsm | Bin 23893 -> 26043 bytes src/lib/md/relay/QueryServer.cpp | 2 +- src/web/ui/src/Users/View.fs | 23 +++++++++--------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/client/spark_excel/spark_excel_example.xlsm b/src/client/spark_excel/spark_excel_example.xlsm index c7cd7d17df092735c29ee1d960b01ce4bdff677a..0a978260d2e354bf61ae84850d0064a0c5d803e1 100644 GIT binary patch delta 18521 zcmYg%V{m3&ux@Nm>^GR$$;5Utv2EMV8{4*R+sVYv#I|kU`Odkw>i*cZd#&nvy7%g? z-PNnR7dt>ZCqS{~rNJT4L7+fjKtMnMAmSQb5qqE@Ao4Kv*d$;;)d|~mMwBkB6MmR3 zD3WY+%7_6+BnL-paI#O33~jBdSFluti{5L+n!ulR#kfqfx?~c6rzfuxxHEL^vZ}cx z%meIJ$aCx9y5QDcR0e%{wifl&gEc(qY;I=j=!iRWd_EX`HpKcO3V452O>z2SfT_UC zk|3kXz=`~bqKWH>q`I1Pa*NBWtK zQ97!N-STq}ve-8$zY2fm%w3xun_U+%BA4RzcRQBBcKP-g(7f!*WPH1*a4#YnV+K%- z1*m$h8y`5T3yB7scn5Q$P=RaJrKg?EVD;4t04?D|69smDz>hC`S+;GGClbDh5U72J z$H;w4h?nfc7xeb@lJibVfHT_B?W8wu`o}P}GW+|EvSO>6Vck$Xg&|>Rr>nhudG_YG zdu=dzS}e-wNK-sb^2&Q{pnlOO^;;Mq8RKMRjb!<7;}>8nHODkh=oXf#lO#YiBf?K~u0UzUh0$NLeRP_M}UVu&)%E&b8Mq(b>sB}lY``T5;uW9&qOv}!~KXkL?l#F_IC>co$d7eo6IjX9WgN*K zZX=kR{jNVnIFNCJH}sO=c?G&&cwO5QY-$Nqn2Awh4Kh(rHhJ_}3XETuq+GzAbq((& z;J!0fH~JhC%!qW<>MHQJr+j=(Nb1c~naE+>vn-A4-XmrkpA{|LEiNc1PQ?^_LL}~@ zqc_U^kOqfz^<(j&h{`H9f9D{ zx!jfYz3zT)pK-c&>g9KOGs8HJ$xidgIZV$?3)lIbT4xBZ6OfsQ0}N)uK^pku%vC*i z<9}cAil5v^lxGEdc8S}EfDWpBtONqD4~ec%Ef1Fjdf12M2dDo_9`-kQh2JSib11_= z4U{Pei$AVD<_)>u0Ib^7HxSmjp2Jtt)JX6b2zS40VF(=i!knQ9eVI*^nJf`s>*HRw z8QG6C%@q4-m&uW?eITq1ifMls*?egWR|XF3t+VKxSPq*tcVq*gg|IkIpIcp>CYC@f z#bJ{romS!Pui7YK>MDx6Dv>&S<5X3qOTFxhtgw5&Eaa)uc2Uz9I*ItFJ%I`sLi90f zNTOTQmz)uJ^11n^9%%M3h|zbcL(s6_+#CO+2QGs-LK^srAFy43P9Ay^yaw_Jd>Itp z?;JEi3&N}ZswPxsN*od&Bsmk_9vo4CbQZ$huecAfFS?J}Z?6OPDb*jd5B>#&9|a^p zfTj*#9kdEU6_g#^24t)@WE0dGtQAB@fV~b%9li>D2^`N)%RjpBXC5^1>$-s*R0{}z z7~uiTM*w044rmSD0TI(_>Q!fMvt?2I(;DC zkoX#)INo|Yvg_V{nZf!c=do7^ZK{q!J{k73D3#jz0Avt#{AgxlAnG}u+iAR>{H%3z zt&OJ1O9xTZhx1chh$7Q)CNh~$U`WYjy+*ziLrArc zf^>*OYebh!{&s3EyzeC5vvrG7|Dq%oj``Rh1IE*rD(DK8(lj#=Z_-2$QUcddwq?4u z6Q+l>+|S=E2sgSJjk*|~JTjImnmP5= z0EKhyiEn7ta?w@-U>ei?%@U6GdL^2&WRuMu(Ty%a;VJXtnPzcLRDb(O5pE)ML|rI> z#&wa=`JJDeBHtR|<|(8y;dM$rH8&Lu2#uM0=jCv)`^o-tyy-knV^9ArGB_xSSzmo` zqf2lWTDYp(Y09n2f4(11uU_?L#j2Jz3NaQr+UkOWOiQ)qXE&57$rd=E59cRdP? z?&^rF`Vv{lgm=GApaY}ol;)39qA0;l3F3sXE7q}Oai2lqF?ZlYsaq!aPqXx979blb z+q&sFA<}w}r?Zo|B_ng)&Kon0rM*2P=B20@j^i2fAJ0(ou}v=gNEgw8aeLM!w>%P# zSqe#~KAw2VDw)IjrW0R-NPXQM??0sG7z6%e6)gKl-F{p%9?~i9k%BmL(nzx#C7C~< zo;?CHE8-^UpfZB#=2ej~LSE#;!ho~--B4VqM|$A|^M*_|;f5W@A!5~)M+@|z;X20G zX2Wvno0X|8TCJ^PtPs|T$NTR=zY9+#7sSz;>qpqO#pk6}!#`I<0P9Wed@0TfHjH`h zVe9g9n)b>1%quJ`SHIEMv@PddFJQ97tma6eY-kXw2ZxI%(wpMPQWUS&bAi&AbLATu zlkD{^t|D=#45+C;XMf)j8q|Gc@<-Sp~AzBvua`{bb2H zOyUYg)$75Dm1Vj`1C-Zuc%%(!_Vq0eu1W#zoIls?-2_i4E@RBrt(KfAEn`**JAcj?<#*CX&a zSL~aA-lzF{A?%wfz4D&_dLk9`*!^L~=-bUF zuUylQ;X}^SYugQ$X5IdZMx@fD#}%fzKPmfm-D2lw(0`Bm8p&oYV)II+lI2@-`4iu>5Wj?>H+oZeGmD`PEWfb zGzwv}*gVc0mKUH#b%$}^2tDLY2Ej~MK$U3bcI2mCv`f&FzMuz6kvGb;ts}h9tOtT% znB!aGPs!tNjy>Q@IU#cGCt)`RYyKh%dD#1c=SFDDt{ODlW*qW5=g8*~1^mp`nQFkT*6lY1$Sl;Ucl1>mn6z5=cCH8f|?NGGch1S-P(62y--vot~L zit|ixQzWw`&_4bTB{u+l8rJ4~w^>NgIno`*w-fq2XcJ&PC@)D^LfP_$U=gb(k6;#` z0=}{snFew;L{}6Tc_HgZ{{rI1zXLakalq^#z;ho~{Lu&3ml$ zAOstf!rZ_bJ?}jCT}QtozZoP56uZDJxGtDtFEMuCtg9g#(iur%Sy`@TPyFf}8*9+B zfk3bE^LV1(5-a{5@LAu2C4pl>z!1J5j)Il>pV;BaJk`>_0Ud% zf!`4t1}`hYEC@!TXIFJI zQK{NS-HGKwIy#=!DYAMLv2=;D3rb*9vy>l%NOTLQih~MS;LrGke@?YvIj{J3aZ zt@Qoow^Kpof9!G!eI|N&)sn0En9El$e+*?&g?)2@&*gi+p|zTTCwkHK-K+1!h4_4u zq0saC2ozW4eVnPi=JlRn0SHob;@%cF{Za=~Oqu?f|8&(xN`i8G6f-Org=0ysx%U8m z(*zTM%n0tF++gff_I39y`wfC@K5aw4&-lOl_kw((z0mA{?!XA}AP@M$xMRO?-7NQ! z_OXLh#jP5FWWRpX-EiDM+>qHLym0Si_9^wX`t?G8fx6?q{JJ67!P)8Tdj^rZ)>r|~ zfKoVrKfAm`t}uY{L+FC(Lis{`klw%vG^ok6KtxQQ7lOwOC%&VXaOzA`y}OtddSPY# zbn+^DexIS4v=&RW_|VP1vgATa{j-rCwvBo!!&RlHtnP3s-@rf^$~VXWt8%4>KG;`;U9gnec>xC*vbd~A^Y4n7x_On2CV*I#b^QcY^%#o#m zj8Y?CoA@p1H4;|j6qU43I%A@U$(vi?LvItX7~Jq70E<^et!rQiZL;)Svl_)t*O+Dw z7wVNLnzp17sqG?OZ*7xOt#kkkQZ}KYuAz;mX(pc(u2R-*{@o&LrbzN9b3x`VYO;V; zv~r%gYOW^P&a5Pucj8uxJlKrdHr3KBW!1DXSL4vJ94%H^eSeF~tXnhmvGzNJu*s3u z@*4N-bc;8sN%T!;nowyde9?whdwC9XsKFK6PVT0}Sk>Fl#$Z05c+Cn(y!M_Qof7a5{QA-udWrGB4t=4UJ2}15NwZaPz`H??lYkgL{#(@9f#**nei~cmmg2Xr2 ziLpR-LO^7IsYjZP4c>=C_KT0yw!E1 zkoa^GUTZ?`Otp&^C9)slIdsC`6`;di;M5#tfaUbYS801*e}y-(HTwE=K4)>AG^PW9 zIbo3+o?4L<#^M6HSw0czQqiBfzwo=Z;M09yeoL*LqVNOuNLJm>Oibp>)$Gc4Qh4h}GktER7E`RM}R zDRUq>Om5`_>N#rQJ15BjcK$P~bj{XbmbB~nMv)r{Jyh*z9Cihx;;ltjs1|l<0NzJ` z%iB&!o;*-jxwvIX**!?Lb`KxS|V=v~>>JbKjqwzzY@fo5g%*EZd3B8jP1wpU|jp2d<}QAM(j-c~i8 zdVmtYCrlkVL}2Yu>FjkWw{+w9sFrt?o4stPtWbMoaN$sH?(cjStMav-lqlDnTq_~` zRz(pE8tz%T(Ct_evuEw#dEv^IiL}9+sOoBEtBkZs=kJwuiIH+SRN^nLc-auW2ZH@~ z&j)An9!ndG4FY1~m-vm2lh}<34ZL((`yge{m1cN{)_pN0kq6wT=VP+Ho7X zUBnO-a4mzzW6-B)ul(G;W>1)Pj{O_;V((Jk5SX6p>G@{kX{tGY4E*xcP1+h<^z89| zRjl#mqD>u0J$3vA^mtS3>AwA*qfK4P9GkFiQ11!S8}A)-dCe6Eeoh?c0w)%8&xs7$ zsQd>e-lShgOz+qDIMn5UK{JVurH5880VyMgXC4jxxs|1XkLT1`lLe7ESkTkE2Kzf6 z%s{FU^tDP7)|A-Tdy5qv+3lRcRGHt#81z5!ZhF6%fI4>NpBWeh>{>FuhE-a=Fp-;W z`CNEw&a%vNgcMkU!zz%P|FpY_r2A5gGeeWDom_wLzkA}DV%SR&OkBEMsT!y2} z?K%62;$sW1n}-H%nI49`c)jE`W2v?*<1wt`A4xHM;MgM7>F|G?)7|>+*DSDsJ~T#~I%AHb1v(2SqtHgILnkfbB(-NAHfWrC>-m zi}_~^V3Zk&r>0+ot^IeiMWP{w$;M0Kc~P_}R`MH49G*mI<&5*v??SDX>(}a;cjKp;p#hbRY?Fb;|gx zYpc8~IztyDE)^wMd(eqmQdJ}CwN~N8d{%U&J3a|(*uS)4y(pd+#RdZ2>d2j5#;WmK zDx~x~$MA>7BQEl|SAWOw)u!-E-#9sU_-2<;DqGM%IW_520te?y;Jgu7v32&Zp9?iV z@B6tgEHYSgW{0H$**%-;mky%&Y^v1Ujbhmd?}q=8&F)5iVo~t8(jH4;;8FY-0e7i; zLU|BY!yMcZ=+_JS?a~ajOB@q9;B$P`z7&;<2X3557&!}9g$5s1^)C>7YQUIWv;C<% zmo9Jo%CH;YZfwncz4DdI_{(Ll&6aBZn=>zV%Jgw@TqG%h~$ zl26$;=ZEK?n2sDE9+~iZ)twkB$0dL^JZjG-dX+`H+ej0aKRDCj;W;$6II~iV;j7z( z-x3Ee0e}8#EB4Fm1OCHx1o$akuB=O&%gEazeRvJbba^GUNuRlKA^$wuK1E3r?fdam z2a}f^{%600G-~C=Uh&m^&pLD-Cx`9)sx{v2!bkEwrmHeDE?h*5t!tu^I$d#XrV)9I zC^;7BT#32Ky>?dU`@y5=3s6j!YHXgM_w*?8`Xkxe^oIa28%25znS?^lB z-T?==iO4C&T2r5Bq#HBU#dwUtUQ0h~0a1x#bZc3l^Or9LY^GPxxy;A;tEZWNF#MzI z+{lR1*@xl!O?^MO=K5HNsIqzXQII5S^tq*jwO}#M$XG|!$yuZM6wT?Humgf?vAA4H zlqw_Mg>mdRMWDW~^gbe{Bub-sjV4Rj*27h&xHup59u(5t`M@O3lCk5m(_k;Vy} zKDXrb%Cu!npRZ+l4CyW5|H&YipW$=eHCN598V-{k2)g#+8x69od;DZ+e}8$j9?bq^ zXJ=c>^P}VI^TVfI{;w?IcsWao)OQKl1nRPesikb?lI4z?3@QleWn$=h%BpBo1sgI! z^c^x}(zz<@*>8dTkrJ`ZJ4vv8IZtO`e0!;P_T7!JeA2sgxYx3cg{BXx=xYc1i(^J~ zMaiRlD%l(v<>ZVqAn2Vd{!F6e@Ql!l-6aph2VfS^UeaM2RSC5QJKR zsI?2F1Q@2wO9$3Vfas4NLI`x)40F6r9WXsa!^)M{QBi*e=3#Eh^=e@t^RO2vWKWon zL4VvjsVSu4oEaFLtK2`;Rv>tySFnCT1{3NS>iyf~MZ2;S&9n~>krkDczp^90(n*zg zR2EVApEDs4Sx1(UM3V^^5YmiO%a(BYcRinYb}LxN@IpH0s)uis?LHz=v`FGP^ebS9 zx8A%8&q<-qYhbw>*oXBIfAdJ3r~f?k(~~5^bX0g1ZVdaH%%&CT-|N2!VdPjcVuaU9o zFxd4MYs%l`+GyqvFVgDA-v9p_1bIWr<61eB{x?dZ^;r@Ti~nB1Z4|kFl2|sC<{p54R}-> zo$Ds0<^WX;ekf+yoIIjh3xx^Rg*&%|%D~(rtjQYvYN8XBSF3H#vjO08+eVv9Xv=kQ zSp~|3CD?}{hqJ_-7d28_3nht=XG?SWbF6oI9)f4097(T0+#*>tgJlvoV3`es-6^3hq8_K+5+WdD3%H)5P@0O9 z058$J!=q#BI{ZD0evGcyzM}Pux3k=B2e==Op;$2X9BRU2C6Qa%CRwgNR4{MQ&G#B)5 zx!I0^2G1b+KL3sp#+gvc_Rs@j2#i4=!}D~3o`~N|t#s?ivl;8bl_>yN5J5I#%*8d? z3QqzkElS~k2|lbO{^OAQ#i%8D=lD3yVoD>aTeC$fYD+R+DfK{k1=fxf9z0J4OB*^Q zXtD-Z+(fHnk#9qZBV#tO#~ zi_o*pcF%AYf}8;0Cdi_o$b^Ly5$KBiC;(I)o(eJY>VZd?OKb$X5&Y9m4(gX+moU$& z{i84BUJ&-!qXo6RA=$E-VO=(2AGf@Y3SAY&vIARXaIuW!O*%Ce-R3s9 z+@o`uHaN5WRl6j>Wa&N(iz*w^Ir4f3jV8H*tlx3Ol8hqUTr`k@@b}>L?irP(A)%hw z;qifniUBF{x7isU`A1>X;x>~qMqcGg_gDP~r|!%*xA6fhy+I#Y!D!XdjFXC5&8Ty4 zbWCXA^vg%ZxlS}g4b))&)Xp^CHj)_oUmJ{FAj^|_aY*#~Y3!@v6L8RC(qs9a?gH)T zo92`DBHhrxHx)S6pvZcqRe?s&v`WpSVWhSw9vlCDen)gAT)|rD4oIlDN%fXk^r1j7 zNef%I?66GuS5|)XNdwU~EXYqULn%Lr+0Rh@tsSu%qVOAI$BX4nx#*-YqT6sxWnDe) zvL^VN#0M?iRjDLelSR8|rOM2ZojipK1ex0Q9T$J@ZX39Kh+7k`<(2?;_PGB1=*;#_ z7}H8;q_UnooIB>+;qA3*?;GNcB3@}9vBH+-@OM<8dhm1|j(st$&FM#L7UV=~>Hc$R zB!*=d=Uk-s%^$}phg6M?$Jj&5M7c*P0kctEioPr~QQNVyiuDmnbJQHBZuTFA0zC?2xD=b^2b81C%(dV@=0a3j{(NmCVrg+8%fB=UHcY&?$EkaepJSzZVJ z!AE+8riH&>81bE~AgG)dxxdbv&kUv>R%pO=SbPq-K-JkwV{)JDj}OcxQr*NRy~ZyK zDBC*kHq}5$`9mPPsFv{A@A5&J1_npXV=AHRCs}}LyzKTW#C&XjH)Xmy;la(e;+!m+ z)c#%)uUxNv?f%Y2h?U8seDKy;^qg+tB+9BKLD zQw47`444e8UnJWW|9vrjsN#kh;(VtoLG2Kt%c8wKh^lHi9OCQUw3;>>?g99@SJhz| zwmk^MWi>HWQ$@;(24uTp7*dXkt4%{{r{qg4^tVs}hIEWZwVHX_rcRTp zXY~^{CPv42F0e`hnby2rfJVd937}*$w||C%g6p*$)`FVp;Vn(S*F# zX{CcJ$+w^sNK_UPusHqBZQYEvi%vvDlfJ+);^|QI1yg~igliT2os``|QDc6K2pm=( z5A1kvo(^s#+iv8+v)%1Ptq*Drv8v{?YSTuIe!ixhpx3si2{U`lis59$1`Fnejr7SK zPlu$4A3Y56bMfIU-P_7B!an&*a<+;llmjZDR^z6}vXzLubr<;TYxJ0Ht%PzAFWJDU z+0w|vhZ$CuZ7)TFaEWiX$Kz3o!8_+dbG3*wN*?}-Q&s|49R=wpvqsg=2k4g z$f^^5#g5-+*z<%+26;PNL-+u3$uTj1vG6c31g}K{KbHFChvojU2n%Jh*WIMYtfM9j zJ8nCltDUBqBJD+gMqC3mgCrQk+&N%8x#gpJrBPe+j8=4b#fT=2n8@J#4Z)o%FG&p~Z#>rQ0IckJGolF(>eS^AbdOmV$0n@Q z4*eJANVj7?=ZfZ7osT4*kGtE2K{+CR@Q;x}Sih?{{{^Ojq#vA1!mBW;+Z(WTfU4t$GR2Smq& z^I>!uKtxc5Jsh{vYU7mSv*mI*z+)rpQJMc=%?6t6D0Jct6=an@W0B8R(-kLvXyGGK zKH6+v^poyDCqkB%69ZAPSs5U)atYhu+&gRtqEKZPOWA^-5W?_+JL>}FccC1`iE^fU z0&K*cajkS~iJ{pCi0rP{9&J*T`tz%=v8*!c&|rG`o>)D(fH!xMS?I%MoIio1WoXta zz@LD*Nm$Hvw4K1wAXIw|pyoQ-OyFn~y0Hdua~)OVKG;HfH4Wui0RTrvAQ>qj8SM=- zX$aih4Bg%5U^}sO3l1$0MhKLr)IZv+Lfu`%>_Q(d;(7>}>x5-5<5;-K>V!jFM@Nx3 zTZQQ_;-t9`#*x}vgl#Y4w73tZkzOrBH`W2$7je+s5OaNJ5+nccA@R}X^wsoear3eq zJL7245YfG#tG1ejfjrzpt-_wJ65B{PD}Ykh(R2c|6@W0ev2keDIsnUcw3xurBvgAH z!0tL)P2gx2>fJ1Sbs1;pIvPme=&cRnqzJM=<+pkn&x3pNBSmPAm=CZTzwc(H8fF&y z;wmwNbh-`z=RWw0#Mvke#%*jK8g&up#C*)ReL4R)k2VJp&gII-v>=voPjIfP#x(e{&Hr5Z#S_7E5O6Z3oT*k!{ zINFA4uK-eAN0SL0Z9+Fz0Ija0*#visNbRk{J*xm@SC|6-MMxCHi!@o#-)u4~6qeZCp zDqz`lG@8KCDs*ENpm!PP#eI-TaHk(ijH`Z$H`f<)ir!b22)4TE&Pr(?QQ(H!+19$? z8Il+nKW%THc&l44(eJ?-=%Bp@jHdLZYGlFR$8O8jH^lh^Jyz5f6&Y&VP=SZ(h*a0? z&eayL%Y<#_Kh_wLOtPXOi&%`%2Hn}GFum_xuMPz1C1R?%1hue@cTjtbirM4aj{VvG z*q7t4_%Jg$4#SVk3QWHZ9Lw?7{JoT!1$W?!bnynA6ViTk00m{M^_8^?y!s0>}}B8C|@3si9P_Srg|d_Xv{HGP9xv%o#R00$>_aJSs4f!49} zc6^U!aWl=MP7Z|A6;iMOrc_Y=vLGT%p%3|pAZ`~@?%0@4MnaZzDg%=$1>NPX|EwQ?Qc~za!+Lc1d-YF&0b>o3x0f&(T^F8`kxS$#Bv+ocb#d*NevDV;nwlK% zr^EckbUkBhUFM@afQa@NR97W56L?TUqS-6G#b|gMa;@Ptc6c{ukbHBsh!rmKV&~yG z391mQWN}%T^a1n$9j0Vm9PiNZd;*I+;K%x`W3Sl8w;CKRcgPqHwK3+Lyo0OE>a)+& zG0QO0WIX&eYf>FYue_{y$o5~?wqzSL;@^hZxSOZOu1!nqP<|e+DG-eGnagEy8^!$l z2xr^Cb}%aCe;Cg7*)%@2$&0Xrm}sYzaPBTT$s^`_7W+Uih^QZsa!$9_`BwXNn}dnJ zPq=KD2d&!Xg_fHRkgh}fv^tM6May*Ghp%A~_5McAMlC9Zx_tUJ`Q-4=V0J*kwRSuC znStEd(LEw2d1AqrE=&l<;mNf}#T#KDk5jnUDgSF6>R;A;xEAl;Iml`J%Z5^DCp_cl z4h2yQz*Pfc6ysOrh92@hA%w{B+q*M}!GByu*E7*&eoj6SM20}pO z55@JrYT#4+WdZ3BNXY~#x%Lt1yAS0-wHL`@vlod8;pIVzA7?@pLYki;kzuk|Ou%OB zyd;I<>plwiC%qf$L&e^BRGaP$H48q9>=${{Afo^-vVbIDqg*R7>3i89Bdx*`f{Uz9 zB!Y<_Ncxk0yjxATnK>t<2|*p3Ib_MtfJmU_x!kzIlCe+Q{2lb%j=dx6L-j!03A6o0 zVlP1Ak1#!Q-&Mxt$3or*ngDS^-=G5~5Eqt80U9%!2qKQ)m7X>V8V)Wcf6K76nDaS zsO&|K4?^(jLXRtPNtKkDIrt;@gFK-G;y?&*JH=U*Pd0P(i5O|fL|LTN_u5kSItl^ik-l0u^y;`~E>&FI`v*5W>|#3F$O(Ms_h ze=p~#|0huv>;Px8$Z@p)%|l%YtxH@IO`;;=7}njqSOyJ0o&q*z^k6V&PLetlVSYw9 zLvg2DQc=LOB@}(nSXR@@?M7amoV>i-%Ho;!vZuJ4qO}ncJjb&OIFq;kAd9OkuCUH| zvU!)F_OJY4Vf4f?@TEB6WM=BZ78JKOt$ z%rhc0*Nwz(S6h6@ZW$Ae+2!FIo?1|ud8L;43dP%W+{kdasE^qV>4VBAQ_|a6IX3e; zk!Ty4yIHpNK-gXWegcI2ubcrKb3}h?0s{eQg9ZUX{MWhcZq4B2>|t%p53D>b@>W*CIqIpETi}Ine`5&|m#z+R>e5;+|Id1=w z*DyX9jLDBKx05^Ov6>ns==kTt$O%327wf@xO|GEE_^T<*bk9i-2xVqGEZgwez0)R*c` zk4Awg;$mrXMl$PArS8B21>W(F+@ydiG`*0p7uEACzQWJSem{rEqFLyg1d*7*W14YA z$I1RWSlL$TUE%8i6xaq(9sSDV)nCeYV+=OPq=DZ=9JvfaIvo8!9pu>#xn zaa~tN5A}hSC8kFWyj-a^fUJGL`XJDRnfu}z>cv3Lf``YbFClU~Q7k%vMes!(i+*!{^y&Fp{H~8b@)AH80rAt$^(4sCa zX83x=m^G6&rEu)Uv0l5zR1jVJi^GFe_r|zM4sVtVf2P_m^v^^8({ycY2ShF{*Yi3( zbZfo?k{}82F90YJ9NP1YlMj*2(wZK(0bb5Zh z_u0-KeOqIG<7DW_BGRJp);QIC^ROAmF?p4F( z_MHE$y5F2-ch!e!fN$l2QXDJ=@)q>K7g(-dMQ3Vt3&#(gpF6MaY@&;p4^4Uc5D3kP z8Hk4At*NbD(4bGOqkb~8%bx0zfg6~0tpahaZpf$$lU!L^Se8=s^QT@HV+gY$$`4|O zanWIu#e*V!KxOCv?r#x99k^Yjo#;F)_JIaJ&X>mT1hTaB2(@G`v#mSRK11t~vV3iz z=e=$6%@XCBL))4Ay_l`&=_2H}XrnNU(wR4Lu%{KaF0x^srXs8bS3y(hxR~Z*u7TYv zE3=m~ti>1WPvI*-B;GGL4jH5g&s#{Y&k6nJxurJ+Cz$WN)eq^Htz?WQBLmuK^@gaG zyO1Rg!(5V-8q$`68=IDsKU%a*TZu)`%pLA=OXr~WF;QGzw*)znhxWfNrsoi&WiKPh z@YA0FY+btOP|kJwX*LbPJxqV>K>izrKw9bU0e$>8{}TfV0)h^bIID%3*ei?-{G}>X zuY(pERA-GSv(~R0K)pF^*m9t;TzFc$Eu%f`n%saD7&G(9BQ9l^b1wA}@Js!gnUgT4 z2&A;T{wi+lebbOJo+QsvOl3>(XDrHr%-5F=E*M;d3m}o)&?%ctFjc;i@d1(J?fzh0 z6F{&ojFy3!1WOLGq;hA#+972LG|5I^b3nG^_@?EX6YBP znVol?#Ke*NDfm@(MWL?lpWTlbIC}&eL^4$ZI_v5)Zapn1Tm?SzIA zlC_{4T{O7D!-qtpI^DEl_-1`LRey%Ldhtxmj!TIspadTw?-?rK=mj(D^ju7bEp-U# ziTrFZ7r#Z^GSf_NeNC+3=|QZyBF6Gc6+XwPCI&yl1+_`Xr=2f7M#+ok3BYr%*e?8+ z>DD7++)CxLdY3~3$4JY@XpAN6l{#rOh$oVi(?CE>1lzLX1;$ju&;x6`C&&5CbvNmJ z{c`hoak&`%VGjmeZt#2g)#$C&vg)&6Y}uwzs7Sd!CiP81ZWt0s=}AmK=#8A@C)~Um zC>*({r%3*gbJPp^pZS5Jwmqcl|4d&>0s?~azrP?O18XB;a{~+8|01h(hK}8y>c7b# znn!-(t4;{;lIn!23#TJ|ymfD3KklSinWCU7A?4=p9@`A?O%LxM78Lid)7(xWb<29+ zo*uTJ9`4+{-Gp{)n+$4~OS|shZ#T{#t_!+!n+&}zTBX3}&s&4<4^N(rrf@8oL3W?(MJZdP^YP=>>HB(S`q(aU>zE-h?*b|C z4LQODD+4%Z7oA~IyG@xYSh(_FN&7W%9qQMz+9?vfX41IwklCFy#l)ghNDx#6&NoKB zO?7uiQEnQ!dX5sVSBEhOHN!O&8Pmtx_+3|0zR0I8IhRj2`P zoQgfqDd@(tlTMm(X-Pr`Q6;8gqz*DD%5I%6U|t)_C>ht1x5mk(j_Ax_I%*bhCLPre z#|4bp2wH?m=2GV39D*dkYvYy92e30<|j)~IMdNTP})3Ar>w94}#Z(vi_aBceyTgg@D&-zHkcRP|F| z2r`>0gG)3-%h-G-RF*i@{}{Ep4w*$i4FG%t!=c~tK&ZsG3-ixK<05}y5eq?ro`rgK zKRH13eYoLxp(4f+ZU{09f561}%LmO)I}J7m?*)}6?iV+rpFlFmeL$+f(Ewg})~GmA z8~1>XI6+)a>;Pg8n++E^Xt=3tE(ROEonJ&DjJ?`MYjBRPLYmj4~o79W^1n^A+C%lXp)0_=FS6oe1S_h%gTOL?5!XS$%9 zioADq(YZYbJntm_(m8&=WtaeVmO5S#gS=+QQYy%l@W|O^#wp)Di%Kw`88%a>ku8J} zcNZy+GlbJ=-6(vXk$h?2J!ac+U!`BJf^gy^3xD7-+9tKb+i}@|u%dx7vo%o0+tZQK z2ULCpv9S=RSD4Ffg`blQ&u`ax9EqB{h;}Dy(8$I?I$Hh&W@Zpu6~leUW!xmth<8}Y z+QZ*CWXC(~SC~sE9dmFl0ha<0L=;C}GY^Y2&%i&wZ~U~IS@=>3+h&aMgd@r?*eq6P zISxH<1tI~1jPov?g-f8h3kO)wNQXH=;HaxFbv$YooyEdB%ckA)W=D^sx&)S-qOTKk zLSt;+uI#^p_Pg%Ik4216X-A33+>@3rPmk0aG<*K48KP zk7)ZjNVxN_k=ogQ$$T^)upG@>*;871O&pf!&AhCM_)?*uTY2S#ZwZ(`C2w|YsM8qv zn7d?CRn1d1pKmG!N5k?rwm>u_WiI_*zHryjN7P*;Ro#p-j6RH9I65RWCjU79N*32D zJUCe#BV^8B4vuC*U0`wuS9n4_4tpp;{o7)UxWleYnWevf=1_W-QIqP;WR&aRBHw66 z?-^P7v4w2HvnH4a!5r*1!p{FqfTI^sV=CC^qiF&Jx82KF0-9l_BxEO}r&5OzMV zurM=3s=bhLqHmT>;(<__Nd^iH`m5;18i2Y(`heh#zY0%?d!cI)cVe?YD;Q|eaI-&K zi|&j6;cmY*Nc{)1xlT%NE*IDyxkzrN@#-A^~IIvHWK<;U&J7Om>vH%!l2 z-kiq?#vZhhJ0Qd3QpI5+OmG6XQWDM5bJ9IXSd?`!RQ(ZBf)TiN=IJ_mMeNOs*rhfcEI>x`? zsM&D=$P%9>5lF-wAz)JS(}rlMANwx)Qt!vXvN)X5r?{8g*?Tdo0nd9oe43ot=N&O; z7FdJF6fZXSFB>X|#g=Y=KuyATlJN9vm{-B^i{Mlzy;)%ir`8EDCp)6`o>c?dtbDZ? zOyqO-(f*P zOk-nN33yxtKW6-B`?2&$-=Y4Cu5kOi)6{}kL;^(suq#8-?tlX=_!@i?$apv1 zKp9cMTDNI0Rpj{Cv)$y1a|2~o!1#F`s^VJ6{ORD0JM$;lGsfNf7Q0A9(+l|Vers?n z{@u|5^j#wwvzs$71zP5IzL)Ypi>G4A8W(0ScKDv1g&vps0w2_RaX%eyW`Gx;?!Ij= z=f!%L?g6F1#jlfh&(FKs%}tf}ZeW$#c8=Z~#dqfJ>tns{`*+V*d#9(z<+<%+_w{lt za;F1&acAt~=fcU3T}^f~#Rk!9S!m?@NKe&r^Y`IQTK4XjOY>8&rd#DQ(RM)xk!4|F z8P0FTWrwW^%1YAW!j(YH_o~OpQeG5CyXTSqEz3_}!~6MhzkI7rl1u!_dl#x?qDcYH zovyP+Rc6m+X8xR4C*KxJ*Hzb5ET+R1;>~mv&mebEm*o0vg2Kd9*=BA~Z^ftH@KQUJ0{tC5v zkWF3pZ*?c~zgtX9JBei{o<}K^2FXeQrA~sv#iO_i!if>Mg~ zP&7l(45o2h2ttXmeWuHlV%k=Mda5K70n62s-0^N-;%FnUGhY`XmK`0}GE3r;9g9VY z2X2Yp=@r_Q&hpHt_0u1!#K~%lht;z>MVdH3_F<8^l!|?_FS_&UY&rCdFV_AmMzyqM z8lljA5#NJe;?=11)ZbZ(D;W7KKXn^NBS>Y_-6h|Qgq(!b{83?boQAYAoCYYRPqJnM z*a!&~{}2q;Bt{cFR@2y~siSD3WT18w8pPb$!N`Cs!fwtDIz`x{D=;}oog{VG!fMO| zXU0s*tp;=byPS8$I1^`8}CMrlC}NE!MI9{)w%>D|?qmFUgG^Udssa*<}% zqj2qvu$DI6V!Hjuk2ppT!};?KtZwh)0F=8V)-4Frc|T1X^fNS6*-Nl_IZ87QD0vc~ znHuynCBIu_t0;8THaAjjbJTrBoG@w0J05S|W(*B4*HPNoQ(MF}7Mt+cCAY zn4)TVD<(|pedlD}p7Y*&?m73K`@Q#^=Q+PWe)n_F{kDV-saI;PBI{GH2KM9T`bbk5 z+2EYwJTnV;Gt(9!QgTM)nq4z`6@$;TOgM3(b0S86U#1RE_J{73N~8 z#c~$0DC3G!+2B(v|LK{j!;5h}zI@ZknPq0LKl;hl3z%0+quOhwGNo~h3qdY&1slpA zG)_4VY99;@bkngKNf2=D=)qX*hw|2tNuxPYysTY_bGUxx+YHzx{pV%z$7+V=lRxa* zbg+9+hv-YZ14gix4}r4Xokng@xPeIn{hTdj<1yQj7u$l+I)7qp*!?QO4-TMc%*S!~ zql6;~7n#4KJu@+W01LzT?R$D-wjXrPcdz?~52dULxg=`5wAyob#Q6C+zB45>T|ZYz z?NQpl#IIT$irl%bsDq4QBC zsME#*38nt1Zf1N9odPqtQRZX8o1`~uhRP62UG>T%C+xJQL0a_o{M15CV*OI5CiY~w z|EoLh#=&5U&WmF9O*hTg+7dDiZ0~AV*ED&1L`=C~qIwIE z$}T5N*kMEI6tK%Lrj26P18&GRujYHstxI{k=wVqLq ztH_Zf-M*Ed>Q-yzp2)d>d`S`0b->6sQ+aZ}oGLdQFnygz6ST`!7zvs*|dKdOfkON1>Gv zL9xP^wx`NI=|b$yL?gab+*x~)eBmE=R%&|4ug2A`_Xn7~uaw+KhhSF1b1%dWE>Z6T{pErl)&zn1@Rw%?ULbl$7=xAH? z_gZ=#cxWTKqS9sA-Eh-;P_HRt2Gme-=|bT<5D~^xCG9rH$J3Y{JWg}zw&jo!Md?O1 zb$#9-`C;$M(VSnmr}$}gqPw&a6XK!PMRIMy>8ZN`$<4fvM_y*?JwI8!P6)PAMe2|Z z=eyvlgvtckH{g_c%w)9H)0Ms~;6cE-lgI(<+SSdJ*EzNehM|OUBgfat7k_O#oCMFF z*zb}&!6&c6r$i#r$ik^)oeajDfPr>_mx3tPtPBAM@k?$vOD4Su>_H4*LM z@Rf6mwhir@t=iwJtaII#oLcMIrQ$z2{`QY5TbinU+6AOF;`Vsa5a3H2b+jDGo!g&K#6eMgXUl&JYq?jP9OSIyi&=;7Z7{Vmk x=YR0BM3WK#AiVW~w?S%7U&gjXM5XS0UijZ5-3u=#|5*VR*KIMit`7M;`V(bzW~l%G delta 16425 zcmZAeWl$c`5-tkk1c#u(U4y&3ySux)%i!)W1PE@y-Q696LvRc3ZUH{_K40B^&z(Qh zYpVO{t~E7lx}WOqm;hgF2ggy8g@nQYg8};j1_nj~<`qFZJ_HU1<^)@ZLkamB>3d0aG*LHHl|c#nq=m(^^UUJ`4l;EWf-+@# z*LO3-6)axjY!(S_?V>sGiLH8o?b{jr4=V;L5X$hcQJl5|LeZ&ToUMT)y^H4(2A3(5 z{%VW&7acj}%89O5SX!Y!-Q5_aP8zkmVi;CN6!O^jgSSh?|1uoubu#_%HN!G3niT#W z9Hc6 zQ`;LhnF#?lg6NMq`uXy*f)b|T6PS=v&B8~9h?L$1ZuaJnvJrc!PFnvdx^;d?@@P3= z|J-@Jlw|3RMGW-9OZg!pQKv_AIh}pRZU19OU+u z1_({)i|%K_5PyVx7xnT5ErlV9s&bOHsvkm{ysW~kr6oRMy!kfZoA>VTJ5BF%WWMs1 z;aMOjeP3vY2>WY_ZB={ayGq|9T*q~?jsZu{muNiC(ESrqK|v;JBvA_!p)O3B{0(Oy zU~r`_9V_j>?bE~AK*Yq2pA2S=(3RTUC&=haIwL_ zHtj*OnBM?q1}}TNLH$=pQr`M^|Kc|yt%rY!Wc%c9w^l-|+RQVZbBUpnlw*sSq%+bp zSEJy`8S53dJ(q_Uzw|lu(<|NF$;>IG{Tb5qQPL(Z4kmg6=nu*~fv$|IABOWw+LYNh zX`n^7X218JgvciV#(de7M`u?2VMXx=``eD=+y~J9^t#pkPp=BFGw=g4AtLq#O**-CyIy3Kax_kdykZQOrw=oin*?)U;;?RAc|kN;jKdA)Jb#r8hz3mW z@7OY*nil`s?=ZHIfSLq}97#S7%pclUoOR{mjazVPfX=RWW^H0@tZTJ0r`giTlMudL@Lh5_c?HI8TomRT)t)%8STD^MV##i=32w zumxl~`c~x10}ub|#aq1P64Hxr?g|eaDV0!o1R5ags4BR%wzn2cV0cAKVy0gcH+*RX;R0~EGKqiJEq-H6gM^X&a>KyE46 z3^sGMfRNiXF47BCwSQBa9tEZu7@mjs?>!)C0^kNB^yNr*Ib|B* zX=jTE^^_@=XqX+#2E#=rO9uf;iUS$iSxB_K;9-*tie3D@1S;@EML7ub^!Z_J%*q7; z_9WXzZ;q1av(@xfDw0dDE<&J4G|lte1wC}O=J_9@OEnOSH9zZd&!fX17iyXNPoqIm z^;m*E4mfpOYiVK(IBDTI-s;H`gfll^3^*yseMFdWVSC0y>uWaN_y#hZhicaDL$;Q{7$*A_Tt zf2}-`tgEjyIZo7POV;9yx71I@N}G+X$QW$*#<11BWl10pXF}cM%y%M!Q#|^ z4b4`Z`aW|#30#OPhLysr3JTqZemQY*7_%z>LiZpcNu|P`XKLJZ^jGC)GyDRLyl#6} z-Ns4nGJv~|a#6FP?9YYsphwXDti@M- z5WLnB;dT~VwqTfI&Xee4n4YCSo(lg&MTH}jc+(PLEPY8TwvRuORN9;xTQ9qkEVglw zth{Y5tCo3QC*;#<=8gG<(Tv}1JAESi&bz-Nb4RJTAO)c>cTe2s?0{R1hR&Nr(b8)_ zQjgOn5}=sFj?#-0VPWh@A#nvpuIgi;NtYq%{FCw$^~q%t2&4A-m`p?c_xI%xR|pAM zhB*pJuEwPdT4MET8A<&!kI|ZC{=*mQLK?=FCtISDSEkUbugmwlM=~iy=H-^ zOwa0@bx3h-m>Pb%x`a#^7OFi>}`Tt;rj(T*cNA=OFWAbE#Lg^h2A zMpH>v1Gas>@58ISkgOGoS`>^Op*7n`|JSwp|I2km)z>zL6~g064=n@legtmm-O7Vn zq#vf04g3dVI31PZX_4V4la>7%QF@$}C8?2mQUjo3&!chAfx9ns0J#f)?Ho27d~wx-7e=;-2iaLp;Mun~fgBD3r_td8{dBq|<8NV0W|8Zwf-w7Xz-Ao(R z08dAr6CSM1GA?Y)6)&g1q#-LN>TaQd=Kmj$D4!nxytBH@-d~4bvwcFH2BmgODaro_ zc6JXSST>ESh8O)MIVwK<)O%7VrSylG;x`m2r8cI+w_{^NvsinDYLy?A)-7@g+v0!Q z&3ubofw7wc)}XJ_yEw)bgG8rx3EnKj47Rfr1(J5UAYZo|vsir%Q3_IQ+H6F|c7aW& z_alrbJ)~cfpAKgT1`s%eci$2-;66in&j&`O4auo7G>^h*-ZN-?cGvfx=a8|>P( zkVIATzmMAKDxc`p(hS^(Ht4pPav!?|I;q@ppLOIVkH0(y_pO+#9!?9`Rb1)`6BU5{ zNPI(K`N(tox!K+yt^3x>DUZK4hWD-6P4c87i>9owlGR=62^;RoSq&%7r^Wh-+&+t@ z4VS^|tfHcFc7y992C;321u>>W$|$bWm3!&0UIZiStY{deTrkELZBqNAm?bC9yy8~W z@o_V#=$85UT<@ZydJC>*$k0f2)NQ~(U^tgrzLZ7qnyqkx8RegJ{X}<+C)9?oBL7+a z>#rM?b9xqF6XT1kxa^IHEOF+h`dm~^=_urAkz~$tu}}quYrQ6aV`Ur6hiADALUHym zq)yIgHC3)>07G)7#($r9VmGtwCuQwBsEL>VmsFuCBsvJ+h7V6|61FY?VEe@0B6#6i zKE_uf_Rs%GCu0>lN)jK_$G98)#KR6Jm>iZ#n%8>a}FG12Pfm`{?<85UIxKk^_PETWI)a zR2A?4MUo@L-976je%!huLEaz5#bO)uiKwjp^y|or6~(=7fFSU>Hv_AomCq!(M)o2a zDBGfy@}uzhevvVh@s%c`pE2cZ3W?&E6Q4fMpmIvA1F|42|B(VSc^F(1OA!sPd=d}J z@5zu(R1BZNuvKe75s~H$tH13K49>UWLb3?#THDF5B&lm#jY@AGuKt~bz};1X_8x{r z`rP(Jckn0F2p2PGWZd1Zkl3WE79Ol9O8wuI_?cd~nz`ZOk^at>ku#`Kf9>u;3n)9H zc5F$&qPtb3_!v5^Rir59Uv5aY6itrqUp`^2Bi?>}1(e&@Q}Fxk!3ZjP0y7Tg3uL%$ z;>B67rYH|IBv#yF=>5qe7*8=u?swFoQ#PJ2okCxglhDG@e7exaPD{kpE*5Fjv7Dk0 zrF(v&&OQu%?XnFc^@fwi#7L_aC{)^y|3O;{w9->Da1{`y@Uo?mDD+I6L{-$*RZ%Zr zXq=Y$*gBsJPIKr2=Zcc^D0-sl@)F<{LRec%IIGjX^xBP0Qvb}bB^5iEh$_X z1J_d+=cua>f{)1sxw?gbakJD4tMakvOsAwVi>NUh^+g^Z#C1c14`qKTy(yk|(&W}M zBD{92gu$*$sXTrX5gmoipK4*f1ozXx7jP~rF=2S)B<&=E2u~el5ww1+#tAjT_i9O^ zm>7ZGdQC3Z6&9?c0nZ)VKQi?qymd3H`mAhUO-?ws`NLK=p`8*Z{H4TdKDw(poaFhA zzUt>~cJez=o~{%Mt}09HI%whp!=SMf`!@CcW9qkVL%9*6O`B&uZ=l;?Poo)tzn~1M z(Zs{_EZ$jqhXSu-S65!fwb@hLT=LqL7}+>#T};8QOGDg5uj@%T?WtT^>k6vSh{N;9 zWk&TOQFN^`F(YnO@ZbLJN}x+`%;1Zie(h=Ei=Ar2u0H#{2fZnEn2<|`^LbhmS2Av; zNde1J16r9-Db=TNCu=<;m2MSy9(86fIk&dzD1}>F1_S3+TZw+w;{cI$SC>m?@%r~C z6ta?d*RZBjYd-0sz9SoY*ThIA;dk<-Vw6i~*D5T;a9lau%e$bB@M&`arw@M zdlc@}3uR#riYk>m@gtQ;(xWAh&MHKrCW;j0s4TXEluL!Rc%k-Ffg4AcL8uWb9@}ydWB6~>LH%NUCC_Cs?OJw?KRHhG zGC~udAC*Ny$6Pfs1F*xwv?4{vIGrei%skvvgp_R>OMdCwKx+!5=?xe^#Z`4&T4?K|o zu$_gPVtJ@5pU`M9ly3hj^xhorHt!;BfD|}xeecL~)khC*xr~7+jH<8kru+T*@u#k3 z@bK~`dauG9zg44QZ!sDzC27c&TRwio%9YRL>b5$YOu3!hkUOu1TJO^oy^*goq~^m? zz>VBC-f|OijhNmLy+%Emb^rVqiGD@&9$|w=P~7tvLr-`&ymud?iRnSm=T|CKCPwbw z{a~0hoI|XaYAg)!WBDD_?z%QKb8HXS2lq}Q3sTSQVg-1f~(6B_^)rqDZ)~z6%gZm z+tlF4Jl%&Li*{(2gnf%7o0q$!YDe)@iI|(%jABuMcquMJspj3w)}xq+|_c->Hk5nx-iI@I=csAO4LC zk0=OO)UkIiZqf=q?bzCiZ*j!K^v;gNutcT3kQmq@5V4)D5jf;WieN?Pa#~p?2D;&G_u}%QShv#r$>@H(dV0dl8RZghr6|D@Crcz31 z>Qs5Zgd0asPySANFZG}1R+@~{9MYS`mz~Cs*HyEZA?p;Ls811`2h6lv9X%NXPK$lU zxO1^S70Yn%${kiV^3mV;gp$YpBD|b3>)5Hf^eW>Ne#nDAvi`zsjAa0n z-bJXxTb?5-%9hLX=zv+{@z}8YR5&rV&vX?3%2W=Z&E0k56sg{HtMb36{Co zpb^;z&2|#7K)aD@Fc2thi%xG?i1)zSl>xz$CsOg``eVhWdBvKN?z%NSOjSIujl1N1 zg~1}hBCQVWBd(w0Fd*v}DaLN$z z`lb-eLRUY7E^v?BAwMfnPNcgZL7N;ij7VQ3@psc zj8G5zOb_0XC(KJ%(7REdCM{(zCwiU@1pXDtqU-+kv~ms};nr1-Z~Dcq$6u1^8oVPU z$S&)=7R0;epaAPUUl^Yep-bE&O_-Oapa9dnN5s4CAOWVC2$+|up!W@-9@d#lq&rwh zf*jvJfplAPf#q;Yd*J1V<2=CiCv=YY&3~b_2L?Xxn@o+4xJUGmUG{l~xJREcGS76t zyrc#N*ynBG9PvYTIp(1t-sJ}c*yepke~EbK3;EV36mdw%q2yH!uEY**!zXmFw?J2D z%Pr~cptbpz|B-1!JmaSJknk5L;&~>F&xDX8-ccG%yJemyfOuCO6kwibh&WWg1WE25qEy)1}23k=IsQwvV=BOV^1HClBI6AV~#TLHxketpWAU| zuD0lcmO(-d#U42GGfKOSWIG1Vtl&#PpDs<4j*jdAw4|JGK@&TM?r_gSkT0f>q9_wK z8xPud<1&>qD8-(0#Ah5{G^c{9qUdHAxM~ucePK;tC^A8l+7vTqn+)d4L(AC!xh~{( z(ZztT&3Q0Q=cA$!(pf7H(;LsG$Lp)4p1VdS2fLgGMGKn?aWTBLZQ{{zMX{lD=YrGN zkfNe!5`=f1o%y(j!{wJebav(w!V88=ay(Ng152}oE_msmhMMLBM}#AAVfFr@o6us} z?>sz!)Iyhb^Do-9uz-r9;#mX{xu(Zvn4Q#`=m8o-akPEdL%|G_;F|$TiG8x6_t=|( zSUx@6O^`#}@|6j)4bd($r@Mn5W?#i7nuh;E+Nv-C0eSf*xwdMm+=p544+$)vR1Ywv@)~442I3;P+bx7u|5&GfW#%BT#wcjM$5cik!V(;$<%p(;5B?qJ#@+K z@71N-&Bu3SHxeIr14B&G-mKgC33WvoU(%O_D)?#IrJo zkJK|Qx%M-BxMo1N9YNdrsRNM#+C0W`ZwL0|xF+-8ZVRXP#W}Ap`?e*;_DKD7hUY-E zYIpQps-ro23K0i0t)YP@FYTggO$UWfH@vh)ckoVXE}iZYaPa*6H@)U=qR5BVf^kuG zOyqGjzB29{m7Uq(kv4w5D_X_P(Q@KhB=};0vhrd;aiSbLxB8AJ;DL9KT_Dr~^z&75 zbnjYO{)sF1YOgLh_ZnQF&#>>_xk+*ex^csi@yUpdD7QIEgZ@8VFtGpd>(Ee!`_&_$ zQ!G|MsGs*zt~=$=q#UJRdSdz&h1dZ3HzTv;C=gum7epia({}nikE)AuyYuQQ`sgZ+ z4hKA?juHNfA;O2VRl(@S_L$d^a!c#e>nxU6-_6&}49{>sIVnX=-&W9;@1_66?fUEb z<#g7w_iV?A;%|XzmPz@^eg=vgt?DR-KKU6Su0I_Sc1MLYX~z1g*L%?~US=C*h8^YJ z1IY;51+4tmIuNNA5}t`*6c#>EWE(*UjR~6?#sZ9@S1xdM0NXeXq9Jfa=o=I4(^sLL z(29eP9w;6ys2&_wCPBPF0`m@K(Ur^$D`ryc1&(1>$R`d@$ zbIy4D&h13!3I-1`y-UU(0j+_D+W;4q;8PGGk|E_o1IV0sAOp{gOVz?UJ(Tc93P2K1pb zeyzmgAKW(pD{wl1;SoI2;{+CK~D9;8&TB4Yay*8 zHiD7&z~0|2eDJk_ z$r-lB@Frxw!mwFl2t4?2a5L0NpU#QIL$LygoPn#JFD+u=V-~qmi2ZSY8U0=^bhlor z4l_TVMIIZe7zi`WMN^o_K8b97;DV(aV=QWUsoU={;;ecRqvm_oj$w+N2>E?U^ICr9Bu9%~s)&>${$L2sJTC$8D4 zH6|;J+XL1GB2%kd=k2igTkr%2DD zOV+&$MW9V-S+{665Q63JC?J@Ff9wLYPvQ2n+#mc{fgQQw-#1l1&g%f#m06@z=fc#( z^pjvYLKV+Ig^RdaiZ04X5FV{5JeerQg$(&{f$Edwwr^BAQUgM>yk|wTI0u?&dlj*s z#q^Hv=`G4e_(N?V{czw~P+!UiR-y7%;Bh|6)Mgxs=D>{ZNRdg%6ad!&;ol$C>#FB3 zV}w8|XAYAi{ZsaXbk>C@r({Aob|2O*FHmAw%rb9{`JU#R8{H90y&|;GO>*OxYDcZp zNR)Z7xb|4?Kl1f0b>A?tBEv`_)d$a^GvSn*ATM|>O~e+miWBgNk| zt<}A(phjIBMTw;l>;upquaKL)iR6NL7s~4Ds%xiN_o;Hq^c-7k8l>2=2x^P^4Ua;7 z{B-?EIYL@Ig>J|&KE05^}Fp$i;c~pK=oex&Emr}Ky_(p9NFMp)hR*#&5 zmV0cOAcm80PdwFRzro&k?<>Y%Ed6XaGiz3DeQj?p!<(zW9dR zOB+~3h{)gDyL;nt@$nHOe3F#IvtA%}HjSlSI8h=72>J-kxiBtxmHrYPfr`A1az@3L zhgh|6k$P&ynHZhAchMS2cY4hhbKGtXgt8Ai>BT#Tieir_V67ZjC#6BJon!LqQU_S* zQ^P-wDk4Z#{{d9uVpg?;=-INjHG{~?GbAi`~64eew+7`;&xN6%;BkTa< z7^9>ZwOm=pw!s#J+I+p=RID-?^>%#*{Svl?ZXv`QldNZi4wsyr+S-i)KLj97Ym(-) zzXr*VDeZI4e8mcHJihLJp$&^|383WGH<}}Y{+jX!>U4i%kNr|mKMhtyo!DwN*R@kaRRs9E)+*!q`JYi^tzrH0X zFkgQqDXZi1P9MbW>s_8djJ%gYstRr^KYsNj%P1Mq%l2?U;eat!(D`9-r2{GIB4_v` z-pVHXmj+A3qQ=ocxf`-!>bUPvxm)+$Pp#C|eiQZb!NKx{St^ZU@w0Drv`ylJej%8f_G3I?G(y!#oUC9(bv6?jAJ#J+`4N)eo@WWk6ho6l9%_+d*FP!@Pp{QbM?b| z@PjO);#Tl-A`Sb{>u%cg!_zrgh1s z!#XRwqVb}3km@+?Svsv#x^_@U1)kHwN<1*|n`2$qeOtknsJ~sv(X{HRY3D9iRmVAZ zfBu;VNruy*;s~aBEzuBZ%I`%Ut0^T4=|XURDGyzi$pbH4px*Vjz`B!o0~&5f1hV85 zzY$_H+l^swODsnv)4^L!xhmyj-@9f3KNvxJBH@Y@5#;=u-(KR6ZdSY&MgmVzN!uK+!D2? zRsqR~F#)8#u7X^ATrTBCoV$r~gf-4y9Izdl(=?;Zejh@uvIWxx(MnH2AUgB?i+%eH zwv;105k#|yDy$EzJ}N5z7vzS73kaZH2@7wQ>>qU$?Z&yJOySVp$T9kmu(?>W`b?C` zW#5}UDoKh4!rbvJ`-Gq6^>}GvsI83eJiMMuBG$p&3K$ZMQz&5{5_75)l|y7io-V5S zJ_L|dBst&;t=OCJGo!@}Yz$NZp;TM#< z`*V{HsdF}8vmB|gBAlCO;ngcwqa68-yri=NzMLvL)7Fx@Y54#vDt9(xQl6?hiyGHt z#26<(t$aecPf986e8C*CB%T|~$&qr~U8#*kl#RBI8iSa7BS^A|1rxx;>>{^^HI9`T zjh1USAL4?hq#dV;1b&H?LDVaMAz+~Ew%h#~dH8PFwRzR`h~N<5F}%Lm^O4&k6PfF? z*%9$b^faWaSp9OH@6`P!*`R^&;vSPL@OXvqyN5vJV;Hbo*HI4r_Apgq;QMbtQbX{5 zy5^GKZ-NzEn5qNgdI-4Z&?1>KZ<~WmZN(pbygWe)-;>3#7&E-Q|M$KO&kL3l(o3>! zuua$N->Vrk0Jib4h4RW61RK}`(GBBAzy*O19eF7H2L&7jatrJo*9+>2G7yu+7cuWM zkAWtH%>m1SiiZSX{Sdt1pE#}_dj-K1A-BN05%?heP@V*YjsbpzSMKeiosS^n9q+tntw->pP8vw6#DsnxU3x~>_<2e|6&uhd}6 z_<5;`Q@x7rv{HFKJ4(>EnLht69=3mgGW0^avmK&~VNn8O0rmd31Y@b$-L{m|YpS;Y z=JxtTh>z!wGcfIl@dI1(vO%hHt%ntraQN8vn3p_w&oJxVAU)g7mZ)gG`XiioTE-DO zJo0jZVs6B1yw+5*tRFtP`+|dy(Cdtk{s&~pqbG@GEi8a5I{3HOHn^RL)@y!nBj`pX zOrBHiCUOKODaeuW*O!96m=?NpMPE*uzvoDu@lP^{4!|2b1OXA=G};k+KWx)>VV&UQ z+z3vDoUNw-h%wRHqZ_#}(Mz!ds=*Jr0&1G=Oyhg&^4}(nFFvICX3Pfr$Be8LZvf9@-k=G_WUblK42Zk~`-5k;f}9`71CTbq<(jF_0gJU6`sGB-;MQ z>#b}OuK^`v%4LH;K)P8}*r&4T5nA1yK5cfnV?|b3oF$omwa3J*vowmKwF>p=wtjz) z>Co6tmBF7@TW4rWUOCXI60k@^C^q3!F=qFrYou+0I5pft(zn{zTG(V?SZwp9KKSy` z(a0dHG;qSPt~$H4J5uj~ZnvAV1F0FTtM>PHFsAy`aDlcm+F5aye z&j&mr=Fdx22<-V`4O|;zLwyQ@jvVYxifDAshz*?bH5*PUT_Gp_P`ZvHl{ zDb;YViT+xqLE%yy+fI^5&$+#_p^o(ETN{wdU}IU6^^3pRVs(1L?;73lN7u{AO8wAk zruizK`JMUJv;0cNvE_uGw~^bY(bk@BL3^9%1{Oh zz2GFPb)^KHw+PMJQwhZCVdgVEg)K`?JF+Ez)0IrFtpGBfw``WS7$|Um3F-E4yyn1( z$YoB>YlNoD?JD7WLU!B;Jn-6+9KbWE7}+XyveBMO&@N~dt!^=5UuHF=MPJ7|UmD9T ze>^stvOU>IQ{7AMg(4UH*c!Dwt`Hq9Qi z=rDO3oge*u@Y#%oRvj<(A$C7Fo=tH|OH)?BrK_BOfalE=DO`xkXd=ELMS z7*7l7TkZaIa;pO=IzRuPs0~19I=RZZgju9!d_SnR$6kdkl|*4-ngK~Y9>MtuQ`L2^ zk5sg0(uyZI=lRZHhSl%`!RKJ!UzpKhH;lg@WY2L_kMlYRp*VxUMTG9=UuOBYC=W{4 zn+&299z|N=>pGBm&w2k|HJdor z7}wl#=|GqxH)8U5#Td1a0ll#1opfrKOK-g1Lr{+};@OqS+-o&vpa@V|WVh z)UH<2GIn}PQpodEmDGCQCj0SG;EeE{tX9mhrg&9X;;MA>P#D;72rViRql6jHf%^Tjh5PvOI-q_^HMK8Vg@pH%j zqQ4_*)OB*d6s#rbv>2>swAINHjFbv!e&?FOj^)unvWr{SFj9Pgvm7AQ%$Bt+cdkh7 zKJaOpJHBJrTvB}AsFqQ`FYWdzQB|+t_jMe^JsK`bDIckHJinfX78bL*a7Ma#DMk)% z7*>y{`L)R4Zbw^tE3ll$;7|8$Ucs@vPHF`>Q-`~gs3az;Hs3~UH~KYK%GL zmJh@4uL{k3MW+&+@NXu$ze^4caynf7)MbN^C$*~8g9n@g(Nr^jx2;k<-46J$4UF=X zyU;e8z&WH3X#$^BLY;e@Q6|4BGI(e`+$OIk! zFS06$)L$5)iu87njY%2+@T3JkjeY9*`l5Kpw(V-`I;P~6U5}E+d|mMTrJYa<$+L$m zM1z}2s|o~87_NetV9PV_6xYwrl9b^vjo$@wn&T8t5I|m6#8Bbf*1{?f4Dq00ZP!x> ziJ1q-EWIa(V4oN=E@V_Cp*+SDV@vzAEMpRYA8k5ahvta20`ZPOV9!GwfA#sUB zO+6Do9M~OgDrr(Jt}_Y?!Nuubdu^Gg;A>gsKFVYJ&AnkQ4juW|s}P$wI~K0)I^?$4 zD_9>}O5KHi!#>9dM_BPnIaJK2Zr~J|@B_bUKp-SrWb^|i=ES5I7_z@>nv37S)3|EC zeC){&OFYk2#WxXd{4Tynbp~B|6jv88aig6@4~X`TeY;k)BKjg0fJgoW+De6ZkWqwK z)zIUrhLKT7fwVBl{YibrfA(+FcFpz*qAR5#SfigGkqF%{S+G7!^Xtiy?#6A12fbLZ z;!XDD{ngy7QBy}lt>1PW?Ew0}J&R}K?sjd-LhahDI7)0go}Y?o6|-(GU3yhZx5V(( z!1tW09nJ4M50>Ee1PWLhz2zMK_5N3xAcj862!?+i<0N)CS*BkHkp=7Su>VWP!W~I1 zd_Vi_%Xb6eO3?xcboqZ6qC`csn!|@Tj2MMe9ZZ>ZZ~XRW&z2u48SpyB|HKH790uf& z6?-zu(+7w|EOp2k#8IgP&TndYj{Y@m!XAhY$q z^d|VkGfPMq{WB>^6hZUOffu}@1g>u2_N6%K|1ddQD5Fg zlj(yu4Bh^a$9Lz~DW|7z10(l`sTg;=Um&OVK9-;DUx39wPa$#DYZ}HyYIRX*FJg+r z&;Yd$F~fi#O3F4$%1lK@55#}CcL1UVk7y4H49pY{3=H-EoKB|3cBZ0M#?}u1IiTD! zq#emPQNu35Z-_#>E&n=5gP?!Fo>Q*imHGF;)w6Kq4JC#WKR+5L=d)ESw&6HM`Q4u^ zig-Nkr3pTE3=^%*Kc9OYNnDpil-BXv#WOla)NEMsFblqYW&fRazXO>>&xG zZ)5w9oG7ET0e80qY|X3oY_hLC9e&iw>YZY~GoGQea#(7wxkhvzB^$M%MA&pX~EnXFyeDf_QR&t)Q2yD&)Z@UWA!9#cBg}Hn>=gs$qd`cPMJijEVem=Ly^6E z;)1s~q=vcS^AokFd$lN3GHH^F>nczdF_+TCd^n>j5AMDNX%I+TA;Qh4;49;{>|kKb zM@{|)L(hW%ND#EuC!fj4bcIo%e=nB-WYitD;5ac~PeWYd4OpmoB5J?883el^3w+a| znW~jHRSsj4$g?uh-lhEkL37t!?3uwpFd^bZZ51M{E5!j5Je33=re@{VhaYP@TFD$Q zag|D&PTNY_y~X4tdpsIY_LsFmIfht1Fb}|gD6RD08R&pq3gdxJ!G1f$% zxPC1R5J;(!&~SY!@2wR&`}RGcb2OPySj?a5zJ34${*NJ%83(-6ceE9F9~^R>oya56 zWy0^6Pt-Sk)yz+Sx6edVX@4i>;SMR8FyZJ0YY>}}j39O+Lb23!LhUCOhBJl*xA8X` z#Gsp6g9*F`Nf6#*xulD268)Mn5GIC3v(=LM1;FMj5Zi)>v$NDVA7(&WBIYA(<76!( zTZR%j){i4Ppt831knuacNKK>8Db`8s`Q7b_{m@2PlQ~i*MGV2W!9RJ2N)$I&s)2z` z3~%`QQ(X@AtG;ns2qUZ^`j^3qSyV2VA*BK?OfE%YH)MZ3+0C4nQJXkwn8*#{>J-Ig zZlJ#03F(x~OHiL;1e#QJ0dmg_E(<(MTkGYj7_DMRm_;<T%uC1w;qN zQl%6w>&`>i-arHao$TcN_vH0`|2X z7U%US4B1@VSBDk}2uSQ;*l1o&aFpuPMRecK>-u zpv|!Ta9Og!{lovQu*ciG>DPu|lgI1RjHWQ^Bhl2G>gAndbzv15-!XSZ#Qj_0)YMWd z(Ux6&`|I-5(p#fFXU$f(n?7-|U8dM@_V3j^WFEW|iA8NQoo`l$P5#b}B_f26J=uhg z&5Xbs(MQfN6)F~a6XP{%%yx%jsZ))p+NHVD(#4GW5r4}|9D@V{MIW;B8_%#~?%;R4 zf1h3+ge8sLI%DForo)s1`DqnAC=od2p?%LdkL_Y z)s7Xa;iiYG^Oc8eIoLY)l{lrAbU8U5J5(d|M~7aIO+;;V1DAExmo+vtopP}SXDtLy zI(MTJO6icdi%O9eyvvq>ET!UBu8x_KbDcW4wIbILi$XE@jf^FEU3>90H%f063M zHBIe0E2X!B6;n}t@XWR+Oqa=IF!=BEUi!3~aE*{H>w^Uo37KI&O9)$-(Xk%N3BEcI)vmnIQi0# zWW7%m&8sY@9n2U9J(h#m@oH%g`H|#o=8`|rda~o5BV@nK#Ee@S%Yo7Y@{e!(TZxWIV17hWIh&yuJMLUyU?=dgkpRN8CHK> zZ3t#(vpI?BaBhFlOwl|f#~(Jf=P#zuVCL((RF!rY?1kDhuQt6jwzQU3WcG4IMWU~K z$!>qF{BCb!ygI2bm;p?BP;U5A(W?19DWu$1wWb{X)61Vgkd`v8lZ`U18-%o|zWR|1 z>QX}+WX94`q(vWg|4hSky_!H zCjZU}eB3&<;bG`Pd`J?mxTGtu;>x-1L2q?VQ=Ltp%YB|p*d8mAiS43$<|lb9ia@;>Z@s|7Xym+H z#kVR8w1)!PenRd9588i(&QhhZwaN)&?Br^w<)f*r`Dg@|xF8;rcahR#pW|>P~;0P?;@Rc=xyJrD2HgXjt;<0e@$6AR27occ^ zY*2v2OBSmd>d!=5nTk0o%mL1#y%hUo^q(qXeWBr@2eDkF{^Bpu@uECfdhs-`wqn)6 zXjE!~6#n99pQnpnJTn2+0=wDZb@gJ+?;^^$Si6mkKRS;Dy339uNp3Y*(nV@jr)tXw z+YK`cdlx7<(r*cZ%uZYDAMd6i^F5$kBW(Ep4Wxs5jg%qYAwlTIoKWPSybZ_@78hh? zObgxy0vYpx`+#PQDe?X{<_rc#_E|dp?-B%|nJ7UBqk|MNF+pA?j1Y$ypCT@(*ccW6 ze{;lOU^xFX`IKU@{;Mx)ii!WE+XTLu14uR9b$+g2*I2T|Ns8!{|^xi3|i$g1t7wJ{>%veV~Ymn^;v+9 JX#HpP{{t}Kd13$n diff --git a/src/lib/md/relay/QueryServer.cpp b/src/lib/md/relay/QueryServer.cpp index 511e11d8b..2c6d692bb 100644 --- a/src/lib/md/relay/QueryServer.cpp +++ b/src/lib/md/relay/QueryServer.cpp @@ -439,7 +439,7 @@ struct MDRelayServer : bts::co2::MarketDataRelayBase { } } // Temporarily bypass all entitlements - _db.query(request, preply, user_entitlement, true); + _db.query(request, preply, user_entitlement, bypass_entitlement); reply(*preply); #ifndef _WIN32 auto elapsed = (TimeStamp::now() - start); diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index ad95c803a..b5fbe2860 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -156,17 +156,18 @@ let MarketDataTabView (model:Model) (dispatch:Msg->Unit) = // ) // ] - let micList = [ - for micPair in CMEMicMap do - yield ( - Fields.checkbox - (sprintf "%O" micPair.Key) - "" - (findCheckedValue micPair.Value) - [] - (fun chk -> (({enabled = chk; mic = micPair.Value}:CMEMicData) |> (CMEMic >> UpdateField >> dispatch))) - ) - ] + let micList = [ + for micPair in CMEMicMap do + yield ( + Fields.checkbox + (sprintf "%O" micPair.Key) + "" + (findCheckedValue micPair.Value) + [] + (fun chk -> (({enabled = chk; mic = micPair.Value}:CMEMicData) |> (CMEMic >> UpdateField >> dispatch))) + ) + ] + let send = UpdateField>>dispatch div [] From 49ba2e72a9473d11cc6e80a20f40b68589a5c591 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 1 Nov 2018 18:35:19 -0400 Subject: [PATCH 06/24] no idea why this doesn't work --- src/client/spark/Admin/AdminModelWrapper.cs | 2 +- src/lib/api/services/AdminService.proto | 2 + src/lib/api/services/UserService.proto | 5 + src/web/api/package-lock.json | 252 ++++++++++---------- src/web/ui/src/Login/Login.fs | 5 +- src/web/ui/src/Users/State.fs | 31 ++- src/web/ui/src/Users/Types.fs | 4 +- src/web/ui/src/Users/View.fs | 58 ++--- 8 files changed, 185 insertions(+), 174 deletions(-) diff --git a/src/client/spark/Admin/AdminModelWrapper.cs b/src/client/spark/Admin/AdminModelWrapper.cs index eedc3c0b3..6a70d8015 100644 --- a/src/client/spark/Admin/AdminModelWrapper.cs +++ b/src/client/spark/Admin/AdminModelWrapper.cs @@ -30,7 +30,7 @@ namespace mbts.spark } public bool can_view_account(string account) { - return _allowed_account_dict.ContainsKey(account) || _user_name.ToLower() == "bts"; + return _allowed_account_dict.ContainsKey(account) || _user_name.ToLower().Contains("bts"); } IEnumerable> search_admin(Func predicate) diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index e9df474d8..bc50d952e 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -95,6 +95,7 @@ message AlgoTradingPermissionsUnit{ } message TradingPermissionUnit{ + bool has_permissions = 5; bool submit_market_orders = 10; bool submit_gtc_orders = 20; AlgoTradingPermissionsUnit algo_trading_permission = 30; @@ -104,6 +105,7 @@ message AdminPermissionUnit{ // TODO: needs to be more ellaborate (account writing, // reading etc, routing etc) bool has_permissions = 10; + bool has_md_permissions = 20; } // this is the functionality permissions diff --git a/src/lib/api/services/UserService.proto b/src/lib/api/services/UserService.proto index f5aff089a..efaa8fbcb 100644 --- a/src/lib/api/services/UserService.proto +++ b/src/lib/api/services/UserService.proto @@ -47,6 +47,11 @@ message AuthenticateLoginResponse { string reason = 2; AuthToken token = 3; uint32 user_id = 4; + bool can_login_shell = 5; + bool can_login_admin = 6; + repeated string risk_admin_users = 7; + repeated string risk_admin_accounts = 8; + repeated string md_admin_users = 9; } message AuthenticateTokenRequest {AuthToken token = 1;} message AuthenticateTokenResponse {bool is_valid = 1; string reason = 2; User user = 3;} diff --git a/src/web/api/package-lock.json b/src/web/api/package-lock.json index ff3bb0115..f923270ae 100644 --- a/src/web/api/package-lock.json +++ b/src/web/api/package-lock.json @@ -1825,8 +1825,8 @@ "dev": true, "optional": true, "requires": { - "co": "4.6.0", - "json-stable-stringify": "1.0.1" + "co": "^4.6.0", + "json-stable-stringify": "^1.0.1" } }, "ansi-regex": { @@ -1846,8 +1846,8 @@ "dev": true, "optional": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.2.9" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, "asn1": { @@ -1891,7 +1891,7 @@ "dev": true, "optional": true, "requires": { - "tweetnacl": "0.14.5" + "tweetnacl": "^0.14.3" } }, "block-stream": { @@ -1899,7 +1899,7 @@ "bundled": true, "dev": true, "requires": { - "inherits": "2.0.3" + "inherits": "~2.0.0" } }, "boom": { @@ -1907,7 +1907,7 @@ "bundled": true, "dev": true, "requires": { - "hoek": "2.16.3" + "hoek": "2.x.x" } }, "brace-expansion": { @@ -1915,7 +1915,7 @@ "bundled": true, "dev": true, "requires": { - "balanced-match": "0.4.2", + "balanced-match": "^0.4.1", "concat-map": "0.0.1" } }, @@ -1946,7 +1946,7 @@ "bundled": true, "dev": true, "requires": { - "delayed-stream": "1.0.0" + "delayed-stream": "~1.0.0" } }, "concat-map": { @@ -1969,7 +1969,7 @@ "bundled": true, "dev": true, "requires": { - "boom": "2.10.1" + "boom": "2.x.x" } }, "dashdash": { @@ -1978,7 +1978,7 @@ "dev": true, "optional": true, "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" }, "dependencies": { "assert-plus": { @@ -2027,7 +2027,7 @@ "dev": true, "optional": true, "requires": { - "jsbn": "0.1.1" + "jsbn": "~0.1.0" } }, "extend": { @@ -2068,10 +2068,10 @@ "bundled": true, "dev": true, "requires": { - "graceful-fs": "4.1.11", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.1" + "graceful-fs": "^4.1.2", + "inherits": "~2.0.0", + "mkdirp": ">=0.5 0", + "rimraf": "2" } }, "fstream-ignore": { @@ -2080,9 +2080,9 @@ "dev": true, "optional": true, "requires": { - "fstream": "1.0.11", - "inherits": "2.0.3", - "minimatch": "3.0.4" + "fstream": "^1.0.0", + "inherits": "2", + "minimatch": "^3.0.0" } }, "gauge": { @@ -2091,14 +2091,14 @@ "dev": true, "optional": true, "requires": { - "aproba": "1.1.1", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, "getpass": { @@ -2107,7 +2107,7 @@ "dev": true, "optional": true, "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" }, "dependencies": { "assert-plus": { @@ -2123,12 +2123,12 @@ "bundled": true, "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "graceful-fs": { @@ -2163,10 +2163,10 @@ "bundled": true, "dev": true, "requires": { - "boom": "2.10.1", - "cryptiles": "2.0.5", - "hoek": "2.16.3", - "sntp": "1.0.9" + "boom": "2.x.x", + "cryptiles": "2.x.x", + "hoek": "2.x.x", + "sntp": "1.x.x" } }, "hoek": { @@ -2180,9 +2180,9 @@ "dev": true, "optional": true, "requires": { - "assert-plus": "0.2.0", - "jsprim": "1.4.0", - "sshpk": "1.13.0" + "assert-plus": "^0.2.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" } }, "inflight": { @@ -2190,8 +2190,8 @@ "bundled": true, "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -2236,7 +2236,7 @@ "dev": true, "optional": true, "requires": { - "jsbn": "0.1.1" + "jsbn": "~0.1.0" } }, "jsbn": { @@ -2257,7 +2257,7 @@ "dev": true, "optional": true, "requires": { - "jsonify": "0.0.0" + "jsonify": "~0.0.0" } }, "json-stringify-safe": { @@ -2338,17 +2338,17 @@ "dev": true, "optional": true, "requires": { - "detect-libc": "1.0.2", + "detect-libc": "^1.0.2", "hawk": "3.1.3", - "mkdirp": "0.5.1", - "nopt": "4.0.1", - "npmlog": "4.1.0", - "rc": "1.2.1", + "mkdirp": "^0.5.1", + "nopt": "^4.0.1", + "npmlog": "^4.0.2", + "rc": "^1.1.7", "request": "2.81.0", - "rimraf": "2.6.1", - "semver": "5.3.0", - "tar": "2.2.1", - "tar-pack": "3.4.0" + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^2.2.1", + "tar-pack": "^3.4.0" } }, "nopt": { @@ -2357,8 +2357,8 @@ "dev": true, "optional": true, "requires": { - "abbrev": "1.1.0", - "osenv": "0.1.4" + "abbrev": "1", + "osenv": "^0.1.4" } }, "npmlog": { @@ -2367,10 +2367,10 @@ "dev": true, "optional": true, "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "number-is-nan": { @@ -2395,7 +2395,7 @@ "bundled": true, "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "os-homedir": { @@ -2416,8 +2416,8 @@ "dev": true, "optional": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "path-is-absolute": { @@ -2454,10 +2454,10 @@ "dev": true, "optional": true, "requires": { - "deep-extend": "0.4.2", - "ini": "1.3.4", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "~0.4.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" }, "dependencies": { "minimist": { @@ -2473,13 +2473,13 @@ "bundled": true, "dev": true, "requires": { - "buffer-shims": "1.0.0", - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "string_decoder": "1.0.1", - "util-deprecate": "1.0.2" + "buffer-shims": "~1.0.0", + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "~1.0.0", + "process-nextick-args": "~1.0.6", + "string_decoder": "~1.0.0", + "util-deprecate": "~1.0.1" } }, "request": { @@ -2488,28 +2488,28 @@ "dev": true, "optional": true, "requires": { - "aws-sign2": "0.6.0", - "aws4": "1.6.0", - "caseless": "0.12.0", - "combined-stream": "1.0.5", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.1.4", - "har-validator": "4.2.1", - "hawk": "3.1.3", - "http-signature": "1.1.1", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.15", - "oauth-sign": "0.8.2", - "performance-now": "0.2.0", - "qs": "6.4.0", - "safe-buffer": "5.0.1", - "stringstream": "0.0.5", - "tough-cookie": "2.3.2", - "tunnel-agent": "0.6.0", - "uuid": "3.0.1" + "aws-sign2": "~0.6.0", + "aws4": "^1.2.1", + "caseless": "~0.12.0", + "combined-stream": "~1.0.5", + "extend": "~3.0.0", + "forever-agent": "~0.6.1", + "form-data": "~2.1.1", + "har-validator": "~4.2.1", + "hawk": "~3.1.3", + "http-signature": "~1.1.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.7", + "oauth-sign": "~0.8.1", + "performance-now": "^0.2.0", + "qs": "~6.4.0", + "safe-buffer": "^5.0.1", + "stringstream": "~0.0.4", + "tough-cookie": "~2.3.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.0.0" } }, "rimraf": { @@ -2517,7 +2517,7 @@ "bundled": true, "dev": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "safe-buffer": { @@ -2548,7 +2548,7 @@ "bundled": true, "dev": true, "requires": { - "hoek": "2.16.3" + "hoek": "2.x.x" } }, "sshpk": { @@ -2557,15 +2557,15 @@ "dev": true, "optional": true, "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jodid25519": "1.0.2", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jodid25519": "^1.0.0", + "jsbn": "~0.1.0", + "tweetnacl": "~0.14.0" }, "dependencies": { "assert-plus": { @@ -2581,9 +2581,9 @@ "bundled": true, "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { @@ -2591,7 +2591,7 @@ "bundled": true, "dev": true, "requires": { - "safe-buffer": "5.0.1" + "safe-buffer": "^5.0.1" } }, "stringstream": { @@ -2605,7 +2605,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-json-comments": { @@ -2619,9 +2619,9 @@ "bundled": true, "dev": true, "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" + "block-stream": "*", + "fstream": "^1.0.2", + "inherits": "2" } }, "tar-pack": { @@ -2630,14 +2630,14 @@ "dev": true, "optional": true, "requires": { - "debug": "2.6.8", - "fstream": "1.0.11", - "fstream-ignore": "1.0.5", - "once": "1.4.0", - "readable-stream": "2.2.9", - "rimraf": "2.6.1", - "tar": "2.2.1", - "uid-number": "0.0.6" + "debug": "^2.2.0", + "fstream": "^1.0.10", + "fstream-ignore": "^1.0.5", + "once": "^1.3.3", + "readable-stream": "^2.1.4", + "rimraf": "^2.5.1", + "tar": "^2.2.1", + "uid-number": "^0.0.6" } }, "tough-cookie": { @@ -2646,7 +2646,7 @@ "dev": true, "optional": true, "requires": { - "punycode": "1.4.1" + "punycode": "^1.4.1" } }, "tunnel-agent": { @@ -2655,7 +2655,7 @@ "dev": true, "optional": true, "requires": { - "safe-buffer": "5.0.1" + "safe-buffer": "^5.0.1" } }, "tweetnacl": { @@ -2696,7 +2696,7 @@ "dev": true, "optional": true, "requires": { - "string-width": "1.0.2" + "string-width": "^1.0.2" } }, "wrappy": { diff --git a/src/web/ui/src/Login/Login.fs b/src/web/ui/src/Login/Login.fs index 20d9d49e9..fd09d561d 100644 --- a/src/web/ui/src/Login/Login.fs +++ b/src/web/ui/src/Login/Login.fs @@ -43,10 +43,7 @@ let update msg model = model, Cmd.Empty | Submit -> printfn "Login with %s %s" model.user model.password - let isAdmin = ((model.user.ToLower().Contains "bts") || (model.user.ToLower().Contains "admin")) - match isAdmin with - | true -> model, loginMsg (model.user.ToLower()) model.password - | false -> { model with error = "Only administrators are allowed to login" }, Cmd.Empty + model, loginMsg (model.user.ToLower()) model.password | LoginFailure msg -> { model with error = msg }, Cmd.Empty | LoginSuccess _ -> failwith "Handled externally. Should not get here." diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index 23323d096..87b8d6059 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -204,19 +204,24 @@ let applyUpdate (field:UserField) (user:BTSUser) = mdperm | None -> Array.concat [[|mic|]; mdperm] updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with mdPermissions = micArr } - | AddAccount id -> - let tmpPermissions = - { adminPermission = { hasPermissions = true } - tradingPermission = - { submitMarketOrders = true - submitGtcOrders = false - algoTradingPermission = - { submitIcebergOrders = false - submitTimeBoxOrders = false - submitSpreaderOrders = false } } } - let newAccountPermissions = JSMap.add id tmpPermissions user.userData.accountPermissions.accountPermissions - let newUserData = { user.userData with accountPermissions = { user.userData.accountPermissions with accountPermissions = newAccountPermissions } } - { user with userData = newUserData } + | TradingPerm (id:string, can_trade:bool) -> + let current = JSMap.find id user.userData.accountPermissions.accountPermissions + 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 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 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 } } + { user with userData = newUserData } | RemoveAccount id -> let newObj = JSMap.remove id user.userData.accountPermissions.accountPermissions diff --git a/src/web/ui/src/Users/Types.fs b/src/web/ui/src/Users/Types.fs index fee416ef7..bdd099c3b 100644 --- a/src/web/ui/src/Users/Types.fs +++ b/src/web/ui/src/Users/Types.fs @@ -22,7 +22,9 @@ type UserField = | SMPInstruction of string | MaxOrderRatePerConnection of string | MiscTags of JSMap -| AddAccount of string +| TradingPerm of id:string * bool +| RiskAdmin of string*bool +| MDAdmin of string*bool | RemoveAccount of string | CMEMic of CMEMicData | CMEProNonPro of ProfessionalDesignation diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index b5fbe2860..ab8b6764f 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -77,7 +77,8 @@ let accountsTabView (model:Model) (dispatch:Msg->Unit) = |> List.filter (fun a -> a.isPresent) |> List.map (fun a -> a.id.ToString(), a.name) |> Map.ofList - + + let realAccList = model.accountsList |> List.filter (fun a -> a.isPresent) let headerRow:TableControl.row = { @@ -85,40 +86,39 @@ let accountsTabView (model:Model) (dispatch:Msg->Unit) = [ TableControl.Cell(str "Account") TableControl.Cell(str "Trading Permission") - TableControl.Cell(str "Admin Permission") + TableControl.Cell(str "Risk Admin Permission") + TableControl.Cell(str "MD Admin Permission") ] className = "" header = None } + let rows:TableControl.row list = - [for acc in accMap do yield { + [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 update permission value _ = permission (string_id, not value) |> UpdateField |> dispatch + yield { cells = [ - TableControl.Cell(str acc.Value) - { content = (Fields.checkbox "" "" ( - keymap.Contains <| acc.Value) - [] - (fun _ -> ( - let message:Msg = acc.Key |> (RemoveAccount >> UpdateField) - match (keymap.Contains <| acc.Value) with - | true -> (OpenConfirmModal ((sprintf "Are you sure you want to remove trading permission for %s?" acc.Value), message)) - | false -> (acc.Key |> (AddAccount >> UpdateField)) - |> dispatch - ) - ) - ); - className = ""; - isHeader = false; - colSpan = 0 - } - { content = (Fields.checkbox "" "" ( - model.scratchUser.name.Contains "bts" || model.scratchUser.name.Contains "admin") - [Disabled true] - ignore - ); - className = ""; - isHeader = false; - colSpan = 0 - } + TableControl.Cell(str acc.name) + { content = Fields.checkbox "" "" hasTradeAdmin [] (update TradingPerm hasTradeAdmin) + className = ""; + isHeader = false; + colSpan = 0 + } + { content = Fields.checkbox "" "" hasRiskAdmin [] (update RiskAdmin hasRiskAdmin) + className = ""; + isHeader = false; + colSpan = 0 + } + { content = Fields.checkbox "" "" hasMdAdmin [] (update MDAdmin hasMdAdmin) + className = ""; + isHeader = false; + colSpan = 0 + } ] className="" header = None From 1dc87de9755fbea5eef8e2a05e7215762edc75bb Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 1 Nov 2018 23:41:42 -0400 Subject: [PATCH 07/24] now just need to filter accounts and users in the webui --- src/client/spark/Admin/AdminModelWrapper.cs | 20 +++++++-------- src/web/ui/src/Users/State.fs | 27 ++++++++++++++++++--- src/web/ui/src/Users/View.fs | 8 +++--- 3 files changed, 37 insertions(+), 18 deletions(-) diff --git a/src/client/spark/Admin/AdminModelWrapper.cs b/src/client/spark/Admin/AdminModelWrapper.cs index 6a70d8015..e428b10f9 100644 --- a/src/client/spark/Admin/AdminModelWrapper.cs +++ b/src/client/spark/Admin/AdminModelWrapper.cs @@ -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> get_trading_permissions(UInt32 user_id) - { - return search_admin(u => u.Id == user_id); - } public IEnumerable viewable_accounts() { return _allowed_accounts; @@ -33,9 +32,10 @@ namespace mbts.spark return _allowed_account_dict.ContainsKey(account) || _user_name.ToLower().Contains("bts"); } - IEnumerable> search_admin(Func predicate) + IEnumerable> + search_admin(Func predicate) { - var rv = new List>(); + var rv = new List>(); 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)); } } } diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index 87b8d6059..97909d08c 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -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 } } diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index ab8b6764f..f3aeaa8e3 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -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 = [ From 23ee9508c2d1eb6c1bc5c4f7d55b6bee6ee77047 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 2 Nov 2018 18:13:12 -0400 Subject: [PATCH 08/24] now all we need to do is filter the webUI --- src/client/spark/Admin/AdminModelWrapper.cs | 2 +- .../api/service_helpers/AdminServiceUtils.cpp | 37 +++++++++-- .../api/service_helpers/AdminServiceUtils.h | 8 +++ src/lib/api/services/AdminService.proto | 21 +++--- src/lib/api/services/UserService.proto | 11 ++-- src/server/sparkd/user/AdminServiceServer.cpp | 2 + src/server/sparkd/user/UserServiceServer.cpp | 66 ++++++++++++++++++- src/server/sparkd/user/UserServiceServer.h | 9 ++- .../sparkd/user/tests/admin_service_tests.cpp | 13 ++-- src/web/ui/src/Users/State.fs | 14 +++- src/web/ui/src/Users/Types.fs | 2 + src/web/ui/src/Users/View.fs | 40 +++++------ 12 files changed, 170 insertions(+), 55 deletions(-) diff --git a/src/client/spark/Admin/AdminModelWrapper.cs b/src/client/spark/Admin/AdminModelWrapper.cs index e428b10f9..62895933c 100644 --- a/src/client/spark/Admin/AdminModelWrapper.cs +++ b/src/client/spark/Admin/AdminModelWrapper.cs @@ -29,7 +29,7 @@ namespace mbts.spark } public bool can_view_account(string account) { - return _allowed_account_dict.ContainsKey(account) || _user_name.ToLower().Contains("bts"); + return _allowed_account_dict.ContainsKey(account) || _user_name.ToLower().Equals("bts"); } IEnumerable> diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index 2c0c0106d..bd00ac21f 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -838,12 +838,35 @@ void AdminServiceUtils::find_user_trading_accounts (const bts::api::admin::Admin const bts::api::admin::UserAccountPermissions* user_perm_ptr = get_user_permissions (admin_data, user_id); if (user_perm_ptr != nullptr) for(auto it=user_perm_ptr->account_permissions().begin(); it!=user_perm_ptr->account_permissions().end(); it++) - if (it->second.has_trading_permission()){ + if (it->second.has_trading_permission() && it->second.trading_permission().has_permissions()){ const api::admin::BTSAccount* account_ptr = find_account(admin_data, it->first); if (account_ptr != nullptr) associated_accounts.push_back(account_ptr); } } + +// for a given account, fills in the associated_users ref arg +// with the users that can trade into the account +void AdminServiceUtils::find_users_for_trading_account (const AdminData& admin_data, + uint32_t account_id, + std::vector& associated_users) +{ + for(const auto& u : AdminServiceUtils::users(admin_data, false)) + { + const auto user_perm_ptr = get_user_permissions (admin_data, u->id()); + if (user_perm_ptr) + { + const auto& permission_unit = user_perm_ptr->account_permissions().find(account_id); + if(permission_unit != user_perm_ptr->account_permissions().end() && permission_unit->second.has_trading_permission() && + permission_unit->second.trading_permission().has_permissions()) + { + associated_users.push_back(u); + } + } + } +} + + void AdminServiceUtils::validate_user_update (const bts::api::admin::AdminData& admin_data, const bts::api::admin::BTSUser& updated_user, bts::api::admin::AdminServiceOperationResult& result){ @@ -967,6 +990,8 @@ bts::api::admin::BTSUser* AdminServiceUtils::create_user (bts::api::admin::Admin uint32_t parent_group_id, const std::string& name, const std::string& password, + const std::string& full_name, + const std::string& company, bool is_active, const bts::api::admin::LicenseData& license_data, const bts::api::admin::LicenseEntitlements& license_entitlements, @@ -992,6 +1017,8 @@ bts::api::admin::BTSUser* AdminServiceUtils::create_user (bts::api::admin::Admin new_user_ptr->set_parent_group_id(parent_group_id); new_user_ptr->set_name(name); new_user_ptr->set_password (password); + new_user_ptr->set_full_name (full_name); + new_user_ptr->set_company (company); new_user_ptr->set_is_active(is_active); new_user_ptr->mutable_license_data()->CopyFrom(license_data); new_user_ptr->mutable_license_entitlements()->CopyFrom(license_entitlements); @@ -1261,10 +1288,10 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){ auto def_group = create_group(data, 0, std::string("default"), result); // adding users to the group bts::api::admin::LicenseData license_data; - bts::api::admin::LicenseEntitlements license_entitlements; - auto user_1 = create_user(data, def_group->id(), std::string("bts"), std::string(""), false, license_data, license_entitlements, user_result); user_1->set_is_active(true); - auto user_2 = create_user(data, def_group->id(), std::string("bts_2"), std::string("bts_2"), false, license_data, license_entitlements, user_result); user_2->set_is_active(true); - auto user_3 = create_user(data, def_group->id(), std::string("bts_3"), std::string("bts_3"), false, license_data, license_entitlements, user_result); user_3->set_is_active(true); + bts::api::admin::LicenseEntitlements license_entitlements; std::string empty(""); + auto user_1 = create_user(data, def_group->id(), std::string("bts"), std::string(""), empty, empty, false, license_data, license_entitlements, user_result); user_1->set_is_active(true); + auto user_2 = create_user(data, def_group->id(), std::string("bts_2"), std::string("bts_2"), empty, empty, false, license_data, license_entitlements, user_result); user_2->set_is_active(true); + auto user_3 = create_user(data, def_group->id(), std::string("bts_3"), std::string("bts_3"), empty, empty, false, license_data, license_entitlements, user_result); user_3->set_is_active(true); //associate users bts::api::admin::UserAccountPermissionUnit permission_unit; permission_unit.mutable_trading_permission()->set_submit_market_orders(true); diff --git a/src/lib/api/service_helpers/AdminServiceUtils.h b/src/lib/api/service_helpers/AdminServiceUtils.h index 5e001ebf0..781a82362 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.h +++ b/src/lib/api/service_helpers/AdminServiceUtils.h @@ -217,6 +217,12 @@ public: const AdminData& admin_data, uint32_t user_id, std::vector& associated_accounts); + // for a given account, fills in the associated_users ref arg + // with the users that can trade into the account + static void find_users_for_trading_account ( + const AdminData& admin_data, + uint32_t account_id, + std::vector& associated_users); // validates that changes in user data satisfy all the // constraints static void validate_user_update (const AdminData& admin_data, @@ -243,6 +249,8 @@ public: uint32_t parent_group_id, const std::string& name, const std::string& password, + const std::string& full_name, + const std::string& company, bool is_active, const LicenseData& license_data, const LicenseEntitlements& license_entitlements, diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index bc50d952e..fd6a904d0 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -54,9 +54,11 @@ message BTSUser{ uint32 parent_group_id = 20; string name = 30; string password = 40; + string full_name = 42; + string company = 44; bool is_active = 50; - LicenseData license_data = 60; - LicenseEntitlements license_entitlements = 70; + LicenseData license_data = 60; //unused + LicenseEntitlements license_entitlements = 70; //unused BTSUserDerivableData user_data = 80; } @@ -89,16 +91,16 @@ message LicenseEntitlements{ } message AlgoTradingPermissionsUnit{ - bool submit_iceberg_orders = 10; - bool submit_time_box_orders = 20; - bool submit_spreader_orders = 30; + bool submit_iceberg_orders = 10; //unused + bool submit_time_box_orders = 20; //unused + bool submit_spreader_orders = 30; //unused } message TradingPermissionUnit{ bool has_permissions = 5; - bool submit_market_orders = 10; - bool submit_gtc_orders = 20; - AlgoTradingPermissionsUnit algo_trading_permission = 30; + bool submit_market_orders = 10; //unused + bool submit_gtc_orders = 20; //unused + AlgoTradingPermissionsUnit algo_trading_permission = 30; //unused } message AdminPermissionUnit{ @@ -115,6 +117,7 @@ message UserAccountPermissionUnit{ } message UserAccountPermissions{ + //uint32 = account_id map account_permissions = 10; } @@ -419,6 +422,8 @@ message UserCreateAPIArgument{ uint32 parent_group_id = 20; string name = 30; string password = 40; + string full_name = 42; + string company = 44; LicenseData license_data = 50; LicenseEntitlements license_entitlements = 70; } diff --git a/src/lib/api/services/UserService.proto b/src/lib/api/services/UserService.proto index efaa8fbcb..cdfeee04b 100644 --- a/src/lib/api/services/UserService.proto +++ b/src/lib/api/services/UserService.proto @@ -40,6 +40,11 @@ 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 { @@ -47,11 +52,7 @@ message AuthenticateLoginResponse { string reason = 2; AuthToken token = 3; uint32 user_id = 4; - bool can_login_shell = 5; - bool can_login_admin = 6; - repeated string risk_admin_users = 7; - repeated string risk_admin_accounts = 8; - repeated string md_admin_users = 9; + 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/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index 526ff3804..528cfecff 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -99,6 +99,8 @@ void AdminServiceServer::create_user( request.parent_group_id(), request.name(), request.password(), + request.full_name(), + request.company(), false, request.license_data(), request.license_entitlements(), diff --git a/src/server/sparkd/user/UserServiceServer.cpp b/src/server/sparkd/user/UserServiceServer.cpp index a8d054633..7b4e7fae9 100644 --- a/src/server/sparkd/user/UserServiceServer.cpp +++ b/src/server/sparkd/user/UserServiceServer.cpp @@ -6,6 +6,7 @@ #include "lib/api/services/AdminService.client.pb.h" #include "lib/utils/PBUtils.h" #include "lib/utils/AuthToken.h" +#include "lib/api/service_helpers/AdminServiceUtils.h" #include #include @@ -62,9 +63,10 @@ void UserServiceServer::authenticate_login(const api::user::AuthenticateLoginReq if (admin_data.success()) { for (const auto& user : admin_data.result()->users()) { if (user.name() == req.login() && user.password() == req.password() && user.is_present()) { - resp.set_is_valid(true); + 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; } @@ -78,5 +80,67 @@ 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 c23df00c5..967e44003 100644 --- a/src/server/sparkd/user/UserServiceServer.h +++ b/src/server/sparkd/user/UserServiceServer.h @@ -2,6 +2,7 @@ #include #include "lib/api/services/UserService.server.pb.h" +#include "lib/api/services/AdminService.pb.h" #include "lib/utils/bts_no_copy.h" namespace bts @@ -18,7 +19,13 @@ public: const std::function& ) override; 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/server/sparkd/user/tests/admin_service_tests.cpp b/src/server/sparkd/user/tests/admin_service_tests.cpp index 7f2709d54..ad33cf908 100644 --- a/src/server/sparkd/user/tests/admin_service_tests.cpp +++ b/src/server/sparkd/user/tests/admin_service_tests.cpp @@ -62,8 +62,8 @@ TEST_CASE ("Users", "[admin_service]") std::string name = "test_user", password = "test_user_password"; bts::api::admin::LicenseData license_data; - const bts::api::admin::LicenseEntitlements license_entitlements; - AdminServiceUtils::create_user(admin_data, parent_group->id(), name, password, true, license_data, license_entitlements, user_result); + const bts::api::admin::LicenseEntitlements license_entitlements; std::string empty(""); + AdminServiceUtils::create_user(admin_data, parent_group->id(), name, password, empty, empty, true, license_data, license_entitlements, user_result); bts::api::admin::BTSUser* new_user = AdminServiceUtils::find_user(admin_data, name); REQUIRE(user_result.is_success()); REQUIRE(admin_data.users_size()==1); @@ -73,7 +73,7 @@ TEST_CASE ("Users", "[admin_service]") REQUIRE(new_user->password() == password); REQUIRE(new_user->is_active()); // duplicate users can not be added - new_user = AdminServiceUtils::create_user(admin_data, parent_group->id(), name, password, true, license_data, license_entitlements, user_result); + new_user = AdminServiceUtils::create_user(admin_data, parent_group->id(), name, password, empty, empty, true, license_data, license_entitlements, user_result); REQUIRE(!user_result.is_success()); REQUIRE(new_user == nullptr); } @@ -92,10 +92,11 @@ TEST_CASE ("Users", "[admin_service]") int n_users = 100; bts::api::admin::LicenseData license_data; const bts::api::admin::LicenseEntitlements license_entitlements; + std::string empty(""); for (int i=1; i<=n_users; i++){ std::string name = fmt::format("test_user_{}",i), - password = fmt::format("password_{}",i); - AdminServiceUtils::create_user(admin_data, parent_group->id(), name, password, true, license_data, license_entitlements, user_result); + password = fmt::format("password_{}",i); + AdminServiceUtils::create_user(admin_data, parent_group->id(), name, password, empty, empty, true, license_data, license_entitlements, user_result); REQUIRE(user_result.is_success()); REQUIRE(AdminServiceUtils::users(admin_data,true).size()==i); REQUIRE(admin_data.users_size()==i); @@ -124,7 +125,7 @@ TEST_CASE ("Users", "[admin_service]") for (int i=1; i<=n_users; i++){ std::string name = "test_user_zombie", password = "password"; - AdminServiceUtils::create_user(admin_data, parent_group->id(), name, password, true, license_data, license_entitlements, user_result); + AdminServiceUtils::create_user(admin_data, parent_group->id(), name, password, empty, empty, true, license_data, license_entitlements, user_result); REQUIRE(user_result.is_success()); REQUIRE(AdminServiceUtils::users(admin_data,true).size()==n_users+i); REQUIRE(AdminServiceUtils::users(admin_data,false).size()==1); diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index 97909d08c..487cd4c63 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -34,6 +34,8 @@ let defaultScratchUser = { isActive = false name = "" password = "" + fullName = "" + company = "" licenseData = { createDate = 0L @@ -159,13 +161,15 @@ let deleteUser (admin:IAdminService) (user:BTSUser) = promise { } let createUser (admin:IAdminService) (user:BTSUser) = promise { - let args = { + let args : UserCreateAPIArgument = { parentGroupId = user.parentGroupId name = user.name password = user.password + fullName = user.fullName + company = user.company licenseData = user.licenseData licenseEntitlements = user.licenseEntitlements - } + } let! result = admin.create_user args if result.isSuccess then return! saveUser admin { user with id = result.newId } @@ -199,6 +203,8 @@ let applyUpdate (field:UserField) (user:BTSUser) = match field with | Name n -> { user with name = n } | Password p -> { user with password = p } + | FullName fn -> { user with fullName = fn } + | Company cc -> { user with company = cc } | IsActive ia -> { user with isActive = ia } | CMEOperatorID oid -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with operatorId = oid } | CMEATSOperatorID atsoid -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with atsOperatorId = atsoid } @@ -271,9 +277,11 @@ let update msg (model:Users.Types.Model) : Model * Cmd = id = usrDest.id name = usrDest.name password = usrDest.password + fullName = usrDest.fullName + company = usrDest.company isActive = usrDest.isActive } - { model with scratchUser = nusr }, Cmd.Empty + { model with scratchUser = nusr }, Cmd.Empty | Delete usr -> let mdl = { model with OptionsMenuOpen = "" } diff --git a/src/web/ui/src/Users/Types.fs b/src/web/ui/src/Users/Types.fs index bdd099c3b..7d92f61cc 100644 --- a/src/web/ui/src/Users/Types.fs +++ b/src/web/ui/src/Users/Types.fs @@ -12,6 +12,8 @@ type Tab = type UserField = | Name of string | Password of string +| FullName of string +| Company of string | IsActive of bool | CMEOperatorID of string | CMEATSOperatorID of string diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index f3aeaa8e3..8b511caeb 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -43,8 +43,10 @@ let generalTabView (model:Model) (dispatch:Msg->Unit) = let modal = Modal.showCreate "Create User" (div [][ - Fields.text "Name" model.scratchUser.name [ ] (Name >> 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 "Active" "Unchecking this stops the user from entering orders" model.scratchUser.isActive [] (IsActive >> UpdateField >> dispatch) ]) (fun _ -> dispatch SaveUser) @@ -52,9 +54,11 @@ let generalTabView (model:Model) (dispatch:Msg->Unit) = div [] [ p [ Style [FontWeight "Bold"] ] [ str ("ID: " + model.scratchUser.id.ToString())] br [] - Fields.text "Name" model.scratchUser.name [ ] (Name >> UpdateField >> dispatch) + Fields.text "Login" model.scratchUser.name [ ] (Name >> UpdateField >> dispatch) Fields.password "Password" model.scratchUser.password [ ] (Password >> UpdateField >> dispatch) - Fields.checkbox "Active" "Unchecking this stops the user from entering orders" model.scratchUser.isActive [] (IsActive >> 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) (if State.isNewUser model.scratchUser then modal else span[][]) ] @@ -97,9 +101,10 @@ let accountsTabView (model:Model) (dispatch:Msg->Unit) = [for acc in realAccList do let string_id = acc.id.ToString() 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 is_bts = model.scratchUser.name = "bts" + let hasTradeAdmin = (if perm.IsNone then false else perm.Value.tradingPermission.hasPermissions) + let hasRiskAdmin = is_bts || (if perm.IsNone then false else perm.Value.adminPermission.hasPermissions) + let hasMdAdmin = is_bts || (if perm.IsNone then false else perm.Value.adminPermission.hasMdPermissions) let update permission value _ = permission (string_id, not value) |> UpdateField |> dispatch yield { cells = [ @@ -109,12 +114,12 @@ let accountsTabView (model:Model) (dispatch:Msg->Unit) = isHeader = false; colSpan = 0 } - { content = Fields.checkbox "" "" hasRiskAdmin [] (update RiskAdmin hasRiskAdmin) + { content = Fields.checkbox "" "" hasRiskAdmin [Disabled is_bts] (update RiskAdmin hasRiskAdmin) className = ""; isHeader = false; colSpan = 0 } - { content = Fields.checkbox "" "" hasMdAdmin [] (update MDAdmin hasMdAdmin) + { content = Fields.checkbox "" "" hasMdAdmin [Disabled is_bts] (update MDAdmin hasMdAdmin) className = ""; isHeader = false; colSpan = 0 @@ -138,23 +143,6 @@ let MarketDataTabView (model:Model) (dispatch:Msg->Unit) = match checkedValue with | Some t -> true | None -> false - - - // let micList = [ - // for micValue in bts.api.CMEMics.values do - // yield ( - // if (micValue = bts.api.CMEMics.UNSET || micValue = bts.api.CMEMics.MGE || - // micValue = bts.api.CMEMics.DME || micValue = bts.api.CMEMics.NYMSW || micValue = bts.api.CMEMics.FXS) |> not then - // Fields.checkbox - // (sprintf "%O" micValue) - // "" - // (findCheckedValue micValue) - // [] - // (fun chk -> (({enabled = chk; mic = micValue }:CMEMicData) |> (CMEMic >> UpdateField >> dispatch))) - // else - // str "" - // ) - // ] let micList = [ for micPair in CMEMicMap do @@ -364,6 +352,8 @@ let selectionPageContent (model:Model) (dispatch:Msg->Unit) = (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) From e332edb36b3ee68195ba89ad3e6078fcb642a22a Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 2 Nov 2018 18:18:45 -0400 Subject: [PATCH 09/24] users should be active when created --- src/web/ui/src/Users/State.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index 487cd4c63..7f0c19c92 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -31,7 +31,7 @@ let defaultScratchUser = { isPresent = true id = 0u parentGroupId = 1u - isActive = false + isActive = true name = "" password = "" fullName = "" From a5b7332fa4808e4914da4b169a453f1ee5fc77ba Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 6 Nov 2018 16:17:21 -0500 Subject: [PATCH 10/24] admin ui almost works with permissions --- src/client/spark/Admin/AdminModel.cs | 2 +- .../spark/Orders/OrderTypeVMs/LeanOrderVM.cs | 4 +- src/lib/CMakeLists.txt | 2 +- src/lib/api/services/AdminService.proto | 10 +- src/lib/api/services/UserService.proto | 6 - src/lib/utils/AuthToken.cpp | 2 + src/server/sparkd/user/AdminServiceServer.cpp | 76 +++++++++++ src/server/sparkd/user/AdminServiceServer.h | 3 + src/server/sparkd/user/UserServiceServer.cpp | 62 --------- src/server/sparkd/user/UserServiceServer.h | 6 - src/web/ui/src/Access.fs | 5 +- src/web/ui/src/Accounts/State.fs | 27 ++-- src/web/ui/src/Accounts/Types.fs | 1 + src/web/ui/src/Accounts/View.fs | 41 ++---- src/web/ui/src/Controls/Fields.fs | 11 +- src/web/ui/src/Users/State.fs | 30 +++-- src/web/ui/src/Users/Types.fs | 2 + src/web/ui/src/Users/View.fs | 122 ++++++++---------- 18 files changed, 207 insertions(+), 205 deletions(-) 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) = (* From e75be340e21340d5082e4de2a49df8005fcb326c Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 6 Nov 2018 18:12:31 -0500 Subject: [PATCH 11/24] GatewayLoginResult --- src/lib/api/apigateway.proto | 1 + src/lib/api/services/UserService.proto | 1 + src/server/sparkd/http/ApiGateway.cpp | 1 + src/server/sparkd/user/UserServiceServer.cpp | 4 ++++ src/web/api/src/ServiceContext.ts | 4 +++- src/web/ui/src/Accounts/State.fs | 5 ++++- src/web/ui/src/Accounts/Types.fs | 1 + src/web/ui/src/Accounts/View.fs | 8 +++++--- src/web/ui/src/Users/State.fs | 13 ++++++++----- src/web/ui/src/Users/Types.fs | 1 + src/web/ui/src/Users/View.fs | 4 +++- 11 files changed, 32 insertions(+), 11 deletions(-) diff --git a/src/lib/api/apigateway.proto b/src/lib/api/apigateway.proto index aa2f10466..f55413bba 100644 --- a/src/lib/api/apigateway.proto +++ b/src/lib/api/apigateway.proto @@ -10,6 +10,7 @@ message GatewayLoginResult { bool is_valid = 1; string reason = 2; string token = 3; + bool can_create = 4; } message GatewayCallHeader { int32 request_id = 1; diff --git a/src/lib/api/services/UserService.proto b/src/lib/api/services/UserService.proto index f5aff089a..f6a59ecb4 100644 --- a/src/lib/api/services/UserService.proto +++ b/src/lib/api/services/UserService.proto @@ -47,6 +47,7 @@ message AuthenticateLoginResponse { string reason = 2; AuthToken token = 3; uint32 user_id = 4; + bool can_create = 5; } message AuthenticateTokenRequest {AuthToken token = 1;} message AuthenticateTokenResponse {bool is_valid = 1; string reason = 2; User user = 3;} diff --git a/src/server/sparkd/http/ApiGateway.cpp b/src/server/sparkd/http/ApiGateway.cpp index 213786c60..ec889dc80 100644 --- a/src/server/sparkd/http/ApiGateway.cpp +++ b/src/server/sparkd/http/ApiGateway.cpp @@ -46,6 +46,7 @@ struct ApiGatewayImpl { if (logon_response.result()->is_valid()) { resp.mutable_logon()->set_is_valid(true); resp.mutable_logon()->set_token(logon_response.result()->token().token()); + resp.mutable_logon()->set_can_create(logon_response.result()->can_create()); } else { resp.mutable_logon()->set_reason(logon_response.result()->reason()); diff --git a/src/server/sparkd/user/UserServiceServer.cpp b/src/server/sparkd/user/UserServiceServer.cpp index e90d6644f..60fcbe60d 100644 --- a/src/server/sparkd/user/UserServiceServer.cpp +++ b/src/server/sparkd/user/UserServiceServer.cpp @@ -66,6 +66,10 @@ 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)); + + api::user::TokenPayload payload; + api::auth::decode_token(resp.token().token(), &payload); + resp.set_can_create(payload.wheel() || user.can_create()); respond(resp); return; } diff --git a/src/web/api/src/ServiceContext.ts b/src/web/api/src/ServiceContext.ts index 6e17094ab..19f155865 100644 --- a/src/web/api/src/ServiceContext.ts +++ b/src/web/api/src/ServiceContext.ts @@ -65,6 +65,7 @@ class PrivateContext { this.ws.onmessage = e => this.onmessage(e) console.log("Authenticated") this.sc.token = response.logon.token + this.sc.can_create = response.logon.can_create resolve(this.sc) } else { @@ -121,7 +122,8 @@ class PrivateContext { export class ServiceContext { next_id : number send : (msg)=>void - token : string + token: string + can_create: boolean outstanding : { [request:number]:{ resolve : (buffer)=>void, reject: (msg)=>void } } constructor(send : (msg)=>void) { diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index 4b43374d7..b1925752e 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -33,6 +33,7 @@ let init (context:ServiceContext.ServiceContext) = SelectedClipLimits = [] SelectedPositionLimits = [] token = context.token + can_create = context.can_create }, Access.getAdminData admin context.token UpdateAdminData NoAdminData let existingSelection (scratch:BTSAccount) (previousScratch:BTSAccount) (data:AdminData) = @@ -189,8 +190,10 @@ let update msg (model:Model) : Model * Cmd = | true -> mdl, Cmd.ofExistingPromise (deleteAccount model.admin account model ) id (box>>ErrorOccured) | false -> mdl, Cmd.Empty | AddAccount -> + match model.can_create with // 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 + | true-> { model with previousScratch = model.scratch; scratch = { emptyAccount with name = "New Account" } }, Cmd.ofMsg <| SelectTab General + | false-> model, Cmd.Empty | SaveScratch -> match isNewAccount model.scratch with | true -> model, Cmd.ofExistingPromise (createAccount model.admin model.scratch model ) id (box>>ErrorOccured) diff --git a/src/web/ui/src/Accounts/Types.fs b/src/web/ui/src/Accounts/Types.fs index 6b64c0cd9..519a9c44a 100644 --- a/src/web/ui/src/Accounts/Types.fs +++ b/src/web/ui/src/Accounts/Types.fs @@ -104,4 +104,5 @@ type Model = { OptionsMenuOpen:string ConfirmModal: string * Msg token: string + can_create: bool } \ 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 de892c05b..f30daf7c5 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -12,6 +12,8 @@ open System open bts.co2 +let accountIsSelected (initialState:BTSAccount) (scratch:BTSAccount) = scratch <> initialState + let selectedAccount model = match model.adminData with | Some data -> @@ -72,7 +74,7 @@ let generalView model dispatch = 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) - (if State.isNewAccount account then modal else span[][]) + (if (State.isNewAccount account && model.can_create) then modal else span[][]) accountControls model dispatch ] @@ -730,8 +732,8 @@ let exchangeSettings model dispatch = let tabContent model dispatch = div [Key (string model.scratch.id); ClassName "is-tab-content"] [ // (match model.tab with - (match model.tab, (selectedAccount model ) with - | _ , None -> p [Style [ Color "Red" ]] [ str "Select an Account" ] + (match model.tab, (accountIsSelected model.scratch Access.Accounts.empty) with + | _ , false -> p [Style [ Color "Red" ]] [ str "Select an Account" ] | General, _ -> generalView model dispatch | LimitsTab, _ -> LimitsView model dispatch | ConnectionsTab, _ -> ConnectionsView model dispatch diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index 38d3e140b..d8cf26947 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -115,6 +115,7 @@ let init (context:ServiceContext.ServiceContext) : Model * Cmd = OptionsMenuOpen = "" ConfirmModal = "", (Msg.SwitchTab Tab.General) token = context.token + can_create = context.can_create }, getAdminData admin context.token let rec removeUser (user:BTSUser) (userList:BTSUser list) = @@ -169,7 +170,7 @@ let deleteUser (admin:IAdminService) (user:BTSUser) (model:Model) = promise { return ErrorOccured (sprintf "Error deleting user: %s" result.errorText) } -let createUser (admin:IAdminService) (user:BTSUser) = promise { +let createUser (admin:IAdminService) (user:BTSUser) (model:Model)= promise { let args : UserCreateAPIArgument = { parentGroupId = user.parentGroupId name = user.name @@ -178,10 +179,10 @@ let createUser (admin:IAdminService) (user:BTSUser) = promise { company = user.company licenseData = user.licenseData licenseEntitlements = user.licenseEntitlements - } + } let! result = admin.create_user args if result.isSuccess then - return! saveUser admin { user with id = result.newId } + return! saveUser admin { user with id = result.newId } model else return ErrorOccured (sprintf "Error creating user: %s" result.errorText) } @@ -300,7 +301,9 @@ let update msg (model:Users.Types.Model) : Model * Cmd = | false -> mdl, Cmd.Empty | AddUser -> - { model with PreviousScratchUser = model.scratchUser; scratchUser = { defaultScratchUser with name = "New User" }}, Cmd.ofMsg (SwitchTab General) + match model.can_create with + | true -> { model with PreviousScratchUser = model.scratchUser; scratchUser = { defaultScratchUser with name = "New User" }}, Cmd.ofMsg (SwitchTab General) + | false -> model, Cmd.Empty | CancelAddUser -> { model with scratchUser = { model.PreviousScratchUser with name = "New User" }}, Cmd.ofMsg (SwitchTab General) | SwitchTab tb -> @@ -311,7 +314,7 @@ let update msg (model:Users.Types.Model) : Model * Cmd = | SaveUser -> // 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) + | 0u -> { model with PreviousScratchUser = model.scratchUser}, Cmd.ofExistingPromise (createUser model.admin {model.scratchUser with name = model.scratchUser.name.ToLower() } model) 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 diff --git a/src/web/ui/src/Users/Types.fs b/src/web/ui/src/Users/Types.fs index 8c33cf2f9..1341230f5 100644 --- a/src/web/ui/src/Users/Types.fs +++ b/src/web/ui/src/Users/Types.fs @@ -61,6 +61,7 @@ type Model = { OptionsMenuOpen: string ConfirmModal: string * Msg token: string + can_create: bool } diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index ca79619fd..85b8fc0c4 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -38,6 +38,8 @@ let saveButton (model:Users.Types.Model) dispatch = let enabled = if dirty then Button.Enabled else Button.Disabled let flavor = if dirty then "is-success" else "" Button.button buttonText flavor "" enabled (fun _ -> dispatch SaveUser) + + let generalTabView (model:Model) (dispatch:Msg->Unit) (readonly: bool)= let modal = Modal.showCreate @@ -61,7 +63,7 @@ let generalTabView (model:Model) (dispatch:Msg->Unit) (readonly: bool)= 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[][]) + (if (State.isNewUser model.scratchUser) then modal else span[][]) ] let accountNameLookup (accountsList:BTSAccount list) (id:string) = From 559ab6994011afb5b41817229b74686999245114 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 7 Nov 2018 15:53:40 -0500 Subject: [PATCH 12/24] can_create is enforced --- src/web/api/src/ServiceContext.ts | 6 ++++-- src/web/ui/src/Accounts/State.fs | 1 + src/web/ui/src/Accounts/Types.fs | 1 + src/web/ui/src/Accounts/View.fs | 4 ++-- src/web/ui/src/Controls/Fields.fs | 7 +++---- src/web/ui/src/Users/Types.fs | 2 +- src/web/ui/src/Users/View.fs | 18 +++++++++++++++--- 7 files changed, 27 insertions(+), 12 deletions(-) diff --git a/src/web/api/src/ServiceContext.ts b/src/web/api/src/ServiceContext.ts index 19f155865..c0efa340d 100644 --- a/src/web/api/src/ServiceContext.ts +++ b/src/web/api/src/ServiceContext.ts @@ -64,8 +64,9 @@ class PrivateContext { // Switch to steady state onmessage this.ws.onmessage = e => this.onmessage(e) console.log("Authenticated") + this.sc.username = this.username this.sc.token = response.logon.token - this.sc.can_create = response.logon.can_create + this.sc.can_create = response.logon.canCreate resolve(this.sc) } else { @@ -121,7 +122,8 @@ class PrivateContext { export class ServiceContext { next_id : number - send : (msg)=>void + send: (msg) => void + username: string token: string can_create: boolean outstanding : { [request:number]:{ resolve : (buffer)=>void, reject: (msg)=>void } } diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index b1925752e..d7f99a2a2 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -34,6 +34,7 @@ let init (context:ServiceContext.ServiceContext) = SelectedPositionLimits = [] token = context.token can_create = context.can_create + this_username = context.username }, Access.getAdminData admin context.token UpdateAdminData NoAdminData let existingSelection (scratch:BTSAccount) (previousScratch:BTSAccount) (data:AdminData) = diff --git a/src/web/ui/src/Accounts/Types.fs b/src/web/ui/src/Accounts/Types.fs index 519a9c44a..ca12aa3bf 100644 --- a/src/web/ui/src/Accounts/Types.fs +++ b/src/web/ui/src/Accounts/Types.fs @@ -105,4 +105,5 @@ type Model = { ConfirmModal: string * Msg token: string can_create: bool + this_username: 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 f30daf7c5..0dfa04bef 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -63,7 +63,7 @@ let generalView model dispatch = (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) + Fields.checkbox "Open For Trading?" "Unchecking this stops all users from entering orders into the account" account.isActive [] (IsActive >> Update >> dispatch) ]) (fun _ -> dispatch SaveScratch) revertFun @@ -73,7 +73,7 @@ let generalView model dispatch = br [] 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) + Fields.checkbox "Open For Trading" "Unchecking this stops all users from entering orders into the account" account.isActive [] (IsActive >> Update >> dispatch) (if (State.isNewAccount account && model.can_create) then modal else span[][]) accountControls model dispatch diff --git a/src/web/ui/src/Controls/Fields.fs b/src/web/ui/src/Controls/Fields.fs index 2d96d8722..1faf98bdc 100644 --- a/src/web/ui/src/Controls/Fields.fs +++ b/src/web/ui/src/Controls/Fields.fs @@ -175,16 +175,15 @@ let checkbox (lbl:string) (description:string) (dv:bool) (attrs:IHTMLProp list) 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 + | 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) ] ]) | Some dt -> (option [] [str dt]) :: ([ for opt in options do yield option [ Value opt.Key ] [ str (opt.Value) ] ]) let dv = match defaultValue with - | Some d -> - d + | Some d -> d | None -> "" diff --git a/src/web/ui/src/Users/Types.fs b/src/web/ui/src/Users/Types.fs index 1341230f5..a86a845ef 100644 --- a/src/web/ui/src/Users/Types.fs +++ b/src/web/ui/src/Users/Types.fs @@ -25,7 +25,7 @@ type UserField = | SMPInstruction of string | MaxOrderRatePerConnection of string | MiscTags of JSMap -| TradingPerm of id:string * bool +| TradingPerm of string * bool | RiskAdmin of string*bool | MDAdmin of string*bool | RemoveAccount of string diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index 85b8fc0c4..2fe8aedf2 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -12,6 +12,7 @@ open bts.api.admin open Users open bts.api open EnumUtils +open Microsoft.FSharp.Collections; let isActiveTab tab currentTab = let ia = "is-active" @@ -39,9 +40,20 @@ let saveButton (model:Users.Types.Model) dispatch = let flavor = if dirty then "is-success" else "" Button.button buttonText flavor "" enabled (fun _ -> dispatch SaveUser) + +let accountIDLookup (accountsList:BTSAccount list) (id:string) = + match (List.tryFind (fun a -> a.id.ToString() = id) accountsList) with + | Some acnt -> acnt.id.ToString() + | None -> "" let generalTabView (model:Model) (dispatch:Msg->Unit) (readonly: bool)= + let accMap = + model.accountsList + |> List.filter (fun a -> a.isPresent) + |> List.map (fun a -> a.id.ToString(), a.name) + |> Map.ofList + let modal = Modal.showCreate "Create User" (div [][ @@ -49,8 +61,9 @@ let generalTabView (model:Model) (dispatch:Msg->Unit) (readonly: bool)= 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 Login and Trade?" "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) + Fields.mapSelect "Trading Account" accMap (Some "Add Accounts") None ( fun x-> (x,true) |> TradingPerm |> UpdateField |> dispatch ) ]) (fun _ -> dispatch SaveUser) (fun _ -> SwitchUser (State.getCurrentUser model) |> dispatch) @@ -61,7 +74,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?" "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 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[][]) ] @@ -71,7 +84,6 @@ let accountNameLookup (accountsList:BTSAccount list) (id:string) = | Some acnt -> acnt.name | None -> "Account Not Found" - let accountsTabView (model:Model) (dispatch:Msg->Unit) (readonly:bool) = let accountPermissions = model.scratchUser.userData.accountPermissions.accountPermissions From efc490cc0dfe55482919dcebd6cc354b91e8ecbe Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 8 Nov 2018 11:52:58 -0500 Subject: [PATCH 13/24] -if a user creates an account, he is given admin permissions on that account -if a user creates a user, he assigns that user trading permissions in one of the accounts he can administer (so he can still see that user, someone else can undo) -bts user has the 'wheel' -bts user can grant other users 'create' permissions, and those users can in turn grant other users create permissions --- src/lib/api/services/AdminService.proto | 1 + src/server/sparkd/user/AdminServiceServer.cpp | 16 ++++++++++++++ src/web/ui/src/Access.fs | 2 ++ src/web/ui/src/Accounts/State.fs | 3 ++- src/web/ui/src/Users/State.fs | 1 + src/web/ui/src/Users/Types.fs | 1 + src/web/ui/src/Users/View.fs | 22 ++++++++++--------- 7 files changed, 35 insertions(+), 11 deletions(-) diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index 7898aa5b1..1761df3d0 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -417,6 +417,7 @@ message AccountCreateAPIArgument{ uint32 parent_account_id = 10; string account_name = 20; string description = 30; + string creator_user = 40; } message AccountUpdateAPIArgument{ BTSAccount complete_data=10; diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index f8cabe337..74bdd5399 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -82,6 +82,22 @@ void AdminServiceServer::create_account( request.description(), false, result); + if(request.creator_user() != "" && result.new_id() != 0) + { + const bts::api::admin::BTSUser* user = AdminServiceUtils::find_user(_state, request.creator_user(), false); + if(user) + { + BTSUser update(*user); + UserAccountPermissionUnit unit(UserAccountPermissionUnit::default_instance()); + unit.mutable_admin_permission()->set_has_permissions(true); + unit.mutable_admin_permission()->set_has_md_permissions(true); + + google::protobuf::MapPair v(result.new_id(), unit); + update.mutable_user_data()->mutable_account_permissions()->mutable_account_permissions()->insert(v); + AdminServiceOperationResult res; + AdminServiceUtils::update_user(_state, update, res); + } + } _update_and_publish(false); reply(result); } diff --git a/src/web/ui/src/Access.fs b/src/web/ui/src/Access.fs index a236143bc..5aa7ca8a1 100644 --- a/src/web/ui/src/Access.fs +++ b/src/web/ui/src/Access.fs @@ -5,6 +5,8 @@ open bts.api open Elmish open bts.api.orderman +let superuser = "bts" + let getAdminData (admin:IAdminService) (token) (fsuc) (ffail) = Cmd.ofPromise admin.get_filtered_admin_data { token = token } diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index d7f99a2a2..a811a443b 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -37,6 +37,7 @@ let init (context:ServiceContext.ServiceContext) = this_username = context.username }, Access.getAdminData admin context.token UpdateAdminData NoAdminData + let existingSelection (scratch:BTSAccount) (previousScratch:BTSAccount) (data:AdminData) = List.choose id [ data.accounts |> Array.tryFind (fun a -> a.id = scratch.id || (scratch.id = 0u && a.name = scratch.name)) @@ -82,7 +83,7 @@ let saveAccount (admin:IAdminService) (account:BTSAccount) (model:Model) = promi } let createAccount (admin:IAdminService) (account:BTSAccount) (model:Model) = promise { - let args = { parentAccountId = 0u; accountName = account.name; description = account.description } + let args = { parentAccountId = 0u; accountName = account.name; description = account.description; creatorUser = model.this_username } let! result = admin.create_account args if result.isSuccess then return! saveAccount admin { account with id = result.newId } model diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index d8cf26947..f051a7b2f 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -116,6 +116,7 @@ let init (context:ServiceContext.ServiceContext) : Model * Cmd = ConfirmModal = "", (Msg.SwitchTab Tab.General) token = context.token can_create = context.can_create + this_username = context.username }, getAdminData admin context.token let rec removeUser (user:BTSUser) (userList:BTSUser list) = diff --git a/src/web/ui/src/Users/Types.fs b/src/web/ui/src/Users/Types.fs index a86a845ef..869e2f2b9 100644 --- a/src/web/ui/src/Users/Types.fs +++ b/src/web/ui/src/Users/Types.fs @@ -62,6 +62,7 @@ type Model = { ConfirmModal: string * Msg token: string can_create: bool + this_username: string } diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index 2fe8aedf2..d09196a38 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -53,7 +53,8 @@ let generalTabView (model:Model) (dispatch:Msg->Unit) (readonly: bool)= |> List.filter (fun a -> a.isPresent) |> List.map (fun a -> a.id.ToString(), a.name) |> Map.ofList - + + let can_create = model.can_create || model.this_username = Access.superuser let modal = Modal.showCreate "Create User" (div [][ @@ -62,7 +63,7 @@ let generalTabView (model:Model) (dispatch:Msg->Unit) (readonly: bool)= Fields.text "Full Name" model.scratchUser.fullName [] (FullName >> UpdateField >> dispatch) Fields.text "Company" model.scratchUser.company [] (Company >> UpdateField >> dispatch) Fields.checkbox "Can Login and Trade?" "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) + Fields.checkbox "Can Create?" "Checking this allows the user to create other users and accounts" model.scratchUser.canCreate [Disabled (not can_create)] (CanCreate >> UpdateField >> dispatch) Fields.mapSelect "Trading Account" accMap (Some "Add Accounts") None ( fun x-> (x,true) |> TradingPerm |> UpdateField |> dispatch ) ]) (fun _ -> dispatch SaveUser) @@ -75,7 +76,7 @@ let generalTabView (model:Model) (dispatch:Msg->Unit) (readonly: bool)= 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 Create?" "Checking this allows the user to create other users and accounts" model.scratchUser.canCreate [Disabled readonly] (CanCreate >> 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[][]) ] @@ -117,7 +118,7 @@ let accountsTabView (model:Model) (dispatch:Msg->Unit) (readonly:bool) = [for acc in realAccList do let string_id = acc.id.ToString() let perm = JSMap.tryFind string_id accountPermissions - let is_bts = model.scratchUser.name = "bts" + let is_bts = model.scratchUser.name = Access.superuser let hasTradeAdmin = (if perm.IsNone then false else perm.Value.tradingPermission.hasPermissions) let hasRiskAdmin = is_bts || (if perm.IsNone then false else perm.Value.adminPermission.hasPermissions) let hasMdAdmin = is_bts || (if perm.IsNone then false else perm.Value.adminPermission.hasMdPermissions) @@ -229,15 +230,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 + let is_bts = model.this_username = Access.superuser + let md_readonly = if is_bts then false else not (adminDisplay = bts.api.admin.CMEUserData.AdminDisplay.All || adminDisplay = bts.api.admin.CMEUserData.AdminDisplay.MD) + let risk_readonly = if is_bts then false else not (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 | _, false -> p [Style [ Color "Red" ]] [ str "Select a User" ] - | 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)) + | Tab.General, true -> generalTabView model dispatch risk_readonly + | Tab.Accounts, true -> accountsTabView model dispatch risk_readonly + | Tab.MarketData, true -> MarketDataTabView model dispatch md_readonly + | Tab.OrderRouting, true -> orderRoutingTabView model dispatch risk_readonly ) userControls model dispatch ] From 52825e0e599ef9e8a1c0049bf211e1e8f686305d Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 8 Nov 2018 13:38:42 -0500 Subject: [PATCH 14/24] sparkd adminreport md --- src/server/sparkd/cmds/AdminReport.cpp | 91 ++++++++++++++++++++++++++ src/server/sparkd/cmds/AdminReport.h | 22 +++++++ src/server/sparkd/main.cpp | 2 + 3 files changed, 115 insertions(+) create mode 100644 src/server/sparkd/cmds/AdminReport.cpp create mode 100644 src/server/sparkd/cmds/AdminReport.h diff --git a/src/server/sparkd/cmds/AdminReport.cpp b/src/server/sparkd/cmds/AdminReport.cpp new file mode 100644 index 000000000..8edcd2b8b --- /dev/null +++ b/src/server/sparkd/cmds/AdminReport.cpp @@ -0,0 +1,91 @@ +#include "AdminReport.h" + +#include "lib/config/config.h" +#include "lib/logging/logging.h" +#include "lib/config/protos/logging.pb.h" +#include "lib/quickbus/quickbus.h" +#include "lib/api/public/ServiceContext.h" + +#include "lib/api/services/AdminService.client.pb.h" +#include "lib/api/service_helpers/AdminServiceUtils.h" +#include +#include + +namespace bts +{ +namespace cmd +{ + +int AdminReport::execute(const std::vector& args) +{ + auto cfg = config::get (); + cfg.mutable_console()->set_default_level("Fatal"); + log::configure_logging(cfg); + + if(args[0] == "md") + return md_report(); + else + { + std::cout << std::endl << std::endl << help() << std::endl << std::endl; + return -1; + } +} + +int AdminReport::md_report() +{ + std::map mic_map; + mic_map[api::CMEMics::CME] = "XCME"; + mic_map[api::CMEMics::COMEX] = "XCEC"; + mic_map[api::CMEMics::CBT] = "XCBT"; + mic_map[api::CMEMics::NYMEX] = "XYM"; + + // config::QuickbusNodeCfg qb_cfg; + // auto& ports = config::get(); + // qb_cfg.set_my_port(ports.qbus_port()); + //qbus::Quickbus quickbus(); + api::ServiceContext (sc); //for Eric + + api::admin::AdminService admin = sc.locate(); + auto res = admin.get_admin_data(api::VoidMessage()); + if(res.success()) + { + const api::admin::AdminData& data = *res.result(); + std::cout << "User,Fullname,Company,Exchange,MIC,Display,Pro/NonPro" << std::endl; + for(const auto& u : data.users()) + { + if(u.name() == "bts") + continue; + const bts::api::admin::CMEUserData* cme = admin::AdminServiceUtils::get_user_cme_data(u, data); + if(cme) + { + for(const auto& md : cme->md_permissions()) + { + std::string mic_string = bts::api::CMEMics_Name(md.mic()); + auto it = mic_map.find(md.mic()); + if(it != mic_map.end()) + mic_string = it->second; + std::string disp_string = (cme->display_nondisplay() == api::admin::DisplayDesignation::DISPLAYDESIGNATION_NONDISPLAY) + ? "NONDISPLAY" : "DISPLAY"; + std::string pro_string = (cme->pro_nonpro() == api::admin::ProfessionalDesignation::PROFESSIONALDESIGNATION_NONPRO) + ? "NONPRO" : "PRO"; + std::cout << u.name() << "," << u.full_name() << "," << u.company() << ",CMEGroup," + << mic_string << "," << disp_string << "," << pro_string << std::endl; + } + } + } + } + return 0; +} + +std::string AdminReport::help() +{ + return + "\t sparkd adminreport [md] \n" + "\t Write a market data entitlement report csv to stdout \n" + ; +} + +} +} + + diff --git a/src/server/sparkd/cmds/AdminReport.h b/src/server/sparkd/cmds/AdminReport.h new file mode 100644 index 000000000..427b5105b --- /dev/null +++ b/src/server/sparkd/cmds/AdminReport.h @@ -0,0 +1,22 @@ +#pragma once + +#include "ICmd.h" + +namespace bts +{ +namespace cmd +{ + +class AdminReport : public ICmd +{ +public: + int execute(std::vector const &args); + int md_report(); + std::string help(); + +}; + +} +} + + diff --git a/src/server/sparkd/main.cpp b/src/server/sparkd/main.cpp index 37d790c76..524a8a1f3 100644 --- a/src/server/sparkd/main.cpp +++ b/src/server/sparkd/main.cpp @@ -16,6 +16,7 @@ #include "server/sparkd/cmds/Span.h" #include "server/sparkd/cmds/Test.h" #include "server/sparkd/cmds/TestCeloxica.h" +#include "server/sparkd/cmds/AdminReport.h" #include "server/sparkd/cmds/Web.h" using namespace bts; @@ -37,6 +38,7 @@ int main(int argc, char **argv) { REGISTER(Span); REGISTER(Web); REGISTER(PrintHedgeOrders); + REGISTER(AdminReport); END_CMD; utils::finit_spark_lib(); From 9c8bb7efeb7882c03f282897724e30226fb8b3fc Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 9 Nov 2018 12:12:31 -0500 Subject: [PATCH 15/24] excel is in with the mics --- .../extensions/OrderService_Excel.cs | 26 ++++++++++++++++++- .../rtd/formatting/JsonFormatter.cs | 3 ++- .../rtd/subscriptions/MDSubscribe.cs | 3 ++- src/client/spark_excel/utils/Utilities.cs | 15 +++++++++++ tools/runexcel.cmd | 4 +++ 5 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 tools/runexcel.cmd diff --git a/src/client/spark_excel/extensions/OrderService_Excel.cs b/src/client/spark_excel/extensions/OrderService_Excel.cs index dcdb0dec6..e081916aa 100644 --- a/src/client/spark_excel/extensions/OrderService_Excel.cs +++ b/src/client/spark_excel/extensions/OrderService_Excel.cs @@ -1,7 +1,10 @@ using System; using System.Collections.Concurrent; +using System.Collections.Generic; using System.Linq; using ExcelDna.Integration; +using ExcelDna.Integration.Rtd; +using ExcelDna.Registration.Utils; using bts.api.admin; using bts.excel; @@ -16,7 +19,28 @@ namespace bts.api.orderman { readonly static Lazy _users = new Lazy(() => Locator.locate(), true); readonly static Lazy _admin = new Lazy(() => Locator.locate(), true); - + + [ExcelFunction(Category = "BTS", Description = "Get All Accessible Accounts")] + async public static void spark_get_accounts(string login_token, ExcelAsyncHandle handle) + { + try + { + List accts = new List(); + var admin = await _admin.Value.get_filtered_admin_data_async(new FilteredAdminDataRequest { Token = login_token }); + if (admin.success) + { + foreach (var acc in admin.value.Accounts) + if(acc.IsPresent) + accts.Add(acc.Name); + } + var res = Utilities.make_column_vector(accts.ToArray()); + handle.SetResult(res); + } + catch (Exception ex) + { + handle.SetException(ex); + } + } [ExcelFunction(Category = "BTS", Description = "Cancel an Order by Order ID", IsMacroType = true)] public static object spark_orderservice_cancel_order(long order_id) diff --git a/src/client/spark_excel/rtd/formatting/JsonFormatter.cs b/src/client/spark_excel/rtd/formatting/JsonFormatter.cs index 1db45e17b..06dddf859 100644 --- a/src/client/spark_excel/rtd/formatting/JsonFormatter.cs +++ b/src/client/spark_excel/rtd/formatting/JsonFormatter.cs @@ -6,6 +6,7 @@ using System.Reactive.Linq; using Google.Protobuf; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using ExcelDna.Integration; namespace bts.excel.rtd { @@ -17,7 +18,7 @@ namespace bts.excel.rtd _data = data; } - #region parser + #region parser static IDictionary parse_dictionary(object[,] range) { Dictionary dict = new Dictionary(); diff --git a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs index 8b60cdcfd..cdfc364b4 100644 --- a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs +++ b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs @@ -4,17 +4,18 @@ using System.Linq; using ExcelDna.Integration; using ExcelDna.Integration.Rtd; +using ExcelDna.Registration.Utils; using System.Reactive.Linq; using bts.api; using bts.api.md; using bts.api.orderman; -using ExcelDna.Registration.Utils; namespace bts.excel.rtd { public class MDSubscribe { static Authenticator _auth = new Authenticator(); + [ExcelFunction(Category = "BTS", Description = "Log in to BTS Spark")] async public static void spark_login(string login, string password, ExcelAsyncHandle handle) { try diff --git a/src/client/spark_excel/utils/Utilities.cs b/src/client/spark_excel/utils/Utilities.cs index b50d116a3..70c6dded1 100644 --- a/src/client/spark_excel/utils/Utilities.cs +++ b/src/client/spark_excel/utils/Utilities.cs @@ -5,12 +5,27 @@ using System.Reflection; using System.Text.RegularExpressions; using ExcelDna.Integration; using bts.api; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; namespace bts.excel { public class Utilities { + [ExcelFunction] + public static object bts_json_lookup(string json, string key1, string key2 = null, string key3 = null) + { + var jo = JObject.Parse(json); + if (key1 != null && key2 != null && key3 != null) + return jo[key1][key2][key3]; + else if (key1 != null && key2 != null) + return jo[key1][key2]; + else if (key1 != null) + return jo[key1]; + return json; + } + public static bool parse_venue(string exch, out Venue ven) { if (!Enum.TryParse(exch.ToUpper(), true, out ven)) diff --git a/tools/runexcel.cmd b/tools/runexcel.cmd new file mode 100644 index 000000000..8d1c9ea90 --- /dev/null +++ b/tools/runexcel.cmd @@ -0,0 +1,4 @@ +@echo off +pushd %~dp0\..\build\debug\bin\net471\ +start spark_excel-addin64.xll +popd From 9f3941d1a137846bd04c8f366c11dc563349373d Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 9 Nov 2018 13:39:06 -0500 Subject: [PATCH 16/24] favor the async excel interface for our api calls --- src/client/spark_excel/utils/Utilities.cs | 15 +++-- .../templates/excel/excel.pb.cs | 65 ++++++++++--------- 2 files changed, 41 insertions(+), 39 deletions(-) diff --git a/src/client/spark_excel/utils/Utilities.cs b/src/client/spark_excel/utils/Utilities.cs index 70c6dded1..99d0d7925 100644 --- a/src/client/spark_excel/utils/Utilities.cs +++ b/src/client/spark_excel/utils/Utilities.cs @@ -17,13 +17,14 @@ namespace bts.excel public static object bts_json_lookup(string json, string key1, string key2 = null, string key3 = null) { var jo = JObject.Parse(json); - if (key1 != null && key2 != null && key3 != null) - return jo[key1][key2][key3]; - else if (key1 != null && key2 != null) - return jo[key1][key2]; - else if (key1 != null) - return jo[key1]; - return json; + JToken val = json; + if (!string.IsNullOrEmpty(key1) && !string.IsNullOrEmpty(key2) && !string.IsNullOrEmpty(key3)) + val = jo[key1][key2][key3]; + else if (!string.IsNullOrEmpty(key1) && !string.IsNullOrEmpty(key2)) + val = jo[key1][key2]; + else if (!string.IsNullOrEmpty(key1)) + val = jo[key1]; + return val.ToString(); } public static bool parse_venue(string exch, out Venue ven) diff --git a/src/lib/api/service_compiler/templates/excel/excel.pb.cs b/src/lib/api/service_compiler/templates/excel/excel.pb.cs index c3c2f3b5c..c51606998 100644 --- a/src/lib/api/service_compiler/templates/excel/excel.pb.cs +++ b/src/lib/api/service_compiler/templates/excel/excel.pb.cs @@ -27,19 +27,7 @@ public partial class {{name}}_Excel : IDisposable { readonly static object _lock = new object(); readonly static Lazy<{{name}}> _service = new Lazy<{{name}}>(() => bts.api.Locator.locate<{{name}}>(), true); - // volatile static api.core.ServiceContext _ctx; - // static T locate() where T : class, IApiClient - // { - // if(_ctx == null) - // { - // lock(_lock) - // { - // if (_ctx == null) - // _ctx = new api.core.ServiceContext(); - // } - // } - // return _ctx.locate(); - // } + public void Dispose() { @@ -88,38 +76,51 @@ public void Dispose() {{#unless skip_excel_generation}} [ExcelFunction(Category = "BTS", Description = "Call BTS Spark {{../lname}} API Method {{lname}} with parameter {{input_type_full}}")] - public static object spark_{{../lname}}_{{lname}} (object[,] parameters, bool show_headers = false, bool display_vertically = false) + async public static void spark_{{../lname}}_{{lname}} (object[,] parameters, ExcelAsyncHandle handle, bool show_headers = false, bool display_vertically = false) { try { Google.Protobuf.IMessage req = null; - if(parameters.Rank == 2 && parameters.GetLength(0) == 1 && parameters.GetLength(1) == 1) + {{input_type_full}} casted_req = null; + try { - if(parameters[0,0] == ExcelMissing.Value) - req = (Google.Protobuf.IMessage) Activator.CreateInstance(typeof({{input_type_full}})); - else if(parameters[0,0] is string json) - req = APIDispatch.generate_imessage(typeof({{input_type_full}}), json); - } - if(req == null) - { - string json = JsonFormatter.parse_json(typeof({{input_type_full}}), parameters); - req = APIDispatch.generate_imessage(typeof({{input_type_full}}), json); + if(parameters.Rank == 2 && parameters.GetLength(0) == 1 && parameters.GetLength(1) == 1) + { + if(parameters[0,0] == ExcelMissing.Value) + req = (Google.Protobuf.IMessage) Activator.CreateInstance(typeof({{input_type_full}})); + else if(parameters[0,0] is string json) + req = APIDispatch.generate_imessage(typeof({{input_type_full}}), json); + } + if(req == null) + { + string json = JsonFormatter.parse_json(typeof({{input_type_full}}), parameters); + req = APIDispatch.generate_imessage(typeof({{input_type_full}}), json); + } + casted_req = ({{input_type_full}}) req; } - object res = _service.Value.{{name}}( ({{input_type_full}}) req ); - object[,] scattered = new JsonFormatter(res).format(show_headers); + catch + { + var members = bts.excel.extensions.ReflectionExtensions + .get_fields_or_properties(typeof({{input_type_full}})) + .Where(x => !DataParser.excluded_member(x)); + handle.SetResult( + "Error in calling method {{lname}}( {{input_type_full}} ), input members are: " + + string.Join(",", members.Select(x => x.Name).ToArray()) + ); + } + + var res = await _service.Value.{{name}}_async( casted_req ); + object res_res = res.value; + object[,] scattered = new JsonFormatter(res_res).format(show_headers); if(display_vertically) scattered = bts.excel.Utilities.transpose_keep_dimension(scattered); - return scattered; + handle.SetResult(scattered); } catch(Exception ex) { Trace.TraceError(ex.ToString()); + handle.SetException(ex); } - var members = bts.excel.extensions.ReflectionExtensions - .get_fields_or_properties(typeof({{input_type_full}})) - .Where(x => !DataParser.excluded_member(x)); - return "Error in calling method {{lname}}( {{input_type_full}} ), input members are: " + - string.Join(",", members.Select(x => x.Name).ToArray()); } {{/unless}} From ea3eacbbaee414e1a7dd82850ba3c4ab319c6cf5 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 9 Nov 2018 15:40:26 -0500 Subject: [PATCH 17/24] async blows up brian's laptop, adding it as an option --- .../templates/excel/excel.pb.cs | 37 ++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/src/lib/api/service_compiler/templates/excel/excel.pb.cs b/src/lib/api/service_compiler/templates/excel/excel.pb.cs index c51606998..9bde3fd92 100644 --- a/src/lib/api/service_compiler/templates/excel/excel.pb.cs +++ b/src/lib/api/service_compiler/templates/excel/excel.pb.cs @@ -76,7 +76,7 @@ public void Dispose() {{#unless skip_excel_generation}} [ExcelFunction(Category = "BTS", Description = "Call BTS Spark {{../lname}} API Method {{lname}} with parameter {{input_type_full}}")] - async public static void spark_{{../lname}}_{{lname}} (object[,] parameters, ExcelAsyncHandle handle, bool show_headers = false, bool display_vertically = false) + async public static void spark_{{../lname}}_{{lname}}_async (object[,] parameters, ExcelAsyncHandle handle, bool show_headers = false, bool display_vertically = false) { try { @@ -122,6 +122,41 @@ public void Dispose() handle.SetException(ex); } } + + [ExcelFunction(Category = "BTS", Description = "Call BTS Spark {{../lname}} API Method {{lname}} with parameter {{input_type_full}}")] + public static object spark_{{../lname}}_{{lname}} (object[,] parameters, bool show_headers = false, bool display_vertically = false) + { + try + { + Google.Protobuf.IMessage req = null; + if(parameters.Rank == 2 && parameters.GetLength(0) == 1 && parameters.GetLength(1) == 1) + { + if(parameters[0,0] == ExcelMissing.Value) + req = (Google.Protobuf.IMessage) Activator.CreateInstance(typeof({{input_type_full}})); + else if(parameters[0,0] is string json) + req = APIDispatch.generate_imessage(typeof({{input_type_full}}), json); + } + if(req == null) + { + string json = JsonFormatter.parse_json(typeof({{input_type_full}}), parameters); + req = APIDispatch.generate_imessage(typeof({{input_type_full}}), json); + } + object res = _service.Value.{{name}}( ({{input_type_full}}) req ); + object[,] scattered = new JsonFormatter(res).format(show_headers); + if(display_vertically) + scattered = bts.excel.Utilities.transpose_keep_dimension(scattered); + return scattered; + } + catch(Exception ex) + { + Trace.TraceError(ex.ToString()); + } + var members = bts.excel.extensions.ReflectionExtensions + .get_fields_or_properties(typeof({{input_type_full}})) + .Where(x => !DataParser.excluded_member(x)); + return "Error in calling method {{lname}}( {{input_type_full}} ), input members are: " + + string.Join(",", members.Select(x => x.Name).ToArray()); + } {{/unless}} {{/if}} From 2fc85d681048aaef6c9ad849cd4db75f7bcb3ce2 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 13 Nov 2018 22:55:17 +0000 Subject: [PATCH 18/24] AdminReport.cpp edited online with Bitbucket --- src/server/sparkd/cmds/AdminReport.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/server/sparkd/cmds/AdminReport.cpp b/src/server/sparkd/cmds/AdminReport.cpp index 8edcd2b8b..f0c259464 100644 --- a/src/server/sparkd/cmds/AdminReport.cpp +++ b/src/server/sparkd/cmds/AdminReport.cpp @@ -60,6 +60,8 @@ int AdminReport::md_report() { for(const auto& md : cme->md_permissions()) { + if(!md.enabled()) + continue; std::string mic_string = bts::api::CMEMics_Name(md.mic()); auto it = mic_map.find(md.mic()); if(it != mic_map.end()) From 42b73006a86d2ebfa51d53f9822fa478da094040 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 13 Nov 2018 23:06:47 +0000 Subject: [PATCH 19/24] AdminReport.cpp edited online with Bitbucket --- src/server/sparkd/cmds/AdminReport.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/sparkd/cmds/AdminReport.cpp b/src/server/sparkd/cmds/AdminReport.cpp index f0c259464..8189d8285 100644 --- a/src/server/sparkd/cmds/AdminReport.cpp +++ b/src/server/sparkd/cmds/AdminReport.cpp @@ -37,7 +37,7 @@ int AdminReport::md_report() mic_map[api::CMEMics::CME] = "XCME"; mic_map[api::CMEMics::COMEX] = "XCEC"; mic_map[api::CMEMics::CBT] = "XCBT"; - mic_map[api::CMEMics::NYMEX] = "XYM"; + mic_map[api::CMEMics::NYMEX] = "XNYM"; // config::QuickbusNodeCfg qb_cfg; // auto& ports = config::get(); From 51ed3a4c2c4592a99c71c3f736b190896fb48823 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 19 Nov 2018 12:02:02 -0500 Subject: [PATCH 20/24] 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" ] From 9b7275e7138a1129ca7d15a073b34a3f13bd930b Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 19 Nov 2018 14:11:28 -0500 Subject: [PATCH 21/24] let's see if I can get this by Jake --- src/server/sparkd/cmds/AdminReport.cpp | 13 ++++- src/web/ui/src/Accounts/View.fs | 20 ++++--- src/web/ui/src/Nav.fs | 3 + src/web/ui/src/Users/State.fs | 4 +- src/web/ui/src/Users/View.fs | 80 ++++++++++++++++---------- 5 files changed, 80 insertions(+), 40 deletions(-) diff --git a/src/server/sparkd/cmds/AdminReport.cpp b/src/server/sparkd/cmds/AdminReport.cpp index 8189d8285..59866b223 100644 --- a/src/server/sparkd/cmds/AdminReport.cpp +++ b/src/server/sparkd/cmds/AdminReport.cpp @@ -8,6 +8,9 @@ #include "lib/api/services/AdminService.client.pb.h" #include "lib/api/service_helpers/AdminServiceUtils.h" + +#include +#include #include #include @@ -70,7 +73,15 @@ int AdminReport::md_report() ? "NONDISPLAY" : "DISPLAY"; std::string pro_string = (cme->pro_nonpro() == api::admin::ProfessionalDesignation::PROFESSIONALDESIGNATION_NONPRO) ? "NONPRO" : "PRO"; - std::cout << u.name() << "," << u.full_name() << "," << u.company() << ",CMEGroup," + + std::string name_string = u.name(); + name_string.erase(std::remove(name_string.begin(), name_string.end(), ','), name_string.end()); + std::string full_string = u.full_name(); + full_string.erase(std::remove(full_string.begin(), full_string.end(), ','), full_string.end()); + std::string co_string = u.company(); + co_string.erase(std::remove(co_string.begin(), co_string.end(), ','), co_string.end()); + + std::cout << name_string << "," << full_string << "," << co_string << ",CMEGroup," << mic_string << "," << disp_string << "," << pro_string << std::endl; } } diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index 9721f16b4..b32725555 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -745,7 +745,7 @@ let tabContent model dispatch = div [Key (string model.scratch.id); ClassName "is-tab-content"] [ // (match model.tab with (match model.tab, (accountIsSelected model.scratch Access.Accounts.empty) with - | _ , false -> p [Style [ Color "Red" ]] [ str "Select an Account" ] + | _ , false -> p [Style [ Color "Red" ]] [ str "You are not authorized to view this data" ] | General, _ -> generalView model dispatch | LimitsTab, _ -> LimitsView model dispatch | ConnectionsTab, _ -> ConnectionsView model dispatch @@ -859,7 +859,12 @@ let NavRoot (accounts:BTSAccount[]) selectedAccount model dispatch = [ p [ Class "menu-label" ] [ span [Class "is-size-4"] [str "Accounts"] span [ Class "is-pulled-right circle-icon" ] - [ Button.fabutton "Add Account" "plus-circle" "" Button.Enabled (fun _ -> dispatch AddAccount) ] + [ Button.fabutton + (if model.can_create then "Add Account" else "") + (if model.can_create then "plus-circle" else "") + "" + (if model.can_create then Button.Enabled else Button.Disabled) + (fun _ -> dispatch AddAccount) ] ] ul [ Class "menu-list" ] @@ -901,14 +906,15 @@ let root (model:Model) dispatch = [ NavRoot data.accounts (selectedAccount model) model dispatch div [ Class "column is-main-content" ] [ + div [ ClassName "tabs is-boxed" ] [ ul [] [ - tabHeader General model.tab dispatch - tabHeader LimitsTab model.tab dispatch - tabHeader ConnectionsTab model.tab dispatch + (if (Array.length data.accounts > 0) then (tabHeader General model.tab dispatch) else span [][] ) + (if (Array.length data.accounts > 0) then (tabHeader LimitsTab model.tab dispatch) else span [][] ) + (if (Array.length data.accounts > 0) then (tabHeader ConnectionsTab model.tab dispatch) else span [][] ) // tabHeader CreditLimits model.tab dispatch - tabHeader ExchangeSettingsTab model.tab dispatch - tabHeader OrdersTab model.tab dispatch + (if (Array.length data.accounts > 0) then (tabHeader ExchangeSettingsTab model.tab dispatch) else span [][] ) + (if (Array.length data.accounts > 0) then (tabHeader OrdersTab model.tab dispatch) else span [][] ) ] ] tabContent model dispatch diff --git a/src/web/ui/src/Nav.fs b/src/web/ui/src/Nav.fs index dccdc36f1..93c18c07e 100644 --- a/src/web/ui/src/Nav.fs +++ b/src/web/ui/src/Nav.fs @@ -55,6 +55,9 @@ let root (currentPage:Page) (sc:ServiceContext) dispatch = div [] [str "Logout"] ] ] + // Michael, fixme + // li [Class "is-size-6"] + // [str ("Logged in as " + sc.username)] ] ] ] diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index f051a7b2f..6e288c739 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -60,7 +60,7 @@ let defaultScratchUser = { exchangeUserData = { cmeData = { - adminDisplayFlag = bts.api.admin.CMEUserData.AdminDisplay.All + adminDisplayFlag = bts.api.admin.CMEUserData.AdminDisplay.None operatorId = "" atsOperatorId = "" smpId = "" @@ -109,7 +109,7 @@ let init (context:ServiceContext.ServiceContext) : Model * Cmd = accountsList = [] scratchUser = defaultScratchUser PreviousScratchUser = defaultScratchUser - currentTab = Tab.General + currentTab = Tab.General admin = admin adminData = None OptionsMenuOpen = "" diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index 131a72e2a..be8203021 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -63,7 +63,7 @@ let generalTabView (model:Model) (dispatch:Msg->Unit) (readonly: bool)= 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 and Trade?" "Unchecking this stops the user from logging in and entering orders" model.scratchUser.isActive [] (IsActive >> UpdateField >> dispatch) + Fields.checkbox "Can Login?" "Unchecking this stops the user from logging in" model.scratchUser.isActive [] (IsActive >> UpdateField >> dispatch) Fields.checkbox "Can Create?" "Checking this allows the user to create other users and accounts" model.scratchUser.canCreate [Disabled (not can_create)] (CanCreate >> UpdateField >> dispatch) Fields.mapSelect "Trading Account" accMap (Some "Add Accounts") None ( fun x-> (x,true) |> TradingPerm |> UpdateField |> dispatch ) ]) @@ -76,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 can_login_disabled] (IsActive >> UpdateField >> dispatch) + Fields.checkbox "Can Login?" "Unchecking this stops the user from logging into Spark" 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[][]) ] @@ -230,20 +230,20 @@ let userControls (model:Model) (dispatch:Msg->Unit) = ] -let tabContent (model:Model) (dispatch:Msg->Unit) = - let adminDisplay = model.scratchUser.userData.exchangeUserData.cmeData.adminDisplayFlag - let is_bts = model.this_username = Access.superuser - let md_readonly = if is_bts then false else not (adminDisplay = bts.api.admin.CMEUserData.AdminDisplay.All || adminDisplay = bts.api.admin.CMEUserData.AdminDisplay.MD) - let risk_readonly = if is_bts then false else not (adminDisplay = bts.api.admin.CMEUserData.AdminDisplay.All || adminDisplay = bts.api.admin.CMEUserData.AdminDisplay.Routing) +let tabContent (model:Model) (dispatch:Msg->Unit) display_md display_risk = + let mod1 = { + model with currentTab = (if (not display_risk && display_md) then Tab.MarketData else model.currentTab) + } + div [Key (string model.scratchUser.id); ClassName "is-tab-content"] [ - (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 risk_readonly - | Tab.Accounts, true -> accountsTabView model dispatch risk_readonly - | Tab.MarketData, true -> MarketDataTabView model dispatch md_readonly - | Tab.OrderRouting, true -> orderRoutingTabView model dispatch risk_readonly ) + (match mod1.currentTab, ( State.userIsSelected model.scratchUser State.defaultScratchUser) with + | _, false -> p [Style [ Color "Red" ]] [ str "You are not authorized to view this data" ] + | Tab.General, true -> generalTabView model dispatch (not display_risk) + | Tab.Accounts, true -> accountsTabView model dispatch (not display_risk) + | Tab.MarketData, true -> MarketDataTabView model dispatch (not display_md) + | Tab.OrderRouting, true -> orderRoutingTabView model dispatch (not display_risk) ) - userControls model dispatch + (if (State.userIsSelected model.scratchUser State.defaultScratchUser) then userControls model dispatch else span[][]) ] let usersMenu (usersList:BTSUser list) (currentUser:BTSUser) (dispatch:Msg->Unit) = @@ -357,11 +357,14 @@ let NavRoot (usersList:BTSUser list) (currentUser:BTSUser) model (dispatch:Msg-> div [ Class "column is-narrow is-sidebar-menu" ] [ aside [ Class "menu" ] - [ p [ Class "menu-label" ] [ + [ p [ Class "menu-label" ] [ span [Class "is-size-4"] [str "Users"] span [ Class "is-pulled-right circle-icon" ] - [ Button.fabutton "Add User" "plus-circle" "" - ( if currentUser.canCreate then Button.Enabled else Button.Disabled) + [ Button.fabutton + (if model.can_create then "Add User" else "") + (if model.can_create then "plus-circle" else "") + "" + (if model.can_create then Button.Enabled else Button.Disabled) (fun _ -> dispatch AddUser) ] ] @@ -386,6 +389,11 @@ let root (model:Model) (dispatch:Msg->Unit) = | _, _ -> () ) *) + let adminDisplay = model.scratchUser.userData.exchangeUserData.cmeData.adminDisplayFlag + let is_bts = model.this_username = Access.superuser + let display_md = if is_bts then true else (adminDisplay = bts.api.admin.CMEUserData.AdminDisplay.All || adminDisplay = bts.api.admin.CMEUserData.AdminDisplay.MD) + let display_risk = if is_bts then true else (adminDisplay = bts.api.admin.CMEUserData.AdminDisplay.All || adminDisplay = bts.api.admin.CMEUserData.AdminDisplay.Routing) + let modal = match (fst model.ConfirmModal) with | "" -> span [] [] | _ -> Modal.showConfirm (fst model.ConfirmModal) (fun () -> (snd model.ConfirmModal) |> dispatch) (fun _ -> OpenConfirmModal ("", Msg.SwitchTab model.currentTab ) |> dispatch) @@ -406,21 +414,33 @@ let root (model:Model) (dispatch:Msg->Unit) = div [ ClassName "tabs is-boxed" ] [ ul [ ] [ - li [ ClassName (isActiveTab Tab.General model.currentTab) ] - [ a [ OnClick (fun _ -> dispatch (SwitchTab Tab.General)) ] - [ str "General" ] ] - li [ ClassName (isActiveTab Tab.Accounts model.currentTab) ] - [ a [ OnClick (fun _ -> dispatch (SwitchTab Tab.Accounts)) ] - [ str "Account Permissions" ] ] - li [ ClassName (isActiveTab Tab.MarketData model.currentTab) ] - [ a [ OnClick (fun _ -> dispatch (SwitchTab Tab.MarketData)) ] - [ str "Market Data" ] ] - li [ ClassName (isActiveTab Tab.OrderRouting model.currentTab) ] - [ a [ OnClick (fun _ -> dispatch (SwitchTab Tab.OrderRouting)) ] - [ str "Order Routing" ] ] + (if display_risk then + li [ ClassName (isActiveTab Tab.General model.currentTab) ] + [ a [ OnClick (fun _ -> dispatch (SwitchTab Tab.General)) ] + [ str "General" ] ] + else + span [] []) + (if display_risk then + li [ ClassName (isActiveTab Tab.Accounts model.currentTab) ] + [ a [ OnClick (fun _ -> dispatch (SwitchTab Tab.Accounts)) ] + [ str "Account Permissions" ] ] + else + span [] []) + (if display_md then + li [ ClassName (isActiveTab Tab.MarketData model.currentTab) ] + [ a [ OnClick (fun _ -> dispatch (SwitchTab Tab.MarketData)) ] + [ str "Market Data" ] ] + else + span [] [] ) + (if display_risk then + li [ ClassName (isActiveTab Tab.OrderRouting model.currentTab) ] + [ a [ OnClick (fun _ -> dispatch (SwitchTab Tab.OrderRouting)) ] + [ str "Order Routing" ] ] + else + span [] [] ) ] ] - tabContent model dispatch + tabContent model dispatch display_md display_risk modal ] ] From d4744d300b1253abc70f1ce57524106c6a9c87a7 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 19 Nov 2018 14:19:00 -0500 Subject: [PATCH 22/24] jakes #7 --- src/web/ui/src/Nav.fs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/web/ui/src/Nav.fs b/src/web/ui/src/Nav.fs index 93c18c07e..d272169e6 100644 --- a/src/web/ui/src/Nav.fs +++ b/src/web/ui/src/Nav.fs @@ -52,12 +52,9 @@ let root (currentPage:Page) (sc:ServiceContext) dispatch = [ div [ ClassName "icon is-large" ] [ i [ ClassName "fa fa-3x fa-sign-out" ] [] ] - div [] [str "Logout"] + div [] [str ("Logout \n" + sc.username)] ] ] - // Michael, fixme - // li [Class "is-size-6"] - // [str ("Logged in as " + sc.username)] ] ] ] From 0f81ce1716fe926aa0a29d08f04d29aecdfa31bb Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 20 Nov 2018 17:16:50 -0500 Subject: [PATCH 23/24] hopefully last fix for fix_mics Enforce at least 1 account selection on User Creation. One can currently create a User and not assign any Account Permissions. If you do this, you as the creator of said user will not see the user in your UI. Also if a user can't add users he can't clone or remove them either --- src/web/ui/src/Accounts/View.fs | 72 +++++++++-------- src/web/ui/src/Users/View.fs | 132 +++++++++++++++++++++----------- 2 files changed, 127 insertions(+), 77 deletions(-) diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index b32725555..483f28756 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -822,35 +822,37 @@ let menuItem account selectedAccount model dispatch = OnClick (fun _ -> SelectAccount account |> dispatch) ] [ span [] [ str account.name ] - span [ Class "is-pulled-right menu-icon" ] - [ - div [ Class (sprintf "dropdown %s" (isOptionsMenuOpen account.name model.OptionsMenuOpen)) ] - [ div [ Class "dropdown-trigger" ] - [ button [ Class "button" - AriaHasPopup true - OnClick (fun _ -> account.name |> OpenOptionsMenu |> dispatch) - HTMLAttr.Custom ("aria-controls", (sprintf "dropdown-menu-%s" account.name)) ] - [ span [ Class "icon is-small" ] - [ i [ Class "fa fa-ellipsis-v" - HTMLAttr.Custom ("aria-hidden", "true") ][ ] - ] - ] - ] - div [ Class "dropdown-menu" - Id (sprintf "dropdown-menu-%s" account.name) - Role "menu" + (if model.can_create then + span [ Class "is-pulled-right menu-icon" ] + [ + div [ Class (sprintf "dropdown %s" (isOptionsMenuOpen account.name model.OptionsMenuOpen)) ] + [ div [ Class "dropdown-trigger" ] + [ button [ Class "button" + AriaHasPopup true + OnClick (fun _ -> account.name |> OpenOptionsMenu |> dispatch) + HTMLAttr.Custom ("aria-controls", (sprintf "dropdown-menu-%s" account.name)) ] + [ span [ Class "icon is-small" ] + [ i [ Class "fa fa-ellipsis-v" + HTMLAttr.Custom ("aria-hidden", "true") ][ ] + ] + ] + ] + div [ Class "dropdown-menu" + Id (sprintf "dropdown-menu-%s" account.name) + Role "menu" - ] - [ div [ Class "dropdown-content" ] - [ //hr [ Class "dropdown-divider" ] - a [ Class "dropdown-item" - OnClick (fun _ -> dispatch <| DeleteAccount account) - ] - [ str "Remove" ] - ] - ] - ] - ] + ] + [ div [ Class "dropdown-content" ] + [ //hr [ Class "dropdown-divider" ] + a [ Class "dropdown-item" + OnClick (fun _ -> dispatch <| DeleteAccount account) + ] + [ str "Remove" ] + ] + ] + ] + ] + else span[][]) ] let NavRoot (accounts:BTSAccount[]) selectedAccount model dispatch = @@ -859,12 +861,14 @@ let NavRoot (accounts:BTSAccount[]) selectedAccount model dispatch = [ p [ Class "menu-label" ] [ span [Class "is-size-4"] [str "Accounts"] span [ Class "is-pulled-right circle-icon" ] - [ Button.fabutton - (if model.can_create then "Add Account" else "") - (if model.can_create then "plus-circle" else "") - "" - (if model.can_create then Button.Enabled else Button.Disabled) - (fun _ -> dispatch AddAccount) ] + (if model.can_create then + [ Button.fabutton + "Add Account" + "plus-circle" + "" + Button.Enabled + (fun _ -> dispatch AddAccount) ] + else []) ] ul [ Class "menu-list" ] diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index be8203021..ba2c57828 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -53,6 +53,41 @@ let generalTabView (model:Model) (dispatch:Msg->Unit) (readonly: bool)= |> List.filter (fun a -> a.isPresent) |> List.map (fun a -> a.id.ToString(), a.name) |> Map.ofList + + let hasPermission (acctid) = + let found = JSMap.tryFind (acctid.ToString()) model.scratchUser.userData.accountPermissions.accountPermissions + match found with + | None -> false + | Some a -> a.tradingPermission.hasPermissions + + let acctlist = model.accountsList |> List.filter (fun a -> a.isPresent) + + let hasOnePermission = + let found = + [ + for entry in acctlist do + yield JSMap.tryFind (entry.id.ToString()) model.scratchUser.userData.accountPermissions.accountPermissions + ] |> List.choose id + + let trues = + List.choose (fun x -> + match x.tradingPermission.hasPermissions with + | true -> Some x + | false -> None + ) found + + match List.length (trues) with + | 0 -> false + | _ -> true + + + let checkboxes = + [ + for acc in acctlist do + yield span [] [ + Fields.checkbox acc.name "" (hasPermission acc.id) [] ( fun x-> (acc.id.ToString(), x) |> TradingPerm |> UpdateField |> dispatch ) + ] + ] let can_create = model.can_create || (model.this_username = Access.superuser) let can_login_disabled = readonly || (model.this_username = model.scratchUser.name) @@ -65,9 +100,15 @@ let generalTabView (model:Model) (dispatch:Msg->Unit) (readonly: bool)= Fields.text "Company" model.scratchUser.company [] (Company >> UpdateField >> dispatch) Fields.checkbox "Can Login?" "Unchecking this stops the user from logging in" model.scratchUser.isActive [] (IsActive >> UpdateField >> dispatch) Fields.checkbox "Can Create?" "Checking this allows the user to create other users and accounts" model.scratchUser.canCreate [Disabled (not can_create)] (CanCreate >> UpdateField >> dispatch) - Fields.mapSelect "Trading Account" accMap (Some "Add Accounts") None ( fun x-> (x,true) |> TradingPerm |> UpdateField |> dispatch ) + + p [ Style [FontWeight "Bold"] ] [ str ("Trading Account")] + div [ Style [Padding " .5em 1em"]] checkboxes + //Fields.mapSelect "Trading Account" accMap (Some "Add Accounts") None ( fun x-> (x,true) |> TradingPerm |> UpdateField |> dispatch ) ]) - (fun _ -> dispatch SaveUser) + (fun _ -> + match hasOnePermission with + | false -> dispatch (ErrorOccured "New Users must have at least one trading account") + | true -> dispatch SaveUser) (fun _ -> SwitchUser (State.getCurrentUser model) |> dispatch) div [] [ p [ Style [FontWeight "Bold"] ] [ str ("ID: " + model.scratchUser.id.ToString())] @@ -315,40 +356,43 @@ let menuItem (user:BTSUser) (selectedUser:BTSUser) model dispatch = ) ] [ span [] [ str user.name ] - span [ Class "is-pulled-right menu-icon" ] - [ - div [ Class (sprintf "dropdown %s" (isOptionsMenuOpen user.name model.OptionsMenuOpen)) ] - [ div [ Class "dropdown-trigger" ] - [ button [ Class "button" - AriaHasPopup true - OnClick (fun _ -> user.name |> OpenOptionsMenu |> dispatch) - HTMLAttr.Custom ("aria-controls", (sprintf "dropdown-menu-%s" user.name)) - ] - [ span [ Class "icon is-small" ] - [ i [ Class "fa fa-ellipsis-v" - HTMLAttr.Custom ("aria-hidden", "true") ][ ] - ] - ] - ] - div [ Class "dropdown-menu" - Id (sprintf "dropdown-menu-%s" user.name) - Role "menu" + (if model.can_create then + span [ Class "is-pulled-right menu-icon" ] + [ + div [ Class (sprintf "dropdown %s" (isOptionsMenuOpen user.name model.OptionsMenuOpen)) ] + [ div [ Class "dropdown-trigger" ] + [ button [ Class "button" + AriaHasPopup true + OnClick (fun _ -> user.name |> OpenOptionsMenu |> dispatch) + HTMLAttr.Custom ("aria-controls", (sprintf "dropdown-menu-%s" user.name)) + ] + [ span [ Class "icon is-small" ] + [ i [ Class "fa fa-ellipsis-v" + HTMLAttr.Custom ("aria-hidden", "true") ][ ] + ] + ] + ] + div [ Class "dropdown-menu" + Id (sprintf "dropdown-menu-%s" user.name) + Role "menu" - ] - [ div [ Class "dropdown-content" ] - [ //hr [ Class "dropdown-divider" ] - a [ Class "dropdown-item" - OnClick (fun _ -> dispatch <| Delete user) - ] - [ str "Remove" ] - a [ Class "dropdown-item" - OnClick (fun _ -> dispatch <| CloneUser) - ] - [ str "Clone" ] - ] - ] - ] - ] + ] + [ div [ Class "dropdown-content" ] + [ //hr [ Class "dropdown-divider" ] + a [ Class "dropdown-item" + OnClick (fun _ -> dispatch <| Delete user) + ] + [ str "Remove" ] + a [ Class "dropdown-item" + OnClick (fun _ -> dispatch <| CloneUser) + ] + [ str "Clone" ] + ] + ] + ] + ] + else + span[][]) ] let NavRoot (usersList:BTSUser list) (currentUser:BTSUser) model (dispatch:Msg->Unit) = @@ -359,14 +403,16 @@ let NavRoot (usersList:BTSUser list) (currentUser:BTSUser) model (dispatch:Msg-> [ aside [ Class "menu" ] [ p [ Class "menu-label" ] [ span [Class "is-size-4"] [str "Users"] - span [ Class "is-pulled-right circle-icon" ] - [ Button.fabutton - (if model.can_create then "Add User" else "") - (if model.can_create then "plus-circle" else "") - "" - (if model.can_create then Button.Enabled else Button.Disabled) - (fun _ -> dispatch AddUser) - ] + span [ Class "is-pulled-right circle-icon" ] + (if model.can_create then + [ Button.fabutton + "Add User" + "plus-circle" + "" + Button.Enabled + (fun _ -> dispatch AddUser) + ] + else []) ] ul [ Class "menu-list" ] From 0aa4f807520ce1058baee8a2496964f5f29f35f6 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 3 Dec 2018 11:26:59 -0500 Subject: [PATCH 24/24] add mics deployment notes to ops_notes --- ops_notes.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ops_notes.txt b/ops_notes.txt index 6d1493c4b..1975dd799 100644 --- a/ops_notes.txt +++ b/ops_notes.txt @@ -1,3 +1,10 @@ +1.4.2 +- Be sure the system has a bts user before deployment. bts is the superuser, he has all permissions and can see all market data +- After deployment re-permission all existing users for trading, riskadmin, and/or md admin permissions as appropriate +- Also note which users can add other users and accounts and permission them appropriately (Can Add?) +- Permission users for appropriate market data entitlements; this has monetary consequences so ask Kevin if you aren't sure. +- MIC reporting needs to be added to audit Jenkins job (https://bluetradesys.atlassian.net/browse/SPARK-1900) + 1.3.5 - Change in market data wire format. Old shell will get only direct market data instead of merged which may not match what the servers is driving from.