Merge pull request #560 from danwalmsley/clone-dialog-dont-disable-filter-while-loading

Clone dialog - Dont disable filter while loading list of Repositories

Author: grokys

src/GitHub.App/ViewModels/RepositoryCloneViewModel.cs

@@ -75,12 +75,12 @@ public RepositoryCloneViewModel(
             repositories.Filter = FilterRepository;
             repositories.NewerComparer = OrderedComparer<IRemoteRepositoryModel>.OrderByDescending(x => x.UpdatedAt).Compare;
 
-            filterTextIsEnabled = this.WhenAny(x => x.IsLoading, x => x.Value)
-                .Select(x => !x && repositories.UnfilteredCount > 0)
+            filterTextIsEnabled = this.WhenAny(x => x.IsLoading,
+                loading => loading.Value || repositories.UnfilteredCount > 0 && !LoadingFailed)
                 .ToProperty(this, x => x.FilterTextIsEnabled);
 
-            this.WhenAny(x => x.FilterTextIsEnabled, x => x.IsLoading, x => x.LoadingFailed
-                , (any, loading, failed) => !any.Value && !loading.Value && !failed.Value)
+            this.WhenAny(x => x.IsLoading, x => x.LoadingFailed,
+                (loading, failed) => !loading.Value && !failed.Value && repositories.UnfilteredCount == 0)
                 .Subscribe(x => NoRepositoriesFound = x);
 
             this.WhenAny(x => x.FilterText, x => x.Value)

src/UnitTests/GitHub.App/ViewModels/RepositoryCloneViewModelTests.cs

@@ -209,6 +209,74 @@ public void IsTrueWhenLoadingCompleteNotFailedAndNoRepositories()
         }
     }
 
+    public class TheFilterTextEnabledProperty : TestBaseClass
+    {
+        [Fact]
+        public void IsTrueInitially()
+        {
+            var repoSubject = new Subject<IRemoteRepositoryModel>();
+            var col = TrackingCollection.Create(repoSubject);
+            var repositoryHost = Substitute.For<IRepositoryHost>();
+            repositoryHost.ModelService.GetRepositories(Arg.Any<ITrackingCollection<IRemoteRepositoryModel>>()).Returns(_ => col);
+            var cloneService = Substitute.For<IRepositoryCloneService>();
+
+            var vm = GetVM(
+                repositoryHost,
+                cloneService,
+                Substitute.For<IOperatingSystem>(),
+                Substitute.For<INotificationService>(),
+                Substitute.For<IUsageTracker>());
+
+            Assert.False(vm.LoadingFailed);
+            Assert.True(vm.FilterTextIsEnabled);
+        }
+
+        [Fact]
+        public void IsFalseIfLoadingReposFails()
+        {
+            var repoSubject = new Subject<IRemoteRepositoryModel>();
+            var col = TrackingCollection.Create(repoSubject);
+            var repositoryHost = Substitute.For<IRepositoryHost>();
+            repositoryHost.ModelService.GetRepositories(Arg.Any<ITrackingCollection<IRemoteRepositoryModel>>()).Returns(_ => col);
+            var cloneService = Substitute.For<IRepositoryCloneService>();
+            var vm = GetVM(
+                repositoryHost,
+                cloneService,
+                Substitute.For<IOperatingSystem>(),
+                Substitute.For<INotificationService>(),
+                Substitute.For<IUsageTracker>());
+
+            Assert.False(vm.LoadingFailed);
+
+            repoSubject.OnError(new InvalidOperationException("Doh!"));
+
+            Assert.True(vm.LoadingFailed);
+            Assert.False(vm.FilterTextIsEnabled);
+            repoSubject.OnCompleted();
+        }
+
+        [Fact]
+        public void IsFalseWhenLoadingCompleteNotFailedAndNoRepositories()
+        {
+            var repoSubject = new Subject<IRemoteRepositoryModel>();
+            var col = TrackingCollection.Create(repoSubject);
+            var repositoryHost = Substitute.For<IRepositoryHost>();
+            repositoryHost.ModelService.GetRepositories(Arg.Any<ITrackingCollection<IRemoteRepositoryModel>>()).Returns(_ => col);
+
+            var cloneService = Substitute.For<IRepositoryCloneService>();
+            var vm = GetVM(
+                repositoryHost,
+                cloneService,
+                Substitute.For<IOperatingSystem>(),
+                Substitute.For<INotificationService>(),
+                Substitute.For<IUsageTracker>());
+
+            repoSubject.OnCompleted();
+
+            Assert.False(vm.FilterTextIsEnabled);
+        }
+    }
+
     public class TheLoadingFailedProperty : TestBaseClass
     {
         [Fact]