diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index 488e7a37d..251965f94 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -27,8 +27,8 @@ namespace mbts.spark { FillsVM(IBus bus, OrdersModel model, IObservable> fills_source, IReadOnlyCollection sorting_criteria, FilterStates filters) : base(RXCollection.CreateTableUpdate(fills_source), sorting_criteria) { _model = model; - account_filter = DiscreteValuesFilterVM.Create(_model.factory.accounts.ToArray(), r => r.account, nameof(Row.account)); - user_filter = DiscreteValuesFilterVM.Create(_model.factory.users, r => r.user, nameof(Row.user)); + account_filter = DiscreteValuesFilterVM.Create(_model.factory.subscribe_accounts(), r => r.account, nameof(Row.account)); + user_filter = DiscreteValuesFilterVM.Create(_model.factory.subscribe_users(), r => r.user, nameof(Row.user)); var securities_source = fills_source .Select(t => new HashSet( t.state.Values diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs b/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs index 3df8c560e..6f5a8d55c 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs @@ -24,6 +24,12 @@ namespace mbts.spark.filters { IEqualityComparer comparer ) => new ReadOnlyItemsFilter(items, get_row_val, prop_name, comparer); + public static IDataGridColumnPersistentFilter Create( + IObservable> items, + Func get_row_val, + string prop_name + ) => Create(items, get_row_val, s => s.ToArray(), s => Observable.Return(s), prop_name, EqualityComparer.Default); + public static IDataGridColumnPersistentFilter Create( IObservable> items, Func get_row_val, diff --git a/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookColumns.cs b/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookColumns.cs index d4db4d2b0..57fbfd874 100644 --- a/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookColumns.cs +++ b/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookColumns.cs @@ -67,7 +67,7 @@ namespace mbts.spark { r => r.user.value, DefaultColumnWidths.User, DiscreteValuesFilterVM.Create( - model.factory.users, + model.factory.subscribe_users(), r => r.user.value, value_path(nameof(CVOrderBookRowVM.user))), DataGridFilterKnownTemplates.DiscreteValues)); diff --git a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookVM.cs b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookVM.cs index ceedf672a..354619760 100644 --- a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookVM.cs +++ b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookVM.cs @@ -41,8 +41,8 @@ namespace mbts.spark { order_sub_type_filter = DiscreteValuesFilterVM.Create(EnumHelper.get_values().ToLArray(), r => r.order_sub_type, nameof(OrderBookRowVM.order_sub_type)); tif_filter = DiscreteValuesFilterVM.Create(EnumHelper.get_values().ToLArray(), r => r.tif, nameof(OrderBookRowVM.tif)); exchange_filter = DiscreteValuesFilterVM.Create(EnumHelper.get_values().ToLArray(), r => r.exchange, nameof(OrderBookRowVM.exchange)); - account_filter = DiscreteValuesFilterVM.Create(_model.factory.accounts.ToArray(), r => r.account, nameof(OrderBookRowVM.account)); - user_filter = DiscreteValuesFilterVM.Create(_model.factory.users, r => r.user, nameof(OrderBookRowVM.user)); + account_filter = DiscreteValuesFilterVM.Create(_model.factory.subscribe_accounts(), r => r.account, nameof(OrderBookRowVM.account)); + user_filter = DiscreteValuesFilterVM.Create(_model.factory.subscribe_users(), r => r.user, nameof(OrderBookRowVM.user)); order_key_filter = new RegexFilterVM(r => r.order_key, nameof(OrderBookRowVM.order_key)); security_key_filter = new RegexFilterVM(r => r.security_key.ToString(), nameof(OrderBookRowVM.security_key)); status_filter = DiscreteValuesFilterVM.Create(EnumHelper.get_values().ToLArray(), r => r.status, nameof(OrderBookRowVM.status)); diff --git a/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs b/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs index 1c40563e5..72c6f1c7c 100644 --- a/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs +++ b/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs @@ -39,11 +39,12 @@ namespace mbts.spark.utilities { [ImportingConstructor] public OrderFactory([Import("username")]string user, AdminModel admin_model) { _user = user; + users = new[] { user }; // might as well initialize it with the one user we know exists + accounts = Enumerable.Empty(); _admin_model = admin_model; _user_map = new Dictionary(); _account_map = new Dictionary(); - var admin_data_sequence = _admin_model.on_admin_data .ObserveOnDispatcher() .Subscribe(admin_data => { @@ -66,17 +67,19 @@ namespace mbts.spark.utilities { } } accounts = account_names; - account_arrived.OnNext(accounts); - users = new HashSet(user_names).Ordered().ToLArray(); + _accounts_subject.OnNext(accounts); + users = new HashSet(user_names).Ordered().ToArray(); + _users_subject.OnNext(users); }); _dispose = Disposable.Create(admin_data_sequence); } - private Subject> account_arrived = new Subject>(); + readonly ReplaySubject> + _accounts_subject = new ReplaySubject>(1), + _users_subject = new ReplaySubject>(1); - public IObservable> subscribe_accounts() { - return account_arrived.StartWith(accounts).Where(vals => vals != null); - } + public IObservable> subscribe_accounts() => _accounts_subject.AsObservable(); + public IObservable> subscribe_users() => _users_subject.AsObservable(); #region Defaults public string default_account { @@ -85,10 +88,16 @@ namespace mbts.spark.utilities { } } - private Dictionary _account_map; + readonly Dictionary _account_map; + /// + /// Warning: These values may change while the app is running, use subscribe_accounts() to observe changes. + /// public IEnumerable accounts { get; private set; } - private Dictionary _user_map; + readonly Dictionary _user_map; + /// + /// Warning: These values may change while the app is running, use subscribe_users() to observe changes. + /// public string[] users { get; private set; } public CustomOrderDefinition.CustomOneofCase default_order_type() =>