diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs index b94b3284a..eb4b901e0 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs @@ -412,7 +412,6 @@ namespace mbts.spark { var state = StartupData.DefaultAuxiliaryFills; if (state.filters == null) state.filters = new bts.shell.fills.FillsFilterStates(); - state.filters.security = SecurityCriteria.from_keys(securities.Select(SecurityDataHelper.key_fn)); switch (column) { case Columns.RawDayPosition: state.filters.fill_kind = new[] { @@ -427,6 +426,12 @@ namespace mbts.spark { break; } state.grid = GridSettingsHelper.hide_cols(state.grid, new[] { ui.spark.FillsView.Columns.Security }); + var sec_keys = securities.Select(SecurityDataHelper.key_fn); + if (securities.All(s => s.ContractCase == Security.ContractOneofCase.Synthetic)) { + state.root_securities = sec_keys.ToArray(); + } else { + state.filters.security = SecurityCriteria.from_keys(sec_keys); + } var vm = new FillsVM( _bus, _orders_model, Observable.Return(state), new WindowSettingsManager.DisconnectedImpl(state.grid)); return (vm, $"{string.Join(_security_delimiter, securities)}", title_desc, fg); diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index e370685ea..5d62c35ea 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -214,10 +214,13 @@ namespace mbts.spark { ((IKeyedColumn)column).key; static IObservable> _get_observable(IBus bus, OrdersModel model, FillsSettings state) { - if (!state.orders.is_null_or_empty()) { - var orders_hash = new HashSet(state.orders); - return model.on_fill_tuples_with_root.Filter(f => orders_hash.Contains(f.fill.OrderKey)); - } else return model.on_fill_tuples_with_root; + var orders_hash = state.orders.is_null_or_empty() ? null : new HashSet(state.orders); + var root_securities_hash = state.root_securities.is_null_or_empty() ? null : new HashSet(state.root_securities); + return orders_hash == null && root_securities_hash == null ? + model.on_fill_tuples_with_root : + model.on_fill_tuples_with_root.Filter(f => + (orders_hash == null || orders_hash.Contains(f.fill.OrderKey)) && + (root_securities_hash == null || root_securities_hash.Contains(f.root_order_security?.security?.Id ?? 0))); } static IObservable> _get_observable(IBus bus, OrdersModel model, IObservable state) => diff --git a/src/client/spark/Modules/Trading/Fills/Settings/FillsSettings.cs b/src/client/spark/Modules/Trading/Fills/Settings/FillsSettings.cs index d059efcf7..47a86af81 100644 --- a/src/client/spark/Modules/Trading/Fills/Settings/FillsSettings.cs +++ b/src/client/spark/Modules/Trading/Fills/Settings/FillsSettings.cs @@ -38,6 +38,8 @@ namespace bts.shell.fills { public static IEnumerable mini_column_keys => DefaultColumns.Mini.mini_cols_data.Keys; public IReadOnlyList sorting_criterion => _sorting_criteria ?? (_sorting_criteria = DefaultColumns.default_sorting_criterion.ToList()); + public uint[] root_securities { get; set; } + public static FillsSettings Default() => new FillsSettings(null, null, new FillsFilterStates(), null);