Expose the PR model from view model.

And bind to that where we don't need to do any transformation for the
view.

Author: grokys

src/GitHub.App/Models/PullRequestModel.cs

@@ -9,6 +9,7 @@
 namespace GitHub.Models
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
+    [NullGuard(ValidationFlags.None)]
     public sealed class PullRequestModel : NotificationAwareObject, IPullRequestModel,
         IEquatable<PullRequestModel>,
         IComparable<PullRequestModel>

src/GitHub.App/SampleData/PullRequestDetailViewModelDesigner.cs

@@ -12,14 +12,17 @@ public class PullRequestDetailViewModelDesigner : BaseViewModel, IPullRequestDet
     {
         public PullRequestDetailViewModelDesigner()
         {
-            Title = "Error handling/bubbling from viewmodels to views to viewhosts";
-            State = PullRequestStateEnum.Open;
+            Model = new PullRequestModel(419, 
+                "Error handling/bubbling from viewmodels to views to viewhosts",
+                 new AccountDesigner { Login = "shana", IsUser = true },
+                 DateTime.Now.Subtract(TimeSpan.FromDays(3)))
+            {
+                State = PullRequestStateEnum.Open,
+                CommitCount = 9,
+            };
+
             SourceBranchDisplayName = "shana/error-handling";
             TargetBranchDisplayName = "master";
-            CommitCount = 9;
-            Author = new AccountDesigner { Login = "shana", IsUser = true };
-            CreatedAt = DateTime.Now.Subtract(TimeSpan.FromDays(3));
-            Number = 419;
             Body = @"Adds a way to surface errors from the view model to the view so that view hosts can get to them.
 
 ViewModels are responsible for handling the UI on the view they control, but they shouldn't be handling UI for things outside of the view. In this case, we're showing errors in VS outside the view, and that should be handled by the section that is hosting the view.
@@ -41,7 +44,6 @@ public PullRequestDetailViewModelDesigner()
             modelsDir.Files.Add(oldBranchModel);
             gitHubDir.Directories.Add(modelsDir);
 
-            ChangedFilesCount = 3;
             ChangedFilesTree = new ReactiveList<IPullRequestChangeNode>();
             ChangedFilesTree.Add(gitHubDir);
 
@@ -53,16 +55,11 @@ public PullRequestDetailViewModelDesigner()
             CheckoutMode = CheckoutMode.Fetch;
         }
 
-        public PullRequestStateEnum State { get; }
+        public IPullRequestModel Model { get; }
         public string SourceBranchDisplayName { get; }
         public string TargetBranchDisplayName { get; }
-        public int CommitCount { get; }
-        public IAccount Author { get; }
-        public DateTimeOffset CreatedAt { get; }
-        public int Number { get; }
         public string Body { get; }
-        public int ChangedFilesCount { get; }
-        public ChangedFilesView ChangedFilesView { get; set; }
+        public ChangedFilesViewType ChangedFilesViewType { get; set; }
         public OpenChangedFileAction OpenChangedFileAction { get; set; }
         public IReactiveList<IPullRequestChangeNode> ChangedFilesTree { get; }
         public IReactiveList<IPullRequestFileViewModel> ChangedFilesList { get; }

src/GitHub.App/Services/ModelService.cs

@@ -180,9 +180,6 @@ public ITrackingCollection<IPullRequestModel> GetPullRequests(ILocalRepositoryMo
 
         public IObservable<IPullRequestModel> GetPullRequest(ILocalRepositoryModel repo, int number)
         {
-            var keyobs = GetUserFromCache()
-                .Select(user => string.Format(CultureInfo.InvariantCulture, "{0}|{1}:{2}", CacheIndex.PRPrefix, user.Login, repo.Name));
-
             return Observable.Defer(() =>
             {
                 return hostCache.GetAndRefreshObject(PRPrefix + '|' + number, () =>

src/GitHub.App/ViewModels/PullRequestDetailViewModel.cs

@@ -26,21 +26,14 @@ namespace GitHub.ViewModels
     [NullGuard(ValidationFlags.None)]
     public class PullRequestDetailViewModel : BaseViewModel, IPullRequestDetailViewModel
     {
-        readonly IRepositoryHost repositoryHost;
         readonly ILocalRepositoryModel repository;
         readonly IModelService modelService;
         readonly IPullRequestService pullRequestsService;
         IPullRequestModel model;
-        PullRequestStateEnum state;
         string sourceBranchDisplayName;
         string targetBranchDisplayName;
-        int commitCount;
-        IAccount author;
-        DateTimeOffset createdAt;
         string body;
-        int number;
-        int changeCount;
-        ChangedFilesView changedFilesView;
+        ChangedFilesViewType changedFilesViewType;
         OpenChangedFileAction openChangedFileAction;
         CheckoutMode checkoutMode;
         string checkoutError;
@@ -59,8 +52,7 @@ public class PullRequestDetailViewModel : BaseViewModel, IPullRequestDetailViewM
             IConnectionRepositoryHostMap connectionRepositoryHostMap,
             ITeamExplorerServiceHolder teservice,
             IPullRequestService pullRequestsService)
-            : this(connectionRepositoryHostMap.CurrentRepositoryHost,
-                  teservice.ActiveRepo,
+            : this(teservice.ActiveRepo,
                   connectionRepositoryHostMap.CurrentRepositoryHost.ModelService,
                   pullRequestsService)
         {
@@ -74,12 +66,10 @@ public class PullRequestDetailViewModel : BaseViewModel, IPullRequestDetailViewM
         /// <param name="pullRequestsService">The pull requests service.</param>
         /// <param name="avatarProvider">The avatar provider.</param>
         public PullRequestDetailViewModel(
-            IRepositoryHost repositoryHost,
             ILocalRepositoryModel repository,
             IModelService modelService,
             IPullRequestService pullRequestsService)
         {
-            this.repositoryHost = repositoryHost;
             this.repository = repository;
             this.modelService = modelService;
             this.pullRequestsService = pullRequestsService;
@@ -95,8 +85,8 @@ public PullRequestDetailViewModel(
             ToggleChangedFilesView = ReactiveCommand.Create();
             ToggleChangedFilesView.Subscribe(_ =>
             {
-                ChangedFilesView = ChangedFilesView == ChangedFilesView.TreeView ?
-                    ChangedFilesView.ListView : ChangedFilesView.TreeView;
+                ChangedFilesViewType = ChangedFilesViewType == ChangedFilesViewType.TreeView ?
+                    ChangedFilesViewType.ListView : ChangedFilesViewType.TreeView;
             });
 
             ToggleOpenChangedFileAction = ReactiveCommand.Create();
@@ -111,12 +101,12 @@ public PullRequestDetailViewModel(
         }
 
         /// <summary>
-        /// Gets the state of the pull request, e.g. Open, Closed, Merged.
+        /// Gets the underlying pull request model.
         /// </summary>
-        public PullRequestStateEnum State
+        public IPullRequestModel Model
         {
-            get { return state; }
-            private set { this.RaiseAndSetIfChanged(ref state, value); }
+            get { return model; }
+            private set { this.RaiseAndSetIfChanged(ref model, value); }
         }
 
         /// <summary>
@@ -137,42 +127,6 @@ public string TargetBranchDisplayName
             private set { this.RaiseAndSetIfChanged(ref targetBranchDisplayName, value); }
         }
 
-        /// <summary>
-        /// Gets the number of commits in the pull request.
-        /// </summary>
-        public int CommitCount
-        {
-            get { return commitCount; }
-            private set { this.RaiseAndSetIfChanged(ref commitCount, value); }
-        }
-
-        /// <summary>
-        /// Gets the pull request number.
-        /// </summary>
-        public int Number
-        {
-            get { return number; }
-            private set { this.RaiseAndSetIfChanged(ref number, value); }
-        }
-
-        /// <summary>
-        /// Gets the account that submitted the pull request.
-        /// </summary>
-        public IAccount Author
-        {
-            get { return author; }
-            private set { this.RaiseAndSetIfChanged(ref author, value); }
-        }
-
-        /// <summary>
-        /// Gets the date and time at which the pull request was created.
-        /// </summary>
-        public DateTimeOffset CreatedAt
-        {
-            get { return createdAt; }
-            private set { this.RaiseAndSetIfChanged(ref createdAt, value); }
-        }
-
         /// <summary>
         /// Gets the pull request body.
         /// </summary>
@@ -182,22 +136,13 @@ public string Body
             private set { this.RaiseAndSetIfChanged(ref body, value); }
         }
 
-        /// <summary>
-        /// Gets the number of files that have been changed in the pull request.
-        /// </summary>
-        public int ChangedFilesCount
-        {
-            get { return changeCount; }
-            private set { this.RaiseAndSetIfChanged(ref changeCount, value); }
-        }
-
         /// <summary>
         /// Gets or sets a value describing how changed files are displayed in a view.
         /// </summary>
-        public ChangedFilesView ChangedFilesView
+        public ChangedFilesViewType ChangedFilesViewType
         {
-            get { return changedFilesView; }
-            set { this.RaiseAndSetIfChanged(ref changedFilesView, value); }
+            get { return changedFilesViewType; }
+            set { this.RaiseAndSetIfChanged(ref changedFilesViewType, value); }
         }
 
         /// <summary>
@@ -267,7 +212,7 @@ public string CheckoutDisabledMessage
         public ReactiveCommand<object> OpenOnGitHub { get; }
 
         /// <summary>
-        /// Gets a command that toggles the <see cref="ChangedFilesView"/> property.
+        /// Gets a command that toggles the <see cref="ChangedFilesViewType"/> property.
         /// </summary>
         public ReactiveCommand<object> ToggleChangedFilesView { get; }
 
@@ -308,17 +253,10 @@ public override void Initialize([AllowNull] ViewWithData data)
         /// <param name="files">The pull request's changed files.</param>
         public async Task Load(IPullRequestModel pullRequest)
         {
-            model = pullRequest;
-            State = pullRequest.State;
+            Model = pullRequest;
             SourceBranchDisplayName = GetBranchDisplayName(pullRequest.Head.Label);
             TargetBranchDisplayName = GetBranchDisplayName(pullRequest.Base.Label);
-            CommitCount = pullRequest.CommitCount;
-            Title = pullRequest.Title;
-            Number = pullRequest.Number;
-            Author = pullRequest.Author;
-            CreatedAt = pullRequest.CreatedAt;
             Body = !string.IsNullOrWhiteSpace(pullRequest.Body) ? pullRequest.Body : "*No description provided.*";
-            ChangedFilesCount = pullRequest.ChangedFiles.Count;
 
             ChangedFilesTree.Clear();
             ChangedFilesList.Clear();
@@ -338,7 +276,7 @@ public async Task Load(IPullRequestModel pullRequest)
 
             if (localBranches.Contains(repository.CurrentBranch))
             {
-                var divergence = await pullRequestsService.CalculateHistoryDivergence(repository, Number);
+                var divergence = await pullRequestsService.CalculateHistoryDivergence(repository, Model.Number);
 
                 if (divergence.BehindBy == null)
                 {
@@ -454,17 +392,17 @@ IObservable<Unit> DoCheckout(object unused)
                     break;
                 case CheckoutMode.Fetch:
                     operation = pullRequestsService
-                        .GetDefaultLocalBranchName(repository, Number, Title)
-                        .SelectMany(x => pullRequestsService.FetchAndCheckout(repository, Number, x));
+                        .GetDefaultLocalBranchName(repository, Model.Number, Title)
+                        .SelectMany(x => pullRequestsService.FetchAndCheckout(repository, Model.Number, x));
                     break;
                 case CheckoutMode.Switch:
-                    operation = pullRequestsService.SwitchToBranch(repository, model);
+                    operation = pullRequestsService.SwitchToBranch(repository, Model);
                     break;
                 case CheckoutMode.InvalidState:
                     operation = pullRequestsService
                         .UnmarkLocalBranch(repository)
-                        .SelectMany(_ => pullRequestsService.GetDefaultLocalBranchName(repository, Number, Title))
-                        .SelectMany(x => pullRequestsService.FetchAndCheckout(repository, Number, x));
+                        .SelectMany(_ => pullRequestsService.GetDefaultLocalBranchName(repository, Model.Number, Title))
+                        .SelectMany(x => pullRequestsService.FetchAndCheckout(repository, Model.Number, x));
                     break;
                 default:
                     Debug.Fail("Invalid CheckoutMode in PullRequestDetailViewModel.DoCheckout.");

src/GitHub.Exports.Reactive/ViewModels/IPullRequestDetailViewModel.cs

@@ -8,7 +8,7 @@ namespace GitHub.ViewModels
     /// <summary>
     /// Describes how changed files are displayed in a the pull request details view.
     /// </summary>
-    public enum ChangedFilesView
+    public enum ChangedFilesViewType
     {
         /// <summary>
         /// The files are displayed as a tree.
@@ -81,9 +81,9 @@ public enum CheckoutMode
     public interface IPullRequestDetailViewModel : IViewModel, IHasBusy
     {
         /// <summary>
-        /// Gets the state of the pull request, e.g. Open, Closed, Merged.
+        /// Gets the underlying pull request model.
         /// </summary>
-        PullRequestStateEnum State { get; }
+        IPullRequestModel Model { get; }
 
         /// <summary>
         /// Gets a string describing how to display the pull request's source branch.
@@ -95,40 +95,15 @@ public interface IPullRequestDetailViewModel : IViewModel, IHasBusy
         /// </summary>
         string TargetBranchDisplayName { get; }
 
-        /// <summary>
-        /// Gets the number of commits in the pull request.
-        /// </summary>
-        int CommitCount { get; }
-
-        /// <summary>
-        /// Gets the pull request number.
-        /// </summary>
-        int Number { get; }
-
-        /// <summary>
-        /// Gets the account that submitted the pull request.
-        /// </summary>
-        IAccount Author { get; }
-
-        /// <summary>
-        /// Gets the date and time at which the pull request was created.
-        /// </summary>
-        DateTimeOffset CreatedAt { get; }
-
         /// <summary>
         /// Gets the pull request body.
         /// </summary>
         string Body { get; }
 
-        /// <summary>
-        /// Gets the number of files that have been changed in the pull request.
-        /// </summary>
-        int ChangedFilesCount { get; }
-
         /// <summary>
         /// Gets or sets a value describing how changed files are displayed in a view.
         /// </summary>
-        ChangedFilesView ChangedFilesView { get; set; }
+        ChangedFilesViewType ChangedFilesViewType { get; set; }
 
         /// <summary>
         /// Gets or sets a value describing how files are opened when double clicked.
@@ -177,7 +152,7 @@ public interface IPullRequestDetailViewModel : IViewModel, IHasBusy
         ReactiveCommand<object> OpenOnGitHub { get; }
 
         /// <summary>
-        /// Gets a command that toggles the <see cref="ChangedFilesView"/> property.
+        /// Gets a command that toggles the <see cref="ChangedFilesViewType"/> property.
         /// </summary>
         ReactiveCommand<object> ToggleChangedFilesView { get; }