Merge branch 'Bring_intoView'

src/ServiceControl.Config/Extensions/VisualTreeExtensions.cs

@@ -0,0 +1,61 @@
+namespace ServiceControl.Config.Extensions
+{
+    using System.Windows;
+    using System.Windows.Controls;
+    using System.Windows.Media;
+
+    public static class VisualTreeExtensions
+    {
+        public static Control FindControlWithError(this DependencyObject parent)
+        {
+            // Confirm parent and childName are valid.
+            if (parent == null)
+            {
+                return null;
+            }
+
+            Control foundChild = null;
+
+            var childrenCount = VisualTreeHelper.GetChildrenCount(parent);
+            for (var i = 0; i < childrenCount; i++)
+            {
+                var child = VisualTreeHelper.GetChild(parent, i);
+                // If the child is not of the request child type child
+                var childType = child;
+                if (childType == null)
+                {
+                    // recursively drill down the tree
+                    foundChild = FindControlWithError(child);
+
+                    // If the child is found, break so we do not overwrite the found child.
+                    if (foundChild != null)
+                    {
+                        break;
+                    }
+                }
+                else
+                {
+                    var frameworkElement = child as FrameworkElement;
+
+                    // If the child is in error
+                    if (frameworkElement != null && Validation.GetHasError(frameworkElement))
+                    {
+                        foundChild = (Control)child;
+                        break;
+                    }
+
+                    // recursively drill down the tree
+                    foundChild = FindControlWithError(child);
+
+                    // If the child is found, break so we do not overwrite the found child.
+                    if (foundChild != null)
+                    {
+                        break;
+                    }
+                }
+            }
+
+            return foundChild;
+        }
+    }
+}

src/ServiceControl.Config/Framework/WindowManagerEx.cs

@@ -9,6 +9,8 @@
 
 namespace ServiceControl.Config.Framework
 {
+    using ServiceControl.Config.Extensions;
+
     public interface IWindowManagerEx : IWindowManager
     {
         void NavigateTo(RxScreen screen, object context = null, IDictionary<string, object> settings = null);
@@ -24,6 +26,8 @@ public interface IWindowManagerEx : IWindowManager
         bool ShowSliderDialog(SliderDialogViewModel viewModel);
 
         bool ShowActionReport(ReportCard reportcard, string title, string errorsMessage, string warningsMessage);
+
+        void ScrollFirstErrorIntoView(object viewModel, object context = null);
     }
 
     class WindowManagerEx : WindowManager, IWindowManagerEx
@@ -105,6 +109,13 @@ public bool ShowActionReport(ReportCard reportcard, string title, string errorsM
             return result ?? false;
         }
 
+        public void ScrollFirstErrorIntoView(object viewModel, object context = null)
+        {
+            var view = ViewLocator.LocateForModel(viewModel, null, context);
+            var controlInError = view?.FindControlWithError();
+            controlInError?.BringIntoView();
+        }
+
         private ShellViewModel GetShell()
         {
             var shell = Application.Current.MainWindow.DataContext as ShellViewModel;

src/ServiceControl.Config/ServiceControl.Config.csproj

@@ -150,6 +150,7 @@
     <Compile Include="Extensions\DeactivateExtensions.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />
     <Compile Include="Extensions\ValidatorExtensions.cs" />
+    <Compile Include="Extensions\VisualTreeExtensions.cs" />
     <Compile Include="Framework\Commands\AwaitableAbstractCommand.cs" />
     <Compile Include="Framework\IProgressViewModel.cs" />
     <Compile Include="Framework\Modules\InstallerModule.cs" />

src/ServiceControl.Config/UI/InstanceAdd/InstanceAddAttachment.cs

@@ -48,6 +48,8 @@ private async Task Add(object arg)
             {
                 viewModel.NotifyOfPropertyChange(string.Empty);
                 viewModel.SubmitAttempted = false;
+                windowManager.ScrollFirstErrorIntoView(viewModel);
+
                 return;
             }
 

src/ServiceControl.Config/UI/InstanceEdit/InstanceEditAttachment.cs

@@ -49,6 +49,8 @@ async Task Save(object arg)
             {
                 viewModel.NotifyOfPropertyChange(string.Empty);
                 viewModel.SubmitAttempted = false;
+                windowManager.ScrollFirstErrorIntoView(viewModel);
+
                 return;
             }
 

src/ServiceControl.Config/UI/SharedInstanceEditor/SharedInstanceEditorView.xaml

@@ -16,12 +16,11 @@
             <RowDefinition Height="auto" />
         </Grid.RowDefinitions>
 
-        <ScrollViewer IsTabStop="False">
+        <ScrollViewer x:Name="ContentScroller" IsTabStop="False">
             <ContentPresenter Content="{Binding SharedContent, ElementName=uc}" />
         </ScrollViewer>
 
-        <Border x:Name="progressOverlay"
-                Grid.RowSpan="2"
+        <Border Grid.RowSpan="2"
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch"
                 Background="#CCFFFFFF"

src/ServiceControl.Config/UI/SharedInstanceEditor/SharedInstanceEditorView.xaml.cs

@@ -4,14 +4,15 @@ namespace ServiceControl.Config.UI.SharedInstanceEditor
 {
     public partial class SharedInstanceEditorView
     {
+
         public SharedInstanceEditorView()
         {
             InitializeComponent();
         }
 
         public string SaveText
         {
-            get { return (string)GetValue(SaveTextProperty); }
+            get { return (string) GetValue(SaveTextProperty); }
             set { SetValue(SaveTextProperty, value); }
         }