From e8dc83a596efe284bd524f2c386f139e95c67c99 Mon Sep 17 00:00:00 2001
From: Brett Hewitson <bletch1971@hotmail.com>
Date: Fri, 17 Dec 2021 16:17:45 +1000
Subject: [PATCH] Added Alias validation

---
 .../UserControls/ServerSettingsControl.xaml   | 18 ++++++++++++++++-
 src/ARKServerManager/Windows/MainWindow.xaml  | 20 +++++++++----------
 .../UserControls/ServerSettingsControl.xaml   | 18 ++++++++++++++++-
 .../Windows/MainWindow.xaml                   | 18 ++++++++---------
 4 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml
index c55acc17..b845570c 100644
--- a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml
+++ b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml
@@ -1619,7 +1619,23 @@
                                 <TextBox Grid.Row="0" Grid.Column="1" Margin="1" Text="{Binding DiscordChannelId, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_DiscordBotChannelTooltip}" VerticalContentAlignment="Center" />
 
                                 <Label Grid.Row="0" Grid.Column="2" Content="{DynamicResource ServerSettings_DiscordAliasLabel}" ToolTip="{DynamicResource ServerSettings_DiscordAliasTooltip}" VerticalAlignment="Center"/>
-                                <TextBox Grid.Row="0" Grid.Column="3" Margin="1" Text="{Binding DiscordAlias, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_DiscordAliasTooltip}" VerticalContentAlignment="Center" />
+                                <TextBox Grid.Row="0" Grid.Column="3" Margin="1" ToolTip="{DynamicResource ServerSettings_DiscordAliasTooltip}" VerticalContentAlignment="Center">
+                                    <Validation.ErrorTemplate>
+                                        <ControlTemplate>
+                                            <StackPanel>
+                                                <AdornedElementPlaceholder x:Name="textBox"/>
+                                                <TextBlock Text="{Binding [0].ErrorContent}" Background="Red" Foreground="White"/>
+                                            </StackPanel>
+                                        </ControlTemplate>
+                                    </Validation.ErrorTemplate>
+                                    <TextBox.Text>
+                                        <Binding Path="DiscordAlias" Mode="TwoWay">
+                                            <Binding.ValidationRules>
+                                                <cvr:StringNoSpacesValidationRule ValidatesOnTargetUpdated="true" />
+                                            </Binding.ValidationRules>
+                                        </Binding>
+                                    </TextBox.Text>
+                                </TextBox>
 
                                 <CheckBox Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Margin="5,5,5,0" IsChecked="{Binding AllowDiscordBackup, Mode=TwoWay}" Content="{DynamicResource ServerSettings_AllowDiscordBackupLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowDiscordBackupTooltip}"/>
                                 <CheckBox Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="2" Margin="5,5,5,0" IsChecked="{Binding AllowDiscordUpdate, Mode=TwoWay}" Content="{DynamicResource ServerSettings_AllowDiscordUpdateLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowDiscordUpdateTooltip}"/>
diff --git a/src/ARKServerManager/Windows/MainWindow.xaml b/src/ARKServerManager/Windows/MainWindow.xaml
index cbaf9329..5fda1e81 100644
--- a/src/ARKServerManager/Windows/MainWindow.xaml
+++ b/src/ARKServerManager/Windows/MainWindow.xaml
@@ -9,7 +9,7 @@
         xmlns:cvr="clr-namespace:ServerManagerTool.Common.ValidationRules;assembly=ServerManager.Common"
         xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
         xmlns:enum="clr-namespace:ServerManagerTool.Enums"
-        xmlns:bot="clr-namespace:ServerManagerTool.DiscordBot;assembly=ServerManager.Discord"
+        xmlns:botenum="clr-namespace:ServerManagerTool.DiscordBot.Enums;assembly=ServerManager.Discord"
         MinWidth="900" MinHeight="600" Width="1100" Height="900" Left="50" Top="50" WindowState="Normal"
         Loaded="MainWindow_Loaded" SizeChanged="MainWindow_SizeChanged" StateChanged="MainWindow_StateChanged" LocationChanged="MainWindow_LocationChanged"
         Name="Main" Icon="../Art/favicon.ico" Title="{DynamicResource MainWindow_Title}">
