Show recipe error instead if throwing an exeption

src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Controllers/ImportRemoteInstanceController.cs

@@ -1,3 +1,4 @@
+using System;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
@@ -6,26 +7,44 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Localization;
 using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Logging;
 using OrchardCore.Deployment.Remote.Services;
 using OrchardCore.Deployment.Remote.ViewModels;
 using OrchardCore.Deployment.Services;
+using OrchardCore.DisplayManagement.Notify;
+using OrchardCore.Recipes.Models;
 
 namespace OrchardCore.Deployment.Remote.Controllers
 {
     public class ImportRemoteInstanceController : Controller
     {
         private readonly RemoteClientService _remoteClientService;
         private readonly IDeploymentManager _deploymentManager;
+        private readonly INotifier _notifier;
+        private readonly ILogger _logger;
         private readonly IDataProtector _dataProtector;
 
+        protected readonly IHtmlLocalizer H;
+        protected readonly IStringLocalizer S;
+
         public ImportRemoteInstanceController(
             IDataProtectionProvider dataProtectionProvider,
             RemoteClientService remoteClientService,
-            IDeploymentManager deploymentManager)
+            IDeploymentManager deploymentManager,
+            INotifier notifier,
+            IHtmlLocalizer<ImportRemoteInstanceController> htmlLocalizer,
+            IStringLocalizer<ImportRemoteInstanceController> stringLocalizer,
+            ILogger<ImportRemoteInstanceController> logger)
         {
             _deploymentManager = deploymentManager;
+            _notifier = notifier;
+            _logger = logger;
             _remoteClientService = remoteClientService;
+            H = htmlLocalizer;
+            S = stringLocalizer;
             _dataProtector = dataProtectionProvider.CreateProtector("OrchardCore.Deployment").ToTimeLimitedDataProtector();
         }
 
@@ -70,6 +89,18 @@ public async Task<IActionResult> Import(ImportViewModel model)
 
                 await _deploymentManager.ImportDeploymentPackageAsync(new PhysicalFileProvider(tempArchiveFolder));
             }
+            catch (RecipeExecutionException e)
+            {
+                _logger.LogError(e, "Unable to import a recipe from JSON input.");
+
+                await _notifier.ErrorAsync(H["The import failed with the following errors: {0}", string.Join(' ', e.StepResult.Errors.SelectMany(x => x.Value))]);
+            }
+            catch (Exception e)
+            {
+                _logger.LogError(e, "Unable to import a package.");
+
+                ModelState.AddModelError(string.Empty, S["Unexpected error occurred while importing the recipe."]);
+            }
             finally
             {
                 if (System.IO.File.Exists(tempArchiveName))