fix externals pointer

add permission filter to manual fills

Approved-by: John Colvin <john.colvin@bluetradesys.com>

doc/api/content/client/getting-started/install.md

@@ -5,7 +5,7 @@ weight = 10
 
 # C#/.NET
 
-We target [.NET Standard 2.0](https://docs.microsoft.com/en-us/dotnet/standard/net-standard) so you can use .NET Framework 4.6.1+ or .NET Core 2.0+.  Simply add a reference to the [Spark Nuget package](https://www.nuget.org/packages/spark_sdk/) to get started.
+We target [.NET Standard 2.0](https://docs.microsoft.com/en-us/dotnet/standard/net-standard) so you can use .NET Framework 4.6.1+ or .NET Core 2.0+.  Simply add a reference to the [Spark Nuget package](https://nuget.org) to get started.
 
 ```
 dotnet new console -lang c#

doc/api/templates/index.html

@@ -73,7 +73,7 @@
                             <p>
                                 The Spark client SDK allows you to integrate spark with your existing ecosystem. The Spark Client is built entirely on this simple, powerful API.
                             </p>
-                            <a href="{{ get_url(path="@/client/_index.md") }}" class="button">Get started</a>
+                            <a href="" class="button">Get started</a>
                         </div>
                         
                     </div>

src/client/spark/App.xaml.cs

@@ -115,7 +115,7 @@ namespace mbts.ui.shell
       {
          try
          {
-            var path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\BTS\\stunnel\\";
+            string path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\BTS\\stunnel\\";
             if (File.Exists(path + "config\\stunnel.conf"))
             {
                uint job_error = BTSUINativeMethods.setup_process_job_object();   
@@ -124,6 +124,15 @@ namespace mbts.ui.shell
                   kill_stunnel();
                start_stunnel(path, job_error);
             }
+            path = AppDomain.CurrentDomain.BaseDirectory + "\\..\\stunnel\\";
+            if (File.Exists(path + "config\\stunnel.conf"))
+            {
+               uint job_error = BTSUINativeMethods.setup_process_job_object();
+               //if we can't put this process and stunnel into a job, try to stop stunnel then restart
+               if (job_error != 0)
+                  kill_stunnel();
+               start_stunnel(path, job_error);
+            }
          }
          catch(Exception ex)
          {

src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesRowVM.cs

@@ -1,7 +1,6 @@
 using bts.api;
 using bts.co2;
 using bts.utils;
-using bts.utils.csv;
 using mbts;
 using mbts.spark;
 using mbts.ui.controls;
@@ -45,18 +44,6 @@ namespace bts.shell.time_and_sales {
       public void raise_invalidated() =>
          invalidated?.Invoke();
 
-      public static System.Collections.Specialized.OrderedDictionary csv_ordered_properties =>
-            CsvHelper.create_ordering_maintainer(
-               typeof(TimeAndSalesRowVM),
-               new string[] {
-                  nameof(security),
-                  nameof(time),
-                  nameof(price),
-                  nameof(size),
-                  nameof(aggressor_side),
-                  nameof(security_key),
-               });
-
       public bool Equals(TimeAndSalesRowVM other) =>
          other != null &&
          row_key == other.row_key;

src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs

@@ -2,7 +2,6 @@
 using bts.shell.fills;
 using bts.spark;
 using bts.view;
-using bts.utils.csv;
 using mbts;
 using mbts.co2;
 using mbts.persist;
@@ -115,8 +114,6 @@ namespace bts.shell.time_and_sales {
             show_in_context_menu = _can_pause_updates
          };
          _commands = new SparkCommand[] {
-            // csv export
-            new SparkCommandCommand("Export to csv", Icons.Export, FileDialogCommand.export_csv(() => _vm.rows.ToCsv(TimeAndSalesRowVM.csv_ordered_properties), "TaS")),
             // ladder
             SparkCommands.ShowLadderAutoLookup(SparkCommands.KeyGestures.ShowLadder)
                .complete(current_sec_key_src, sec_keys => sec_keys.Count > 0),

src/client/spark/Modules/Trading/Fills/FillsVM.cs

@@ -5,7 +5,6 @@ using bts.collections;
 using bts.shell.fills;
 using bts.spark;
 using bts.utils;
-using bts.utils.csv;
 using mbts.collections;
 using mbts.persist;
 using mbts.spark.filters;
@@ -331,27 +330,6 @@ namespace mbts.spark {
          public override bool Equals(object obj) => Equals(obj as Row);
          public override int GetHashCode() => _fill.FillKey.GetHashCode() ^ _order.Key.GetHashCode();
 
-         public static System.Collections.Specialized.OrderedDictionary csv_ordered_properties =>
-            CsvHelper.create_ordering_maintainer(typeof(Row),
-               new string[] {
-                  nameof(security),
-                  nameof(order_type),
-                  nameof(root_algo_display_name),
-                  nameof(side),
-                  nameof(fill_time),
-                  nameof(user),
-                  nameof(account),
-                  nameof(exchange),
-                  nameof(time_in_force),
-                  nameof(size),
-                  nameof(price),
-                  nameof(fill_kind),
-                  nameof(fill_status),
-                  nameof(fill_key),
-                  nameof(order_key),
-                  nameof(security_key)
-               });
-
          public event Action invalidated;
          void IRowVM.raise_invalidated() => invalidated?.Invoke();
       }

src/client/spark/Modules/Trading/Fills/FillsWindow.cs

@@ -4,7 +4,6 @@ using bts.shell;
 using bts.shell.fills;
 using bts.spark;
 using bts.view;
-using bts.utils.csv;
 using mbts.persist;
 using mbts.ui;
 using mbts.ui.settings;
@@ -62,7 +61,6 @@ namespace mbts.spark {
          _view = new FillsView { DataContext = _vm };
 
          _commands = new List<SparkCommand> {
-            new SparkCommandCommand("Export to csv", Icons.Export, FileDialogCommand.export_csv(() => _vm.rows.ToCsv(FillsVM.Row.csv_ordered_properties), "Fills")),
             // wrap the grid settings view factory in a dialogCommand here since the vm is destroyed/recreated when the security criteria changes
             SparkCommands.window_settings_command(new DialogCommand(() => {
                var vm = new ShellSettingsDialogVM<GridSettings, SimpleGridSettingsVM>(

src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs

@@ -534,8 +534,7 @@ namespace mbts.spark {
          _size_from_row(row, _price_list, _asks, _vm.security.ContractSpec);
 
       uint _volume_from_row(int row) {
-         if (_price_list != null) {
-            var price = _price_list[row];
+         if (_price_list.SafeTryGetAt(row, out var price)) {
             var vapls = _volume_container.read_new_value();
             if (vapls != null) {
                return vapls.SelectFirstOrDefault(v => MathUtils.epsilon_equals(v.Price, price), v => v.Volume);

src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs

@@ -4,7 +4,6 @@ using bts.api.orderman;
 using bts.collections;
 using bts.spark;
 using bts.utils;
-using bts.utils.csv;
 using mbts.ui;
 using mbts.ui.controls;
 using System;
@@ -12,7 +11,6 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Reactive.Linq;
 using System.Runtime.CompilerServices;
-using System.Linq;
 using System.Windows.Input;
 using System.Windows.Media;
 using Columns = mbts.spark.OrderBookGridView.ColumnKeys;
@@ -62,35 +60,6 @@ namespace mbts.spark {
       public event Action<(OrderSecurityRootPair oldval, OrderSecurityRootPair newval)> updated;
       public event PropertyChangedEventHandler PropertyChanged;
 
-      public static System.Collections.Specialized.OrderedDictionary csv_ordered_properties =>
-            CsvHelper.create_ordering_maintainer(
-               typeof(OrderBookRowVM), 
-               new string[] {
-                  nameof(security_text),
-                  nameof(symbol),
-                  nameof(time_created),
-                  nameof(last_change),
-                  nameof(user),
-                  nameof(account),
-                  nameof(exchange),
-                  nameof(time_in_force),
-                  nameof(order_type),
-                  nameof(root_algo_display_name),
-                  nameof(order_sub_type),
-                  nameof(side),
-                  nameof(quantity),
-                  nameof(filled_quantity),
-                  nameof(price),
-                  nameof(avg_price),
-                  nameof(last_price),
-                  nameof(piq),
-                  nameof(status),
-                  // last message (could contains commas, so skipping)
-                  nameof(security_key),
-                  nameof(order_key),
-                  nameof(parent_order_key),
-               });
-
       // Core
       public OrderSecurityRootPair order_tuple { get; private set; }
       public OrderRecordImmutable order => order_tuple.order.order;

src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs

@@ -4,7 +4,6 @@ using bts.shell;
 using bts.shell.fills;
 using bts.shell.orderbook;
 using bts.spark;
-using bts.utils.csv;
 using bts.view;
 using mbts.persist;
 using mbts.ui;
@@ -195,7 +194,6 @@ namespace mbts.spark {
          show_grid_settings_command.group = CommandGroups.Auxiliary;
 
          _commands = new SparkCommand[] {
-            new SparkCommandCommand("Export to csv", Icons.Export, FileDialogCommand.export_csv(() => _vm.rows.ToCsv(OrderBookRowVM.csv_ordered_properties), "OrderBook")),
             toggle_show_right_panel_command,
             attach_selected_orders_command,
             detach_selected_orders_command,

src/client/spark/Orders/OrdersModel.cs

@@ -215,8 +215,11 @@ namespace mbts.spark {
             FillTuple.key_fn);
          on_fill_tuples_with_root = fill_order_tuples_with_root_join.Cache();
          // manual fills
-         on_manual_fills_securities = _position_service.subscribei_manual_fills()
-            .Naggle(interval, scheduler)
+         on_manual_fills_securities = admin_model
+            .permission_filter(
+               _position_service.subscribei_manual_fills()
+               .Naggle(interval, scheduler),
+               f => f.AccountId)
             .Filter(f => f.FillType == ManualFill.Types.FillType.Local)
             .join(sstore, mf => mf.SecurityKey)
             .Table().Cache();

src/client/spark/view/Extensions/Command/FileDialogCommand.cs

@@ -64,25 +64,6 @@ namespace mbts.ui {
             }
          }, can_execute == null ? null : new Func<object, bool>(_ => can_execute()));
 
-      public static IDialogCommand export_csv(
-         Func<string> get_file_content,
-         string source_window_name) =>
-         new AnonymousFileDialogCommand<object>(_ =>
-            _create_save_file_dialog(
-               Environment.GetFolderPath(Environment.SpecialFolder.Desktop),
-               $"BTS_Spark_{source_window_name}_{DateTime.Now.ToString("yyyyMMdd_HHmm")}.csv",
-               new[] { ("CSV (comma delimited)", new string[] { "csv" }) }
-            ),
-            (_, file) => {
-               try {
-                  File.WriteAllText(file, get_file_content.Invoke());
-               } catch (Exception ex) {
-                  BTSMessageBox.Show($"Error exporting data to csv: {ex}.", "CSV Export Error", BTSMessageBoxButtons.OK, System.Windows.MessageBoxImage.Error, true, false, true);
-               }
-            },
-            // we are always able to perform an export, even when no rows (it will just be a header)
-            (_) => true);
-
       static TDialog _create_file_dialog<TDialog>(string initial_dir = null, IReadOnlyList<(string name, string[] extensions)> filter_items = null) where TDialog : FileDialog, new() {
          var rv = new TDialog();
          if (!string.IsNullOrEmpty(initial_dir))

src/client/spark_core/Collections/Extensions/ListExtensions.cs

@@ -103,6 +103,15 @@ namespace bts.collections {
          return array;
       }
 
+      public static bool SafeTryGetAt<T>(this IList<T> list, int index, out T value) {
+         if (list != null && index >= 0 && index < list.Count) {
+            value = list[index];
+            return true;
+         }
+         value = default;
+         return false;
+      }
+
       public static bool TryGetAt<T>(this IList<T> list, int index, out T value) {
          if (index >= 0 && index < list.Count) {
             value = list[index];

src/client/spark_core/utils/CsvHelper.cs

@@ -1,52 +0,0 @@
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Reflection;
-
-namespace bts.utils.csv {
-   public static class CsvHelper {
-
-      public static string ToCsv<T>(this IEnumerable<T> items, OrderedDictionary properties = null) where T : class {
-         var output = "";
-         var delimiter = ",";
-         if (properties == null) {
-            properties = new OrderedDictionary();
-            foreach (var pi in typeof(T).GetProperties()) {
-               properties.Add(pi.Name, pi);
-            }
-         }
-
-         using (var sw = new StringWriter()) {
-            var dict_values = properties.Values.OfType<PropertyInfo>();
-            var header = dict_values.Select(n => n.Name).Aggregate((first, second) => first + delimiter + second);
-            sw.WriteLine(header);
-            foreach (var i in items) {
-               var row = dict_values.Select(x => x.GetValue(i, null))
-                  .Select(x => x == null ? "null" : x.ToString())
-                  .Aggregate((first, second) => first + delimiter + second);
-               sw.WriteLine(row);
-            }
-            output = sw.ToString();
-         }
-         return output;
-      }
-
-      public static OrderedDictionary create_ordering_maintainer(Type t, string[] property_names_in_order) {
-         OrderedDictionary od = new OrderedDictionary();
-         var props = t.GetProperties();
-         foreach (var n in property_names_in_order) {
-            var query = props.Where(pi => pi.Name == n);
-            if (query.Any()) {
-               var property_info = query.First();
-               if (!od.Contains(property_info)) {
-                  od.Add(n, property_info);
-               }
-            }
-         }
-         return od;
-      }
-
-   }
-}

src/lib/config/defaults/keycode.conf

@@ -1,13 +1,10 @@
-
-
 #nusers: 1
 #allow concurrent : true
-#expires: 2020-Mar-31 00:00:00   637212096000000000
-#generation_time: 2020-Jan-06 18:56:23.406931   5248825356261457214
+#expires: 2021-Jan-01 00:00:00   637450560000000000
+#generation_time: 2020-Apr-03 18:39:31.010863   5248901378137496534
 EncryptedKeyCode {
    value {
-      keycode: "Ixb/z6hwFQmojpm4GwNEpQmsqpYT9OTHbcKtROIqj38GwGqyVn54JMDB04V048quO+NAI78DKJXsUWgjDH0y5HQlwN6Lq48s/bdwKqR1OTBPr6xoTImtCb+l5b+8fUGlg7t3X8gfMdxohHgcUi9k9n7ZrnNvqcjdYKoP0CaTZT8zHuBQx3f4Lqrz32gq9rJ5skRjH6ZqNblNdlsF+kOAqXCkvI5p0QfyKgtCodr33qsW2cbqY5gUD9KwsnmFVa8/zuFBucsoM7dHB47yRaIeOFFu7xGayAdAHA8SwLyoxE5y+adIX1SYnAiqAu1raZpeXgRE1LNQk3c7uhUjt0coag=="
+      keycode: "BJBQWsbdTXWa/iLmOf3ekE8vP/NYkf0Q/nUsp/rJ78Ze3W9pNXICCMabmmsr1xOM7aqRIclPgZd955uSSfvFkdNWFTxwPQ5IfnDGopj3QdhUVxhzgVLaXHN+vC0H/MWrDQ5K4WY5J/6VXgUn1LSN/2HNb5iR2sKXeh3Alamg87YtCWEi+scelffE7HK5ERT/3A3Y/e0pqUFhP6xouIjHRhC2FRBb6OoJQVvFwVDADSuKZNo9B6GhC3H0YdHqjFhGDoky5ecgzeKIX8uWJEQNnQXQJ0iTgQ95+YR5IMU+XWdlVfSrc0fuTmj3YWcBQ8Kl2ItEcobyZzJYega3tu6Ftw=="
    }
 }
 
-