diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index 8516a7675..d600aef4f 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -71,9 +71,23 @@ namespace mbts.spark { // algo items view (common resources) var algo_items_comp = AlgoCollectionHelper.algo_data_vm_comparer.to_non_generic(); var algo_items_group_desc = new PropertyGroupDescription(nameof(AlgoDataVM.group)); - // TODO: update [non-root] order type filter to use 'algo_items_source' so it includes studio algos (like the orderbook, and the new root algo column below) // order type - var order_type_filter = dv_filter(OrderDataHelper.all_order_types, r => r.order?.order_type() ?? OrderType.None); + var order_type_filter = DiscreteValuesFilterVM.CreateTableUpdate( + ft => new AlgoDataVM(ft.algo ?? AlgoData.empty), + AlgoDataVM.id_fn, + ots => Array.ConvertAll(ots ?? Array.Empty(), ot => AlgoID.from_algo_key(AlgoKey.from_known_type(ot))), + ids => ids.empty_if_null().Select(AlgoID.to_algo_key).Where(k => k.mode == AlgoKey.Mode.Factory).Select(k => k.factory).ToArray(), + out var order_type_observer, + out var order_type_items_view); + + order_type_items_view.CustomSort = algo_items_comp; + order_type_items_view.GroupDescriptions.Add(algo_items_group_desc); + order_type_observer.OnNext(TableUpdate.mk_empty(AlgoDataVM.id_fn) + .with_added(OrderDataHelper.all_order_types + .Select(OrderDataHelper.Defaults.CustomOrderDefinitionImmutable) + .Select(AlgoData.from_custom_def) + .Select(d => new AlgoDataVM(d)))); + add_col_expl(Columns.OrderType, new OrderTypeColumn(Columns.OrderType, new Binding(nameof(Row.badge_fill)), new Binding(nameof(Row.display_name)), order_type_filter) { id = col_id(Columns.OrderType), diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/FrameworkElementColumns/OrderTypeColumn.cs b/src/client/spark/view/Controls/DIYGrid/Columns/FrameworkElementColumns/OrderTypeColumn.cs index b06958305..1b67efb4e 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/FrameworkElementColumns/OrderTypeColumn.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/FrameworkElementColumns/OrderTypeColumn.cs @@ -16,7 +16,7 @@ namespace mbts.ui.controls { } public IDataGridColumnFilter filter { get; } - public virtual string filter_template => DataGridFilterKnownTemplates.DiscreteValues; + public virtual string filter_template => DataGridFilterKnownTemplates.AlgoType; public BindingBase font_weight_binding { get; set; } public override FrameworkElement view_factory() { diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs b/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs index be1856777..053babc81 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs @@ -63,8 +63,24 @@ namespace mbts.spark.filters { ) => new DynamicItemsFilter(items, get_row_val, get_state, load_state, prop_name, equality_comparer ?? EqualityComparer.Default, comparer); public static IDataGridColumnPersistentFilter CreateTableUpdate( - Func factory, Func key, out IObserver> items_observer, out ListCollectionView items_view) where TKey : struct, IEquatable { - var filter = new TableUpdateItemsFilter(factory, key, keys => keys, keys => keys.ToArray()); + Func factory, + Func key, + out IObserver> items_observer, + out ListCollectionView items_view) + where TKey : struct, IEquatable => + // + CreateTableUpdate(factory, key, keys => keys, keys => keys.ToArray(), out items_observer, out items_view); + + public static IDataGridColumnPersistentFilter CreateTableUpdate( + Func factory, + Func key, + Func> load_state, + Func, TState> get_state, + out IObserver> items_observer, + out ListCollectionView items_view) + where TKey : struct, IEquatable { + // + var filter = new TableUpdateItemsFilter(factory, key, load_state, get_state); items_observer = filter; items_view = filter.items_view; return filter;