Merge pull request #664 from ckuhn203/sourcecontrol

added collapsable split panel for displaying error states

Author: rubberduck203

RetailCoder.VBE/UI/SourceControl/BranchesPresenter.cs

@@ -74,10 +74,6 @@ private void OnSelectedBranchChanged(object sender, EventArgs e)
             }
             catch (SourceControlException ex)
             {
-                //todo: find a better way of displaying these errors
-                //todo: remove messagebox
-                MessageBox.Show(ex.InnerException.Message, ex.Message, MessageBoxButtons.OK, MessageBoxIcon.Error);
-
                 RaiseActionFailedEvent(ex);
             }
 
@@ -129,6 +125,7 @@ private IEnumerable<IBranch> RemoteBranches()
         private void OnShowDeleteBranchView(object sender, EventArgs e)
         {
             if (_view.Local == null) { return; }
+
             _deleteView.Branches = _view.Local;
             _deleteView.Show();
         }

RetailCoder.VBE/UI/SourceControl/ISourceControlView.cs

@@ -7,7 +7,10 @@ public interface ISourceControlView : IDockableUserControl
         event EventHandler<EventArgs> RefreshData;
         event EventHandler<EventArgs> OpenWorkingDirectory;
         event EventHandler<EventArgs> InitializeNewRepository;
+        event EventHandler<EventArgs> DismissMessage;
 
         string Status { get; set; }
+        string FailedActionMessage { get; set; }
+        bool FailedActionMessageVisible { get; set; }
     }
 }

RetailCoder.VBE/UI/SourceControl/SourceControlPanel.Designer.cs

@@ -57,6 +57,18 @@ public string Status
             set { this.StatusMessage.Text = value; }
         }
 
+        public string FailedActionMessage
+        {
+            get { return this.ActionFailedMessage.Text; }
+            set { this.ActionFailedMessage.Text = value; }
+        }
+
+        public bool FailedActionMessageVisible
+        {
+            get { return !this.MainContainer.Panel1Collapsed; }
+            set { this.MainContainer.Panel1Collapsed = !value; }
+        }
+
         public event EventHandler<EventArgs> RefreshData;
         private void RefreshButton_Click(object sender, EventArgs e)
         {
@@ -75,6 +87,12 @@ private void InitRepoButton_Click(object sender, EventArgs e)
             RaiseGenericEvent(InitializeNewRepository, e);
         }
 
+        public event EventHandler<EventArgs> DismissMessage;
+        private void DismissMessageButton_Click(object sender, EventArgs e)
+        {
+            RaiseGenericEvent(DismissMessage, e);
+        }
+
         private void RaiseGenericEvent(EventHandler<EventArgs> handler, EventArgs e)
         {
             if (handler != null)

RetailCoder.VBE/UI/SourceControl/SourceControlPanel.cs

@@ -30,10 +30,16 @@ public SourceControlPresenter
             _config = _configService.LoadConfiguration();
 
             _changesPresenter = changesPresenter;
+            _changesPresenter.ActionFailed += OnActionFailed;
 
             _branchesPresenter = branchesPresenter;
+            _branchesPresenter.ActionFailed += OnActionFailed;
+
             _settingsPresenter = settingsPresenter;
+            _settingsPresenter.ActionFailed += OnActionFailed;
+
             _unsyncedPresenter = unsyncedPresenter;
+            _unsyncedPresenter.ActionFailed += OnActionFailed;
 
             _folderBrowserFactory = folderBrowserFactory;
             _providerFactory = providerFactory;
@@ -44,6 +50,17 @@ public SourceControlPresenter
             _view.RefreshData += OnRefreshChildren;
             _view.OpenWorkingDirectory += OnOpenWorkingDirectory;
             _view.InitializeNewRepository += OnInitNewRepository;
+            _view.DismissMessage += OnDismissMessage;
+        }
+
+        private void OnDismissMessage(object sender, EventArgs eventArgs)
+        {
+            _view.FailedActionMessageVisible = false;
+        }
+
+        private void OnActionFailed(object sender, ActionFailedEventArgs e)
+        {
+            ShowActionFailedMessage(e.Title, e.Message);
         }
 
         private void _branchesPresenter_BranchChanged(object sender, EventArgs e)
@@ -90,10 +107,9 @@ private void OnOpenWorkingDirectory(object sender, EventArgs e)
                 {
                     _provider = _providerFactory.CreateProvider(project, repo);
                 }
-                catch (SourceControlException)
+                catch (SourceControlException ex)
                 {
-                    MessageBox.Show(RubberduckUI.SourceControl_NoRepoFound, RubberduckUI.SourceControlPanel_Caption,
-                        MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    ShowActionFailedMessage(ex.Message, ex.InnerException.Message);
                     return;
                 }
 
@@ -139,6 +155,12 @@ public void RefreshChildren()
             _view.Status = RubberduckUI.Online;
         }
 
