Removed DynamicGrid.DefaultOptions

prs.desktop/Dashboards/UtilityDashboard.xaml.cs

@@ -231,7 +231,10 @@ namespace PRSDesktop
         {
             var favourites = GetFavourites().ToList();
             var grid = new DynamicItemsListGrid<DashboardFavourite>() { Items = favourites };
-            grid.DefaultOptions.AddRange(DynamicGridOption.DeleteRows, DynamicGridOption.EditRows, DynamicGridOption.MultiSelect);
+            grid.Reconfigure(options =>
+            {
+                options.AddRange(DynamicGridOption.DeleteRows, DynamicGridOption.EditRows, DynamicGridOption.MultiSelect);
+            });
             grid.OnCustomiseEditor += FavouritesGrid_OnCustomiseEditor;
             DynamicGridUtils.CreateGridWindow("Manage Favourites", grid).ShowDialog();
 

prs.desktop/Grids/EmployeeRosterGrid.cs

@@ -73,7 +73,7 @@ namespace PRSDesktop
                 ? new List<EmployeeRosterItem>()
                 : Serialization.Deserialize<List<EmployeeRosterItem>>(Employee.Roster);
             var rostergrid = new DynamicItemsListGrid<EmployeeRosterItem>() { Items = rosteritems };
-            rostergrid.OnReconfigure += (options) =>
+            rostergrid.Reconfigure(options =>
             {
                 options
                     .BeginUpdate()
@@ -82,8 +82,7 @@ namespace PRSDesktop
                     .Add(DynamicGridOption.DirectEdit)
                     .Add(DynamicGridOption.RecordCount)
                     .EndUpdate();
-            };
-            rostergrid.Reconfigure();
+            });
             rostergrid.Refresh(true, true);
 
             var window = new DynamicContentDialog(rostergrid);

prs.desktop/Panels/Factory/ManufacturingTreatmentWindow.xaml.cs

@@ -31,7 +31,7 @@ namespace PRSDesktop
             Packets.HiddenColumns.Add(x => x.ID);
             Packets.HiddenColumns.Add(x => x.Packet.SetoutLink.JobLink.ID);
             Packets.ActionColumns.Add(new DynamicImageColumn(GetImage, SelectPacket));
-            Packets.DefaultOptions.AddRange(DynamicGridOption.RecordCount);
+            Packets.Reconfigure(options => options.AddRange(DynamicGridOption.RecordCount));
             Packets.Treatments = treatments;
         }
 
@@ -49,7 +49,7 @@ namespace PRSDesktop
         public Guid SupplierID => (Guid)Suppliers.SelectedValue;
         public string SupplierName => ((KeyValuePair<Guid, string>)Suppliers.SelectedItem).Value;
 
-        private bool SelectPacket(CoreRow arg)
+        private bool SelectPacket(CoreRow? arg)
         {
             if (arg == null)
             {
@@ -72,7 +72,7 @@ namespace PRSDesktop
             return true;
         }
 
-        private BitmapImage GetImage(CoreRow arg)
+        private BitmapImage? GetImage(CoreRow? arg)
         {
             if (arg == null)
                 return tick;

prs.desktop/Panels/GPSTrackers/GPSTrackers.xaml.cs

@@ -26,14 +26,14 @@ namespace PRSDesktop
                 VerticalAlignment = VerticalAlignment.Stretch,
                 Margin = new Thickness(0)
             };
-            Trackers.DefaultOptions.AddRange(DynamicGridOption.RecordCount, DynamicGridOption.FilterRows, DynamicGridOption.MultiSelect,
-                DynamicGridOption.SelectColumns);
+            Trackers.Reconfigure(options => options.AddRange(DynamicGridOption.RecordCount, DynamicGridOption.FilterRows, DynamicGridOption.MultiSelect,
+                DynamicGridOption.SelectColumns));
             AddChild(Trackers);
         }
 
         public bool IsReady { get; set; }
 
-        public event DataModelUpdateEvent OnUpdateDataModel;
+        public event DataModelUpdateEvent? OnUpdateDataModel;
 
         public Dictionary<string, object[]> Selected()
         {

prs.desktop/Panels/Jobs/JobSummaryGrid.cs

@@ -114,11 +114,10 @@ namespace PRSDesktop
                 return;
             }
             grid.ColumnsTag = $"{ColumnsTag}.{columnname}";
