Adding functionality to display error message

Author: StanleyGoldman

src/GitHub.App/SampleData/ForkRepositoryExecuteViewModelDesigner.cs

@@ -50,6 +50,8 @@ public ForkRepositoryExecuteViewModelDesigner()
 
         public bool CanResetMasterTracking => UpdateOrigin && AddUpstream;
 
+        public string Error { get; } = "I AM ERROR";
+
         public Task InitializeAsync(ILocalRepositoryModel sourceRepository, IAccount destinationAccount, IConnection connection)
         {
             return Task.CompletedTask;

src/GitHub.App/ViewModels/Dialog/ForkRepositoryExecuteViewModel.cs

@@ -98,12 +98,10 @@ IObservable<Repository> OnCreateFork(object o)
                 .ForkRepository(apiClient, SourceRepository, newRepositoryFork, UpdateOrigin, CanAddUpstream && AddUpstream, CanResetMasterTracking && ResetMasterTracking)
                 .Catch<Repository, Exception>(ex =>
                 {
-                    if (!ex.IsCriticalException())
-                    {
-                        log.Error(ex, "Error Creating Fork");
-                        var error = ex.GetUserFriendlyErrorMessage(ErrorType.RepoForkFailed);
-                        notificationService.ShowError(error);
-                    }
+                    log.Error(ex, "Error Creating Fork");
+
+                    var apiEx = ex as ApiException;
+                    Error = apiEx != null ? apiEx.Message : "An unexpected error occurred.";
 
                     return Observable.Return<Repository>(null);
                 });
@@ -143,5 +141,12 @@ public bool ResetMasterTracking
             get { return resetMasterTracking; }
             set { this.RaiseAndSetIfChanged(ref resetMasterTracking, value); }
         }
+
+        string error = null;
+        public string Error
+        {
+            get { return error; }
+            private set { this.RaiseAndSetIfChanged(ref error, value); }
+        }
     }
 }

src/GitHub.Exports.Reactive/ViewModels/Dialog/IForkRepositoryExecuteViewModel.cs

@@ -33,6 +33,8 @@ public interface IForkRepositoryExecuteViewModel : IDialogContentViewModel
 
         bool CanResetMasterTracking { get; }
 
+        string Error { get; }
+
         /// <summary>
         /// Initializes the view model.
         /// </summary>

src/GitHub.VisualStudio/Views/Dialog/ForkRepositoryExecuteView.xaml

@@ -5,9 +5,9 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:markdig="clr-namespace:Markdig.Wpf;assembly=Markdig.Wpf"
              xmlns:sampleData="clr-namespace:GitHub.SampleData;assembly=GitHub.App"
+             xmlns:ui="https://github.com/github/VisualStudio"
              Margin="8"
-             mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="300">
+             mc:Ignorable="d" d:DesignWidth="300" Height="315.179">
 
   <d:DesignProperties.DataContext>
     <sampleData:ForkRepositoryExecuteViewModelDesigner/>
@@ -72,7 +72,14 @@
         </DockPanel>
       </Border>
       <Border Style="{StaticResource ItemBorder}">
-        <Button Click="repoForkButton_OnClick">Fork Repo</Button>
+        <StackPanel >
+          <Button Click="repoForkButton_OnClick">Fork Repo</Button>
+          <TextBlock TextWrapping="Wrap"
+                     Foreground="Red" 
+                     Text="{Binding Error, Mode=OneWay}"
+                     HorizontalAlignment="Center"
+                     Visibility="{Binding Error, Converter={ui:NullToVisibilityConverter}}"/>
+        </StackPanel>
       </Border>
     </ItemsControl>
   </StackPanel>