From da96744f7f015bc831683cce30b6832df6c5aaa3 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 2 Aug 2025 01:06:40 -0400 Subject: [PATCH] feat: Add Stream Reports shell window --- .../Modules/Analytics/AnalyticsShellModule.cs | 61 +++++++- .../Analytics/AnalyticsShellModuleVM.cs | 1 + .../Analytics/AnalyticsShellModuleView.xaml | 20 +++ .../Analytics/StreamReport/StreamReport.cs | 15 ++ .../StreamReportConfigurationDialog.xaml | 63 ++++++++ .../StreamReportConfigurationDialog.xaml.cs | 12 ++ .../StreamReportConfigurationVM.cs | 44 ++++++ .../StreamReport/StreamReportModel.cs | 0 .../StreamReport/StreamReportRowVM.cs | 35 +++++ .../StreamReport/StreamReportSettings.cs | 11 ++ .../Analytics/StreamReport/StreamReportVM.cs | 135 ++++++++++++++++++ .../StreamReport/StreamReportView.xaml | 55 +++++++ .../StreamReport/StreamReportView.xaml.cs | 13 ++ .../StreamReport/StreamReportWindow.cs | 72 ++++++++++ .../StreamReport/StreamReportWindowFactory.cs | 69 +++++++++ src/client/spark/core/Bus/SparkTags.cs | 3 + .../Filters/DataGridFilterHelper.cs | 1 + .../Filters/VM/Int64MinMaxFilterVM.cs | 69 +++++++++ .../Filters/Views/FilterTemplates.xaml | 18 +++ .../Views/Int64MinMaxFilterControl.xaml | 58 ++++++++ .../Views/Int64MinMaxFilterControl.xaml.cs | 75 ++++++++++ .../Reactive/ObservableExtensions.cs | 15 ++ 22 files changed, 841 insertions(+), 4 deletions(-) create mode 100644 src/client/spark/Modules/Analytics/StreamReport/StreamReport.cs create mode 100644 src/client/spark/Modules/Analytics/StreamReport/StreamReportConfigurationDialog.xaml create mode 100644 src/client/spark/Modules/Analytics/StreamReport/StreamReportConfigurationDialog.xaml.cs create mode 100644 src/client/spark/Modules/Analytics/StreamReport/StreamReportConfigurationVM.cs create mode 100644 src/client/spark/Modules/Analytics/StreamReport/StreamReportModel.cs create mode 100644 src/client/spark/Modules/Analytics/StreamReport/StreamReportRowVM.cs create mode 100644 src/client/spark/Modules/Analytics/StreamReport/StreamReportSettings.cs create mode 100644 src/client/spark/Modules/Analytics/StreamReport/StreamReportVM.cs create mode 100644 src/client/spark/Modules/Analytics/StreamReport/StreamReportView.xaml create mode 100644 src/client/spark/Modules/Analytics/StreamReport/StreamReportView.xaml.cs create mode 100644 src/client/spark/Modules/Analytics/StreamReport/StreamReportWindow.cs create mode 100644 src/client/spark/Modules/Analytics/StreamReport/StreamReportWindowFactory.cs create mode 100644 src/client/spark/view/Controls/DataGridEx/Filters/VM/Int64MinMaxFilterVM.cs create mode 100644 src/client/spark/view/Controls/DataGridEx/Filters/Views/Int64MinMaxFilterControl.xaml create mode 100644 src/client/spark/view/Controls/DataGridEx/Filters/Views/Int64MinMaxFilterControl.xaml.cs diff --git a/src/client/spark/Modules/Analytics/AnalyticsShellModule.cs b/src/client/spark/Modules/Analytics/AnalyticsShellModule.cs index 9923b6dd3..07cccb585 100644 --- a/src/client/spark/Modules/Analytics/AnalyticsShellModule.cs +++ b/src/client/spark/Modules/Analytics/AnalyticsShellModule.cs @@ -4,16 +4,20 @@ namespace mbts.spark { using bts.api.analytics; using bts.api.core; using bts.collections; + using bts.md; using bts.shell; using bts.shell.pnl; using bts.spark; + using Bts.DataStreamCore; + using mbts.analytics; using mbts.persist; using mbts.ui; using mbts.ui.shell; using mbts.ui.utility; + using Spark.Analytics; using Spark.Core.Data; using Spark.Core.Disposables; using Spark.Core.Reactive; @@ -35,6 +39,7 @@ namespace mbts.spark { readonly IBus _bus; readonly IWindowManager _wm; readonly List _window_factories; + readonly IUserPersist persist; IDisposable _dispose; @@ -46,20 +51,34 @@ namespace mbts.spark { OrdersModel orders_model, IPositionModel position_model, ISecurityMetadataStore sec_meta_store, - Lazy user) { + Lazy user, + IUserPersist persist, + IEnumerable streamFactories) { _wm = wm; _bus = bus; + this.persist = persist; var reports_demuxer = new TableUpdateDemuxer(default, false); var nullable_reports_src = bus.subscribe(SparkTags.ReportBlackboardTags.ListTag) .Table(r => r.Id) .Select( r => new ReportImmutable?(r), r => r?.Id ?? throw new ArgumentNullException(nameof(r))); + var streamReportsSrc = Observable.Create>( + o => persist.subscribe( + StreamReport.PersistTopic, + ".*", + rs => o.OnNext(rs.ToDictionary(r => r.key, r => r.value)))) + .Replay(1); + var streamFactoryList = streamFactories.ToList(); + var streamFactory = streamFactoryList.Count == 1 + ? streamFactoryList[0] + : new CompositeDataStreamFactory(streamFactoryList); _window_factories = new() { new VolSurfaceWindowFactory(this, bus, user.Value), new AnalyticsExpirationParametersWindowFactory(this, bus), new SlideReportWindowFactory(this, bus, reports_demuxer.subscribe), new ComboReportWindowFactory(this, bus, reports_demuxer.subscribe), + new StreamReportWindowFactory(this, bus, persist, streamFactory, streamReportsSrc), new PNLWindowFactory( this, bus, settings_hub, orders_model, position_model, sec_meta_store), new DayFillsWindowFactory( @@ -72,6 +91,7 @@ namespace mbts.spark { reports_src.Subscribe(_on_reports), nullable_reports_src.Subscribe(reports_demuxer), reports_demuxer, + streamReportsSrc.OnDispatcher().Subscribe(onStreamReports), vm.launch_exp_params_view_cmd.subscribe_executed(_launch_exp_params_view), vm.launch_pnl_cmd.subscribe_executed(_launch_pnl), vm.launch_day_fills_cmd.subscribe_executed(_launch_day_fills), @@ -86,7 +106,12 @@ namespace mbts.spark { // combo vm.combo_report_launcher_vm.launch_cmd.subscribe_executed(_launch_combo_report), vm.combo_report_launcher_vm.create_cmd.subscribe_executed(_create_combo_report), - vm.combo_report_launcher_vm.delete_cmd.subscribe_executed(_delete_combo_report)); + vm.combo_report_launcher_vm.delete_cmd.subscribe_executed(_delete_combo_report), + // stream + vm.StreamReportLauncher.launch_cmd.subscribe_executed(launchStreamReport), + vm.StreamReportLauncher.create_cmd.subscribe_executed(createStreamReport), + vm.StreamReportLauncher.delete_cmd.subscribe_executed(r => deleteStreamReport(r).ignore()), + streamReportsSrc.Connect()); } public enum WindowType { Main, Heatmap } @@ -111,8 +136,8 @@ namespace mbts.spark { var settings = VolSurfaceSettings.Default(string.Empty); var vm = new VolSurfaceSettingsEditorVM( _bus, settings, v => _bus.post(SparkTags.VolSurfaceCreateTag, v)) { - can_edit_name = true - }; + can_edit_name = true + }; var window = new VolSurfaceSettingsEditor { DataContext = vm, WindowStartupLocation = WindowStartupLocation.CenterScreen @@ -237,6 +262,29 @@ namespace mbts.spark { void _launch_combo_report(int id) => _bus.post(SparkTags.ShowComboReportTag, ComboReportSettings.Default(id)); + void createStreamReport(string _) { + var vm = new StreamReportConfigurationVM(true); + var win = new StreamReportConfigurationDialog() { + DataContext = vm + }; + WindowUtilities.connect_vm(win, vm); + vm.CommitCmd.executed += Commit; + win.move_to_mouse(-100, -100); + win.Show(); + + async void Commit(StreamReport report) { + await persist.set(StreamReport.PersistTopic, report.Name.ToString(), report); + WindowUtilities.force_close(win); + _bus.post(SparkTags.ShowStreamReportTag, report); + } + } + + async Task deleteStreamReport(string name) => + await persist.clear(StreamReport.PersistTopic, name); + + void launchStreamReport(string name) => + _bus.post(SparkTags.ShowStreamReportTag, new() { Name = name }); + void _on_reports(IReadOnlyDictionary reports) { vm.slide_report_launcher_vm.items.Clear(); vm.combo_report_launcher_vm.items.Clear(); @@ -251,5 +299,10 @@ namespace mbts.spark { } } } + + void onStreamReports(IReadOnlyDictionary streamReports) { + vm.StreamReportLauncher.items.SetItems( + streamReports.Values.Select(r => new KeyValueItemVM(r.Name, r.Name))); + } } } diff --git a/src/client/spark/Modules/Analytics/AnalyticsShellModuleVM.cs b/src/client/spark/Modules/Analytics/AnalyticsShellModuleVM.cs index 40d12274c..ef121adb5 100644 --- a/src/client/spark/Modules/Analytics/AnalyticsShellModuleVM.cs +++ b/src/client/spark/Modules/Analytics/AnalyticsShellModuleVM.cs @@ -12,6 +12,7 @@ namespace mbts.spark { public KeyValueLauncherVM vol_surface_launcher_vm { get; } = new() { type_name = "Vol Surface" }; public KeyValueLauncherVM slide_report_launcher_vm { get; } = new() { type_name = "Slide Report" }; public KeyValueLauncherVM combo_report_launcher_vm { get; } = new() { type_name = "Combo Report" }; + public KeyValueLauncherVM StreamReportLauncher { get; } = new() { type_name = "Stream Report" }; // pnl public EventCommand launch_pnl_cmd { get; } = new(); diff --git a/src/client/spark/Modules/Analytics/AnalyticsShellModuleView.xaml b/src/client/spark/Modules/Analytics/AnalyticsShellModuleView.xaml index 029f09f5f..bdac79fa9 100644 --- a/src/client/spark/Modules/Analytics/AnalyticsShellModuleView.xaml +++ b/src/client/spark/Modules/Analytics/AnalyticsShellModuleView.xaml @@ -105,6 +105,8 @@ + +