@@ -146,7 +146,7 @@
                                         <Setter Property="Foreground" Value="White"/>
                                         <Style.Triggers>
                                             <DataTrigger Binding="{Binding AutoBackupState}" Value="{x:Static tsk:TaskState.Disabled}">
-                                                <Setter Property="Foreground" Value="DarkRed"/>
+                                                <Setter Property="Foreground" Value="Orange"/>
                                             </DataTrigger>
                                             <DataTrigger Binding="{Binding AutoBackupState}" Value="{x:Static tsk:TaskState.Ready}">
                                                 <Setter Property="Foreground" Value="White"/>
@@ -207,7 +207,7 @@
                                         <Setter Property="Foreground" Value="White"/>
                                         <Style.Triggers>
                                             <DataTrigger Binding="{Binding AutoUpdateState}" Value="{x:Static tsk:TaskState.Disabled}">
-                                                <Setter Property="Foreground" Value="DarkRed"/>
+                                                <Setter Property="Foreground" Value="Orange"/>
                                             </DataTrigger>
                                             <DataTrigger Binding="{Binding AutoUpdateState}" Value="{x:Static tsk:TaskState.Ready}">
                                                 <Setter Property="Foreground" Value="White"/>
@@ -267,13 +267,13 @@
                                     <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="{x:Type Label}">
                                         <Setter Property="Foreground" Value="White"/>
                                         <Style.Triggers>
-                                            <DataTrigger Binding="{Binding DiscordBotState}" Value="{x:Static bot:Enums.BotState.Disabled}">
-                                                <Setter Property="Foreground" Value="DarkRed"/>
+                                            <DataTrigger Binding="{Binding DiscordBotState}" Value="{x:Static botenum:BotState.Disabled}">
+                                                <Setter Property="Foreground" Value="Orange"/>
                                             </DataTrigger>
-                                            <DataTrigger Binding="{Binding DiscordBotState}" Value="{x:Static bot:Enums.BotState.Stopped}">
+                                            <DataTrigger Binding="{Binding DiscordBotState}" Value="{x:Static botenum:BotState.Stopped}">
                                                 <Setter Property="Foreground" Value="White"/>
                                             </DataTrigger>
-                                            <DataTrigger Binding="{Binding DiscordBotState}" Value="{x:Static bot:Enums.BotState.Running}">
+                                            <DataTrigger Binding="{Binding DiscordBotState}" Value="{x:Static botenum:BotState.Running}">
                                                 <Setter Property="Foreground" Value="LightGreen"/>
                                             </DataTrigger>
                                         </Style.Triggers>
@@ -291,7 +291,7 @@
                                         <Style.Triggers>
                                             <MultiDataTrigger>
                                                 <MultiDataTrigger.Conditions>
-                                                    <Condition Binding="{Binding DiscordBotState}" Value="{x:Static bot:Enums.BotState.Stopped}"/>
+                                                    <Condition Binding="{Binding DiscordBotState}" Value="{x:Static botenum:BotState.Stopped}"/>
                                                 </MultiDataTrigger.Conditions>
                                                 <Setter Property="Background" Value="#00AA00"/>
                                                 <Setter Property="Foreground" Value="White"/>
@@ -301,7 +301,7 @@
                                             </MultiDataTrigger>
                                             <MultiDataTrigger>
                                                 <MultiDataTrigger.Conditions>
-                                                    <Condition Binding="{Binding DiscordBotState}" Value="{x:Static bot:Enums.BotState.Running}"/>
+                                                    <Condition Binding="{Binding DiscordBotState}" Value="{x:Static botenum:BotState.Running}"/>
                                                 </MultiDataTrigger.Conditions>
                                                 <Setter Property="Background" Value="#AA8A00"/>
                                                 <Setter Property="Foreground" Value="White"/>