+        private void ShowActionFailedMessage(string title, string message)
+        {
+            _view.FailedActionMessageVisible = true;
+            _view.FailedActionMessage = string.Format("{0}{1}{2}", title, Environment.NewLine, message);
+        }
+
         private void SetChildPresenterSourceControlProviders(ISourceControlProvider provider)
         {
             _branchesPresenter.Provider = provider;

RetailCoder.VBE/UI/SourceControl/SourceControlPresenter.cs

@@ -569,5 +569,72 @@ public void RefreshingViewShouldNotCheckoutBranch()
             //assert
             _provider.Verify(git => git.Checkout(It.IsAny<string>()),Times.Never);
         }
+
+        [TestMethod]
+        public void OnBranchChange_WhenCheckoutFails_ActionFailedEventIsRaised()
+        {
+            //arrange
+            var wasRaised = false;
+
+            _provider.Setup(p => p.Checkout(It.IsAny<string>()))
+                .Throws(
+                    new SourceControlException("A source control exception was thrown.",
+                        new LibGit2Sharp.LibGit2SharpException("With an inner libgit2sharp exception"))
+                    );
+
+            _presenter.ActionFailed += (sender, args) => wasRaised = true;
+
+            _view.SetupProperty(v => v.Current, "master");
+
+            //act
+            _view.Raise(v => v.SelectedBranchChanged += null, EventArgs.Empty);
+
+            //assert
+            Assert.IsTrue(wasRaised, "ActionFailedEvent was not raised.");
+        }
+
+        [TestMethod]
+        public void OnDeleteBranch_WhenDeleteFails_ActionFailedEventIsRaised()
+        {
+            //arrange
+            var wasRaised = false;
+
+            var branchName = "dev";
+            _provider.Setup(p => p.DeleteBranch(It.Is<string>(b => b == branchName)))
+                .Throws(
+                    new SourceControlException("A source control exception was thrown.",
+                        new LibGit2Sharp.LibGit2SharpException("With an inner libgit2sharp exception"))
+                    );
+
+            _presenter.ActionFailed += (sender, args) => wasRaised = true;
+
+            //act
+            _deleteView.Raise(v => v.Confirm += null, new BranchDeleteArgs(branchName));
+
+            //assert
+            Assert.IsTrue(wasRaised, "ActionFailedEvent was not raised.");
+        }
+
+        [TestMethod]
+        public void OnCreateBranch_WhenCreateFails_ActionFailedEventIsRaised()
+        {
+            //arrange
+            var wasRaised = false;
+
+            var branchName = "dev";
+            _provider.Setup(p => p.CreateBranch(It.Is<string>(b => b == branchName)))
+                .Throws(
+                    new SourceControlException("A source control exception was thrown.",
+                        new LibGit2Sharp.LibGit2SharpException("With an inner libgit2sharp exception"))
+                    );
+
+            _presenter.ActionFailed += (sender, args) => wasRaised = true;
+
+            //act
+            _createView.Raise(v => v.Confirm += null, new BranchCreateArgs(branchName));
+
+            //assert
+            Assert.IsTrue(wasRaised, "ActionFailedEvent was not raised.");
+        }
     }
 }

RubberduckTests/SourceControl/BranchesPresenterTests.cs

@@ -189,5 +189,31 @@ public void ExcludedIsClearedAfterRefresh()
             //
             Assert.IsFalse(_viewMock.Object.ExcludedChanges.Any());
         }
+
+        [TestMethod]
+        public void ChangesPresenter_WhenCommitFails_ActionFailedEventIsRaised()
+        {
+            //arrange
+            var wasRaised = false;
+
+            _providerMock.Setup(p => p.Commit(It.IsAny<string>()))
+                .Throws(
+                    new SourceControlException("A source control exception was thrown.", 
+                        new LibGit2Sharp.LibGit2SharpException("With an inner libgit2sharp exception"))
+                    );
+
+            _viewMock.SetupProperty(v => v.IncludedChanges);
+            _viewMock.Object.IncludedChanges = new List<IFileStatusEntry>() { new FileStatusEntry(@"C:\path\to\module.bas", FileStatus.Modified) };
+
+            var presenter = new ChangesPresenter(_viewMock.Object, _providerMock.Object);
+
+            presenter.ActionFailed += (sender, args) => wasRaised = true;
+
+            //act
+            presenter.Commit();
+
+            //assert
+            Assert.IsTrue(wasRaised, "ActionFailedEvent was not raised.");
+        }
     }
 }