Update edit window error messages on property change.

Closes #164.
TQLApp · Dec 10, 2023 · 8142955 · 8142955
1 parent aeabd37
commit 8142955
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 32 deletions.
diff --git a/src/Tql.App/ConfigurationUI/PackageSourceEditWindow.xaml b/src/Tql.App/ConfigurationUI/PackageSourceEditWindow.xaml
@@ -35,15 +35,15 @@
         <Label
             Content="{x:Static app:Labels.PackageSourceEditWindow_URLLabel}" />
         <TextBox
-            Text="{Binding Url}"
+            Text="{Binding Url, UpdateSourceTrigger=PropertyChanged}"
             Grid.Column="1"
             Margin="3" />
 
         <Label
             Content="{x:Static app:Labels.PackageSourceEditWindow_UserNameLabel}"
             Grid.Row="1" />
         <TextBox
-            Text="{Binding UserName}"
+            Text="{Binding UserName, UpdateSourceTrigger=PropertyChanged}"
             Grid.Row="1"
             Grid.Column="1"
             Margin="3" />
@@ -52,7 +52,7 @@
             Content="{x:Static app:Labels.PackageSourceEditWindow_PasswordLabel}"
             Grid.Row="2" />
         <PasswordBox
-            utilities:PasswordBoxHelper.BoundPassword="{Binding Password, Mode=TwoWay}"
+            utilities:PasswordBoxHelper.BoundPassword="{Binding Password, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
             Grid.Row="2"
             Grid.Column="1"
             Margin="3" />

diff --git a/src/Tql.Plugins.Azure/ConfigurationUI/ConnectionEditWindow.xaml b/src/Tql.Plugins.Azure/ConfigurationUI/ConnectionEditWindow.xaml
@@ -33,15 +33,15 @@
 
         <Label Content="{x:Static app:Labels.ConnectionEditWindow_NameLabel}" />
         <TextBox
-            Text="{Binding Name}"
+            Text="{Binding Name, UpdateSourceTrigger=PropertyChanged}"
             Grid.Column="1"
             Margin="3" />
 
         <Label
             Content="{x:Static app:Labels.ConnectionEditWindow_TenantIDLabel}"
             Grid.Row="1" />
         <TextBox
-            Text="{Binding TenantId}"
+            Text="{Binding TenantId, UpdateSourceTrigger=PropertyChanged}"
             Grid.Row="1"
             Grid.Column="1"
             Margin="3" />

diff --git a/src/Tql.Plugins.AzureDevOps/ConfigurationUI/ConfigurationDto.cs b/src/Tql.Plugins.AzureDevOps/ConfigurationUI/ConfigurationDto.cs
@@ -78,7 +78,7 @@ public ConnectionDto(Guid id)
         AddProperty(
             nameof(Url),
             p => ValidateNotEmpty(p) ?? ValidateUrl(p),
-            p => CoerceUrlEndsInSlash(CoerceEmptyStringToNull(p))
+            CoerceEmptyStringToNull
         );
         AddProperty(nameof(PATToken), ValidateNotEmpty, CoerceEmptyStringToNull);
     }

diff --git a/src/Tql.Plugins.AzureDevOps/ConfigurationUI/ConnectionEditWindow.xaml b/src/Tql.Plugins.AzureDevOps/ConfigurationUI/ConnectionEditWindow.xaml
@@ -35,15 +35,15 @@
 
         <Label Content="{x:Static app:Labels.ConnectionEditWindow_NameLabel}" />
         <TextBox
-            Text="{Binding Name}"
+            Text="{Binding Name, UpdateSourceTrigger=PropertyChanged}"
             Grid.Column="1"
             Margin="3" />
 
         <Label
             Content="{x:Static app:Labels.ConnectionEditWindow_URLLabel}"
             Grid.Row="1" />
         <TextBox
-            Text="{Binding Url}"
+            Text="{Binding Url, UpdateSourceTrigger=PropertyChanged}"
             Grid.Row="1"
             Grid.Column="1"
             Margin="3" />
@@ -58,7 +58,7 @@
             Content="{x:Static app:Labels.ConnectionEditWindow_PATTokenLabel}"
             Grid.Row="3" />
         <PasswordBox
