diff --git a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoData.cs b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoData.cs index 58f92670c..222890793 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoData.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoData.cs @@ -36,4 +36,21 @@ namespace mbts.spark { public static bool operator ==(AlgoData a, AlgoData b) => a.Equals(b); public static bool operator !=(AlgoData a, AlgoData b) => !a.Equals(b); } + + struct AlgoDataVM : IEquatable { + public readonly AlgoData data; + + public AlgoDataVM(AlgoData data) => + this.data = data; + + public override string ToString() => + data.name; + + public static AlgoDataVM from_data(AlgoData data) => + new AlgoDataVM(data); + + public bool Equals(AlgoDataVM other) => data == other.data; + public override bool Equals(object obj) => obj is AlgoDataVM other && Equals(other); + public override int GetHashCode() => data.GetHashCode(); + } } \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoKey.cs b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoKey.cs index fc236e6a4..98c414a46 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoKey.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoKey.cs @@ -1,9 +1,76 @@ using bts.api.orderman; using bts.persist.algo; using bts.utils; +using ProtoBuf; using System; namespace mbts.spark { + [ProtoContract] + struct AlgoID : IEquatable { + [ProtoMember(1)] + readonly CustomOrderDefinition.CustomOneofCase? _factory_key; + [ProtoMember(2)] + readonly string _dynamic_key; + [ProtoMember(3)] + readonly uint? _persisted_key; + + public AlgoID(CustomOrderDefinition.CustomOneofCase factory_key) { + _factory_key = factory_key; + _dynamic_key = null; + _persisted_key = null; + } + + public AlgoID(string dynamic_key) { + _factory_key = null; + _dynamic_key = dynamic_key; + _persisted_key = null; + } + + public AlgoID(uint persisted_key) { + _factory_key = null; + _dynamic_key = null; + _persisted_key = persisted_key; + } + + public static AlgoID from_order_def(OrderDefinitionImmutable order_def) { + switch (order_def.CustomDef.CustomCase) { + case CustomOrderDefinition.CustomOneofCase.Composite: return new AlgoID(order_def.CustomDef.Composite.AlgoTemplateKey); + case CustomOrderDefinition.CustomOneofCase.Dynamic: return new AlgoID(order_def.CustomDef.Dynamic.DynamicOrderType); + default: return new AlgoID(order_def.CustomDef.CustomCase); + } + } + + public static AlgoID from_algo_key(AlgoKey key) { + switch (key.mode) { + case AlgoKey.Mode.Factory: + if (key.factory.structure.structure.Count > 0) + return new AlgoID((CustomOrderDefinition.CustomOneofCase)key.factory.structure.structure[0]); + break; + case AlgoKey.Mode.Persisted: + return new AlgoID(key.persisted.id_uint); + } + return new AlgoID(CustomOrderDefinition.CustomOneofCase.None); + } + + public bool Equals(AlgoID other) => + _factory_key == other._factory_key && + _dynamic_key == other._dynamic_key && + _persisted_key == other._persisted_key; + + public override bool Equals(object obj) => + obj is AlgoID && Equals(obj); + + public override int GetHashCode() => + EqualityComparer.aggregate_hash( + _factory_key?.GetHashCode() ?? 0, + _dynamic_key?.GetHashCode() ?? 0, + _persisted_key?.GetHashCode() ?? 0); + + public static bool operator ==(AlgoID a, AlgoID b) => a.Equals(b); + public static bool operator !=(AlgoID a, AlgoID b) => !a.Equals(b); + } + + /// TODO: Remove , and redirect references to . struct AlgoKey : IEquatable { readonly AlgoPersistedKey? _persisted_key; readonly AlgoNameStructureKey? _factory_key; @@ -83,4 +150,4 @@ namespace mbts.spark { InvalidOperationException _unexpected_mode_ex() => new InvalidOperationException($"Unexpected Mode '{mode}.'"); } -} \ No newline at end of file +} diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index c76449f06..c3faef8d9 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -1,5 +1,6 @@ using bts; using bts.api; +using bts.api.core; using bts.api.orderman; using bts.shell.orderbook; using bts.utils; @@ -163,10 +164,14 @@ namespace mbts.spark { _wrap_comparer(r => r.time_in_force))); // order type Add(order_type_column = new OrderBookOrderTypeColumn( - DiscreteValuesFilterVM.Create( - utilities.OrderDataHelper.all_order_types, - ort => ort.order.order_type(), - nameof(OrderBookRowVM.order_type)))); + DiscreteValuesFilterVM.Create( + model.subscribe_all_algos().Select(t => (t.added.Concat(t.changed).Select(AlgoDataVM.from_data), t.removed.Select(AlgoDataVM.from_data))), + o => new AlgoDataVM(o.algo.GetValueOrDefault()), + selected_algos => ArrayHelper.convert(selected_algos, a => AlgoID.from_algo_key(a.data.key)), + ids => { + var id_set = new HashSet(ids.empty_if_null()); + return model.subscribe_all_algos().Filter(a => id_set.Contains(AlgoID.from_algo_key(a.key))).SelectKeyValue(AlgoDataVM.from_data, vm => vm.data.key).Select(t => t.state.Values); + }))); // order sub type Add(sub_type_column = new SimpleTextColumn( Columns.SubType, @@ -567,7 +572,7 @@ namespace mbts.spark { public class OrderBookOrderTypeColumn : OrderTypeColumn, ICVOrderBookColumn { ListSortDirection? _cached_sort_direction; - public OrderBookOrderTypeColumn(IDataGridColumnPersistentFilter filter) + public OrderBookOrderTypeColumn(IDataGridColumnPersistentFilter filter) : base(Columns.OrderType, new Binding(nameof(OrderBookRowVM.badge_fill)), new Binding(nameof(OrderBookRowVM.display_name)), filter) { id = key.ToString(); this.filter = filter; @@ -575,7 +580,7 @@ namespace mbts.spark { _cached_sort_direction = SortDirection; } - public new IDataGridColumnPersistentFilter filter { get; } + public new IDataGridColumnPersistentFilter filter { get; } public IComparer comparer => _wrap_comparer(r => r.order_type); IDataGridColumnFilter ICVOrderBookColumn.filter => filter; diff --git a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs index e928b30d2..ede81088f 100644 --- a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs +++ b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs @@ -27,8 +27,10 @@ namespace bts.shell.orderbook { public Venue[] exchanges; [ProtoMember(7)] public TimeInForce[] tifs; - [ProtoMember(8)] - public CustomOrderDefinition.CustomOneofCase[] order_types; + //[ProtoMember(8)] + //public CustomOrderDefinition.CustomOneofCase[] order_types; + [ProtoMember(23)] + public AlgoID[] order_types; [ProtoMember(9)] public Side[] sides; [ProtoMember(10)] @@ -128,7 +130,7 @@ namespace bts.shell.orderbook { add_discrete_values(fs.accounts, o => o.order.account()); add_discrete_values(fs.exchanges, o => o.security?.Exchange ?? Venue.Unset); add_discrete_values(fs.tifs, o => o.order.time_in_force()); - add_discrete_values(fs.order_types, o => o.order.order_type()); + add_discrete_values(fs.order_types, o => AlgoID.from_order_def(o.order.Def)); add_discrete_values(fs.order_sub_types, o => o.order.sub_type()); add_discrete_values(fs.sides, o => o.order.side()); add_discrete_values(fs.statuses, o => o.order.status()); diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index e24229ce1..9fad1a990 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -437,6 +437,16 @@ namespace mbts.spark { return rod; }).Select(r => r.last_update); + public static IObservable> subscribe_all_algos(this OrdersModel orders_model) => + orders_model.algo_model.definitions.MergeTable(Observable.Return( + new TableUpdate( + ImmutableDictionary.Empty.AddRange(orders_model.factory.default_algos(OrderDataHelper.all_order_types)), + Array.Empty(), + Array.Empty>(), + Array.Empty(), + d => d.key + ).as_snapshot())); + public static async Task order_from_key(this OrdersModel orders_model, uint order_key) { (var tu, var success) = await orders_model.on_orders.FirstAsyncTask(t => t.state.ContainsKey(order_key), TimeSpan.FromSeconds(3)); if (success && tu.state.TryGetValue(order_key, out var rec)) {