diff --git a/src/client/spark/Modules/Spreader/SpreaderModel.cs b/src/client/spark/Modules/Spreader/SpreaderModel.cs index 69f8bc97d..91bd55ddc 100644 --- a/src/client/spark/Modules/Spreader/SpreaderModel.cs +++ b/src/client/spark/Modules/Spreader/SpreaderModel.cs @@ -24,7 +24,14 @@ namespace mbts.spark } public IObservable> strategy => _bus.subscribe(SparkTags.SyntheticstrategiesTag); - public IObservable> strategy_tuple => _bus.subscribe(SparkTags.SecuritiesTag).CombineLatest(strategy, (m, s) => s.Join(m)); + public IObservable> strategy_tuple => + _bus.subscribe(SparkTags.SecuritiesTag) + .Select(md_map => md_map.Values.Where(smd => smd.security.ContractCase == Security.ContractOneofCase.Synthetic).ToList()) + .CombineLatest(_bus.subscribe(SparkTags.SyntheticstrategiesTag), + (synthetics, strategies) => synthetics + .ToDictionary(smd => smd.security.Id) + .LeftJoin(strategies, (security, strategy) => (new ExecutionStrategyImmutable?(strategy), security), security => (new ExecutionStrategyImmutable?(), security)) + ); public async Task<(ExecutionStrategyImmutable result, bool success)> lookup_strategy_async(SecurityImmutable security) { var result = await _service.query_security_metadata_async(new MetadataQuery { SecurityKey = { security.Id } }); diff --git a/src/client/spark/Modules/Spreader/SyntheticManagementView.xaml b/src/client/spark/Modules/Spreader/SyntheticManagementView.xaml index ae6e6b70e..55ef8e9a3 100644 --- a/src/client/spark/Modules/Spreader/SyntheticManagementView.xaml +++ b/src/client/spark/Modules/Spreader/SyntheticManagementView.xaml @@ -25,10 +25,11 @@ c:DataGridFilterProperties.Filter="{Binding DataContext.security_filter, Source={u:DirectReference grid}}" c:DataGridFilterProperties.FilterActive="{Binding DataContext.security_filter.active, Source={u:DirectReference grid}}" c:DataGridFilterProperties.FilterTemplate="{StaticResource RegexFinder}"/> - + diff --git a/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs b/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs index 4d0b10452..ba39cbf7b 100644 --- a/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs +++ b/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs @@ -10,7 +10,7 @@ using static bts.shell.SyntheticManagementWindowFactory; using static mbts.spark.DataGridColumnFilters; namespace mbts.spark { - class SyntheticManagementVM : SecurityMDGrid { + class SyntheticManagementVM : SecurityMDGrid { readonly SpreaderModel _model; public SyntheticManagementVM(IBus bus, SpreaderModel model) : this(bus, model, null, null) { } @@ -18,7 +18,7 @@ namespace mbts.spark { : base(model.strategy_tuple.Select(map => map.Values), sorting) => _model = model; - protected override Row row_factory((ExecutionStrategyImmutable strategy, SecurityMD md) row_model) => new Row(row_model.md, row_model.strategy); + protected override Row row_factory((ExecutionStrategyImmutable? strategy, SecurityMD md) row_model) => new Row(row_model.md, row_model.strategy); #region Filters public IDataGridColumnPersistentFilter create_time_filter { get; } = new Time(r => r.create_time, nameof(Row.create_time)); @@ -41,9 +41,9 @@ namespace mbts.spark { new PartFormattingTuple(ContractParts.Symbol), new PartFormattingTuple(ContractParts.RawExp, "l") }; - readonly ExecutionStrategyImmutable _strategy; + readonly ExecutionStrategyImmutable? _strategy; - public Row(SecurityMD security_md, ExecutionStrategyImmutable strategy) : base(security_md) { + public Row(SecurityMD security_md, ExecutionStrategyImmutable? strategy) : base(security_md) { _strategy = strategy; name = security.Synthetic.Name; n_legs = security.Synthetic.Legs.Count(); @@ -54,6 +54,7 @@ namespace mbts.spark { public string name { get; } public int n_legs { get; } public string description { get; } + public bool strategy_present => _strategy.HasValue; } } } \ No newline at end of file diff --git a/src/client/spark/core/GlobalExtensions/GenericCollectionExtensions.cs b/src/client/spark/core/GlobalExtensions/GenericCollectionExtensions.cs index f9dc37052..d7865a08c 100644 --- a/src/client/spark/core/GlobalExtensions/GenericCollectionExtensions.cs +++ b/src/client/spark/core/GlobalExtensions/GenericCollectionExtensions.cs @@ -367,6 +367,15 @@ namespace System.Collections.Generic return new ReadOnlyDictionary(iks.ToDictionary(k => k, k => select(dictionary[k], merge_target[k]))); } + public static IReadOnlyDictionary LeftJoin(this IReadOnlyDictionary dictionary, IReadOnlyDictionary merge_target, + Func select, Func select_left_only) => + dictionary.ToDictionary(kv => kv.Key, kv => { + if (merge_target.TryGetValue(kv.Key, out TValue2 v2)) + return select(kv.Value, v2); + else + return select_left_only(kv.Value); + }); + public static IReadOnlyDictionary SuperJoin(this IReadOnlyDictionary dictionary, IReadOnlyDictionary merge_target) { var eks1 = dictionary.Keys.Except(merge_target.Keys); var eks2 = merge_target.Keys.Except(dictionary.Keys);