Implement filtering of the pr list view

shana · shana · commit 6819bea86395 · 2016-04-22T17:40:09.000+02:00
diff --git a/src/GitHub.App/SampleData/PullRequestListViewModelDesigner.cs b/src/GitHub.App/SampleData/PullRequestListViewModelDesigner.cs
@@ -5,6 +5,10 @@
 using GitHub.Collections;
 using GitHub.Models;
 using GitHub.ViewModels;
+using System.Collections.Generic;
+using ReactiveUI;
+using System.Collections.ObjectModel;
+using System.Linq;
 
 namespace GitHub.SampleData
 {
@@ -14,14 +18,43 @@ public class PullRequestListViewModelDesigner : BaseViewModelDesigner, IPullRequ
         public PullRequestListViewModelDesigner()
         {
             var prs = new TrackingCollection<IPullRequestModel>(Observable.Empty<IPullRequestModel>());
-            prs.Add(new PullRequestModel(399, "Let's try doing this differently", new AccountDesigner { Login = "shana", IsUser = true }, DateTimeOffset.Now - TimeSpan.FromDays(1)));
-            prs.Add(new PullRequestModel(389, "Build system upgrade", new AccountDesigner { Login = "haacked", IsUser = true }, DateTimeOffset.Now - TimeSpan.FromMinutes(2)) { CommentCount = 4, HasNewComments = false });
-            prs.Add(new PullRequestModel(409, "Fix publish button style", new AccountDesigner { Login = "shana", IsUser = false }, DateTimeOffset.Now - TimeSpan.FromHours(5)) { CommentCount = 27, HasNewComments = true });
+            prs.Add(new PullRequestModel(399, "Let's try doing this differently",
+                new AccountDesigner { Login = "shana", IsUser = true },
+                new AccountDesigner { Login = "shana", IsUser = true },
+                DateTimeOffset.Now - TimeSpan.FromDays(1)));
+            prs.Add(new PullRequestModel(389, "Build system upgrade",
+                new AccountDesigner { Login = "haacked", IsUser = true },
+                new AccountDesigner { Login = "shana", IsUser = true },
+                DateTimeOffset.Now - TimeSpan.FromMinutes(2)) { CommentCount = 4, HasNewComments = false });
+            prs.Add(new PullRequestModel(409, "Fix publish button style",
+                new AccountDesigner { Login = "shana", IsUser = true },
+                new AccountDesigner { Login = "Haacked", IsUser = true },
+                DateTimeOffset.Now - TimeSpan.FromHours(5)) { CommentCount = 27, HasNewComments = true });
             PullRequests = prs;
+
+            States = new List<PullRequestState> {
+                new PullRequestState { IsOpen = true, Name = "Open" },
+                new PullRequestState { IsOpen = false, Name = "Closed" },
+                new PullRequestState { Name = "All" }
+            };
+            SelectedState = States[0];
+            Assignees = new ObservableCollection<IAccount>(prs.Select(x => x.Assignee));
+            Authors = new ObservableCollection<IAccount>(prs.Select(x => x.Author));
+            SelectedAssignee = Assignees.ElementAt(1);
+            SelectedAuthor = Authors.ElementAt(1);
         }
 
-        public ITrackingCollection<IPullRequestModel> PullRequests { get; set; }
+        public ObservableCollection<IPullRequestModel> PullRequests { get; set; }
         public IPullRequestModel SelectedPullRequest { get; set; }
         public ICommand OpenPullRequest { get; set; }
+
+        public IReadOnlyList<PullRequestState> States { get; set; }
+        public PullRequestState SelectedState { get; set; }
+
+        public ObservableCollection<IAccount> Authors { get; set; }
+        public IAccount SelectedAuthor { get; set; }
+
+        public ObservableCollection<IAccount> Assignees { get; set; }
+        public IAccount SelectedAssignee { get; set; }
     }
 }
diff --git a/src/GitHub.App/ViewModels/PullRequestListViewModel.cs b/src/GitHub.App/ViewModels/PullRequestListViewModel.cs
@@ -13,10 +13,10 @@
 using System.Reactive.Linq;
 using GitHub.Extensions.Reactive;
 using System.Windows.Data;
-using System.ComponentModel;
 using GitHub.Collections;
 using System.Windows.Input;
 using GitHub.UI;