-            utilities:PasswordBoxHelper.BoundPassword="{Binding PATToken, Mode=TwoWay}"
+            utilities:PasswordBoxHelper.BoundPassword="{Binding PATToken, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
             Grid.Row="3"
             Grid.Column="1"
             Margin="3" />

diff --git a/src/Tql.Plugins.AzureDevOps/ConfigurationUI/ConnectionEditWindow.xaml.cs b/src/Tql.Plugins.AzureDevOps/ConfigurationUI/ConnectionEditWindow.xaml.cs
@@ -15,6 +15,10 @@ public ConnectionEditWindow(IUI ui)
 
     private void _acceptButton_Click(object sender, RoutedEventArgs e)
     {
+        var dto = (ConnectionDto)DataContext;
+        if (!dto.Url!.EndsWith("/"))
+            dto.Url += "/";
+
         DialogResult = true;
     }
 

diff --git a/src/Tql.Plugins.Confluence/ConfigurationUI/ConfigurationDto.cs b/src/Tql.Plugins.Confluence/ConfigurationUI/ConfigurationDto.cs
@@ -91,7 +91,7 @@ public ConnectionDto(Guid id)
         AddProperty(
             nameof(Url),
             p => ValidateNotEmpty(p) ?? ValidateUrl(p),
-            p => CoerceUrlEndsInSlash(CoerceEmptyStringToNull(p))
+            CoerceEmptyStringToNull
         );
         AddProperty(nameof(UserName), ValidateNotEmpty, CoerceEmptyStringToNull);
         AddProperty(nameof(Password), ValidateNotEmpty, CoerceEmptyStringToNull);

diff --git a/src/Tql.Plugins.Confluence/ConfigurationUI/ConnectionEditWindow.xaml b/src/Tql.Plugins.Confluence/ConfigurationUI/ConnectionEditWindow.xaml
@@ -36,15 +36,15 @@
 
         <Label Content="{x:Static app:Labels.ConnectionEditWindow_NameLabel}" />
         <TextBox
-            Text="{Binding Name}"
+            Text="{Binding Name, UpdateSourceTrigger=PropertyChanged}"
             Grid.Column="1"
             Margin="3" />
 
         <Label
             Content="{x:Static app:Labels.ConnectionEditWindow_URLLabel}"
             Grid.Row="1" />
         <TextBox
-            Text="{Binding Url}"
+            Text="{Binding Url, UpdateSourceTrigger=PropertyChanged}"
             Grid.Row="1"
             Grid.Column="1"
             Margin="3" />
@@ -59,7 +59,7 @@
             Content="{x:Static app:Labels.ConnectionEditWindow_UserNameLabel}"
             Grid.Row="3" />
         <TextBox
-            Text="{Binding UserName}"
+            Text="{Binding UserName, UpdateSourceTrigger=PropertyChanged}"
             Grid.Row="3"
             Grid.Column="1"
             Margin="3" />
@@ -68,7 +68,7 @@
             Content="{x:Static app:Labels.ConnectionEditWindow_PasswordLabel}"
             Grid.Row="4" />
         <PasswordBox
-            utilities:PasswordBoxHelper.BoundPassword="{Binding Password, Mode=TwoWay}"
+            utilities:PasswordBoxHelper.BoundPassword="{Binding Password, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
             Grid.Row="4"
             Grid.Column="1"
             Margin="3" />

diff --git a/src/Tql.Plugins.Confluence/ConfigurationUI/ConnectionEditWindow.xaml.cs b/src/Tql.Plugins.Confluence/ConfigurationUI/ConnectionEditWindow.xaml.cs
@@ -15,6 +15,10 @@ public ConnectionEditWindow(IUI ui)
 
     private void _acceptButton_Click(object sender, RoutedEventArgs e)
     {
+        var dto = (ConnectionDto)DataContext;
+        if (!dto.Url!.EndsWith("/"))
+            dto.Url += "/";
+
         DialogResult = true;
     }
 

diff --git a/src/Tql.Plugins.GitHub/ConfigurationUI/ConnectionEditWindow.xaml b/src/Tql.Plugins.GitHub/ConfigurationUI/ConnectionEditWindow.xaml
@@ -31,7 +31,7 @@
 
         <Label Content="{x:Static app:Labels.ConnectionEditWindow_NameLabel}" />
         <TextBox
