Correctly clear SC view when tracked project is closed

Hosch250 · Hosch250 · commit 7855e3c60e0d · 2016-07-20T11:56:54.000-05:00
diff --git a/RetailCoder.VBE/UI/SourceControl/BranchesViewViewModel.cs b/RetailCoder.VBE/UI/SourceControl/BranchesViewViewModel.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Windows.Input;
 using NLog;
 using Rubberduck.SourceControl;
 using Rubberduck.UI.Command;
@@ -60,6 +59,22 @@ public void RefreshView()
             DestinationBranch = CurrentBranch;
         }
 
+        public void ResetView()
+        {
+            Logger.Trace("Resetting view");
+
+            _provider = null;
+            _currentBranch = string.Empty;
+            SourceBranch = string.Empty;
+            DestinationBranch = CurrentBranch;
+
+            OnPropertyChanged("LocalBranches");
+            OnPropertyChanged("PublishedBranches");
+            OnPropertyChanged("UnpublishedBranches");
+            OnPropertyChanged("Branches");
+            OnPropertyChanged("CurrentBranch");
+        }
+
         public SourceControlTab Tab { get { return SourceControlTab.Branches; } }
 
         public IEnumerable<string> Branches
@@ -115,9 +130,12 @@ public string CurrentBranch
 
                     CreateBranchSource = value;
 
+                    if (Provider == null) { return; }
+
                     try
                     {
-                        OnLoadingComponentsStarted();
+                        Provider.NotifyExternalFileChanges = false;
+                        Provider.HandleVbeSinkEvents = false;
                         Provider.Checkout(_currentBranch);
                     }
                     catch (SourceControlException ex)
@@ -130,7 +148,8 @@ public string CurrentBranch
                             RubberduckUI.SourceControl_UnknownErrorMessage, NotificationType.Error);
                         throw;
                     }
-                    OnLoadingComponentsCompleted();
+                    Provider.NotifyExternalFileChanges = true;
+                    Provider.HandleVbeSinkEvents = true;
                 }
             }
         }
@@ -330,7 +349,8 @@ private void MergeBranchOk()
         {
             Logger.Trace("Merging branch {0} into branch {1}", SourceBranch, DestinationBranch);
 
-            OnLoadingComponentsStarted();
+            Provider.NotifyExternalFileChanges = false;
+            Provider.HandleVbeSinkEvents = false;
 
             try
             {
@@ -339,19 +359,24 @@ private void MergeBranchOk()
             catch (SourceControlException ex)
             {
                 RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);
-                OnLoadingComponentsCompleted();
+                Provider.NotifyExternalFileChanges = true;
+                Provider.HandleVbeSinkEvents = true;
                 return;
             }
             catch
             {
                 RaiseErrorEvent(RubberduckUI.SourceControl_UnknownErrorTitle,
                     RubberduckUI.SourceControl_UnknownErrorMessage, NotificationType.Error);
+                Provider.NotifyExternalFileChanges = true;
+                Provider.HandleVbeSinkEvents = true;
                 throw;
             }
 
             DisplayMergeBranchesGrid = false;
             RaiseErrorEvent(RubberduckUI.SourceControl_MergeStatus, string.Format(RubberduckUI.SourceControl_SuccessfulMerge, SourceBranch, DestinationBranch), NotificationType.Info);
-            OnLoadingComponentsCompleted();
+
+            Provider.NotifyExternalFileChanges = true;
+            Provider.HandleVbeSinkEvents = true;
         }
 
         private void MergeBranchCancel()
@@ -380,8 +405,7 @@ private void DeleteBranch(bool isBranchPublished)
 
             RefreshView();
         }
-
-
+        
         private bool CanDeleteBranch(bool isBranchPublished)
         {
             return isBranchPublished
@@ -515,25 +539,5 @@ private void RaiseErrorEvent(string message, string innerMessage, NotificationTy
                 handler(this, new ErrorEventArgs(message, innerMessage, notificationType));
             }
         }