+using System.Windows.Media.Imaging;
 
 namespace GitHub.ViewModels
 {
@@ -27,6 +27,8 @@ public class PullRequestListViewModel : BaseViewModel, IPullRequestListViewModel
         readonly ReactiveCommand<object> openPullRequestCommand;
         readonly IRepositoryHost repositoryHost;
         readonly ISimpleRepositoryModel repository;
+        readonly TrackingCollection<IAccount> trackingAuthors;
+        readonly TrackingCollection<IAccount> trackingAssignees;
 
         [ImportingConstructor]
         PullRequestListViewModel(
@@ -46,30 +48,68 @@ public PullRequestListViewModel(IRepositoryHost repositoryHost, ISimpleRepositor
                 VisualStudio.Services.DefaultExportProvider.GetExportedValue<IVisualStudioBrowser>().OpenUrl(repositoryHost.Address.WebUri);
             });
 
-            var list = new TrackingCollection<IPullRequestModel>();
-            list.Comparer = OrderedComparer<IPullRequestModel>.OrderByDescending(x => x.UpdatedAt).Compare;
-            list.Filter = (pr, i, l) => pr.IsOpen;
-            PullRequests = list;
+            States = new List<PullRequestState> {
+                new PullRequestState { IsOpen = true, Name = "Open" },
+                new PullRequestState { IsOpen = false, Name = "Closed" },
+                new PullRequestState { Name = "All" }
+            };
+            SelectedState = States[0];
+
+            this.WhenAny(x => x.SelectedState, x => x.Value)
+                .Where(x => PullRequests != null)
+                .Subscribe(s => UpdateFilter(s, SelectedAssignee, SelectedAuthor));
+
+            this.WhenAny(x => x.SelectedAssignee, x => x.Value)
+                .Where(x => PullRequests != null)
+                .Subscribe(a => UpdateFilter(SelectedState, a, SelectedAuthor));
+
+            this.WhenAny(x => x.SelectedAuthor, x => x.Value)
+                .Where(x => PullRequests != null)
+                .Subscribe(a => UpdateFilter(SelectedState, SelectedAssignee, a));
+
+            trackingAuthors = new TrackingCollection<IAccount>(Observable.Empty<IAccount>(),
+                OrderedComparer<IAccount>.OrderByDescending(x => x.Login).Compare);
+            trackingAssignees = new TrackingCollection<IAccount>(Observable.Empty<IAccount>(), 
+                OrderedComparer<IAccount>.OrderByDescending(x => x.Login).Compare);
+            trackingAuthors.Subscribe();
+            trackingAssignees.Subscribe();
+
+            Authors = trackingAuthors.CreateListenerCollection(new List<IAccount> { EmptyUser });
+            Assignees = trackingAssignees.CreateListenerCollection(new List<IAccount> { EmptyUser });
+
+            PullRequests = new TrackingCollection<IPullRequestModel>();
+            pullRequests.Comparer = OrderedComparer<IPullRequestModel>.OrderByDescending(x => x.UpdatedAt).Compare;
+            pullRequests.Filter = (pr, i, l) => pr.IsOpen;
         }
 
         public override void Initialize([AllowNull] ViewWithData data)
         {
             base.Initialize(data);
 
-            var old = PullRequests;
-            var list = repositoryHost.ModelService.GetPullRequests(repository);
-            list.Comparer = old.Comparer;
-            list.Filter = old.Filter;
-            PullRequests = list;
-            list.Subscribe();
-            old.Dispose();
+            repositoryHost.ModelService.GetPullRequests(repository, pullRequests);
+            pullRequests.Subscribe(pr =>
+            {
+                trackingAssignees.AddItem(pr.Assignee);
+                trackingAuthors.AddItem(pr.Author);
+            }, () => { });
         }
 
-        ITrackingCollection<IPullRequestModel> pullRequests;
-        public ITrackingCollection<IPullRequestModel> PullRequests
+        void UpdateFilter(PullRequestState state, [AllowNull]IAccount ass, [AllowNull]IAccount aut)
         {
+            if (PullRequests == null)
+                return;
+            pullRequests.Filter = (pr, i, l) =>
+                (!state.IsOpen.HasValue || state.IsOpen == pr.IsOpen) &&
+                     (ass == null || pr.Assignee == ass) &&
+                     (aut == null || pr.Author == aut);
+        }
+
+        TrackingCollection<IPullRequestModel> pullRequests;
+        public ObservableCollection<IPullRequestModel> PullRequests
+        {
+            [return: AllowNull]
             get { return pullRequests; }
-            private set { this.RaiseAndSetIfChanged(ref pullRequests, value); }
+            private set { this.RaiseAndSetIfChanged(ref pullRequests, (TrackingCollection<IPullRequestModel>)value); }
         }
 
         IPullRequestModel selectedPullRequest;
@@ -85,5 +125,106 @@ public ICommand OpenPullRequest
         {
             get { return openPullRequestCommand; }
         }
