Merge master into feature/pr/views

Author: shana

documentation/manifest.md

@@ -93,9 +93,9 @@
         - [ ] Verify Issues button navigates to Issues page on GitHub.com (when logged in and the repository is enabled)
 - [ ] **Creating Multiple Repositories**
     - [ ] Go to Team Explorer Connect page (logged in)
-    - [ ] Create additional repository
-    - [ ] Publish new repository
-    - [ ] Verify remote information present in repository settings
+      - [ ] Create additional repository
+        - [ ] Publish new repository
+          - [ ] Verify remote information present in repository settings
 - [ ] **Validate Publish Repository Error**
     - [ ] Remove remote settings from repository
     - [ ] Go to Sync page and publish repository
@@ -121,3 +121,10 @@
 - [ ] **Login with 2FA on**
       - [ ] Login GitHub with 2FA turned on
       - [ ] Resend works
+
+# Settings
+- [ ] **Property page loads outside of team explorer view**
+  - [ ] Select solution explorer as focused pane
+  - [ ] Restart Visual Studio
+  - [ ] Go to GitHub for VS property pane in Options
+    - [ ] Property page loads without errors

src/GitHub.Exports/GitHub.Exports.csproj

@@ -133,6 +133,8 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>IPackageSettings.tt</DependentUpon>
     </Compile>
+    <Compile Include="Settings\GitHubConnectSectionState.cs" />
+    <Compile Include="Settings\UIState.cs" />
     <Compile Include="ViewModels\IServiceProviderAware.cs" />
     <Compile Include="UI\IView.cs" />
     <Compile Include="UI\Octicon.cs" />

src/GitHub.Exports/Settings/GitHubConnectSectionState.cs

@@ -0,0 +1,22 @@
+using System;
+using GitHub.Settings;
+
+namespace GitHub.Settings
+{
+    /// <summary>
+    /// Stores persistent UI state for a <see cref="GitHubConnectSection"/> in 
+    /// <see cref="IPackageSettings"/>.
+    /// </summary>
+    public class GitHubConnectSectionState
+    {
+        /// <summary>
+        /// Gets or sets the name of the connection section.
+        /// </summary>
+        public string SectionName { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the section should be expanded.
+        /// </summary>
+        public bool IsExpanded { get; set; } = true;
+    }
+}

src/GitHub.Exports/Settings/UIState.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using GitHub.Settings;
+using System.Linq;
+using GitHub.VisualStudio.TeamExplorer.Connect;
+
+namespace GitHub.Settings
+{
+    /// <summary>
+    /// Stores persistent UI state in <see cref="IPackageSettings"/>.
+    /// </summary>
+    public class UIState
+    {
+        /// <summary>
+        /// Gets or sets the UI state for the <see cref="IGitHubConnectSection"/>s in Team Explorer.
+        /// </summary>
+        public List<GitHubConnectSectionState> GitHubConnectSections { get; set; }
+            = new List<GitHubConnectSectionState>();
+
+        /// <summary>
+        /// Gets or creates the UI state for a named <see cref="IGitHubConnectSection"/>.
+        /// </summary>
+        /// <param name="sectionName">The name of the section.</param>
+        /// <returns>A <see cref="GitHubConnectSectionState"/> object.</returns>
+        public GitHubConnectSectionState GetOrCreateConnectSection(string sectionName)
+        {
+            var result = GitHubConnectSections.FirstOrDefault(x => x.SectionName == sectionName);
+
+            if (result == null)
+            {
+                result = new GitHubConnectSectionState { SectionName = sectionName };
+                GitHubConnectSections.Add(result);
+            }
+
+            return result;
+        }
+    }
+}

src/GitHub.Exports/Settings/generated/IPackageSettings.tt

@@ -27,5 +27,6 @@ foreach (var j in json["settings"].Children()) {
 <#
 }
 #>
+		UIState UIState { get; }
     }
 }

src/GitHub.TeamFoundation.14/Connect/GitHubConnectSection.cs

@@ -19,6 +19,7 @@
 using System.Threading.Tasks;
 using GitHub.VisualStudio.UI;
 using GitHub.Primitives;
