From ffe2cf60c2f22bb54a83d4c39cee5d3872312dc9 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 18 Dec 2018 18:49:04 -0600 Subject: [PATCH] fix algotemplate dropdown/content for synth ladders --- .../AlgoStudio/AlgoDefinitionCollection.cs | 26 ++++++---- .../AlgoStudio/VM/AlgoDefinitionTemplateVM.cs | 12 ++--- .../Trading/AlgoStudio/VM/AlgoDefinitionVM.cs | 23 ++++---- .../spark/Orders/OrderPropertiesEditorVM.cs | 2 +- .../Orders/OrderTypeVMs/OrderTypeVMFactory.cs | 52 +++++-------------- .../core/GlobalExtensions/GlobalExtensions.cs | 7 +++ .../spark/view/Spark/Core/OrderUtils.cs | 7 +-- 7 files changed, 60 insertions(+), 69 deletions(-) diff --git a/src/client/spark/Modules/Trading/AlgoStudio/AlgoDefinitionCollection.cs b/src/client/spark/Modules/Trading/AlgoStudio/AlgoDefinitionCollection.cs index 788d31709..80ba68647 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/AlgoDefinitionCollection.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/AlgoDefinitionCollection.cs @@ -1,25 +1,30 @@ -using bts.api; -using bts.api.orderman; +using bts.api.orderman; using mbts.collections; using System; using System.Collections.Generic; using System.Linq; +using System.Reactive.Linq; namespace mbts.spark { class AlgoDefinitionCollection : ObservableKeyedCollection { + readonly OrdersModel _model; + readonly IObservable _security_md_source; + SecurityMD? _security_md; IReadOnlyDictionary _templates = new Dictionary(); IReadOnlyDictionary _factory_defs = new Dictionary(); - //Dictionary _factory_type_ids = new Dictionary(); - readonly OrdersModel _model; public AlgoDefinitionCollection(OrdersModel model) - : base(def => new AlgoNameStructureKey(def.id, new CustomOrderDefinitionImmutable(def.algo_root.create()))) => + : base(def => new AlgoNameStructureKey(def.id, new CustomOrderDefinitionImmutable(def.algo_root.create()))) { _model = model; + _security_md_source = Observable.FromEvent(cb => _security_md_changed += cb, cb => _security_md_changed -= cb).StartWith(() => _security_md.Value, () => _security_md.HasValue); + } + + event Action _security_md_changed; public bool is_updating { get; private set; } public IDisposable connect(IObservable> templates_source) => templates_source.Subscribe(on_templates); - public IDisposable connect(IObservable security_source) => security_source.Subscribe(on_security); + public IDisposable connect(IObservable security_source) => security_source.Subscribe(on_security); public void on_templates(IReadOnlyDictionary templates) { using (_begin_update()) { @@ -50,20 +55,21 @@ namespace mbts.spark { } } - public void on_security(SecurityImmutable security) { + public void on_security(SecurityMD security_md) { using (_begin_update()) { - var new_factory_defs = _model.factory.default_order_type_defs(security).ToDictionary(d => new AlgoNameStructureKey(d)); + var new_factory_defs = _model.factory.default_order_type_defs(security_md.security).ToDictionaryCrushed(d => new AlgoNameStructureKey(d)); _factory_defs.Keys.difference(new_factory_defs.Keys, out IEnumerable added, out IEnumerable removed); foreach (var sk in removed) Remove(sk); _factory_defs = new_factory_defs; + _security_md = security_md; + _security_md_changed?.Invoke(security_md); // removes foreach (var sk in added) { - var vm = new AlgoDefinitionVM(_model); + var vm = new AlgoDefinitionVM(_model, _security_md_source); var def = _factory_defs[sk]; vm.load_from(def); vm.name = OrderUtils.order_type_display_name(def.CustomCase); - //vm.name = OrderUtils.abbreviate_structure(def); Add(vm); } } diff --git a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionTemplateVM.cs b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionTemplateVM.cs index 70b42e1b5..fd335e057 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionTemplateVM.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionTemplateVM.cs @@ -25,10 +25,10 @@ namespace mbts.spark { Snapshot _committed; string _name; - public AlgoDefinitionTemplateVM(AlgoDefinitionVM owner, OrdersModel model, AlgoTemplateRecordImmutable template_record) - : this(owner, model, template_record.AlgoTemplate.definition(), template_record.AlgoTemplate.Name, template_record.Key) { } + public AlgoDefinitionTemplateVM(AlgoDefinitionVM owner, OrdersModel model, IObservable security_md_source, AlgoTemplateRecordImmutable template_record) + : this(owner, model, security_md_source, template_record.AlgoTemplate.definition(), template_record.AlgoTemplate.Name, template_record.Key) { } - public AlgoDefinitionTemplateVM(AlgoDefinitionVM owner, OrdersModel model, CustomOrderDefinitionImmutable definition, string name, string id = null, OrderTypeEditingPermissions editing_permissions = OrderTypeEditingPermissions.AllowEditValues) { + public AlgoDefinitionTemplateVM(AlgoDefinitionVM owner, OrdersModel model, IObservable security_md_source, CustomOrderDefinitionImmutable definition, string name, string id = null, OrderTypeEditingPermissions editing_permissions = OrderTypeEditingPermissions.AllowEditValues) { this.owner = owner; _model = model; vm_key = string.IsNullOrEmpty(id) ? new VMKey(Guid.NewGuid()) : new VMKey(id); @@ -36,7 +36,7 @@ namespace mbts.spark { _abbreviation = backing(nameof(abbreviation), name); _is_default = backing(nameof(is_default), false); _is_favorite = backing(nameof(is_favorite), false); - algo_root = OrderTypeVMFactory.create(model, definition.CustomCase, editing_permissions); + algo_root = OrderTypeVMFactory.create(_model, security_md_source, definition.CustomCase, editing_permissions: editing_permissions); algo_root.load_from(definition); _change_logger = new DeferrableActionWrapper(on_definition_changed); _version = new VersionContainer(() => new Snapshot(this)); @@ -202,8 +202,8 @@ namespace mbts.spark { public class CustomTemplatePlaceholderVM : AlgoDefinitionTemplateVM { const string _custom_name = "(Custom)"; - public CustomTemplatePlaceholderVM(AlgoDefinitionVM owner, OrdersModel model, CustomOrderDefinitionImmutable definition) - : base(owner, model, definition, _custom_name, null, OrderTypeEditingPermissions.AllowEditStructure | OrderTypeEditingPermissions.AllowEditValues) => + public CustomTemplatePlaceholderVM(AlgoDefinitionVM owner, OrdersModel model, IObservable security_md_source, CustomOrderDefinitionImmutable definition) + : base(owner, model, security_md_source, definition, _custom_name, null, OrderTypeEditingPermissions.AllowEditStructure | OrderTypeEditingPermissions.AllowEditValues) => _edit_stack.reset(new Snapshot(this)); public override bool is_custom_placeholder => true; diff --git a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs index ac95245d6..fa9f39a5c 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs @@ -38,20 +38,22 @@ namespace mbts.spark { readonly ObservableAppendCollection _templates_with_custom; readonly DeferrableActionWrapper _edit_stack_push; readonly ReactiveThresholdMonitor _any_templates_dirty_monitor = new ReactiveThresholdMonitor(t => t.observe_is_dirty()); + readonly IObservable _security_md_source; OrderTypeEditingPermissions _editing_permissions = _get_permissions(0); string _name = "New Algo"; ComspositeAlgoDefinitionImmutable? _committed; AlgoDefinitionMetadata _metadata; - public AlgoDefinitionVM(OrdersModel model) - : this(model, null) { } + public AlgoDefinitionVM(OrdersModel model, IObservable security_md_source = null) + : this(model, null, null, security_md_source) { } public AlgoDefinitionVM(OrdersModel model, AlgoDefinitionTemplates state) : this(model, new AlgoDefinitionTemplates?(state), state.record.Key) { } - AlgoDefinitionVM(OrdersModel model, AlgoDefinitionTemplates? state, string id = null) { + AlgoDefinitionVM(OrdersModel model, AlgoDefinitionTemplates? state, string id = null, IObservable security_md_source = null) { _model = model; - algo_roots = new ObservableCollection(OrderDataHelper.exchange_order_types.Select(t => OrderTypeVMFactory.create(_model, t, _editing_permissions))); + _security_md_source = security_md_source ?? Observable.Empty(); + algo_roots = new ObservableCollection(OrderDataHelper.exchange_order_types.Select(_mk_algo_root)); _templates_with_custom = new ObservableAppendCollection(templates); templates_view = (ListCollectionView)CollectionViewSource.GetDefaultView(_templates_with_custom); _selected_template = backing(nameof(selected_template)); @@ -64,7 +66,7 @@ namespace mbts.spark { _templates.SyncWith(state.Value.templates.ToDictionary( kv => new AlgoVMKey(kv.Key), kv => kv.Value), - t => new AlgoDefinitionTemplateVM(this, _model, t), + t => new AlgoDefinitionTemplateVM(this, _model, _security_md_source, t), (t, advm) => advm.load_from(t)); } else { vm_key = new AlgoVMKey(Guid.NewGuid()); @@ -149,7 +151,7 @@ namespace mbts.spark { public IDictionary template_map => _templates; public ListCollectionView templates_view { get; } - public AlgoDefinitionTemplateVM template_factory() => new AlgoDefinitionTemplateVM(this, _model, algo_root.create(), "Untitled"); + public AlgoDefinitionTemplateVM template_factory() => new AlgoDefinitionTemplateVM(this, _model, _security_md_source, algo_root.create(), "Untitled"); public IObservable subscribe_is_definition_dirty() => _is_dirty.observe_current(true); public IObservable subscribe_any_templates_dirty() => _any_templates_dirty_monitor; public IObservable subscribe_is_definition_or_any_templates_dirty() => @@ -183,7 +185,7 @@ namespace mbts.spark { value.templates.ToDictionary( kv => new AlgoVMKey(kv.Key), kv => kv.Value), - t => new AlgoDefinitionTemplateVM(this, _model, t), + t => new AlgoDefinitionTemplateVM(this, _model, _security_md_source, t), (t, advm) => advm.load_from(t)); _sync_meta(); } @@ -197,7 +199,7 @@ namespace mbts.spark { using (_edit_stack_push.defer_execution()) _load_def(def); if (_templates_with_custom.appended_front.Count == 0) { - _templates_with_custom.insert_front(new AlgoDefinitionTemplateVM.CustomTemplatePlaceholderVM(this, _model, def)); + _templates_with_custom.insert_front(new AlgoDefinitionTemplateVM.CustomTemplatePlaceholderVM(this, _model, _security_md_source, def)); } else { _templates_with_custom.appended_front[0].algo_root.load_from(def); } @@ -209,7 +211,7 @@ namespace mbts.spark { void _load_def(CustomOrderDefinitionImmutable def) { algo_root = algo_roots.FirstOrDefault(d => d.order_type == def.CustomCase); if (algo_root == null) { - var new_vm = OrderTypeVMFactory.create(_model, def.CustomCase, _editing_permissions); + var new_vm = _mk_algo_root(def.CustomCase); new_vm.load_from(def); algo_roots.Add(new_vm); algo_root = new_vm; @@ -261,6 +263,9 @@ namespace mbts.spark { static OrderTypeEditingPermissions _get_permissions(int n_templates) => n_templates > 0 ? OrderTypeEditingPermissions.None : OrderTypeEditingPermissions.AllowEditStructure | OrderTypeEditingPermissions.AllowSaveStructure; + IOrderTypeVM _mk_algo_root(CustomOrderDefinition.CustomOneofCase t) => + OrderTypeVMFactory.create(_model, _security_md_source, t, editing_permissions: _editing_permissions); + void _refresh_undo_redo() { _can_undo.refresh(); _can_redo.refresh(); diff --git a/src/client/spark/Orders/OrderPropertiesEditorVM.cs b/src/client/spark/Orders/OrderPropertiesEditorVM.cs index 58389291a..ac4c7a755 100644 --- a/src/client/spark/Orders/OrderPropertiesEditorVM.cs +++ b/src/client/spark/Orders/OrderPropertiesEditorVM.cs @@ -179,7 +179,7 @@ namespace mbts.spark { _dispose = new CompositeDisposable( _selected_algo_definition.subscribe_changed(_selected_algo_definition_Changed), ((IPropertyChangedDemuxer)this).subscribe(nameof(selected_algo_template)).Subscribe(undo_observer, redo_observer), - security_source.Subscribe(s => { + security_md_source.Subscribe(s => { using (_selected_algo_definition.begin_update()) _algo_definitions.on_security(s); }), diff --git a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs index f898d3af6..fbc7f7cb4 100644 --- a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs +++ b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs @@ -44,7 +44,11 @@ namespace mbts.spark { public static IOrderTypeVM spreader(OrdersModel model, IObservable security_source, string id, string display_name, OrderTypeEditingPermissions editing_permissions) => new SpreaderOrderVM(model, security_source, id, display_name, editing_permissions); public static IOrderTypeVM dynamic(OrdersModel model, IObservable security_md_source, string dynamic_type, string id, string display_name, OrderTypeEditingPermissions editing_permissions) => new DynamicOrderVM(model, security_md_source, dynamic_type, id, display_name, editing_permissions); - public static IOrderTypeVM create(CustomOneofCase order_type, string id, string display_name, OrdersModel model, IObservable security_md_source, string dynamic_type = null, OrderTypeEditingPermissions editing_permissions = default_editing_permissions) { + public static IOrderTypeVM create(OrdersModel model, IObservable security_md_source, CustomOneofCase order_type, string id = null, string display_name = null, string dynamic_type = null, OrderTypeEditingPermissions editing_permissions = default_editing_permissions) { + if (id == null) + id = order_type.type_id(); + if (display_name == null) + display_name = OrderUtils.order_type_display_name(order_type); switch (order_type) { case CustomOneofCase.Market: return market(model); case CustomOneofCase.Limit: return limit(model); @@ -65,42 +69,6 @@ namespace mbts.spark { } } - public static IOrderTypeVM stop_limit(OrdersModel model, string id, string display_name, OrderTypeEditingPermissions editing_permissions) => new StopLimitOrderVM(model, id, display_name, editing_permissions); - public static IOrderTypeVM time_box(OrdersModel model, string id, string display_name, OrderTypeEditingPermissions editing_permissions) => new TimeBoxOrderVM(model, id, display_name, editing_permissions); - public static IOrderTypeVM tick(OrdersModel model, string id, string display_name, OrderTypeEditingPermissions editing_permissions) => new TickOrderVM(model, id, display_name, editing_permissions); - public static IOrderTypeVM lean(OrdersModel model, string id, string display_name, OrderTypeEditingPermissions editing_permissions) => new LeanOrderVM(model, id, display_name, editing_permissions); - public static IOrderTypeVM join(OrdersModel model, string id, string display_name, OrderTypeEditingPermissions editing_permissions) => new JoinOrderVM(model, id, display_name, editing_permissions); - public static IOrderTypeVM top(OrdersModel model, string id, string display_name, OrderTypeEditingPermissions editing_permissions) => new TopOrderVM(model, id, display_name, editing_permissions); - public static IOrderTypeVM cover(OrdersModel model, string id, string display_name, OrderTypeEditingPermissions editing_permissions) => new CoverOrderVM(model, id, display_name, editing_permissions); - public static IOrderTypeVM offset(OrdersModel model, string id, string display_name, OrderTypeEditingPermissions editing_permissions) => new OffsetOrderVM(model, id, display_name, editing_permissions); - public static IOrderTypeVM trigger(OrdersModel model, string id, string display_name, OrderTypeEditingPermissions editing_permissions) => new TriggerOrderVM(model, id, display_name, editing_permissions); - public static IOrderTypeVM iceberg(OrdersModel model, string id, string display_name, OrderTypeEditingPermissions editing_permissions) => new IcebergOrderVM(model, id, display_name, editing_permissions); - //public static IOrderTypeVM spreader(OrdersModel model, string id, string display_name) => new SpreaderOrderVM(model, id, display_name); - //public static IOrderTypeVM dynamic(OrdersModel model, string dynamic_type, string id, string display_name) => new DynamicOrderVM(model, dynamic_type, id, display_name); - - public static IOrderTypeVM create(OrdersModel orders_model, CustomOneofCase order_type, OrderTypeEditingPermissions editing_permissions, string id = null, string display_name = null) => - create(order_type, id ?? order_type.ToString(), display_name ?? OrderUtils.order_type_display_name(order_type), orders_model, editing_permissions: editing_permissions); - - public static IOrderTypeVM create(CustomOneofCase order_type, string id, string display_name, OrdersModel model, string dynamic_type = null, OrderTypeEditingPermissions editing_permissions = default_editing_permissions) { - switch (order_type) { - case CustomOneofCase.Market: return market(model); - case CustomOneofCase.Limit: return limit(model); - case CustomOneofCase.Stop: return stop(model, id, display_name); - case CustomOneofCase.StopLimit: return stop_limit(model, id, display_name, editing_permissions); - case CustomOneofCase.TimeBox: return time_box(model, id, display_name, editing_permissions); - case CustomOneofCase.Tick: return tick(model, id, display_name, editing_permissions); - case CustomOneofCase.Lean: return lean(model, id, display_name, editing_permissions); - case CustomOneofCase.Join: return join(model, id, display_name, editing_permissions); - case CustomOneofCase.Top: return top(model, id, display_name, editing_permissions); - case CustomOneofCase.Cover: return cover(model, id, display_name, editing_permissions); - case CustomOneofCase.Offset: return offset(model, id, display_name, editing_permissions); - case CustomOneofCase.Trigger: return trigger(model, id, display_name, editing_permissions); - case CustomOneofCase.Iceberg: return iceberg(model, id, display_name, editing_permissions); - case CustomOneofCase.Dynamic: return dynamic(model, Observable.Empty(), dynamic_type, id, display_name, editing_permissions); - default: throw new NotImplementedException(); - } - } - #region OrderTypeVM Base Classes abstract class OrderTypeVMBase : DisposableViewModelBase, IOrderTypeVM { protected readonly OrdersModel model; @@ -153,7 +121,7 @@ namespace mbts.spark { } public bool key_match(KeyEventArgs key) => - key.Key == (Key.A + display_name[0] - 'A'); + !string.IsNullOrEmpty(display_name) && key.Key == (Key.A + display_name[0] - 'A'); public void load_from(CustomOrderDefinitionImmutable value) { if (value.CustomCase == order_type) load_from_internal(value); @@ -174,7 +142,7 @@ namespace mbts.spark { public override string type_name => new T().Descriptor.Name; } - abstract class HierarchicalOrderTypeVMBase : OrderTypeVMBase, IHierarchicalOrderTypeVM, IDisposable where T : Google.Protobuf.IMessage, new() { + abstract class HierarchicalOrderTypeVMBase : OrderTypeVMBase, IHierarchicalOrderTypeVM, IObserver, IDisposable where T : Google.Protobuf.IMessage, new() { protected readonly IObservable _security_md_source; protected readonly IOrderSelector _order_selector; CompositeDisposable _resources; @@ -235,7 +203,7 @@ namespace mbts.spark { _resources.Add(() => _permissions_changed -= propagate_permissions); return rv; IOrderTypeVM factory(OrderTemplateHeader ot) { - var ovm = create(ot.key.type, ot.key.name, ot.display_name, model, _security_md_source, editing_permissions: editing_permissions); + var ovm = create(model, _security_md_source, ot.key.type, ot.key.name, ot.display_name, editing_permissions: editing_permissions); if (ovm.has_editable_properties) ovm.editable_properties_open = true; return ovm; @@ -247,6 +215,10 @@ namespace mbts.spark { } } } + + void IObserver.OnNext(SecurityMD value) => _on_security_changed(value); + void IObserver.OnError(Exception error) { } + void IObserver.OnCompleted() { } } interface IOrderSelector { diff --git a/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs b/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs index e1d91390c..286878328 100644 --- a/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs +++ b/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs @@ -322,6 +322,13 @@ namespace System.Reactive.Linq return source.Subscribe(o); }); + public static IObservable StartWith(this IObservable source, Func get_value, Func can_get_value) => + Observable.Create(o => { + if (can_get_value()) + o.OnNext(get_value()); + return source.Subscribe(o); + }); + public static IDisposable SubscribeHookLatest(this IObservable source, Func get_hook) { IDisposable latest_hook = null; return new Disposables.CompositeDisposable( diff --git a/src/client/spark/view/Spark/Core/OrderUtils.cs b/src/client/spark/view/Spark/Core/OrderUtils.cs index 8eb7beefa..5194d12af 100644 --- a/src/client/spark/view/Spark/Core/OrderUtils.cs +++ b/src/client/spark/view/Spark/Core/OrderUtils.cs @@ -97,7 +97,7 @@ namespace mbts.spark { case AlgoTemplate.AlgoParamsOneofCase.SystemAlgoParams: return template.SystemAlgoParams; default: throw ExceptionBuilder.Argument.unexpected_case(template.AlgoParamsCase, nameof(template.AlgoParamsCase)); - } + } } public static string full_description(this OrderRecordImmutable order, SecurityImmutable security) { @@ -131,8 +131,6 @@ namespace mbts.spark { public static string short_description(this OrderRecordImmutable order, ContractSpecificationImmutable? spec) => $"{(order.HasDef ? order.Def.Side.ToString() : "(unknown-side)")} {(order.HasState ? ($@"{spec.format(order.State.Price)} @ {order.State.Quantity}") : "(unknown-price) @ (unknown-quantity)")}"; - - public static bool has_parent(this OrderRecordImmutable order) => order.ParentKey != 0; @@ -151,6 +149,9 @@ namespace mbts.spark { } } + public static string type_id(this CustomOrderDefinition.CustomOneofCase order_type) => + order_type.ToString().ToUpper(); + public static string order_type_display_name(CustomOrderDefinition.CustomOneofCase order_type) => camel_to_title_case(Regex.Replace(order_type.ToString(), "Order", string.Empty, RegexOptions.IgnoreCase));