+
+        IReadOnlyList<PullRequestState> states;
+        public IReadOnlyList<PullRequestState> States
+        {
+            get { return states; }
+            set { this.RaiseAndSetIfChanged(ref states, value); }
+        }
+
+        PullRequestState selectedState;
+        public PullRequestState SelectedState
+        {
+            get { return selectedState; }
+            set { this.RaiseAndSetIfChanged(ref selectedState, value); }
+        }
+
+        ObservableCollection<IAccount> assignees;
+        public ObservableCollection<IAccount> Assignees
+        {
+            get { return assignees; }
+            set { this.RaiseAndSetIfChanged(ref assignees, value); }
+        }
+
+        ObservableCollection<IAccount> authors;
+        public ObservableCollection<IAccount> Authors
+        {
+            get { return authors; }
+            set { this.RaiseAndSetIfChanged(ref authors, value); }
+        }
+
+        IAccount selectedAuthor;
+        [AllowNull]
+        public IAccount SelectedAuthor
+        {
+            [return: AllowNull]
+            get { return selectedAuthor; }
+            set { this.RaiseAndSetIfChanged(ref selectedAuthor, value); }
+        }
+
+        IAccount selectedAssignee;
+        [AllowNull]
+        public IAccount SelectedAssignee
+        {
+            [return: AllowNull]
+            get { return selectedAssignee; }
+            set { this.RaiseAndSetIfChanged(ref selectedAssignee, value); }
+        }
+
+        public IAccount EmptyUser
+        {
+            get { return new Account("[None]", false, false, 0, 0, Observable.Empty<BitmapSource>()); }
+        }
+    }
+
+    // doing this as an extension because I get the feeling it might be useful in other places
+    public static class TrackingCollectionExtensions
+    {
+        public static ObservableCollection<T> CreateListenerCollection<T>(this ITrackingCollection<T> tcol,
+            IList<T> stickieItemsOnTop = null)
+            where T : ICopyable<T>
+        {
+            var col = new ObservableCollection<T>();
+            tcol.CollectionChanged += (s, e) =>
+            {
+                var offset = 0;
+                if (stickieItemsOnTop != null)
+                {
+                    foreach (var item in stickieItemsOnTop)
+                    {
+                        if (col.Contains(item))
+                            offset++;
+                    }
+                }
+
+                if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Move)
+                {
+                    for (int i = 0, oldIdx = e.OldStartingIndex, newIdx = e.NewStartingIndex;
+                        i < e.OldItems.Count; i++, oldIdx++, newIdx++)
+                        col.Move(oldIdx + offset, newIdx + offset);
+                }
+                else if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add)
+                    foreach (T item in e.NewItems)
+                        col.Add(item);
+                else if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove)
+                    foreach (T item in e.OldItems)
+                        col.Remove(item);
+                else if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace)
+                    for (int i = 0, idx = e.OldStartingIndex;
+                        i < e.OldItems.Count; i++, idx++)
+                        col[idx + offset] = (T)e.NewItems[i];
+                else if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Reset)
+                {
+                    col.Clear();
+                    if (stickieItemsOnTop != null)
+                    {
+                        foreach (var item in stickieItemsOnTop)
+                            col.Add(item);
+                    }
+                }
+            };
+            return col;
+        }
     }
 }
diff --git a/src/GitHub.Exports.Reactive/ViewModels/IPullRequestListViewModel.cs b/src/GitHub.Exports.Reactive/ViewModels/IPullRequestListViewModel.cs
@@ -1,13 +1,32 @@
-﻿using GitHub.Collections;
+﻿using System.Collections.Generic;
+using GitHub.Collections;
 using GitHub.Models;
 using System.Windows.Input;
+using ReactiveUI;
+using System.Collections.ObjectModel;
 
 namespace GitHub.ViewModels
 {
+    public class PullRequestState
+    {
+        public bool? IsOpen;
+        public string Name;
+        public override string ToString()
+        {
+            return Name;
+        }
+    }
+
     public interface IPullRequestListViewModel : IViewModel
     {
-        ITrackingCollection<IPullRequestModel> PullRequests { get; }
+        ObservableCollection<IPullRequestModel> PullRequests { get; }
         IPullRequestModel SelectedPullRequest { get; }
         ICommand OpenPullRequest { get; }
+        IReadOnlyList<PullRequestState> States { get; set; }
+        PullRequestState SelectedState { get; set; }
+        ObservableCollection<IAccount> Authors { get; }
+        IAccount SelectedAuthor { get; set; }
+        ObservableCollection<IAccount> Assignees { get; }
+        IAccount SelectedAssignee { get; set; }
     }
 }
diff --git a/src/GitHub.VisualStudio/UI/Views/PullRequestListView.xaml b/src/GitHub.VisualStudio/UI/Views/PullRequestListView.xaml
