Merge pull request #1480 from github/feature/submodule-changes-progress-on-statusbar

Show progress of sync submodules command on the status bar

Author: grokys

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

@@ -35,6 +35,7 @@ public sealed class PullRequestDetailViewModel : PanePageViewModelBase, IPullReq
         readonly IPullRequestSessionManager sessionManager;
         readonly IUsageTracker usageTracker;
         readonly ITeamExplorerContext teamExplorerContext;
+        readonly IStatusBarNotificationService statusBarNotificationService;
         IModelService modelService;
         IPullRequestModel model;
         string sourceBranchDisplayName;
@@ -67,19 +68,22 @@ public PullRequestDetailViewModel(
             IPullRequestSessionManager sessionManager,
             IModelServiceFactory modelServiceFactory,
             IUsageTracker usageTracker,
-            ITeamExplorerContext teamExplorerContext)
+            ITeamExplorerContext teamExplorerContext,
+            IStatusBarNotificationService statusBarNotificationService)
         {
             Guard.ArgumentNotNull(pullRequestsService, nameof(pullRequestsService));
             Guard.ArgumentNotNull(sessionManager, nameof(sessionManager));
             Guard.ArgumentNotNull(modelServiceFactory, nameof(modelServiceFactory));
             Guard.ArgumentNotNull(usageTracker, nameof(usageTracker));
             Guard.ArgumentNotNull(teamExplorerContext, nameof(teamExplorerContext));
+            Guard.ArgumentNotNull(statusBarNotificationService, nameof(statusBarNotificationService));
 
             this.pullRequestsService = pullRequestsService;
             this.sessionManager = sessionManager;
             this.modelServiceFactory = modelServiceFactory;
             this.usageTracker = usageTracker;
             this.teamExplorerContext = teamExplorerContext;
+            this.statusBarNotificationService = statusBarNotificationService;
 
             Checkout = ReactiveCommand.CreateAsyncObservable(
                 this.WhenAnyValue(x => x.CheckoutState)
@@ -684,7 +688,11 @@ async Task DoSyncSubmodules(object unused)
                 usageTracker.IncrementCounter(x => x.NumberOfSyncSubmodules).Forget();
 
                 var writer = new StringWriter(CultureInfo.CurrentCulture);
-                var complete = await pullRequestsService.SyncSubmodules(LocalRepository, writer.WriteLine);
+                var complete = await pullRequestsService.SyncSubmodules(LocalRepository, line =>
+                {
+                    writer.WriteLine(line);
+                    statusBarNotificationService.ShowMessage(line);
+                });
                 if (!complete)
                 {
                     throw new ApplicationException(writer.ToString());
@@ -693,6 +701,7 @@ async Task DoSyncSubmodules(object unused)
             finally
             {
                 IsBusy = false;
+                statusBarNotificationService.ShowMessage(string.Empty);
             }
         }
 

test/UnitTests/GitHub.App/ViewModels/GitHubPane/PullRequestDetailViewModelTests.cs

@@ -555,7 +555,8 @@ static Tuple<PullRequestDetailViewModel, IPullRequestService> CreateTargetAndSer
                 sessionManager ?? Substitute.For<IPullRequestSessionManager>(),
                 Substitute.For<IModelServiceFactory>(),
                 Substitute.For<IUsageTracker>(),
-                Substitute.For<ITeamExplorerContext>());
+                Substitute.For<ITeamExplorerContext>(),
+                Substitute.For<IStatusBarNotificationService>());
             vm.InitializeAsync(repository, Substitute.For<IConnection>(), "owner", "repo", 1).Wait();
 
             return Tuple.Create(vm, pullRequestService);