diff --git a/src/client/spark/Modules/Settings/SettingsShellModule.cs b/src/client/spark/Modules/Settings/SettingsShellModule.cs index a20b0e834..c485d2ab7 100644 --- a/src/client/spark/Modules/Settings/SettingsShellModule.cs +++ b/src/client/spark/Modules/Settings/SettingsShellModule.cs @@ -22,12 +22,10 @@ namespace bts.ui { [ImportingConstructor] public SettingsShellModule(IBus bus, WorkspacesModel ws) { - // todo: Create workspaces dialog // todo: settings dialog ws_model = ws; _dispose = bus.subscribe(SparkTags.ShowWorkspaces).Subscribe(_ => show_workspaces_dialog()); - _bus = bus; } public ImageSource icon => Icons.Admin; diff --git a/src/client/spark/Modules/Support/ActivityLog/ActivityLogCategories.cs b/src/client/spark/Modules/Support/ActivityLog/ActivityLogCategories.cs new file mode 100644 index 000000000..e4dbd156e --- /dev/null +++ b/src/client/spark/Modules/Support/ActivityLog/ActivityLogCategories.cs @@ -0,0 +1,30 @@ +using mbts.ui; +using mbts.ui.controls; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Media; + +namespace bts.shell +{ + public static class ActivityLogCategory + { + public static ILogViewerCategory order = new LogViewerCategory("Order", BTSColors.Orders.sent_brush); + public static ILogViewerCategory fill = new LogViewerCategory("Fill", BTSColors.Orders.filled_dark); + public static ILogViewerCategory cancel = new LogViewerCategory("Cancel", BTSColors.Orders.working_cancel); + public static ILogViewerCategory modify = new LogViewerCategory("Modify", BTSColors.Orders.modified); + public static ILogViewerCategory warn = new LogViewerCategory("Warn", Brushes.Gold); + + public static IEnumerable all_categories { + get { + yield return order; + yield return fill; + yield return cancel; + yield return modify; + yield return warn; + } + } + } +} \ No newline at end of file diff --git a/src/client/spark/Modules/Support/ActivityLog/ActivityLogWindow.cs b/src/client/spark/Modules/Support/ActivityLog/ActivityLogWindow.cs new file mode 100644 index 000000000..dad85fc2e --- /dev/null +++ b/src/client/spark/Modules/Support/ActivityLog/ActivityLogWindow.cs @@ -0,0 +1,36 @@ +using bts.api; +using bts.spark; +using mbts; +using mbts.ui.controls; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reactive.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Media; + +namespace bts.shell +{ + class ActivityLogWindow : SparkWindow { + IDisposable _dispose; + LogViewerMessageCollection _messages = new LogViewerMessageCollection(); + + public ActivityLogWindow(IObservable messages, IBus bus, ActivityWindowFactory isw) + : base("Activity Log", bus, isw, SparkCommands.ShowActivityLog.icon) { + _dispose = messages.ObserveOnDispatcher().Subscribe(_messages.AddLog); + } + + public override ActivityWindowState SaveState => new ActivityWindowState(); + + public override UIElement Content => + new LogViewer { + ItemsSource = _messages, + Categories = ActivityLogCategory.all_categories }; + + public override void Dispose() { + Disposable.dispose(ref _dispose); + } + } +} diff --git a/src/client/spark/Modules/Support/ActivityLog/ActivityWindowFactory.cs b/src/client/spark/Modules/Support/ActivityLog/ActivityWindowFactory.cs new file mode 100644 index 000000000..1308ef92b --- /dev/null +++ b/src/client/spark/Modules/Support/ActivityLog/ActivityWindowFactory.cs @@ -0,0 +1,45 @@ +using System; +using System.Reactive.Linq; +using System.Reactive.Subjects; +using System.Threading.Tasks; +using bts.api; +using bts.shell; +using mbts; +using mbts.spark; +using mbts.ui; +using mbts.ui.controls; + +namespace bts.shell { + + internal class ActivityWindowFactory : ShellWindowFactory { + readonly IBus _bus; + readonly IConnectableObservable messages; + + public ActivityWindowFactory(IShellModule owner, IBus bus) : base(owner, "Activity Window") { + _bus = bus; + messages = bus.subscribe(SparkTags.LogActivity).Replay(512); + _dispose = Disposable.Create( + bus.subscribe(SparkTags.ShowActivityLog).Subscribe(show_log), + messages.Connect() + ); + } + + public void show_log(SparkTags.Nothing _) { + _bus.post(SparkTags.ShowWindow, create_window()); + } + + private IShellWindow create_window() { + return new ActivityLogWindow(messages, _bus, this); + } + + public override Task load(ActivityWindowState state) { + return Task.FromResult(create_window()); + } + } + + [ProtoBuf.ProtoContract] + class ActivityWindowState { + // nothing yet + } + +} \ No newline at end of file diff --git a/src/client/spark/Modules/Support/SupportShellModule.cs b/src/client/spark/Modules/Support/SupportShellModule.cs index ae014c8e4..e4b5246de 100644 --- a/src/client/spark/Modules/Support/SupportShellModule.cs +++ b/src/client/spark/Modules/Support/SupportShellModule.cs @@ -11,20 +11,24 @@ using System.Windows.Media; using bts.api; using mbts; using mbts.spark; +using System.Reactive.Linq; +using static mbts.ui.shell.ProtoBufSerializationHelper; -namespace bts.Modules.Support { +namespace bts.shell { [Export(typeof(IShellModule))] class HelpShellModule : IShellModule { IDisposable _dispose; [ImportingConstructor] public HelpShellModule(IBus bus, IBrowserWindowManager browser) { - + _awf = new ActivityWindowFactory(this, bus); _dispose = Disposable.Create( - bus.subscribe(SparkTags.ShowUri).Subscribe(u => browser.Pages.Add(u)) + bus.subscribe(SparkTags.ShowUri).ObserveOnDispatcher().Subscribe(u => browser.Pages.Add(u)) ); } + ActivityWindowFactory _awf; + public ImageSource icon => Icons.Support; public string name => "Help"; @@ -36,11 +40,12 @@ namespace bts.Modules.Support { //SparkCommands.ShowAuditLogs, //SparkCommands.ShowDiagnostics, SparkCommands.ShowReportIssue.complete("Create Support Ticket"), - SparkCommands.ShowAboutSpark + SparkCommands.ShowAboutSpark, + SparkCommands.ShowActivityLog }; public Task create(Stream load_stream) { - throw new NotImplementedException(); + return dispatch_to_factory(load_stream, _awf); } public void Dispose() { diff --git a/src/client/spark/Modules/Trading/TradingShellModule.cs b/src/client/spark/Modules/Trading/TradingShellModule.cs index 44aa7d7b6..ada108bec 100644 --- a/src/client/spark/Modules/Trading/TradingShellModule.cs +++ b/src/client/spark/Modules/Trading/TradingShellModule.cs @@ -49,12 +49,7 @@ namespace bts.shell } public Task create(Stream load_stream) { - if (try_deserialize(load_stream, out ShellSerializationHeader header)) { - foreach (var wf in window_factories()) { - if (header.name == wf.name) return wf.load_window(load_stream, header.version); - } - } - return null; + return dispatch_to_factory(load_stream, window_factories().ToLArray()); } public void Dispose() { diff --git a/src/client/spark/core/Bus/SparkCommand.cs b/src/client/spark/core/Bus/SparkCommand.cs index 173927e14..7049104bf 100644 --- a/src/client/spark/core/Bus/SparkCommand.cs +++ b/src/client/spark/core/Bus/SparkCommand.cs @@ -1,5 +1,6 @@ using bts.api; using mbts; +using mbts.ui; using System; using System.Linq; using System.Reactive.Linq; @@ -52,6 +53,27 @@ namespace bts.spark public static SparkCommandParamObserver create(string title, ImageSource icon, ITag tag, IObservable parameter, IObservable can_execute) => new SparkCommandParamObserver(title, icon, tag, parameter, can_execute); + + + } + + public static class SparkCommandExtensions { + public static ICommand ICommand(this SparkCommand sp, IBus bus) { + var command = new DelegateCommand(() => sp.execute(bus), sp.canExecute); + var w = new WeakReference(command); + EventHandler handler = null; + handler = (o, e) => { + if (w.TryGetTarget(out ICommand c)) { + c.TryRaiseCanExecuteChanged(); + } + else { + // lazily unsubscribe from this event when this is gone + if (handler != null) sp.CanExecuteChanged -= handler; + } + }; + sp.CanExecuteChanged += handler; + return command; + } } public class PartialCommand { diff --git a/src/client/spark/core/Bus/SparkCommands.cs b/src/client/spark/core/Bus/SparkCommands.cs index c2ec8e8fb..a928b81f4 100644 --- a/src/client/spark/core/Bus/SparkCommands.cs +++ b/src/client/spark/core/Bus/SparkCommands.cs @@ -81,6 +81,9 @@ namespace bts.spark public static SparkCommand ShowAboutSpark => SparkCommand.create("About Spark", Icons.Support, SparkTags.About); + public static SparkCommand ShowActivityLog => + SparkCommand.create("Activity Log", Icons.Wrench, SparkTags.ShowActivityLog); + public static PartialCommand ShowReportIssue => SparkCommand.create("Report a Problem", Icons.Support, SparkTags.Support); diff --git a/src/client/spark/core/Bus/SparkTags.cs b/src/client/spark/core/Bus/SparkTags.cs index 2a7115c74..7290b77a2 100644 --- a/src/client/spark/core/Bus/SparkTags.cs +++ b/src/client/spark/core/Bus/SparkTags.cs @@ -39,6 +39,8 @@ namespace mbts.spark public static ITag ShowUri { get; } = new SparkTag("ShowUri"); public static ITag Support { get; } = new SparkTag(nameof(Support)); public static ITag About { get; } = new SparkTag("About"); + public static ITag ShowActivityLog { get; } = new SparkTag("Show Activity Log"); + public static ITag LogActivity { get; } = new SparkTag("Activity Log"); public static ITag ShowNotImplemented { get; } = new SparkTag(nameof(ShowNotImplemented)); public static ITag NotImplemented { get; } = new SparkTag("Not Implemented"); diff --git a/src/client/spark/view/Shell/ProtoBufSerializationHelper.cs b/src/client/spark/view/Shell/ProtoBufSerializationHelper.cs index e270c355d..1ef129c8b 100644 --- a/src/client/spark/view/Shell/ProtoBufSerializationHelper.cs +++ b/src/client/spark/view/Shell/ProtoBufSerializationHelper.cs @@ -1,8 +1,10 @@ using bts.api; +using bts.shell; using Google.Protobuf; using ProtoBuf; using System; using System.IO; +using System.Threading.Tasks; namespace mbts.ui.shell { @@ -34,6 +36,17 @@ namespace mbts.ui.shell } } + public static Task dispatch_to_factory(Stream load_stream, params IShellWindowFactory[] factories) { + if (try_deserialize(load_stream, out ShellSerializationHeader header)) { + foreach (var wf in factories) { + if (wf.name == header.name) { + return wf.load_window(load_stream, header.version); + } + } + } + return null; + } + public static void serialize(Stream stream, T t) { Serializer.SerializeWithLengthPrefix(stream, t, PrefixStyle.Fixed32); } diff --git a/src/client/spark/view/Spark/Ladder/LadderVM.cs b/src/client/spark/view/Spark/Ladder/LadderVM.cs index 8a1939dd1..f87b8b337 100644 --- a/src/client/spark/view/Spark/Ladder/LadderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderVM.cs @@ -1,5 +1,7 @@ using bts.api; using bts.api.orderman; +using bts.shell; +using bts.spark; using mbts.co2; using mbts.ui; using mbts.ui.controls; @@ -14,15 +16,6 @@ using System.Windows.Input; using System.Windows.Media; namespace mbts.spark { - enum LadderStatusType { - Empty, - Order, - Cancel, - Modify, - Fill, - Warn - } - class LadderVM : OrderPropertiesEditorVM, IKeyListener { readonly IBus _bus; readonly LadderModel _model; @@ -73,8 +66,11 @@ namespace mbts.spark { Property _status; public string status_message => _status.Value; - public async void push_status(string msg, LadderStatusType type) { + public ICommand status_click_command => SparkCommands.ShowActivityLog.ICommand(_bus); + + public async void update_status(string msg, ILogViewerCategory category) { _status.set(msg); + _bus.post(SparkTags.LogActivity, new LogViewerMessage(category, $"{security}: {msg}")); await Task.Delay(TimeSpan.FromSeconds(5)); if (_status.Value == msg) { _status.set(""); @@ -121,7 +117,7 @@ namespace mbts.spark { string msg = result.key.HasValue ? OrderUtils.successful_order_description(order, security.ContractSpec, args.price, size, result.key.Value) : OrderUtils.unsuccessful_order_desecription(order, security.ContractSpec, args.price, size); - push_status(msg, LadderStatusType.Order); + update_status(msg, ActivityLogCategory.order); if (revert) { size_calculator.value = _settings.size; if (selected_time_in_force != _settings.default_time_in_force && time_in_forces.Contains(_settings.default_time_in_force)) { @@ -151,7 +147,7 @@ namespace mbts.spark { var result = await _model.cancel_orders(ct); foreach (var (def, success, error) in result) { string msg = cancel_log_msg(def, success, error); - push_status(msg, LadderStatusType.Cancel); + update_status(msg, ActivityLogCategory.cancel); } } @@ -186,7 +182,7 @@ namespace mbts.spark { _bus.post(SparkTags.ShowOrderTicketTag, (new OrderDefinitionImmutable(create(Side.Buy)), 0d, 0u)); void _log_warning(string msg) { - push_status(msg, LadderStatusType.Warn); + update_status(msg, ActivityLogCategory.warn); Logger.error(bts.log.Subsystem.Ui, msg); } diff --git a/src/client/spark/view/Spark/Ladder/LadderView.xaml b/src/client/spark/view/Spark/Ladder/LadderView.xaml index ff2a0eefe..d34d59417 100644 --- a/src/client/spark/view/Spark/Ladder/LadderView.xaml +++ b/src/client/spark/view/Spark/Ladder/LadderView.xaml @@ -250,6 +250,12 @@ - + \ No newline at end of file diff --git a/src/client/spark/view/Spark/Ladder/OrderVM.cs b/src/client/spark/view/Spark/Ladder/OrderVM.cs index 0223f1d84..3b2b7155f 100644 --- a/src/client/spark/view/Spark/Ladder/OrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/OrderVM.cs @@ -1,5 +1,6 @@ using bts.api; using bts.api.orderman; +using bts.shell; using bts.spark; using mbts.ui; using mbts.ui.controls; @@ -44,13 +45,13 @@ namespace mbts.spark { void _init(OrderRecordImmutable new_order) { string mod_desc = OrderUtils.modified_description(_order, new_order, _parent.security.ContractSpec); if (!string.IsNullOrEmpty(mod_desc)) { - _parent.push_status(mod_desc, LadderStatusType.Modify); + _parent.update_status(mod_desc, ActivityLogCategory.modify); } if (new_order.State.FilledQuantity != _order.State.FilledQuantity) { - _parent.push_status(OrderUtils.fill_summary(_order, new_order), LadderStatusType.Fill); + _parent.update_status(OrderUtils.fill_summary(_order, new_order), ActivityLogCategory.fill); } if (new_order.State.Status != _order.State.Status) { - _parent.push_status(OrderUtils.status_change_description(_order, _order.State.Status, new_order.State.Status), LadderStatusType.Modify); + _parent.update_status(OrderUtils.status_change_description(_order, _order.State.Status, new_order.State.Status), ActivityLogCategory.modify); } _order = new_order; OrderMetadata meta = _parent.model.order_gateway.factory.get_metadata(_order), parentmeta = null; @@ -110,20 +111,20 @@ namespace mbts.spark { async void _cancel_order() { var result = await model.order_gateway.cancel_order_get_error(_order.Key); string msg = _parent.cancel_log_msg(_order, result.success, result.error); - _parent.push_status(msg, LadderStatusType.Cancel); + _parent.update_status(msg, ActivityLogCategory.cancel); } public async void try_set_price(double new_price) { _phantom_price = new_price; RaisePropertyChanged(nameof(price)); ++_n_active_price_change_ops; - _parent.push_status($"({id}) Drag/Drop initiated price change from {_parent.security.ContractSpec.format(_real_price)} to {_parent.security.ContractSpec.format(new_price)}", LadderStatusType.Modify); + _parent.update_status($"({id}) Drag/Drop initiated price change from {_parent.security.ContractSpec.format(_real_price)} to {_parent.security.ContractSpec.format(new_price)}", ActivityLogCategory.modify); if (await _parent.model.order_gateway.update_order_price(_order.Key, new_price)) { // wait 3 secs, then give up if price change still hasn't taken effect await Task.Delay(3000); } else { - _parent.push_status(OrderUtils.unsuccessful_change_price_description(_order, _parent.security, _real_price, new_price), LadderStatusType.Modify); + _parent.update_status(OrderUtils.unsuccessful_change_price_description(_order, _parent.security, _real_price, new_price), ActivityLogCategory.modify); } // only update when the last price change op is finished if (--_n_active_price_change_ops == 0) {