+using GitHub.Settings;
 
 namespace GitHub.VisualStudio.TeamExplorer.Connect
 {
@@ -27,6 +28,9 @@ public class GitHubConnectSection : TeamExplorerSectionBase, IGitHubConnectSecti
         readonly int sectionIndex;
         bool isCloning;
         bool isCreating;
+        IPackageSettings packageSettings;
+        GitHubConnectSectionState settings;
+
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         SectionStateTracker sectionTracker;
 
@@ -83,17 +87,21 @@ public ISimpleRepositoryModel SelectedRepository
 
         internal ITeamExplorerServiceHolder Holder => holder;
 
-        public GitHubConnectSection(ISimpleApiClientFactory apiFactory, ITeamExplorerServiceHolder holder, IConnectionManager manager, int index)
+        public GitHubConnectSection(ISimpleApiClientFactory apiFactory,
+            ITeamExplorerServiceHolder holder,
+            IConnectionManager manager,
+            IPackageSettings packageSettings,
+            int index)
             : base(apiFactory, holder, manager)
         {
             Title = "GitHub";
             IsEnabled = true;
             IsVisible = false;
-            IsExpanded = true;
             LoggedIn = false;
-
             sectionIndex = index;
 
+            this.packageSettings = packageSettings;
+
             connectionManager.Connections.CollectionChanged += RefreshConnections;
             PropertyChanged += OnPropertyChange;
             UpdateConnection();
@@ -125,6 +133,7 @@ protected void Refresh(IConnection connection)
                 if (Repositories != null)
                     Repositories.CollectionChanged -= UpdateRepositoryList;
                 Repositories = null;
+                settings = null;
 
                 if (sectionIndex == 0 && ServiceProvider != null)
                 {
@@ -151,6 +160,9 @@ protected void Refresh(IConnection connection)
                     LoggedIn = true;
                     if (ServiceProvider != null)
                         RefreshRepositories().Forget();
+
+                    settings = packageSettings.UIState.GetOrCreateConnectSection(Title);
+                    IsExpanded = settings.IsExpanded;
                 }
             }
         }
@@ -183,6 +195,8 @@ void OnPropertyChange(object sender, PropertyChangedEventArgs e)
         {
             if (e.PropertyName == "IsVisible" && IsVisible && View == null)
                 View = new GitHubConnectContent { DataContext = this };
+            else if (e.PropertyName == "IsExpanded" && settings != null)
+                settings.IsExpanded = IsExpanded;
         }
 
         async void UpdateRepositoryList(object sender, NotifyCollectionChangedEventArgs e)
@@ -358,6 +372,7 @@ protected override void Dispose(bool disposing)
                     if (Repositories != null)
                         Repositories.CollectionChanged -= UpdateRepositoryList;
                     disposed = true;
+                    packageSettings.Save();
                 }
             }
             base.Dispose(disposing);

src/GitHub.TeamFoundation.14/Connect/GitHubConnectSection0.cs

@@ -1,6 +1,7 @@
 using GitHub.Api;
 using GitHub.Models;
 using GitHub.Services;
+using GitHub.Settings;
 using Microsoft.TeamFoundation.Controls;
 using System.ComponentModel.Composition;
 
@@ -13,8 +14,11 @@ public class GitHubConnectSection0 : GitHubConnectSection
         public const string GitHubConnectSection0Id = "519B47D3-F2A9-4E19-8491-8C9FA25ABE90";
 
         [ImportingConstructor]
-        public GitHubConnectSection0(ISimpleApiClientFactory apiFactory, ITeamExplorerServiceHolder holder, IConnectionManager manager)
-            : base(apiFactory, holder, manager, 0)
+        public GitHubConnectSection0(ISimpleApiClientFactory apiFactory,
+            ITeamExplorerServiceHolder holder,
+            IConnectionManager manager,
+            IPackageSettings settings)
+            : base(apiFactory, holder, manager, settings, 0)
         {
         }
     }

src/GitHub.TeamFoundation.14/Connect/GitHubConnectSection1.cs

@@ -1,6 +1,7 @@
 using GitHub.Api;
 using GitHub.Models;
 using GitHub.Services;
+using GitHub.Settings;
 using Microsoft.TeamFoundation.Controls;
 using System.ComponentModel.Composition;
 
@@ -13,8 +14,11 @@ public class GitHubConnectSection1 : GitHubConnectSection
         public const string GitHubConnectSection1Id = "519B47D3-F2A9-4E19-8491-8C9FA25ABE91";
 
         [ImportingConstructor]
-        public GitHubConnectSection1(ISimpleApiClientFactory apiFactory, ITeamExplorerServiceHolder holder, IConnectionManager manager)
-            : base(apiFactory, holder, manager, 1)
+        public GitHubConnectSection1(ISimpleApiClientFactory apiFactory,
+            ITeamExplorerServiceHolder holder,
+            IConnectionManager manager,
+            IPackageSettings settings)
+            : base(apiFactory, holder, manager, settings, 1)
         {
         }
     }

src/GitHub.UI.Reactive/Controls/Validation/ValidationMessage.cs

@@ -33,6 +33,7 @@ public ValidationMessage()
                 .Do(CreateBinding)
                 .Select(control =>
                     Observable.Merge(
+                        this.WhenAnyValue(x => x.ShowError),
                         control.Events().TextChanged
                             .Throttle(TimeSpan.FromSeconds(ShowError ? defaultTextChangeThrottle : TextChangeThrottle),
                             RxApp.MainThreadScheduler)