From 23e4002f526445a93c70cdfaec6cfcf3aeb16aeb Mon Sep 17 00:00:00 2001
From: Kapu <kapu1500@gmail.com>
Date: Tue, 14 Jun 2022 23:21:48 +0200
Subject: [PATCH] Settings window + ScriptConfigs add/remove

---
 .../ScriptRunner.GUI/ScriptRunner.GUI.csproj  | 16 +++--
 .../Settings/AppSettingsService.cs            | 17 ++++-
 .../Settings/ScriptRunnerAppSettings.cs       |  3 +-
 .../ViewModels/MainWindowViewModel.cs         |  8 +++
 .../ViewModels/SettingsWindowViewModel.cs     | 67 +++++++++++++++++++
 .../Views/FilePicker.axaml.cs                 | 20 +++++-
 .../ScriptRunner.GUI/Views/MainWindow.axaml   | 11 ++-
 .../Views/MainWindow.axaml.cs                 |  1 +
 .../Views/SettingsWindow.axaml                | 50 ++++++++++++++
 .../Views/SettingsWindow.axaml.cs             | 24 +++++++
 10 files changed, 200 insertions(+), 17 deletions(-)
 create mode 100644 src/ScriptRunner/ScriptRunner.GUI/ViewModels/SettingsWindowViewModel.cs
 create mode 100644 src/ScriptRunner/ScriptRunner.GUI/Views/SettingsWindow.axaml
 create mode 100644 src/ScriptRunner/ScriptRunner.GUI/Views/SettingsWindow.axaml.cs

diff --git a/src/ScriptRunner/ScriptRunner.GUI/ScriptRunner.GUI.csproj b/src/ScriptRunner/ScriptRunner.GUI/ScriptRunner.GUI.csproj
index b620840..258d77b 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/ScriptRunner.GUI.csproj
+++ b/src/ScriptRunner/ScriptRunner.GUI/ScriptRunner.GUI.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
@@ -8,8 +8,7 @@
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
   </PropertyGroup>
   <ItemGroup>
-    <Folder Include="Models\" />
-    <AvaloniaResource Include="Assets\**" />
+	<AvaloniaResource Include="Assets\**" />
     <Folder Include="ScriptReader\" />
     <None Remove=".gitignore" />
     <None Remove="Themes\DarkTheme.xaml" />
@@ -27,11 +26,14 @@
     <TrimmableAssembly Include="Avalonia.Themes.Default" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.13" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.13" />
+    <PackageReference Include="Avalonia" Version="0.10.14" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.14" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.13" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.13" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.14" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.14" />
+    <PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.14" />
+    <PackageReference Include="Avalonia.Xaml.Interactions" Version="0.10.14" />
+    <PackageReference Include="Avalonia.Xaml.Interactivity" Version="0.10.14" />
     <PackageReference Include="CliWrap" Version="3.4.4" />
     <PackageReference Include="Projektanker.Icons.Avalonia" Version="4.4.0" />
     <PackageReference Include="Projektanker.Icons.Avalonia.FontAwesome" Version="4.4.0" />
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Settings/AppSettingsService.cs b/src/ScriptRunner/ScriptRunner.GUI/Settings/AppSettingsService.cs
index 42a377c..9460513 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Settings/AppSettingsService.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/Settings/AppSettingsService.cs
@@ -2,10 +2,11 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Text.Json;
 
-namespace ScriptRunner.GUI;
+namespace ScriptRunner.GUI.Settings;
 
 public class AppSettingsService
 {
@@ -63,6 +64,20 @@ public static void UpdateLayoutSettings(Action<LayoutSettings> updateSettings)
         Debug.WriteLine($"Width: {allSettings.Layout.Width}, Height: {allSettings.Layout.Height}, L: {allSettings.Layout.ActionsPanelWidth}, M: {allSettings.Layout.RunningJobsPanelHeight}");
     }
 
