Merge branch 'master' into donokuda/pr-list-polish

Author: donokuda

src/GitHub.App/Collections/IVirtualizingListSource.cs

@@ -10,7 +10,7 @@ namespace GitHub.Collections
     /// </summary>
     /// <typeparam name="T">The item type.</typeparam>
     /// <remarks>
-    /// This interface is used the the <see cref="VirtualizingList{T}"/> class to load pages of data.
+    /// This interface is used by the <see cref="VirtualizingList{T}"/> class to load pages of data.
     /// </remarks>
     public interface IVirtualizingListSource<T> : IDisposable, INotifyPropertyChanged
     {

src/GitHub.App/GitHub.App.csproj

@@ -194,6 +194,9 @@
       <HintPath>..\..\packages\Rx-XAML.2.2.5-custom\lib\net45\System.Reactive.Windows.Threading.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />

src/GitHub.App/SampleData/PullRequestListViewModelDesigner.cs

@@ -59,9 +59,12 @@ public PullRequestListViewModelDesigner()
         public IReadOnlyList<IRepositoryModel> Forks { get; }
         public string SearchQuery { get; set; }
         public string SelectedState { get; set; }
+        public string StateCaption { get; set; }
         public IReadOnlyList<string> States { get; }
+        public Uri WebUrl => null;
         public ReactiveCommand<object> CreatePullRequest { get; }
         public ReactiveCommand<Unit> OpenItem { get; }
+        public ReactiveCommand<object> OpenItemInBrowser { get; }
 
         public Task InitializeAsync(ILocalRepositoryModel repository, IConnection connection) => Task.CompletedTask;
     }

src/GitHub.App/Services/RepositoryService.cs

@@ -14,7 +14,7 @@ namespace GitHub.Services
     [PartCreationPolicy(CreationPolicy.Shared)]
     public class RepositoryService : IRepositoryService
     {
-        static ICompiledQuery<string> readParentOwnerLogin;
+        static ICompiledQuery<Tuple<string, string>> readParentOwnerLogin;
         readonly IGraphQLClientFactory graphqlFactory;
 
         [ImportingConstructor]
@@ -25,7 +25,7 @@ public RepositoryService(IGraphQLClientFactory graphqlFactory)
             this.graphqlFactory = graphqlFactory;
         }
 
-        public async Task<string> ReadParentOwnerLogin(HostAddress address, string owner, string name)
+        public async Task<(string owner, string name)?> FindParent(HostAddress address, string owner, string name)
         {
             Guard.ArgumentNotNull(address, nameof(address));
             Guard.ArgumentNotEmptyString(owner, nameof(owner));
@@ -35,7 +35,7 @@ public async Task<string> ReadParentOwnerLogin(HostAddress address, string owner
             {
                 readParentOwnerLogin = new Query()
                     .Repository(Var(nameof(owner)), Var(nameof(name)))
-                    .Select(r => r.Parent != null ? r.Parent.Owner.Login : null)
+                    .Select(r => r.Parent != null ? Tuple.Create(r.Parent.Owner.Login, r.Parent.Name) : null)
                     .Compile();
             }
 
@@ -46,7 +46,8 @@ public async Task<string> ReadParentOwnerLogin(HostAddress address, string owner
             };
 
             var graphql = await graphqlFactory.CreateConnection(address);
-            return await graphql.Run(readParentOwnerLogin, vars);
+            var result = await graphql.Run(readParentOwnerLogin, vars);
+            return result != null ? (result.Item1, result.Item2) : ((string, string)?)null;
         }
     }
 }

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

@@ -30,6 +30,7 @@ public abstract class IssueListViewModelBase : PanePageViewModelBase, IIssueList
         IReadOnlyList<IRepositoryModel> forks;
         string searchQuery;
         string selectedState;
+        ObservableAsPropertyHelper<string> stateCaption;
         string stringFilter;
         int numberFilter;
         IUserFilterViewModel authorFilter;
@@ -42,6 +43,13 @@ public IssueListViewModelBase(IRepositoryService repositoryService)
         {
             this.repositoryService = repositoryService;
             OpenItem = ReactiveCommand.CreateAsyncTask(OpenItemImpl);
+            stateCaption = this.WhenAnyValue(
+                x => x.Items.Count,
+                x => x.SelectedState,
+                x => x.IsBusy,
+                x => x.IsLoading,
+                (count, state, busy, loading) => busy || loading ? state : count + " " + state)
+                .ToProperty(this, x => x.StateCaption);
         }
 
         /// <inheritdoc/>
@@ -106,6 +114,9 @@ public string SelectedState
         /// <inheritdoc/>
         public abstract IReadOnlyList<string> States { get; }
 
+        /// <inheritdoc/>
+        public string StateCaption => stateCaption.Value;
+
         /// <inheritdoc/>
         public ReactiveCommand<Unit> OpenItem { get; }
 