@@ -460,7 +460,7 @@
                                             <Setter Property="Foreground" Value="Black"/>
                                             <Style.Triggers>
                                                 <DataTrigger Binding="{Binding Profile.SOTF_Enabled}" Value="True">
-                                                    <Setter Property="Foreground" Value="DarkRed"/>
+                                                    <Setter Property="Foreground" Value="Red"/>
                                                 </DataTrigger>
                                                 <DataTrigger Binding="{Binding Profile.PGM_Enabled}" Value="True">
                                                     <Setter Property="Foreground" Value="#4E008B"/>
diff --git a/src/ConanServerManager/UserControls/ServerSettingsControl.xaml b/src/ConanServerManager/UserControls/ServerSettingsControl.xaml
index 1538ee97..3e63d22c 100644
--- a/src/ConanServerManager/UserControls/ServerSettingsControl.xaml
+++ b/src/ConanServerManager/UserControls/ServerSettingsControl.xaml
@@ -1094,7 +1094,23 @@
                                 <TextBox Grid.Row="0" Grid.Column="1" Margin="1" Text="{Binding DiscordChannelId, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_DiscordBotChannelTooltip}" VerticalContentAlignment="Center" />
 
                                 <Label Grid.Row="0" Grid.Column="2" Content="{DynamicResource ServerSettings_DiscordAliasLabel}" ToolTip="{DynamicResource ServerSettings_DiscordAliasTooltip}" VerticalAlignment="Center"/>
-                                <TextBox Grid.Row="0" Grid.Column="3" Margin="1" Text="{Binding DiscordAlias, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_DiscordAliasTooltip}" VerticalContentAlignment="Center" />
+                                <TextBox Grid.Row="0" Grid.Column="3" Margin="1" ToolTip="{DynamicResource ServerSettings_DiscordAliasTooltip}" VerticalContentAlignment="Center">
+                                    <Validation.ErrorTemplate>
+                                        <ControlTemplate>
+                                            <StackPanel>
+                                                <AdornedElementPlaceholder x:Name="textBox"/>
+                                                <TextBlock Text="{Binding [0].ErrorContent}" Background="Red" Foreground="White"/>
+                                            </StackPanel>
+                                        </ControlTemplate>
+                                    </Validation.ErrorTemplate>
+                                    <TextBox.Text>
+                                        <Binding Path="DiscordAlias" Mode="TwoWay">
+                                            <Binding.ValidationRules>
+                                                <cvr:StringNoSpacesValidationRule ValidatesOnTargetUpdated="true" />
+                                            </Binding.ValidationRules>
+                                        </Binding>
+                                    </TextBox.Text>
+                                </TextBox>
 
                                 <CheckBox Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Margin="5,5,5,0" IsChecked="{Binding AllowDiscordBackup, Mode=TwoWay}" Content="{DynamicResource ServerSettings_AllowDiscordBackupLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowDiscordBackupTooltip}"/>
                                 <CheckBox Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="2" Margin="5,5,5,0" IsChecked="{Binding AllowDiscordUpdate, Mode=TwoWay}" Content="{DynamicResource ServerSettings_AllowDiscordUpdateLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowDiscordUpdateTooltip}"/>
diff --git a/src/ConanServerManager/Windows/MainWindow.xaml b/src/ConanServerManager/Windows/MainWindow.xaml
index c80333e3..42843bdd 100644
--- a/src/ConanServerManager/Windows/MainWindow.xaml
+++ b/src/ConanServerManager/Windows/MainWindow.xaml
@@ -9,7 +9,7 @@
         xmlns:cvr="clr-namespace:ServerManagerTool.Common.ValidationRules;assembly=ServerManager.Common"
         xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
         xmlns:enum="clr-namespace:ServerManagerTool.Enums"
-        xmlns:bot="clr-namespace:ServerManagerTool.DiscordBot;assembly=ServerManager.Discord"
+        xmlns:botenum="clr-namespace:ServerManagerTool.DiscordBot.Enums;assembly=ServerManager.Discord"
         MinWidth="900" MinHeight="600" Width="1100" Height="900" Left="50" Top="50" WindowState="Normal"
         Loaded="MainWindow_Loaded" SizeChanged="MainWindow_SizeChanged" StateChanged="MainWindow_StateChanged" LocationChanged="MainWindow_LocationChanged"
         Name="Main" Icon="../Art/favicon.ico" Title="{DynamicResource MainWindow_Title}">
