Add feature to select how the project are added over wizard: new grou…

…ps are create based on project path, name includes project path or do not assign groups.
Soloplan · Jan 17, 2020 · 5cbdeb2 · 5cbdeb2
1 parent 9bce73f
commit 5cbdeb2
Show file tree

Hide file tree

Showing 18 changed files with 437 additions and 57 deletions.
diff --git a/src/Soloplan.WhatsON.CruiseControl/CruiseControlPlugin.cs b/src/Soloplan.WhatsON.CruiseControl/CruiseControlPlugin.cs
@@ -41,7 +41,7 @@ public override async Task<IList<Project>> GetProjects(string address)
       var serverProjects = new List<Project>();
       foreach (var project in allProjects.CruiseControlProject)
       {
-        var serverProjectTreeItem = new Project { Name = project.Name, Address = address };
+        var serverProjectTreeItem = new Project(address, project.Name);
         if (string.IsNullOrWhiteSpace(project.ServerName))
         {
           result.Add(serverProjectTreeItem);
@@ -51,12 +51,13 @@ public override async Task<IList<Project>> GetProjects(string address)
           var serverProject = serverProjects.FirstOrDefault(s => s.Name == project.ServerName);
           if (serverProject == null)
           {
-            serverProject = new Project { Name = project.ServerName };
+            serverProject = new Project(null, project.ServerName);
             serverProjects.Add(serverProject);
             result.Add(serverProject);
           }
 
           serverProject.Children.Add(serverProjectTreeItem);
+          serverProjectTreeItem.Parent = serverProject;
         }
       }
 

diff --git a/src/Soloplan.WhatsON.GUI.Common/IAdditionalWindowSettingsSupport.cs b/src/Soloplan.WhatsON.GUI.Common/IAdditionalWindowSettingsSupport.cs
@@ -0,0 +1,29 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="IAdditionalWindowSettingsSupport.cs" company="Soloplan GmbH">
+//   Copyright (c) Soloplan GmbH. All rights reserved.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace Soloplan.WhatsON.GUI.Common
+{
+  using System.Windows;
+  using Soloplan.WhatsON.GUI.Common.VisualConfig;
+
+  /// <summary>
+  /// Adds support for storing additional window settings values.
+  /// </summary>
+  public interface IAdditionalWindowSettingsSupport
+  {
+    /// <summary>
+    /// Applies the additional window settings to the <see cref="Window"/> instance.
+    /// </summary>
+    /// <param name="getAdditionalSettingValue">The get additional setting value.</param>
+    void Apply(WindowSettings.GetAdditionalSettingValueDelegate getAdditionalSettingValue);
+
+    /// <summary>
+    /// Parses the specified additional setting values from <see cref="Window"/> instance on which the interface is implemented.
+    /// </summary>
+    /// <param name="setAdditionalSettingValue">The set additional setting value.</param>
+    void Parse(WindowSettings.SetAdditionalSettingValueDelegate setAdditionalSettingValue);
+  }
+}
diff --git a/src/Soloplan.WhatsON.GUI.Common/Soloplan.WhatsON.GUI.Common.csproj b/src/Soloplan.WhatsON.GUI.Common/Soloplan.WhatsON.GUI.Common.csproj
@@ -77,6 +77,7 @@
     <Compile Include="Converters\InvertBooleanConverter.cs" />
     <Compile Include="Converters\InvertBooleanToVisibilityConverter.cs" />
     <Compile Include="Converters\NullOrDefaultToVisibilityConverter.cs" />
+    <Compile Include="IAdditionalWindowSettingsSupport.cs" />
     <Compile Include="OpenWebPageCommand.cs" />
     <Compile Include="PresentationPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

diff --git a/src/Soloplan.WhatsON.GUI.Common/VisualConfig/MainWindowSettings.cs b/src/Soloplan.WhatsON.GUI.Common/VisualConfig/MainWindowSettings.cs
@@ -27,6 +27,8 @@ public class MainWindowSettings
 
     public WindowSettings ConfigDialogSettings { get; set; }
 
+    public WindowSettings WizardDialogSettings { get; set; } = new WindowSettings();
+
     public ColorSettings ColorSettings { get; set; }
   }
 }
