Merge pull request #382 from github/backport/context-menu-visibility

shana · web-flow · commit c8152df85eb5 · 2016-06-23T19:35:04.000+02:00
[Backport] Context menu visibility
diff --git a/src/GitHub.VisualStudio/Base/MenuBase.cs b/src/GitHub.VisualStudio/Base/MenuBase.cs
@@ -3,20 +3,50 @@
 using GitHub.Extensions;
 using GitHub.Models;
 using GitHub.Services;
+using System.Threading.Tasks;
+using GitHub.Api;
+using NullGuard;
+using System.Diagnostics;
+using GitHub.Primitives;
 
 namespace GitHub.VisualStudio
 {
     public abstract class MenuBase
     {
         readonly IServiceProvider serviceProvider;
+        readonly ISimpleApiClientFactory apiFactory;
+
         protected IServiceProvider ServiceProvider { get { return serviceProvider; } }
 
         protected ISimpleRepositoryModel ActiveRepo { get; private set; }
 
+        protected ISimpleApiClient simpleApiClient;
+
+        [AllowNull]
+        protected ISimpleApiClient SimpleApiClient
+        {
+            [return: AllowNull]
+            get { return simpleApiClient; }
+            set
+            {
+                if (simpleApiClient != value && value == null)
+                    apiFactory.ClearFromCache(simpleApiClient);
+                simpleApiClient = value;
+            }
+        }
+
+        protected ISimpleApiClientFactory ApiFactory => apiFactory;
+
         protected MenuBase()
         {
         }
 
+        protected MenuBase(IServiceProvider serviceProvider, ISimpleApiClientFactory apiFactory)
+        {
+            this.serviceProvider = serviceProvider;
+            this.apiFactory = apiFactory;
+        }
+
         protected MenuBase(IServiceProvider serviceProvider)
         {
             this.serviceProvider = serviceProvider;
@@ -41,10 +71,24 @@ void RefreshRepo()
             }
         }
 
-        protected bool IsGitHubRepo()
+        protected async Task<bool> IsGitHubRepo()
         {
             RefreshRepo();
-            return ActiveRepo?.CloneUrl?.RepositoryName != null;
+
+            var uri = ActiveRepo.CloneUrl;
+            if (uri == null)
+                return false;
+
+            Debug.Assert(apiFactory != null, "apiFactory cannot be null. Did you call the right constructor?");
+            SimpleApiClient = apiFactory.Create(uri);
+
+            var isdotcom = HostAddress.IsGitHubDotComUri(uri.ToRepositoryUrl());
+            if (!isdotcom)
+            {
+                var repo = await SimpleApiClient.GetRepository();
+                return (repo.FullName == ActiveRepo.Name || repo.Id == 0) && SimpleApiClient.IsEnterprise();
+            }
+            return isdotcom;
         }
     }
 }
diff --git a/src/GitHub.VisualStudio/Menus/AddConnection.cs b/src/GitHub.VisualStudio/Menus/AddConnection.cs
@@ -4,16 +4,17 @@
 using GitHub.Services;
 using GitHub.UI;
 using GitHub.Extensions;