+    public static void RemoveScriptConfig(string scriptPath)
+    {
+        var allSettings = Load();
+        allSettings.ConfigScripts.Remove(scriptPath);
+        Save(allSettings);
+    }
+
+    public static void UpdateScriptConfigs(IEnumerable<string> configScripts)
+    {
+        var allSettings = Load();
+        allSettings.ConfigScripts = configScripts.ToList();
+        Save(allSettings);
+    }
+
     private static string GetSettingsPath()
     {
         var path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "ScriptRunner");
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Settings/ScriptRunnerAppSettings.cs b/src/ScriptRunner/ScriptRunner.GUI/Settings/ScriptRunnerAppSettings.cs
index 3118dae..3e2ecb5 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Settings/ScriptRunnerAppSettings.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/Settings/ScriptRunnerAppSettings.cs
@@ -6,7 +6,8 @@ public class ScriptRunnerAppSettings
 {
     public LayoutSettings? Layout { get; set; }
     public Dictionary<string, CommandInstallationStatus> InstalledActions { get; set; }
-    
+    public List<string> ConfigScripts { get; set; }
+
 }
 
 public class CommandInstallationStatus
diff --git a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs
index d5e9718..57207df 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs
@@ -5,6 +5,8 @@
 using ReactiveUI;
 using ScriptRunner.GUI.ScriptConfigs;
 using ScriptRunner.GUI.ScriptReader;
+using ScriptRunner.GUI.Settings;
+using ScriptRunner.GUI.Views;
 
 namespace ScriptRunner.GUI.ViewModels;
 
@@ -151,6 +153,12 @@ public void InstallScript()
         }
     }
 