-        
-        public event EventHandler<EventArgs> LoadingComponentsStarted;
-        private void OnLoadingComponentsStarted()
-        {
-            var handler = LoadingComponentsStarted;
-            if (handler != null)
-            {
-                handler(this, EventArgs.Empty);
-            }
-        }
-
-        public event EventHandler<EventArgs> LoadingComponentsCompleted;
-        private void OnLoadingComponentsCompleted()
-        {
-            var handler = LoadingComponentsCompleted;
-            if (handler != null)
-            {
-                handler(this, EventArgs.Empty);
-            }
-        }
     }
 }
diff --git a/RetailCoder.VBE/UI/SourceControl/ChangesViewViewModel.cs b/RetailCoder.VBE/UI/SourceControl/ChangesViewViewModel.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Windows.Input;
 using NLog;
 using Rubberduck.SourceControl;
 using Rubberduck.UI.Command;
@@ -74,6 +73,19 @@ public void RefreshView()
                     Provider.Status().Where(stat => stat.FileStatus.HasFlag(FileStatus.Untracked)));
         }
 
+        public void ResetView()
+        {
+            Logger.Trace("Resetting view");
+
+            _provider.BranchChanged -= Provider_BranchChanged;
+            _provider = null;
+
+            OnPropertyChanged("CurrentBranch");
+
+            IncludedChanges = new ObservableCollection<IFileStatusEntry>();
+            UntrackedFiles = new ObservableCollection<IFileStatusEntry>();
+        }
+
         public SourceControlTab Tab { get { return SourceControlTab.Changes; } }
 
         private void Provider_BranchChanged(object sender, EventArgs e)
diff --git a/RetailCoder.VBE/UI/SourceControl/IControlViewModel.cs b/RetailCoder.VBE/UI/SourceControl/IControlViewModel.cs
@@ -25,5 +25,6 @@ public interface IControlViewModel
         event EventHandler<ErrorEventArgs> ErrorThrown;
 
         void RefreshView();
+        void ResetView();
     }
 }
diff --git a/RetailCoder.VBE/UI/SourceControl/SettingsView.xaml b/RetailCoder.VBE/UI/SourceControl/SettingsView.xaml
@@ -29,11 +29,11 @@
                                 <ColumnDefinition />
                                 <ColumnDefinition Width="40" />
                             </Grid.ColumnDefinitions>
-                            <TextBox Margin="5,0,0,0"
+                            <TextBox Margin="5,0,0,5"
                                      Padding="2"
                                      Text="{Binding DefaultRepositoryLocation, Mode=TwoWay}" />
                             <Button Content="&#8230;"
-                                    Margin="5,0"
+                                    Margin="5,0,0,5"
                                     Grid.Column="1"
                                     FontSize="15"
                                     Command="{Binding ShowDefaultRepoFolderPickerCommand}" />
diff --git a/RetailCoder.VBE/UI/SourceControl/SettingsViewViewModel.cs b/RetailCoder.VBE/UI/SourceControl/SettingsViewViewModel.cs
@@ -2,7 +2,6 @@
 using System.Diagnostics;
 using System.IO;
 using System.Windows.Forms;
-using System.Windows.Input;
 using NLog;
 using Rubberduck.UI.Command;
 using Rubberduck.SourceControl;
@@ -45,7 +44,12 @@ public SettingsViewViewModel(
         }
 
         public ISourceControlProvider Provider { get; set; }
-        public void RefreshView() {} // nothing to refresh here
+        public void RefreshView() { } // nothing to refresh here
+
+        public void ResetView()
+        {
+            Provider = null;
+        }
 
         public SourceControlTab Tab { get { return SourceControlTab.Settings; } }
 
diff --git a/RetailCoder.VBE/UI/SourceControl/SourceControlViewViewModel.cs b/RetailCoder.VBE/UI/SourceControl/SourceControlViewViewModel.cs
@@ -93,6 +93,7 @@ public SourceControlViewViewModel(
             _sinks.ComponentAdded += ComponentAdded;
             _sinks.ComponentRemoved += ComponentRemoved;
             _sinks.ComponentRenamed += ComponentRenamed;
+            _sinks.ProjectRemoved += ProjectRemoved;
 
             TabItems = new ObservableCollection<IControlView>
             {
@@ -177,6 +178,38 @@ private void ComponentRenamed(object sender, IComponentRenamedEventArgs e)
             }
         }
 