+using GitHub.Api;
 
 namespace GitHub.VisualStudio.Menus
 {
     [Export(typeof(IMenuHandler))]
     [PartCreationPolicy(CreationPolicy.Shared)]
-    public class AddConnection: MenuBase, IMenuHandler
+    public class AddConnection : MenuBase, IMenuHandler
     {
         [ImportingConstructor]
-        public AddConnection([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider)
-            : base(serviceProvider)
+        public AddConnection([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider, ISimpleApiClientFactory apiFactory)
+            : base(serviceProvider, apiFactory)
         {
         }
 
diff --git a/src/GitHub.VisualStudio/Menus/CopyLink.cs b/src/GitHub.VisualStudio/Menus/CopyLink.cs
@@ -5,6 +5,7 @@
 using GitHub.Extensions;
 using GitHub.Services;
 using GitHub.VisualStudio.UI;
+using GitHub.Api;
 
 namespace GitHub.VisualStudio.Menus
 {
@@ -13,17 +14,18 @@ namespace GitHub.VisualStudio.Menus
     public class CopyLink : LinkMenuBase, IDynamicMenuHandler
     {
         [ImportingConstructor]
-        public CopyLink([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider)
-            : base(serviceProvider)
+        public CopyLink([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider, ISimpleApiClientFactory apiFactory)
+            : base(serviceProvider, apiFactory)
         {
         }
 
         public Guid Guid => GuidList.guidContextMenuSet;
         public int CmdId => PkgCmdIDList.copyLinkCommand;
 
-        public void Activate()
+        public async void Activate()
         {
-            if (!IsGitHubRepo())
+            var isgithub = await IsGitHubRepo();
+            if (!isgithub)
                 return;
 
             var link = GenerateLink();
@@ -44,7 +46,9 @@ public void Activate()
 
         public bool CanShow()
         {
-            return IsGitHubRepo();
+            var githubRepoCheckTask = IsGitHubRepo();
+            return githubRepoCheckTask.Wait(250) ? githubRepoCheckTask.Result : false;
         }
+
     }
 }
diff --git a/src/GitHub.VisualStudio/Menus/LinkMenuBase.cs b/src/GitHub.VisualStudio/Menus/LinkMenuBase.cs
@@ -1,13 +1,14 @@
-﻿using GitHub.Extensions;
+﻿using GitHub.Api;
+using GitHub.Extensions;
 using GitHub.Primitives;
 using System;
 
 namespace GitHub.VisualStudio.Menus
 {
     public class LinkMenuBase: MenuBase
     {
-        public LinkMenuBase(IServiceProvider serviceProvider)
-            : base(serviceProvider)
+        public LinkMenuBase(IServiceProvider serviceProvider, ISimpleApiClientFactory apiFactory)
+            : base(serviceProvider, apiFactory)
         {
         }
 
diff --git a/src/GitHub.VisualStudio/Menus/OpenLink.cs b/src/GitHub.VisualStudio/Menus/OpenLink.cs
@@ -3,6 +3,7 @@
 using Microsoft.VisualStudio.Shell;
 using System;
 using System.ComponentModel.Composition;
+using GitHub.Api;
 
 namespace GitHub.VisualStudio.Menus
 {
@@ -11,17 +12,18 @@ namespace GitHub.VisualStudio.Menus
     public class OpenLink: LinkMenuBase, IDynamicMenuHandler
     {
         [ImportingConstructor]
-        public OpenLink([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider)
-            : base(serviceProvider)
+        public OpenLink([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider, ISimpleApiClientFactory apiFactory)
+            : base(serviceProvider, apiFactory)
         {
         }
 
         public Guid Guid => GuidList.guidContextMenuSet;
         public int CmdId => PkgCmdIDList.openLinkCommand;
 
-        public void Activate()
+        public async void Activate()
         {
-            if (!IsGitHubRepo())
+            var isgithub = await IsGitHubRepo();
+            if (!isgithub)
                 return;
 
             var link = GenerateLink();
@@ -33,7 +35,8 @@ public void Activate()
 
         public bool CanShow()
         {
-            return IsGitHubRepo();
+            var githubRepoCheckTask = IsGitHubRepo();
+            return githubRepoCheckTask.Wait(250) ? githubRepoCheckTask.Result : false;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,16 +4,17 @@`
`4`	`4`	`using GitHub.Services;`
`5`	`5`	`using GitHub.UI;`
`6`	`6`	`using GitHub.Extensions;`
	`7`	`+using GitHub.Api;`
`7`	`8`
`8`	`9`	`namespace GitHub.VisualStudio.Menus`
`9`	`10`	`{`
`10`	`11`	`[Export(typeof(IMenuHandler))]`
`11`	`12`	`[PartCreationPolicy(CreationPolicy.Shared)]`
`12`		`- public class AddConnection: MenuBase, IMenuHandler`
	`13`	`+ public class AddConnection : MenuBase, IMenuHandler`
`13`	`14`	`{`
`14`	`15`	`[ImportingConstructor]`
`15`		`- public AddConnection([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider)`
`16`		`- : base(serviceProvider)`
	`16`	`+ public AddConnection([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider, ISimpleApiClientFactory apiFactory)`
	`17`	`+ : base(serviceProvider, apiFactory)`
`17`	`18`	`{`
`18`	`19`	`}`
`19`	`20`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using GitHub.Extensions;`
`6`	`6`	`using GitHub.Services;`
`7`	`7`	`using GitHub.VisualStudio.UI;`
	`8`	`+using GitHub.Api;`
`8`	`9`
`9`	`10`	`namespace GitHub.VisualStudio.Menus`
`10`	`11`	`{`
`@@ -13,17 +14,18 @@ namespace GitHub.VisualStudio.Menus`
`13`	`14`	`public class CopyLink : LinkMenuBase, IDynamicMenuHandler`
`14`	`15`	`{`
`15`	`16`	`[ImportingConstructor]`
`16`		`- public CopyLink([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider)`
`17`		`- : base(serviceProvider)`
	`17`	`+ public CopyLink([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider, ISimpleApiClientFactory apiFactory)`
	`18`	`+ : base(serviceProvider, apiFactory)`
`18`	`19`	`{`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`public Guid Guid => GuidList.guidContextMenuSet;`
`22`	`23`	`public int CmdId => PkgCmdIDList.copyLinkCommand;`
`23`	`24`
`24`		`- public void Activate()`
	`25`	`+ public async void Activate()`
`25`	`26`	`{`
`26`		`- if (!IsGitHubRepo())`
	`27`	`+ var isgithub = await IsGitHubRepo();`
	`28`	`+ if (!isgithub)`
`27`	`29`	`return;`
`28`	`30`
`29`	`31`	`var link = GenerateLink();`
`@@ -44,7 +46,9 @@ public void Activate()`
`44`	`46`
`45`	`47`	`public bool CanShow()`
`46`	`48`	`{`
`47`		`- return IsGitHubRepo();`
	`49`	`+ var githubRepoCheckTask = IsGitHubRepo();`
	`50`	`+ return githubRepoCheckTask.Wait(250) ? githubRepoCheckTask.Result : false;`
`48`	`51`	`}`
	`52`	`+`
`49`	`53`	`}`
`50`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,14 @@`
`1`		`-using GitHub.Extensions;`
	`1`	`+using GitHub.Api;`
	`2`	`+using GitHub.Extensions;`
`2`	`3`	`using GitHub.Primitives;`
`3`	`4`	`using System;`
`4`	`5`
`5`	`6`	`namespace GitHub.VisualStudio.Menus`
`6`	`7`	`{`
`7`	`8`	`public class LinkMenuBase: MenuBase`
`8`	`9`	`{`
`9`		`- public LinkMenuBase(IServiceProvider serviceProvider)`
`10`		`- : base(serviceProvider)`
	`10`	`+ public LinkMenuBase(IServiceProvider serviceProvider, ISimpleApiClientFactory apiFactory)`
	`11`	`+ : base(serviceProvider, apiFactory)`
`11`	`12`	`{`
`12`	`13`	`}`
`13`	`14`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using Microsoft.VisualStudio.Shell;`
`4`	`4`	`using System;`
`5`	`5`	`using System.ComponentModel.Composition;`
	`6`	`+using GitHub.Api;`
`6`	`7`
`7`	`8`	`namespace GitHub.VisualStudio.Menus`
`8`	`9`	`{`
`@@ -11,17 +12,18 @@ namespace GitHub.VisualStudio.Menus`
`11`	`12`	`public class OpenLink: LinkMenuBase, IDynamicMenuHandler`
`12`	`13`	`{`
`13`	`14`	`[ImportingConstructor]`
`14`		`- public OpenLink([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider)`
`15`		`- : base(serviceProvider)`
	`15`	`+ public OpenLink([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider, ISimpleApiClientFactory apiFactory)`
	`16`	`+ : base(serviceProvider, apiFactory)`
`16`	`17`	`{`
`17`	`18`	`}`
`18`	`19`
`19`	`20`	`public Guid Guid => GuidList.guidContextMenuSet;`
`20`	`21`	`public int CmdId => PkgCmdIDList.openLinkCommand;`
`21`	`22`
`22`		`- public void Activate()`
	`23`	`+ public async void Activate()`
`23`	`24`	`{`
`24`		`- if (!IsGitHubRepo())`
	`25`	`+ var isgithub = await IsGitHubRepo();`
	`26`	`+ if (!isgithub)`
`25`	`27`	`return;`
`26`	`28`
`27`	`29`	`var link = GenerateLink();`
`@@ -33,7 +35,8 @@ public void Activate()`
`33`	`35`
`34`	`36`	`public bool CanShow()`
`35`	`37`	`{`
`36`		`- return IsGitHubRepo();`
	`38`	`+ var githubRepoCheckTask = IsGitHubRepo();`
	`39`	`+ return githubRepoCheckTask.Wait(250) ? githubRepoCheckTask.Result : false;`
`37`	`40`	`}`
`38`	`41`	`}`
`39`	`42`	`}`