+    public void OpenSettingsWindow()
+    {
+        var window = new SettingsWindow();
+        window.Show();
+    }
+
     public bool SelectedActionInstalled
     {
         get => _selectedActionInstalled;
diff --git a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/SettingsWindowViewModel.cs b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/SettingsWindowViewModel.cs
new file mode 100644
index 0000000..b20c547
--- /dev/null
+++ b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/SettingsWindowViewModel.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using ReactiveUI;
+using ScriptRunner.GUI.Settings;
+using ScriptRunner.GUI.Views;
+
+namespace ScriptRunner.GUI.ViewModels;
+
+public class SettingsWindowViewModel : ViewModelBase
+{
+    /// <summary>
+    /// Contains records of configuration scripts loaded from settings file
+    /// </summary>
+    private ObservableCollection<ConfigScriptFileRow> _configScriptFiles;
+
+    public ObservableCollection<ConfigScriptFileRow> ConfigScriptFiles
+    {
+        get => _configScriptFiles;
+        private set => this.RaiseAndSetIfChanged(ref _configScriptFiles, value);
+    }
+
+    public SettingsWindowViewModel()
+    {
+        var configScripts = AppSettingsService.Load().ConfigScripts;
+        ConfigScriptFiles =
+            new ObservableCollection<ConfigScriptFileRow>(configScripts.Select(path => new ConfigScriptFileRow(path, SaveConfigScripts)));
+    }
+
+    public void AddNewConfigScriptRow()
+    {
+        ConfigScriptFiles.Add(new ConfigScriptFileRow(string.Empty, SaveConfigScripts));
+    }
+
+    public void RemoveConfigScript(ConfigScriptFileRow configScriptFileRow)
+    {
+        AppSettingsService.RemoveScriptConfig(configScriptFileRow.Path);
+        ConfigScriptFiles.Remove(configScriptFileRow);
+    }
+
+    private void SaveConfigScripts()
+    {
+        AppSettingsService.UpdateScriptConfigs(ConfigScriptFiles.Select(q => q.Path));
+    }
+}
+
+public class ConfigScriptFileRow
+{
+    public string Path { get; set; }
+
+    // TODO: Check if file path is correct and mark this flag
+    public bool Exists { get; set; }
+
+    public Action UpdateConfigScriptEntry;
+
+    public ConfigScriptFileRow(string path, Action updateConfigScriptEntry)
+    {
+        Path = path;
+        UpdateConfigScriptEntry = updateConfigScriptEntry;
+    }
+
+    private void OnFilePicked(FilePickedArgs args)
+    {
+        Path = args.Path;
+        UpdateConfigScriptEntry.Invoke();
+    }
+}
\ No newline at end of file
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/FilePicker.axaml.cs b/src/ScriptRunner/ScriptRunner.GUI/Views/FilePicker.axaml.cs
index f1c2ed9..0610fbe 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Views/FilePicker.axaml.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/FilePicker.axaml.cs
@@ -1,3 +1,4 @@
+using System;
 using System.IO;
 using System.Linq;
 using Avalonia;
@@ -5,6 +6,7 @@
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
+using Avalonia.VisualTree;
 
 namespace ScriptRunner.GUI.Views
 {
@@ -21,7 +23,8 @@ private void InitializeComponent()
         }
 
         public static readonly DirectProperty<FilePicker, string> FilePathProperty = AvaloniaProperty.RegisterDirect<FilePicker, string>(nameof(FilePath), picker => picker.FindControl<TextBox>("FilePathTextBox").Text, (picker, s) => picker.FindControl<TextBox>("FilePathTextBox").Text = s);
-            
+
+        public event EventHandler? OnFilePicked;
 
         public string FilePath
         {
@@ -33,6 +36,8 @@ private void ChangeFileClick(object? sender, RoutedEventArgs e)
         {
             if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
             {
+                var sourceWindow = (sender as IControl)?.GetVisualRoot() as Window ?? desktop.MainWindow;
+
                 var dialog = new OpenFileDialog();
                 if (string.IsNullOrWhiteSpace(FilePath) == false && Path.GetDirectoryName(FilePath) is { } dir)
                 {
@@ -43,12 +48,23 @@ private void ChangeFileClick(object? sender, RoutedEventArgs e)
                 
                 dialog.AllowMultiple = false;
                 
-                var result = dialog.ShowAsync(desktop.MainWindow).GetAwaiter().GetResult();
+                var result = dialog.ShowAsync(sourceWindow).GetAwaiter().GetResult();
                 if (result?.FirstOrDefault() is { } file)
                 {
                     FilePath = file;
+                    OnFilePicked?.Invoke(this, new FilePickedArgs(file));
                 }
             }
         }
     }
+
+    public class FilePickedArgs : EventArgs
+    {
+        public string Path { get; }
+
+        public FilePickedArgs(string path)
+        {
+            Path = path;
+        }
+    }
 }
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/MainWindow.axaml b/src/ScriptRunner/ScriptRunner.GUI/Views/MainWindow.axaml
index 3b4625a..847c951 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Views/MainWindow.axaml
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/MainWindow.axaml
@@ -27,7 +27,7 @@
             <RowDefinition Height="300" ></RowDefinition>
         </Grid.RowDefinitions>
 
-        <DockPanel Grid.Column="0" Classes="actionsMenu" >
+		<DockPanel Grid.Column="0" Classes="actionsMenu" LastChildFill="True">
             <!-- List of available actions, selectable -->
             <StackPanel DockPanel.Dock="Top" >
                 <ListBox Items="{Binding Actions}" SelectedItem="{Binding SelectedAction, Mode=TwoWay}">
@@ -39,11 +39,10 @@
                 </ListBox>
             </StackPanel>
 
-			<!-- Settings button, for future use :D -->
-            <!--<StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
-                <Button i:Attached.Icon="fas fa-cog">
-                </Button>
-            </StackPanel>-->
+            <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" VerticalAlignment="Bottom">
+                <Button i:Attached.Icon="fas fa-cog" Height="35" Width="50" FontSize="18"
+                        Command="{Binding OpenSettingsWindow}" />
+            </StackPanel>
         </DockPanel>
 
         <GridSplitter Grid.Column="1" Grid.Row="0" ResizeDirection="Columns"></GridSplitter>
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/MainWindow.axaml.cs b/src/ScriptRunner/ScriptRunner.GUI/Views/MainWindow.axaml.cs
index dfd062e..e35f9a7 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Views/MainWindow.axaml.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/MainWindow.axaml.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Layout;
+using ScriptRunner.GUI.Settings;
 using static System.Double;
 
 namespace ScriptRunner.GUI.Views;
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/SettingsWindow.axaml b/src/ScriptRunner/ScriptRunner.GUI/Views/SettingsWindow.axaml
new file mode 100644
index 0000000..4e4ef13
--- /dev/null
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/SettingsWindow.axaml
@@ -0,0 +1,50 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:vm="clr-namespace:ScriptRunner.GUI.ViewModels"
+        xmlns:views="clr-namespace:ScriptRunner.GUI.Views"
+        xmlns:avalonia="clr-namespace:Projektanker.Icons.Avalonia;assembly=Projektanker.Icons.Avalonia"
+        mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="450"
+        Width="600" Height="450"
+        x:Class="ScriptRunner.GUI.Views.SettingsWindow"
+        Title="Settings"
+        Icon="/Assets/avalonia-logo.ico"
+        FontFamily="Segoe UI Variable">
+    <Design.DataContext>
+        <vm:SettingsWindowViewModel />
+    </Design.DataContext>
+
+    <StackPanel Orientation="Vertical" Margin="5">
+        <TextBlock Classes="h2" Text="Config sources:" Margin="0, 5"/>
+        <ItemsControl Items="{Binding ConfigScriptFiles}">
+			<ItemsControl.ItemTemplate>
+                <DataTemplate>
+						<Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="100" />
+                            </Grid.ColumnDefinitions>
+                            <views:FilePicker Grid.Column="0" Name="FilePicker" FilePath="{Binding Path}">
+                                <Interaction.Behaviors>
+                                    <EventTriggerBehavior EventName="OnFilePicked" SourceObject="{Binding #FilePicker}">
+                                        <InvokeCommandAction Command="{Binding OnFilePicked}" PassEventArgsToCommand="True"/>
+                                    </EventTriggerBehavior>
+                                </Interaction.Behaviors>
+                            </views:FilePicker>
+                            <Button Grid.Column="1" avalonia:Attached.Icon="fa fa-trash" FontSize="18" Margin="10,0"
+                                    Command="{Binding DataContext.RemoveConfigScript, RelativeSource={RelativeSource AncestorType={x:Type views:SettingsWindow}}}"
+                                    CommandParameter="{Binding}"/>
+						</Grid>
+                </DataTemplate>
+			</ItemsControl.ItemTemplate>
+        </ItemsControl>
+        <Button Command="{Binding AddNewConfigScriptRow}">
+            <StackPanel Orientation="Horizontal">
+                <avalonia:Icon Value="fa fa-plus" Margin="4,0"/>
+				<TextBlock>Add new config script</TextBlock>
+            </StackPanel>
+        </Button>
+	</StackPanel>
+
+</Window>
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/SettingsWindow.axaml.cs b/src/ScriptRunner/ScriptRunner.GUI/Views/SettingsWindow.axaml.cs
new file mode 100644
index 0000000..6601ea0
--- /dev/null
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/SettingsWindow.axaml.cs
@@ -0,0 +1,24 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using ScriptRunner.GUI.ViewModels;
+
+namespace ScriptRunner.GUI.Views
+{
+    public partial class SettingsWindow : Window
+    {
+        public SettingsWindow()
+        {
+            InitializeComponent();
+            DataContext = new SettingsWindowViewModel();
+#if DEBUG
+            this.AttachDevTools();
+#endif
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}