Attempting to use the view locator correctly

src/GitHub.App/ViewModels/GitHubPane/PullRequestCheckViewModel.cs

@@ -20,18 +20,14 @@ public class PullRequestCheckViewModel: ViewModelBase, IPullRequestCheckViewMode
         private readonly IUsageTracker usageTracker;
         const string DefaultAvatar = "pack://application:,,,/GitHub.App;component/Images/default_user_avatar.png";
 
-        [Import]
-        public IVisualStudioBrowser VisualStudioBrowser { get; set; }
-
         private string title;
         private string description;
         private PullRequestCheckStatusEnum status;
         private Uri detailsUrl;
         private string avatarUrl;
         private BitmapImage avatar;
 
-        public static IEnumerable<IPullRequestCheckViewModel> Build(IViewViewModelFactory viewViewModelFactory,
-            PullRequestDetailModel pullRequest)
+        public static IEnumerable<IPullRequestCheckViewModel> Build(IViewViewModelFactory viewViewModelFactory, PullRequestDetailModel pullRequest)
         {
             return pullRequest.Statuses?.Select(model =>
             {
@@ -79,7 +75,6 @@ public PullRequestCheckViewModel(IUsageTracker usageTracker)
 
         private void DoOpenDetailsUrl(object obj)
         {
-            VisualStudioBrowser.OpenUrl(DetailsUrl);
             usageTracker.IncrementCounter(x => x.NumberOfPRCheckStatusesOpenInGitHub).Forget();
         }
 

src/GitHub.App/ViewModels/GitHubPane/PullRequestDetailViewModel.cs

@@ -125,9 +125,7 @@ public PullRequestDetailViewModel(
             SyncSubmodules.Subscribe(_ => Refresh().ToObservable());
             SubscribeOperationError(SyncSubmodules);
 
-            OpenOnGitHub = ReactiveCommand.Create().OnExecuteCompleted(o => {
-                usageTracker.IncrementCounter(x => x.NumberOfPRDetailsOpenInGitHub).Forget();
-            });
+            OpenOnGitHub = ReactiveCommand.Create();
             ShowReview = ReactiveCommand.Create().OnExecuteCompleted(DoShowReview);
         }
 

src/GitHub.VisualStudio/Views/GitHubPane/PullRequestCheckView.xaml

@@ -1,12 +1,13 @@
-<UserControl x:Class="GitHub.VisualStudio.Views.GitHubPane.PullRequestCheckView"
+<local:GenericPullRequestCheckView
+            x:Class="GitHub.VisualStudio.Views.GitHubPane.PullRequestCheckView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:GitHub.VisualStudio.Views.GitHubPane"
              xmlns:ghfvs="https://github.com/github/VisualStudio"
              xmlns:c="clr-namespace:GitHub.VisualStudio.UI.Controls;assembly=GitHub.VisualStudio.UI"
-             xmlns:v="clr-namespace:GitHub.VisualStudio.Views"
+             xmlns:views="clr-namespace:GitHub.VisualStudio.Views"
              xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI"
              xmlns:vm="clr-namespace:GitHub.ViewModels.GitHubPane;assembly=GitHub.App"
              xmlns:cache="clr-namespace:GitHub.UI.Helpers;assembly=GitHub.UI"
@@ -56,5 +57,5 @@
             <Hyperlink ToolTip="{Binding DetailsUrl}"  Command="{Binding OpenDetailsUrl}">Details</Hyperlink>
         </Label>
     </Grid>
-</UserControl>
+</local:GenericPullRequestCheckView>
 

src/GitHub.VisualStudio/Views/GitHubPane/PullRequestCheckView.xaml.cs

@@ -1,12 +1,36 @@
-using System.Windows.Controls;
+using System;
+using System.ComponentModel.Composition;
+using GitHub.Exports;
+using GitHub.Services;
+using GitHub.UI;
+using GitHub.ViewModels.GitHubPane;
+using ReactiveUI;
 
 namespace GitHub.VisualStudio.Views.GitHubPane
 {
-    public partial class PullRequestCheckView : UserControl
+    public class GenericPullRequestCheckView : ViewBase<IPullRequestCheckViewModel, GenericPullRequestCheckView> { }
+
+    [ExportViewFor(typeof(IPullRequestCheckViewModel))]
+    [PartCreationPolicy(CreationPolicy.NonShared)]
+    public partial class PullRequestCheckView : GenericPullRequestCheckView
     {
         public PullRequestCheckView()
         {
             InitializeComponent();
+
+            this.WhenActivated(d =>
+            {
+                d(ViewModel.OpenDetailsUrl.Subscribe(_ => DoOpenDetailsUrl()));
+            });
+        }
+
+        [Import]
+        IVisualStudioBrowser VisualStudioBrowser { get; set; }
+
+        void DoOpenDetailsUrl()
+        {
+            var browser = VisualStudioBrowser;
+            browser.OpenUrl(ViewModel.DetailsUrl);
         }
     }
 }

src/GitHub.VisualStudio/Views/GitHubPane/PullRequestDetailView.xaml

@@ -43,6 +43,8 @@
                 <ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/Assets/Markdown.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
+            <v:ViewLocator x:Key="viewLocator"/>
+
             <Style x:Key="Separator" TargetType="Rectangle">
                 <Setter Property="Fill" Value="{DynamicResource GitHubHeaderSeparatorBrush}"/>
             </Style>
@@ -257,8 +259,8 @@
                             </ItemsPanelTemplate>
                         </ItemsControl.ItemsPanel>
                         <ItemsControl.ItemTemplate>
-                            <DataTemplate>
-                                <local:PullRequestCheckView/>
+                            <DataTemplate DataType="ghfvs:PullRequestCheckViewModel">
+                                <ContentControl Content="{Binding Converter={StaticResource viewLocator}}"/>
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>