@@ -116,20 +127,21 @@ public async Task InitializeAsync(ILocalRepositoryModel repository, IConnection
             SelectedState = States.FirstOrDefault();
             AuthorFilter = new UserFilterViewModel(LoadAuthors);
 
-            var parentOwner = await repositoryService.ReadParentOwnerLogin(
+            var parent = await repositoryService.FindParent(
                 HostAddress.Create(repository.CloneUrl),
                 repository.Owner,
                 repository.Name);
 
-            if (parentOwner == null)
+            if (parent == null)
             {
                 RemoteRepository = repository;
             }
             else
             {
+                // TODO: Handle forks with different names.
                 RemoteRepository = new RepositoryModel(
                     repository.Name,
-                    UriString.ToUriString(repository.CloneUrl.ToRepositoryUrl(parentOwner)));
+                    UriString.ToUriString(repository.CloneUrl.ToRepositoryUrl(parent.Value.owner)));
 
                 Forks = new IRepositoryModel[]
                 {

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

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Diagnostics;
+using System.Reactive.Linq;
 using System.Threading.Tasks;
 using GitHub.Collections;
 using GitHub.Extensions;
@@ -24,6 +25,7 @@ public class PullRequestListViewModel : IssueListViewModelBase, IPullRequestList
         readonly IPullRequestSessionManager sessionManager;
         readonly IPullRequestService service;
         readonly IDisposable subscription;
+        ObservableAsPropertyHelper<Uri> webUrl;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PullRequestListViewModel"/> class.
@@ -45,15 +47,25 @@ public PullRequestListViewModel(
             this.service = service;
 
             subscription = sessionManager.WhenAnyValue(x => x.CurrentSession.PullRequest.Number).Subscribe(UpdateCurrent);
+            webUrl = this.WhenAnyValue(x => x.RemoteRepository)
+                .Select(x => x?.CloneUrl?.ToRepositoryUrl().Append("pulls"))
+                .ToProperty(this, x => x.WebUrl);
             CreatePullRequest = ReactiveCommand.Create().OnExecuteCompleted(_ => NavigateTo("pull/new"));
+            OpenItemInBrowser = ReactiveCommand.Create();
         }
 
         /// <inheritdoc/>
         public override IReadOnlyList<string> States => states;
 
+        /// <inheritdoc/>
+        public Uri WebUrl => webUrl.Value;
+
         /// <inheritdoc/>
         public ReactiveCommand<object> CreatePullRequest { get; }
 
+        /// <inheritdoc/>
+        public ReactiveCommand<object> OpenItemInBrowser { get; }
+
         /// <inheritdoc/>
         protected override IVirtualizingListSource<IIssueListItemViewModelBase> CreateItemSource()
         {

src/GitHub.App/ViewModels/UserFilterViewModel.cs

@@ -25,8 +25,11 @@ public class UserFilterViewModel : ViewModelBase, IUserFilterViewModel
 
         public UserFilterViewModel(LoadPageDelegate load)
         {
+            Guard.ArgumentNotNull(load, nameof(load));
+
             this.load = load;
             this.WhenAnyValue(x => x.Filter).Subscribe(FilterChanged);
+            this.WhenAnyValue(x => x.Selected).Subscribe(_ => Filter = null);
             ClearSelection = ReactiveCommand.Create(
                 this.WhenAnyValue(x => x.Selected).Select(x => x != null))
                 .OnExecuteCompleted(_ => Selected = null);
@@ -96,7 +99,7 @@ void FilterChanged(string filter)
                 }
             }
 
-            usersView.Refresh();
+            UsersView.Refresh();
         }
 
         bool FilterUsers(object obj)

src/GitHub.App/packages.config

@@ -33,4 +33,5 @@
   <package id="SerilogAnalyzer" version="0.12.0.0" targetFramework="net461" />
   <package id="SQLitePCL.raw_basic" version="0.7.3.0-vs2012" targetFramework="net45" />
   <package id="Stateless" version="2.5.56.0" targetFramework="net45" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
 </packages>

src/GitHub.Exports.Reactive/ViewModels/GitHubPane/IIssueListViewModelBase.cs

@@ -89,6 +89,11 @@ public interface IIssueListViewModelBase : ISearchablePageViewModel
         /// </summary>
         IReadOnlyList<string> States { get; }
 
+        /// <summary>
+        /// Gets the caption to display as the header on the <see cref="States"/> dropdown.
+        /// </summary>
+        string StateCaption { get; }
+
         /// <summary>
         /// Gets a command which opens the item passed as a parameter.
         /// </summary>

src/GitHub.Exports.Reactive/ViewModels/GitHubPane/IPullRequestListViewModel.cs

@@ -6,11 +6,16 @@ namespace GitHub.ViewModels.GitHubPane
     /// <summary>
     /// Represents a view model which displays a pull request list.
     /// </summary>
-    public interface IPullRequestListViewModel : IIssueListViewModelBase
+    public interface IPullRequestListViewModel : IIssueListViewModelBase, IOpenInBrowser
     {
         /// <summary>
         /// Gets a command which navigates to the "Create Pull Request" view.
         /// </summary>
         ReactiveCommand<object> CreatePullRequest { get; }
+
+        /// <summary>
+        /// Gets a command that opens pull request item on GitHub.
+        /// </summary>
+        ReactiveCommand<object> OpenItemInBrowser { get; }
     }
 }