-            grid.OnReconfigure += (options) =>
+            grid.Reconfigure(options =>
             {
                 options.BeginUpdate().Clear().AddRange(DynamicGridOption.FilterRows, DynamicGridOption.SelectColumns).EndUpdate();
-            };
-            grid.Reconfigure();
+            });
             grid.OnDefineFilter += t =>
             {
                 var filter = new Filter<TEntity>(productcol).IsEqualTo(productid)

prs.desktop/Panels/Notifications/NotificationPanel.xaml.cs

@@ -72,8 +72,7 @@ public partial class NotificationPanel : UserControl, IPanel<Notification>
 
         Notifications.HiddenColumns.Add(x => x.Closed);
 
-        Notifications.DefaultOptions.AddRange(DynamicGridOption.RecordCount, DynamicGridOption.FilterRows, DynamicGridOption.SelectColumns,
-            DynamicGridOption.MultiSelect);
+        Notifications.Reconfigure(options => options.AddRange(DynamicGridOption.RecordCount, DynamicGridOption.FilterRows, DynamicGridOption.SelectColumns, DynamicGridOption.MultiSelect));
         Notifications.SetValue(Grid.RowProperty, 0);
         Notifications.SetValue(Grid.ColumnProperty, 1);
         Notifications.Margin = new Thickness(0);
@@ -135,7 +134,7 @@ public partial class NotificationPanel : UserControl, IPanel<Notification>
 
     public bool IsReady { get; set; }
 
-    public event DataModelUpdateEvent OnUpdateDataModel;
+    public event DataModelUpdateEvent? OnUpdateDataModel;
 
     private Button CreateButton(string caption, BitmapImage? umage, Func<Button, CoreRow[], bool> action)
     {

prs.desktop/Panels/Products/Locations/StockTakeWindow.xaml.cs

@@ -64,7 +64,7 @@ namespace PRSDesktop
 
         private void SetupStockHoldingGrid()
         {
-            Holdings.OnReconfigure += options =>
+            Holdings.Reconfigure(options =>
             {
                 options.Remove(DynamicGridOption.EditRows);
                 options.Remove(DynamicGridOption.DeleteRows);
@@ -75,7 +75,7 @@ namespace PRSDesktop
                 options.Add(DynamicGridOption.AddRows);
 
                 options.Add(DynamicGridOption.DirectEdit);
-            };
+            });
 
             Holdings.OnCustomiseEditor += Page_OnCustomiseEditor;
             Holdings.OnValidate += Page_OnValidate;

prs.desktop/Panels/Products/Reservation Management/JobRequisitionsPanel.xaml.cs

@@ -41,7 +41,7 @@ namespace PRSDesktop
         {
             InitializeComponent();
 
-            JobRequiItems.OnReconfigure += options =>
+            JobRequiItems.Reconfigure(options =>
             {
                 if(Mode == PanelMode.Reserve)
                 {
@@ -51,7 +51,7 @@ namespace PRSDesktop
                 {
                     options.Add(DynamicGridOption.MultiSelect);
                 }
-            };
+            });
         }
 
         enum PanelMode

prs.desktop/Panels/Quotes/QuoteDetails.xaml.cs

@@ -82,7 +82,7 @@ namespace PRSDesktop
                 statuscodes[row.Get<QuoteStatus, Guid>(x => x.ID)] = row.Get<QuoteStatus, string>(x => x.Description);
             Status.ItemsSource = statuscodes;
 
-            Proposals.DefaultOptions.AddRange(DynamicGridOption.RecordCount, DynamicGridOption.SelectColumns);
+            Proposals.Reconfigure(options => options.AddRange(DynamicGridOption.RecordCount, DynamicGridOption.SelectColumns));
             Proposals.Refresh(true, false);
 
             Title.EditorDefinition = new TextBoxEditor();
@@ -153,7 +153,7 @@ namespace PRSDesktop
             });
         }
 
-        private void Title_OnEditorValueChanged(IDynamicEditorControl sender, Dictionary<string, object> values)
+        private void Title_OnEditorValueChanged(IDynamicEditorControl sender, Dictionary<string, object?> values)
         {
             if (IsReady)
             {

prs.desktop/Panels/Requisitions/RequisitionPanel.xaml.cs

@@ -66,7 +66,7 @@ namespace PRSDesktop
             Items.OnBeforeSave += Items_OnBeforeSave;
             UnPickedItems.OnBeforeSave += UnPickedItems_OnBeforeSave;
 
-            Items.OnReconfigure += options =>
+            Items.Reconfigure(options =>
             {
                 options.BeginUpdate();
                 if (_requisition != null)
@@ -84,7 +84,7 @@ namespace PRSDesktop
                 }
 
                 options.EndUpdate();
-            };
+            });
 
             Requisitions.Refresh(true, false);
             Items.Refresh(true, false);

prs.desktop/Panels/StockSummary/StockSummaryGrid.cs

@@ -94,11 +94,7 @@ namespace PRSDesktop
                 return;
             }
             grid.ColumnsTag = $"{ColumnsTag}.{columnname}";
-            grid.OnReconfigure += options =>
-            {
-                options.BeginUpdate().Clear().AddRange(DynamicGridOption.FilterRows, DynamicGridOption.SelectColumns).EndUpdate();
-            };
-            grid.Reconfigure();
+            grid.Reconfigure(options => { options.BeginUpdate().Clear().AddRange(DynamicGridOption.FilterRows, DynamicGridOption.SelectColumns).EndUpdate(); });
             grid.OnDefineFilter += t =>
             {
                 var filter = new Filter<TEntity>(productcol).IsEqualTo(productid)

prs.desktop/Panels/Tasks/TasksByStatusControl.xaml.cs

@@ -1552,7 +1552,7 @@ namespace PRSDesktop
 
             var window = new ThemableWindow();
             var grid = new JobGrid();
-            grid.OnReconfigure += options =>
+            grid.Reconfigure(options =>
             {
                 options.Remove(DynamicGridOption.EditRows);
                 options.Remove(DynamicGridOption.DeleteRows);
@@ -1560,8 +1560,7 @@ namespace PRSDesktop
                 options.Remove(DynamicGridOption.MultiSelect);
                 options.Remove(DynamicGridOption.ExportData);
                 options.Remove(DynamicGridOption.ImportData);
-            };
-            grid.Reconfigure();
+            });
             grid.OnSelectItem += (object sender, DynamicGridSelectionEventArgs e) =>
             {
                 if ((sender as JobGrid).SelectedRows.Count() == 0)