@@ -142,7 +142,7 @@
                                         <Setter Property="Foreground" Value="White"/>
                                         <Style.Triggers>
                                             <DataTrigger Binding="{Binding AutoBackupState}" Value="{x:Static tsk:TaskState.Disabled}">
-                                                <Setter Property="Foreground" Value="DarkRed"/>
+                                                <Setter Property="Foreground" Value="Orange"/>
                                             </DataTrigger>
                                             <DataTrigger Binding="{Binding AutoBackupState}" Value="{x:Static tsk:TaskState.Ready}">
                                                 <Setter Property="Foreground" Value="White"/>
@@ -203,7 +203,7 @@
                                         <Setter Property="Foreground" Value="White"/>
                                         <Style.Triggers>
                                             <DataTrigger Binding="{Binding AutoUpdateState}" Value="{x:Static tsk:TaskState.Disabled}">
-                                                <Setter Property="Foreground" Value="DarkRed"/>
+                                                <Setter Property="Foreground" Value="Orange"/>
                                             </DataTrigger>
                                             <DataTrigger Binding="{Binding AutoUpdateState}" Value="{x:Static tsk:TaskState.Ready}">
                                                 <Setter Property="Foreground" Value="White"/>
@@ -263,13 +263,13 @@
                                     <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="{x:Type Label}">
                                         <Setter Property="Foreground" Value="White"/>
                                         <Style.Triggers>
-                                            <DataTrigger Binding="{Binding DiscordBotState}" Value="{x:Static bot:Enums.BotState.Disabled}">
-                                                <Setter Property="Foreground" Value="DarkRed"/>
+                                            <DataTrigger Binding="{Binding DiscordBotState}" Value="{x:Static botenum:BotState.Disabled}">
+                                                <Setter Property="Foreground" Value="Orange"/>
                                             </DataTrigger>
-                                            <DataTrigger Binding="{Binding DiscordBotState}" Value="{x:Static bot:Enums.BotState.Stopped}">
+                                            <DataTrigger Binding="{Binding DiscordBotState}" Value="{x:Static botenum:BotState.Stopped}">
                                                 <Setter Property="Foreground" Value="White"/>
                                             </DataTrigger>
-                                            <DataTrigger Binding="{Binding DiscordBotState}" Value="{x:Static bot:Enums.BotState.Running}">
+                                            <DataTrigger Binding="{Binding DiscordBotState}" Value="{x:Static botenum:BotState.Running}">
                                                 <Setter Property="Foreground" Value="LightGreen"/>
                                             </DataTrigger>
                                         </Style.Triggers>
@@ -287,7 +287,7 @@
                                         <Style.Triggers>
                                             <MultiDataTrigger>
                                                 <MultiDataTrigger.Conditions>
-                                                    <Condition Binding="{Binding DiscordBotState}" Value="{x:Static bot:Enums.BotState.Stopped}"/>
+                                                    <Condition Binding="{Binding DiscordBotState}" Value="{x:Static botenum:BotState.Stopped}"/>
                                                 </MultiDataTrigger.Conditions>
                                                 <Setter Property="Background" Value="#00AA00"/>
                                                 <Setter Property="Foreground" Value="White"/>
@@ -297,7 +297,7 @@
                                             </MultiDataTrigger>
                                             <MultiDataTrigger>
                                                 <MultiDataTrigger.Conditions>
-                                                    <Condition Binding="{Binding DiscordBotState}" Value="{x:Static bot:Enums.BotState.Running}"/>
+                                                    <Condition Binding="{Binding DiscordBotState}" Value="{x:Static botenum:BotState.Running}"/>
                                                 </MultiDataTrigger.Conditions>
                                                 <Setter Property="Background" Value="#AA8A00"/>
                                                 <Setter Property="Foreground" Value="White"/>