diff --git a/src/Soloplan.WhatsON.GUI.Common/VisualConfig/WindowSettings.cs b/src/Soloplan.WhatsON.GUI.Common/VisualConfig/WindowSettings.cs
@@ -7,24 +7,87 @@
 
 namespace Soloplan.WhatsON.GUI.Common.VisualConfig
 {
+  using System.Collections.Generic;
+  using System.Linq;
   using System.Windows;
 
   public class WindowSettings
   {
-    public double Width { get; set; }
+    /// <summary>
+    /// The delegate used to get additional settings values to apply them to window.
+    /// </summary>
+    /// <param name="key">The key.</param>
+    /// <param name="defaultValue">The default value.</param>
+    /// <returns>The setting value.</returns>
+    public delegate string GetAdditionalSettingValueDelegate(string key, string defaultValue);
 
-    public double Height { get; set; }
+    /// <summary>
+    /// The delegate used to set additional settings values based on window.
+    /// </summary>
+    /// <param name="key">The key.</param>
+    /// <param name="value">The value.</param>
+    public delegate void SetAdditionalSettingValueDelegate(string key, string value);
+
+    public double? Width { get; set; }
+
+    public double? Height { get; set; }
+
+    public IList<KeyValuePair<string, string>> AdditionalSettingsStore { get; set; }
 
     public void Apply(Window window)
     {
-      window.Width = this.Width;
-      window.Height = this.Height;
+      if (this.Width.HasValue)
+      {
+        window.Width = this.Width.Value;
+      }
+
+      if (this.Height.HasValue)
+      {
+        window.Height = this.Height.Value;
+      }
+
+      if (window is IAdditionalWindowSettingsSupport additionalSettingsWindow)
+      {
+        additionalSettingsWindow.Apply(this.GetAdditionalSettingValue);
+      }
+    }
+
+    public string GetAdditionalSettingValue(string key, string defaultValue)
+    {
+      if (this.AdditionalSettingsStore == null)
+      {
+        return defaultValue;
+      }
+
+      var records = this.AdditionalSettingsStore.Where(a => a.Key == key).ToList();
+      return records.Count == 0 ? defaultValue : records.First().Value;
+    }
+
+    public void SetAdditionalSettingValue(string key, string value)
+    {
+      if (this.AdditionalSettingsStore == null)
+      {
+        this.AdditionalSettingsStore = new List<KeyValuePair<string, string>>();
+      }
+
+      var records = this.AdditionalSettingsStore.Where(a => a.Key == key).ToList();
+      if (records.Count == 1)
+      {
+        this.AdditionalSettingsStore.Remove(records.First());
+      }
+
+      this.AdditionalSettingsStore.Add(new KeyValuePair<string, string>(key, value));
     }
 
     public WindowSettings Parse(Window window)
     {
       this.Width = window.Width;
       this.Height = window.Height;
+      if (window is IAdditionalWindowSettingsSupport additionalSettingsWindow)
+      {
+        additionalSettingsWindow.Parse(this.SetAdditionalSettingValue);
+      }
+
       return this;
     }
   }

diff --git a/src/Soloplan.WhatsON.GUI/Configuration/View/ConfigWindow.xaml.cs b/src/Soloplan.WhatsON.GUI/Configuration/View/ConfigWindow.xaml.cs
@@ -14,6 +14,7 @@ namespace Soloplan.WhatsON.GUI.Configuration.View
   using System.Windows.Forms;
   using Soloplan.WhatsON.Composition;
   using Soloplan.WhatsON.Configuration;
+  using Soloplan.WhatsON.GUI.Common.VisualConfig;
   using Soloplan.WhatsON.GUI.Configuration.ViewModel;
   using Soloplan.WhatsON.Model;
   using Application = System.Windows.Application;
@@ -53,6 +54,11 @@ public partial class ConfigWindow : Window
     /// </summary>
     private readonly ConnectorPlugin newConnectorPlugin;
 
+    /// <summary>
+    /// The wizard dialog settings.
+    /// </summary>
+    private readonly WindowSettings wizardDialogSettings;
+
     /// <summary>
     /// The configuration source.
     /// </summary>
@@ -79,12 +85,14 @@ public partial class ConfigWindow : Window
     private bool windowShown;
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="ConfigWindow"/> class.
+    /// Initializes a new instance of the <see cref="ConfigWindow" /> class.
     /// </summary>
     /// <param name="configuration">The configuration.</param>
-    public ConfigWindow(ApplicationConfiguration configuration)
+    /// <param name="wizardDialogSettings">The wizard dialog settings.</param>
+    public ConfigWindow(ApplicationConfiguration configuration, WindowSettings wizardDialogSettings)
     {
       this.configurationSource = configuration;
+      this.wizardDialogSettings = wizardDialogSettings;
       this.configurationViewModel.Load(configuration);
       this.configurationViewModel.SingleConnectorMode = false;
       this.DataContext = this.configurationViewModel;
@@ -100,12 +108,13 @@ public ConfigWindow(ApplicationConfiguration configuration)
     }
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="ConfigWindow"/> class.
+    /// Initializes a new instance of the <see cref="ConfigWindow" /> class.
     /// </summary>
     /// <param name="configuration">The configuration.</param>
     /// <param name="initialFocusedConnector">The connector focused on initialization.</param>
-    public ConfigWindow(ApplicationConfiguration configuration, Connector initialFocusedConnector)
-      : this(configuration)
+    /// <param name="wizardDialogSettings">The wizard dialog settings.</param>
+    public ConfigWindow(ApplicationConfiguration configuration, Connector initialFocusedConnector, WindowSettings wizardDialogSettings)
+      : this(configuration, wizardDialogSettings)
     {
       this.initialFocusedConnector = initialFocusedConnector;
       this.configurationViewModel.SingleConnectorMode = true;
@@ -118,8 +127,9 @@ public ConfigWindow(ApplicationConfiguration configuration, Connector initialFoc
     /// </summary>
     /// <param name="configuration">The configuration.</param>
     /// <param name="newConnectorPlugin">The new connector plugin.</param>
-    public ConfigWindow(ApplicationConfiguration configuration, ConnectorPlugin newConnectorPlugin)
-      : this(configuration)
+    /// <param name="wizardDialogSettings">The wizard dialog settings.</param>
+    public ConfigWindow(ApplicationConfiguration configuration, ConnectorPlugin newConnectorPlugin, WindowSettings wizardDialogSettings)
+      : this(configuration, wizardDialogSettings)
     {
       this.newConnectorPlugin = newConnectorPlugin;
       this.configurationViewModel.SingleConnectorMode = true;
@@ -204,15 +214,15 @@ private void ListBoxSelectionChanged(object sender, SelectionChangedEventArgs e)
           {
             if (!this.configurationViewModel.SingleConnectorMode)
             {
-              this.connectorPage = new ConnectorsPage(this.configurationViewModel.Connectors, this, this.configurationSource);
+              this.connectorPage = new ConnectorsPage(this.configurationViewModel.Connectors, this, this.configurationSource, this.wizardDialogSettings);
             }
             else if (this.initialFocusedConnector != null)
             {
-              this.connectorPage = new ConnectorsPage(this.configurationViewModel.Connectors, this, this.initialFocusedConnector, this.configurationSource);
+              this.connectorPage = new ConnectorsPage(this.configurationViewModel.Connectors, this, this.initialFocusedConnector, this.configurationSource, this.wizardDialogSettings);
             }
             else
             {
-              this.connectorPage = new ConnectorsPage(this.configurationViewModel.Connectors, this, this.newConnectorPlugin, this.configurationSource);
+              this.connectorPage = new ConnectorsPage(this.configurationViewModel.Connectors, this, this.newConnectorPlugin, this.configurationSource, this.wizardDialogSettings);
             }
           }
 

diff --git a/src/Soloplan.WhatsON.GUI/Configuration/View/ConnectorsConfigPage.xaml.cs b/src/Soloplan.WhatsON.GUI/Configuration/View/ConnectorsConfigPage.xaml.cs
@@ -8,7 +8,6 @@
 namespace Soloplan.WhatsON.GUI.Configuration.View
 {
   using System;
-  using System.Collections.Generic;
   using System.ComponentModel;
   using System.Linq;
   using System.Runtime.CompilerServices;
@@ -18,6 +17,7 @@ namespace Soloplan.WhatsON.GUI.Configuration.View
   using MaterialDesignThemes.Wpf;
   using Soloplan.WhatsON.Composition;
   using Soloplan.WhatsON.Configuration;
+  using Soloplan.WhatsON.GUI.Common.VisualConfig;
   using Soloplan.WhatsON.GUI.Configuration.ViewModel;
   using Soloplan.WhatsON.GUI.Configuration.Wizard;
   using Soloplan.WhatsON.Model;
@@ -34,6 +34,11 @@ public partial class ConnectorsPage : Page, INotifyPropertyChanged
 
     private readonly ApplicationConfiguration config;
 
+    /// <summary>
+    /// The wizard dialog settings.
+    /// </summary>
+    private readonly WindowSettings wizardDialogSettings;
+
     /// <summary>
     /// The current connector.
     /// </summary>
@@ -50,8 +55,10 @@ public partial class ConnectorsPage : Page, INotifyPropertyChanged
     /// <param name="connectors">The connectors.</param>
     /// <param name="ownerWindow">The owner <see cref="Window" />.</param>
     /// <param name="initialFocusedConnector">The initial focused connector.</param>
-    public ConnectorsPage(ConnectorViewModelCollection connectors, Window ownerWindow, Connector initialFocusedConnector, ApplicationConfiguration config)
-     : this(connectors, ownerWindow, config)
+    /// <param name="config">The configuration.</param>
+    /// <param name="wizardDialogSettings">The wizard dialog settings.</param>
+    public ConnectorsPage(ConnectorViewModelCollection connectors, Window ownerWindow, Connector initialFocusedConnector, ApplicationConfiguration config, WindowSettings wizardDialogSettings)
+     : this(connectors, ownerWindow, config, wizardDialogSettings)
     {
       this.CurrentConnector = this.Connectors.FirstOrDefault(c => c.SourceConnectorConfiguration == initialFocusedConnector.Configuration);
       this.InitilizeConnectorNameTextEditBinding();
@@ -64,8 +71,10 @@ public ConnectorsPage(ConnectorViewModelCollection connectors, Window ownerWindo
     /// <param name="connectors">The connectors.</param>
     /// <param name="ownerWindow">The owner <see cref="Window" />.</param>
     /// <param name="newConnectorPlugin">The new connector plugin.</param>
-    public ConnectorsPage(ConnectorViewModelCollection connectors, Window ownerWindow, ConnectorPlugin newConnectorPlugin, ApplicationConfiguration config)
-      : this(connectors, ownerWindow, config)
+    /// <param name="config">The configuration.</param>
+    /// <param name="wizardDialogSettings">The wizard dialog settings.</param>
+    public ConnectorsPage(ConnectorViewModelCollection connectors, Window ownerWindow, ConnectorPlugin newConnectorPlugin, ApplicationConfiguration config, WindowSettings wizardDialogSettings)
+      : this(connectors, ownerWindow, config, wizardDialogSettings)
     {
       var newConnector = new ConnectorViewModel();
 
@@ -84,11 +93,14 @@ public ConnectorsPage(ConnectorViewModelCollection connectors, Window ownerWindo
     /// </summary>
     /// <param name="connectors">The connectors.</param>
     /// <param name="ownerWindow">The owner <see cref="Window" />.</param>
-    public ConnectorsPage(ConnectorViewModelCollection connectors, Window ownerWindow, ApplicationConfiguration config)
+    /// <param name="config">The configuration.</param>
+    /// <param name="wizardDialogSettings">The wizard dialog settings.</param>
+    public ConnectorsPage(ConnectorViewModelCollection connectors, Window ownerWindow, ApplicationConfiguration config, WindowSettings wizardDialogSettings)
     {
       this.ownerWindow = ownerWindow;
       this.Connectors = connectors;
       this.config = config;
+      this.wizardDialogSettings = wizardDialogSettings;
       this.DataContext = this;
       this.InitializeComponent();
       this.Connectors.Loaded -= this.ConnectorsLoaded;
@@ -283,7 +295,7 @@ private async void AddConnectorClick(object sender, System.Windows.RoutedEventAr
     /// <param name="e">The <see cref="System.Windows.RoutedEventArgs"/> instance containing the event data.</param>
     private void EditInWizardClick(object sender, System.Windows.RoutedEventArgs e)
     {
-      var wizardController = new WizardController(this.ownerWindow, this.config);
+      var wizardController = new WizardController(this.ownerWindow, this.config, this.wizardDialogSettings);
       if (wizardController.Start(this.CurrentConnector))
       {
         var selectedProjects = wizardController.GetSelectedProjects();
@@ -303,7 +315,7 @@ private void EditInWizardClick(object sender, System.Windows.RoutedEventArgs e)
     /// <param name="e">The <see cref="System.Windows.RoutedEventArgs"/> instance containing the event data.</param>
     private void NewInWizardClick(object sender, System.Windows.RoutedEventArgs e)
     {
-      var wizardController = new WizardController(this.ownerWindow, this.config);
+      var wizardController = new WizardController(this.ownerWindow, this.config, this.wizardDialogSettings);
       wizardController.MultiSelectionMode = false;
       var result = false;
       try

diff --git a/src/Soloplan.WhatsON.GUI/Configuration/Wizard/GrouppingSetting.cs b/src/Soloplan.WhatsON.GUI/Configuration/Wizard/GrouppingSetting.cs
@@ -0,0 +1,35 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="GrouppingSetting.cs" company="Soloplan GmbH">
+//   Copyright (c) Soloplan GmbH. All rights reserved.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace Soloplan.WhatsON.GUI.Configuration.Wizard
+{
+  /// <summary>
+  /// The grouping settings item.
+  /// </summary>
+  public class GrouppingSetting
+  {
+    /// <summary>
+    /// Initializes a new instance of the <see cref="GrouppingSetting"/> class.
+    /// </summary>
+    /// <param name="caption">The caption.</param>
+    /// <param name="id">The identifier.</param>
+    public GrouppingSetting(string caption, string id)
+    {
+      this.Caption = caption;
+      this.Id = id;
+    }
+
+    /// <summary>
+    /// Gets the caption.
+    /// </summary>
+    public string Caption { get; }
+
+    /// <summary>
+    /// Gets the identifier.
+    /// </summary>
+    public string Id { get; }
+  }
+}