Merge pull request #2473 from github/fixes/tool-window-discoverability

jcansdale · web-flow · commit 4479000e6449 · 2020-03-17T12:58:52.000Z
Make pull request functionality more discoverable outside of Team Explorer
diff --git a/src/GitHub.InlineReviews/Services/PullRequestStatusBarManager.cs b/src/GitHub.InlineReviews/Services/PullRequestStatusBarManager.cs
@@ -98,7 +98,7 @@ async Task RefreshCurrentSession(LocalRepositoryModel repository, IPullRequestSe
                 return;
             }
 
-            var viewModel = CreatePullRequestStatusViewModel(session);
+            var viewModel = CreatePullRequestStatusViewModel(repository, session);
             ShowStatus(viewModel);
         }
 
@@ -155,13 +155,15 @@ async Task<bool> IsDotComOrEnterpriseRepository(LocalRepositoryModel repository)
             return false;
         }
 
-        PullRequestStatusViewModel CreatePullRequestStatusViewModel(IPullRequestSession session)
+        PullRequestStatusViewModel CreatePullRequestStatusViewModel(LocalRepositoryModel repository, IPullRequestSession session)
         {
-            var pullRequestStatusViewModel = new PullRequestStatusViewModel(openPullRequestsCommand, showCurrentPullRequestCommand);
-            var pullRequest = session?.PullRequest;
-            pullRequestStatusViewModel.Number = pullRequest?.Number;
-            pullRequestStatusViewModel.Title = pullRequest?.Title;
-            return pullRequestStatusViewModel;
+            return new PullRequestStatusViewModel(openPullRequestsCommand, showCurrentPullRequestCommand)
+            {
+                Number = session?.PullRequest?.Number,
+                Title = session?.PullRequest?.Title,
+                RepositoryName = repository?.Name,
+                RepositoryOwner = repository?.Owner,
+            };
         }
 
         PullRequestStatusView ShowStatus(PullRequestStatusViewModel pullRequestStatusViewModel = null)
diff --git a/src/GitHub.InlineReviews/ViewModels/PullRequestStatusViewModel.cs b/src/GitHub.InlineReviews/ViewModels/PullRequestStatusViewModel.cs
@@ -8,6 +8,8 @@ public class PullRequestStatusViewModel : INotifyPropertyChanged
     {
         int? number;
         string title;
+        string repositoryName;
+        string repositoryOwner;
 
         public PullRequestStatusViewModel(ICommand openPullRequestsCommand, ICommand showCurrentPullRequestCommand)
         {
@@ -41,6 +43,32 @@ public string Title
             }
         }
 
+        public string RepositoryOwner
+        {
+            get { return repositoryOwner; }
+            set
+            {
+                if (repositoryOwner != value)
+                {
+                    repositoryOwner = value;
+                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(RepositoryOwner)));
+                }
+            }
+        }
+
+        public string RepositoryName
+        {
+            get { return repositoryName; }
+            set
+            {
+                if (repositoryName != value)
+                {
+                    repositoryName = value;
+                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(RepositoryName)));
+                }
+            }
+        }
+
         public ICommand OpenPullRequestsCommand { get; }
         public ICommand ShowCurrentPullRequestCommand { get; }
 
diff --git a/src/GitHub.InlineReviews/Views/PullRequestStatusView.xaml b/src/GitHub.InlineReviews/Views/PullRequestStatusView.xaml
@@ -49,7 +49,10 @@
                         Fill="White"
                         VerticalAlignment="Bottom"
                         Margin="0 0 4 0 "
-                        Icon="git_pull_request" />
+                        Icon="mark_github" />
+                    <TextBlock VerticalAlignment="Center">
+                        <Run Text="{Binding RepositoryOwner}" /> / <Run Text="{Binding RepositoryName}" />
+                    </TextBlock>
                 </StackPanel>
             </Button>
             <Grid.ToolTip>

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ async Task RefreshCurrentSession(LocalRepositoryModel repository, IPullRequestSe`
`98`	`98`	`return;`
`99`	`99`	`}`
`100`	`100`
`101`		`- var viewModel = CreatePullRequestStatusViewModel(session);`
	`101`	`+ var viewModel = CreatePullRequestStatusViewModel(repository, session);`
`102`	`102`	`ShowStatus(viewModel);`
`103`	`103`	`}`
`104`	`104`
`@@ -155,13 +155,15 @@ async Task<bool> IsDotComOrEnterpriseRepository(LocalRepositoryModel repository)`
`155`	`155`	`return false;`
`156`	`156`	`}`
`157`	`157`
`158`		`- PullRequestStatusViewModel CreatePullRequestStatusViewModel(IPullRequestSession session)`
	`158`	`+ PullRequestStatusViewModel CreatePullRequestStatusViewModel(LocalRepositoryModel repository, IPullRequestSession session)`
`159`	`159`	`{`
`160`		`- var pullRequestStatusViewModel = new PullRequestStatusViewModel(openPullRequestsCommand, showCurrentPullRequestCommand);`
`161`		`- var pullRequest = session?.PullRequest;`
`162`		`- pullRequestStatusViewModel.Number = pullRequest?.Number;`
`163`		`- pullRequestStatusViewModel.Title = pullRequest?.Title;`
`164`		`- return pullRequestStatusViewModel;`
	`160`	`+ return new PullRequestStatusViewModel(openPullRequestsCommand, showCurrentPullRequestCommand)`
	`161`	`+ {`
	`162`	`+ Number = session?.PullRequest?.Number,`
	`163`	`+ Title = session?.PullRequest?.Title,`
	`164`	`+ RepositoryName = repository?.Name,`
	`165`	`+ RepositoryOwner = repository?.Owner,`
	`166`	`+ };`
`165`	`167`	`}`
`166`	`168`
`167`	`169`	`PullRequestStatusView ShowStatus(PullRequestStatusViewModel pullRequestStatusViewModel = null)`