+        private void ProjectRemoved(object sender, IProjectEventArgs e)
+        {
+            if (Provider == null || !Provider.HandleVbeSinkEvents)
+            {
+                return;
+            }
+
+            if (e.ProjectId != Provider.CurrentRepository.Id)
+            {
+                return;
+            }
+
+            ResetView();
+        }
+
+        private void ResetView()
+        {
+            Logger.Trace("Resetting view");
+
+            _provider = null;
+            OnPropertyChanged("RepoDoesNotHaveRemoteLocation");
+            Status = RubberduckUI.Offline;
+
+            UiDispatcher.InvokeAsync(() =>
+            {
+                foreach (var tab in _tabItems)
+                {
+                    tab.ViewModel.ResetView();
+                }
+            });
+        }
+
         private static readonly IDictionary<NotificationType, BitmapImage> IconMappings =
             new Dictionary<NotificationType, BitmapImage>
             {
diff --git a/RetailCoder.VBE/UI/SourceControl/UnsyncedCommitsViewViewModel.cs b/RetailCoder.VBE/UI/SourceControl/UnsyncedCommitsViewViewModel.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Collections.ObjectModel;
-using System.Windows.Input;
 using NLog;
 using Rubberduck.SourceControl;
 using Rubberduck.UI.Command;
@@ -44,6 +43,18 @@ public void RefreshView()
             OutgoingCommits = new ObservableCollection<ICommit>(Provider.UnsyncedLocalCommits);
         }
 
+        public void ResetView()
+        {
+            Logger.Trace("Resetting view");
+
+            _provider.BranchChanged -= Provider_BranchChanged;
+            _provider = null;
+            CurrentBranch = string.Empty;
+
+            IncomingCommits = new ObservableCollection<ICommit>();
+            OutgoingCommits = new ObservableCollection<ICommit>();
+        }
+
         public SourceControlTab Tab { get { return SourceControlTab.UnsyncedCommits; } }
 
         private void Provider_BranchChanged(object sender, EventArgs e)
diff --git a/Rubberduck.SourceControl/ISourceControlProvider.cs b/Rubberduck.SourceControl/ISourceControlProvider.cs
@@ -11,8 +11,8 @@ public interface ISourceControlProvider
         IEnumerable<IBranch> Branches { get; }
         IList<ICommit> UnsyncedLocalCommits { get; }
         IList<ICommit> UnsyncedRemoteCommits { get; }
-        bool NotifyExternalFileChanges { get; }
-        bool HandleVbeSinkEvents { get; }
+        bool NotifyExternalFileChanges { get; set; }
+        bool HandleVbeSinkEvents { get; set; }
 
         event EventHandler<EventArgs> BranchChanged;
 
diff --git a/Rubberduck.SourceControl/SourceControlProviderBase.cs b/Rubberduck.SourceControl/SourceControlProviderBase.cs
@@ -31,8 +31,8 @@ protected SourceControlProviderBase(VBProject project, IRepository repository, I
         public abstract IEnumerable<IBranch> Branches { get; }
         public abstract IList<ICommit> UnsyncedLocalCommits { get; }
         public abstract IList<ICommit> UnsyncedRemoteCommits { get; }
-        public bool NotifyExternalFileChanges { get; protected set; }
-        public bool HandleVbeSinkEvents { get; protected set; }
+        public bool NotifyExternalFileChanges { get; set; }
+        public bool HandleVbeSinkEvents { get; set; }
         public abstract IRepository Clone(string remotePathOrUrl, string workingDirectory, SecureCredentials credentials = null);
         public abstract void Push();
         public abstract void Fetch(string remoteName);

Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,6 @@ public interface IControlViewModel`
`25`	`25`	`event EventHandler<ErrorEventArgs> ErrorThrown;`
`26`	`26`
`27`	`27`	`void RefreshView();`
	`28`	`+ void ResetView();`
`28`	`29`	`}`
`29`	`30`	`}`