From 3b447bdb3c73e41b42a0cff02c8136eb4597ca1c Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 5 Jan 2019 01:19:13 -0600 Subject: [PATCH] OrderTypeVMFactory.OrderSelector - fix load_from() --- .../Orders/OrderTypeVMs/OrderTypeVMFactory.cs | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs index 3db738472..6333ef908 100644 --- a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs +++ b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs @@ -1,7 +1,6 @@ using bts.api; using bts.api.orderman; using bts.spark; -using mbts.collections; using mbts.spark.utilities; using mbts.ui.shell; using mbts.ui.utility; @@ -11,7 +10,6 @@ using System.ComponentModel; using System.Linq; using System.Reactive.Disposables; using System.Reactive.Linq; -using System.Reactive.Subjects; using System.Windows.Input; using static bts.api.orderman.CustomOrderDefinition; @@ -248,12 +246,11 @@ namespace mbts.spark { public OrderSelector(IValidationViewModel owner, string prop_name, OrdersModel model, IObservable security_md_source, OrderTypeEditingPermissions editing_permissions, Action raise_definition_changed, EventHandler on_errors_changed) { _owner = owner; _prop_name = prop_name; - _model = model; - _order_types = new OrderTypeVMCollection(model); + _order_types = new OrderTypeVMCollection(_model = model); _security_md_source = security_md_source; _on_errors_changed = on_errors_changed; _raise_definition_changed = raise_definition_changed; - _editing_permissions = editing_permissions; + _order_types.on_editing_permissions(_editing_permissions = editing_permissions); } public ICollection order_types => _order_types; @@ -282,8 +279,12 @@ namespace mbts.spark { public void load_from(CustomOrderDefinitionImmutable def) => load_from(new NamedCustomOrderDefinition(def)); - public void load_from(NamedCustomOrderDefinition named_def) => - _select_order(_order_types.GetOrAdd(named_def.id, _ => create(_model, _security_md_source, named_def, _editing_permissions, true))); + public void load_from(NamedCustomOrderDefinition named_def) { + if (_order_types.TryGetValue(named_def.id, out IOrderTypeVM o)) + o.load_from(named_def.definition); + else _order_types.Add(named_def.id, o = create(_model, _security_md_source, named_def, _editing_permissions, true)); + _select_order(o); + } public void validate() => _owner.assert(_order != null && !((_order as INotifyDataErrorInfo)?.HasErrors ?? false), _prop_name, string.Empty); @@ -295,11 +296,8 @@ namespace mbts.spark { _order_types.Clear(); } - public void propagate_permissions(OrderTypeEditingPermissions editing_permissions) { - _editing_permissions = editing_permissions; - foreach (var ot in order_types) - ot.set_permissions(editing_permissions); - } + public void propagate_permissions(OrderTypeEditingPermissions editing_permissions) => + _order_types.on_editing_permissions(_editing_permissions = editing_permissions); void _select_order(IOrderTypeVM newval) { if (newval == _order) return;