-            Text="{Binding Name}"
+            Text="{Binding Name, UpdateSourceTrigger=PropertyChanged}"
             Grid.Column="1"
             Margin="3" />
 

diff --git a/src/Tql.Plugins.Jira/ConfigurationUI/ConfigurationDto.cs b/src/Tql.Plugins.Jira/ConfigurationUI/ConfigurationDto.cs
@@ -91,7 +91,7 @@ public ConnectionDto(Guid id)
         AddProperty(
             nameof(Url),
             p => ValidateNotEmpty(p) ?? ValidateUrl(p),
-            p => CoerceUrlEndsInSlash(CoerceEmptyStringToNull(p))
+            CoerceEmptyStringToNull
         );
         AddProperty(nameof(UserName), ValidateNotEmpty, CoerceEmptyStringToNull);
         AddProperty(nameof(Password), ValidateNotEmpty, CoerceEmptyStringToNull);

diff --git a/src/Tql.Plugins.Jira/ConfigurationUI/ConnectionEditWindow.xaml b/src/Tql.Plugins.Jira/ConfigurationUI/ConnectionEditWindow.xaml
@@ -36,15 +36,15 @@
 
         <Label Content="{x:Static app:Labels.ConnectionEditWindow_NameLabel}" />
         <TextBox
-            Text="{Binding Name}"
+            Text="{Binding Name, UpdateSourceTrigger=PropertyChanged}"
             Grid.Column="1"
             Margin="3" />
 
         <Label
             Content="{x:Static app:Labels.ConnectionEditWindow_URLLabel}"
             Grid.Row="1" />
         <TextBox
-            Text="{Binding Url}"
+            Text="{Binding Url, UpdateSourceTrigger=PropertyChanged}"
             Grid.Row="1"
             Grid.Column="1"
             Margin="3" />
@@ -59,7 +59,7 @@
             Content="{x:Static app:Labels.ConnectionEditWindow_UserNameLabel}"
             Grid.Row="3" />
         <TextBox
-            Text="{Binding UserName}"
+            Text="{Binding UserName, UpdateSourceTrigger=PropertyChanged}"
             Grid.Row="3"
             Grid.Column="1"
             Margin="3" />
@@ -68,7 +68,7 @@
             Content="{x:Static app:Labels.ConnectionEditWindow_PasswordLabel}"
             Grid.Row="4" />
         <PasswordBox
-            utilities:PasswordBoxHelper.BoundPassword="{Binding Password, Mode=TwoWay}"
+            utilities:PasswordBoxHelper.BoundPassword="{Binding Password, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
             Grid.Row="4"
             Grid.Column="1"
             Margin="3" />

diff --git a/src/Tql.Plugins.Jira/ConfigurationUI/ConnectionEditWindow.xaml.cs b/src/Tql.Plugins.Jira/ConfigurationUI/ConnectionEditWindow.xaml.cs
@@ -15,6 +15,10 @@ public ConnectionEditWindow(IUI ui)
 
     private void _acceptButton_Click(object sender, RoutedEventArgs e)
     {
+        var dto = (ConnectionDto)DataContext;
+        if (!dto.Url!.EndsWith("/"))
+            dto.Url += "/";
+
         DialogResult = true;
     }
 

diff --git a/src/Tql.Utilities/DtoBase.cs b/src/Tql.Utilities/DtoBase.cs
@@ -77,18 +77,6 @@ protected void AddProperty(
     protected object? CoerceEmptyStringToNull(object? value) =>
         string.Empty.Equals(value) ? null : value;
 
-    /// <summary>
-    /// Utility method to ensure that URLs end in a slash.
-    /// </summary>
-    /// <param name="value">Value to coerce.</param>
-    /// <returns>Coerced value.</returns>
-    protected object? CoerceUrlEndsInSlash(object? value)
-    {
-        if (value is string stringValue && !stringValue.IsEmpty() && !stringValue.EndsWith('/'))
-            return stringValue + "/";
-        return value;
-    }
-
     /// <summary>
     /// Gets the value of a property.
     /// </summary>