diff --git a/src/client/spark/Modules/Trading/AlgoStudio/Utils/AlgoDefinitionVMCollectionHelper.cs b/src/client/spark/Modules/Trading/AlgoStudio/Utils/AlgoDefinitionVMCollectionHelper.cs index 738551d9e..8e066264c 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/Utils/AlgoDefinitionVMCollectionHelper.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/Utils/AlgoDefinitionVMCollectionHelper.cs @@ -1,12 +1,24 @@ using bts.api.core; +using bts.utils; using mbts.collections; using mbts.ui.utilities; +using mbts.utils; using System; using System.Collections.Generic; namespace mbts.spark { static class AlgoDefinitionVMCollectionHelper { - public static readonly IComparer default_comparer = Comparer.Create((a, b) => DisplayNameHelper.compare_alpha_numeric(a?.name, b?.name)); + public static readonly IComparer default_comparer = + new ComparerBuilder( + new [] { + Comparer.Create(_CompareUtils.compare_modes), + Comparer.Create(_CompareUtils.compare_names) + }).to_comparer().to_safe(); + + static AlgoDefinitionVMCollectionHelper() { + var ordered_def_modes = new[] { AlgoVMKey.Mode.LegacyFlex, AlgoVMKey.Mode.Persisted, AlgoVMKey.Mode.Unpersisted }; + var default_comp_builder = new ComparerBuilder(); + } public static void update_persisted_definitions(ObservableKeyedCollection target, TableUpdate update, Func factory) { foreach (var d in update.removed) @@ -31,5 +43,23 @@ namespace mbts.spark { pdef.Dispose(); } } + + static class _CompareUtils { + public static int compare_modes(AlgoDefinitionVM a, AlgoDefinitionVM b) => + _mode_sort_index(a.vm_key.mode).CompareTo(_mode_sort_index(b.vm_key.mode)); + + public static int compare_names(AlgoDefinitionVM a, AlgoDefinitionVM b) => + DisplayNameHelper.compare_alpha_numeric(a.name, b.name); + + static int _mode_sort_index(AlgoVMKey.Mode mode) { + switch (mode) { + case AlgoVMKey.Mode.LegacyFlex: return 0; + case AlgoVMKey.Mode.Persisted: return 1; + case AlgoVMKey.Mode.Unpersisted: return 2; + case AlgoVMKey.Mode.None: return -1; + default: throw ExceptionBuilder.Argument.unexpected_case(mode, nameof(mode)); + } + } + } } } \ No newline at end of file diff --git a/src/client/spark/Orders/OrderPropertiesEditorVM.cs b/src/client/spark/Orders/OrderPropertiesEditorVM.cs index fef022260..6c1dd4d51 100644 --- a/src/client/spark/Orders/OrderPropertiesEditorVM.cs +++ b/src/client/spark/Orders/OrderPropertiesEditorVM.cs @@ -4,6 +4,7 @@ using bts.api.core; using bts.api.orderman; using bts.collections; using bts.spark; +using bts.utils; using mbts.collections; using mbts.ui; using mbts.ui.controls; @@ -56,6 +57,7 @@ namespace mbts.spark { readonly SelectorProperty _time_in_force; readonly SelectionModel _selected_algo_definition; readonly ObservableKeyedCollection _algo_definitions = new ObservableKeyedCollection(d => d.vm_key); + readonly ListCollectionView _algo_definitions_view; readonly TableUpdateBuffer _definitions_buffer = new TableUpdateBuffer(d => d.key); readonly EditableCollectionModel _algo_template_collection_model; readonly ObservableKeyedCollection _favorite_templates = new ObservableKeyedCollection(tvm => tvm.vm_key); @@ -63,7 +65,9 @@ namespace mbts.spark { public OrderPropertiesEditorVM(OrdersModel model, IObservable security_md_source, IObservable order_properties) { _model = model; - algo_definitions_view = new ListCollectionView(_algo_definitions); + _algo_definitions_view = new ListCollectionView(_algo_definitions) { + CustomSort = AlgoDefinitionVMCollectionHelper.default_comparer.to_non_generic() + }; algo_definitions_view.Filter = d => !(d.vm_key.mode == AlgoVMKey.Mode.Persisted && _algo_metadata.TryGetValue(d.vm_key.persisted_id, out AlgoDefinitionMetadata meta) && meta.is_hidden); var security_source = security_md_source.Select(smd => smd.security); _security = backing(nameof(security), security_source, SecurityDataHelper.Defaults.SecurityImmutable); @@ -198,7 +202,7 @@ namespace mbts.spark { // items sources public ObservableCollection algo_definitions => _algo_definitions; public ObservableCollection algo_templates { get; } = new ObservableCollection(); - public ICollectionView algo_definitions_view { get; } + public ICollectionView algo_definitions_view => _algo_definitions_view; public ICollectionView algo_templates_view { get; } public ICollectionView favorite_algo_templates_view { get; } // selected items diff --git a/src/client/spark_core/utils/CompareUtils.cs b/src/client/spark_core/utils/CompareUtils.cs index 2484c596d..a3b48c755 100644 --- a/src/client/spark_core/utils/CompareUtils.cs +++ b/src/client/spark_core/utils/CompareUtils.cs @@ -32,6 +32,9 @@ namespace bts.utils { public static IComparer to_non_generic(this IComparer comparer) => new NonGenericComparerWrapper(comparer); + public static IComparer to_safe(this IComparer comparer) where T : class => + new SafeComparerWrapper(comparer); + public static IComparer wrap(this IComparer inner_comparer, Func selector) => Comparer.Create((a, b) => inner_comparer.Compare(a == null ? default : selector(a), b == null ? default : selector(b))); @@ -49,6 +52,19 @@ namespace bts.utils { public int Compare(object x, object y) => _comparer.Compare(ConvertUtils.try_convert(x), ConvertUtils.try_convert(y)); } + + class SafeComparerWrapper : IComparer where T : class{ + readonly IComparer _comparer; + + public SafeComparerWrapper(IComparer comparer) => + _comparer = comparer; + + public int Compare(T x, T y) { + if (x == null) return y == null ? 0 : -1; + if (y == null) return 1; + return _comparer.Compare(x, y); + } + } #endregion } -} +} \ No newline at end of file