Import Recipe from Json (#6255)

OrchardCMS · Jul 12, 2020 · 725fa64 · 725fa64
1 parent 1783ab6
commit 725fa64
Show file tree

Hide file tree

Showing 5 changed files with 107 additions and 4 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/AdminMenu.cs
@@ -34,6 +34,11 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
                             .Permission(Permissions.Import)
                             .LocalNav()
                         )
+                        .Add(S["JSON Import"], S["JSON Import"].PrefixPosition(), deployment => deployment
+                            .Action("Json", "Import", new { area = "OrchardCore.Deployment" })
+                            .Permission(Permissions.Import)
+                            .LocalNav()
+                        )
                     )
                 );
 

diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/ImportController.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/ImportController.cs
@@ -6,9 +6,12 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Localization;
 using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Localization;
 using OrchardCore.Admin;
 using OrchardCore.Deployment.Services;
+using OrchardCore.Deployment.ViewModels;
 using OrchardCore.DisplayManagement.Notify;
+using OrchardCore.Mvc.Utilities;
 
 namespace OrchardCore.Deployment.Controllers
 {
@@ -19,19 +22,22 @@ public class ImportController : Controller
         private readonly IAuthorizationService _authorizationService;
         private readonly INotifier _notifier;
         private readonly IHtmlLocalizer H;
+        private readonly IStringLocalizer S;
 
         public ImportController(
             IDeploymentManager deploymentManager,
             IAuthorizationService authorizationService,
             INotifier notifier,
-            IHtmlLocalizer<ImportController> localizer
+            IHtmlLocalizer<ImportController> htmlLocalizer,
+            IStringLocalizer<ImportController> stringLocalizer
         )
         {
             _deploymentManager = deploymentManager;
             _authorizationService = authorizationService;
             _notifier = notifier;
 
-            H = localizer;
+            H = htmlLocalizer;
+            S = stringLocalizer;
         }
 
         public async Task<IActionResult> Index()
@@ -82,7 +88,7 @@ public async Task<IActionResult> Import(IFormFile importedPackage)
 
                     await _deploymentManager.ImportDeploymentPackageAsync(new PhysicalFileProvider(tempArchiveFolder));
 
-                    _notifier.Success(H["Deployment package imported"]);
+                    _notifier.Success(H["Deployment package imported."]);
                 }
                 finally
                 {
@@ -102,7 +108,55 @@ public async Task<IActionResult> Import(IFormFile importedPackage)
                 _notifier.Error(H["Please add a file to import."]);
             }
 
-            return RedirectToAction("Index");
+            return RedirectToAction(nameof(Index));
+        }
+
+        public async Task<IActionResult> Json()
+        {
+            if (!await _authorizationService.AuthorizeAsync(User, Permissions.Import))
+            {
+                return Forbid();
+            }
+
+            return View();
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> Json(ImportJsonViewModel model)
+        {
+            if (!await _authorizationService.AuthorizeAsync(User, Permissions.Import))
+            {
+                return Forbid();
+            }
+
+            if (!model.Json.IsJson())
+            {
+                ModelState.AddModelError(nameof(model.Json), S["The recipe is written in an incorrect json format."]);
+            }
+
+            if (ModelState.IsValid)
+            {
+                var tempArchiveFolder = PathExtensions.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+
+                try
+                {
+                    Directory.CreateDirectory(tempArchiveFolder);
+                    System.IO.File.WriteAllText(Path.Combine(tempArchiveFolder, "Recipe.json"), model.Json);
+
+                    await _deploymentManager.ImportDeploymentPackageAsync(new PhysicalFileProvider(tempArchiveFolder));
+
+                    _notifier.Success(H["Recipe imported."]);
+                }
+                finally
+                {
+                    if (Directory.Exists(tempArchiveFolder))
+                    {
+                        Directory.Delete(tempArchiveFolder, true);
+                    }
+                }
+            }
+
+            return View(model);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Startup.cs
@@ -104,6 +104,13 @@ public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder ro
                 defaults: new { controller = typeof(ImportController).ControllerName(), action = nameof(ImportController.Index) }
             );
 
+            routes.MapAreaControllerRoute(
+                name: "DeploymentPlanImportJson",
+                areaName: "OrchardCore.Deployment",
+                pattern: _adminOptions.AdminUrlPrefix + "/DeploymentPlan/Import/Json",
+                defaults: new { controller = typeof(ImportController).ControllerName(), action = nameof(ImportController.Json) }
+            );
+
             routes.MapAreaControllerRoute(
                 name: "DeploymentPlanExportFileExecute",
                 areaName: "OrchardCore.Deployment",

diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/ImportJsonViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/ImportJsonViewModel.cs
@@ -0,0 +1,7 @@
+namespace OrchardCore.Deployment.ViewModels
+{
+    public class ImportJsonViewModel
+    {
+        public string Json { get; set; }
+    }
+}
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Views/Import/Json.cshtml b/src/OrchardCore.Modules/OrchardCore.Deployment/Views/Import/Json.cshtml
@@ -0,0 +1,30 @@
+@model OrchardCore.Deployment.ViewModels.ImportJsonViewModel
+<h1>@RenderTitleSegments(T["JSON Import"])</h1>
+
+<style asp-name="codemirror"></style>
+<script asp-name="codemirror" depends-on="admin" at="Foot"></script>
+<script asp-name="codemirror-addon-display-autorefresh" at="Foot"></script>
+<script asp-name="codemirror-mode-javascript" at="Foot"></script>
+
+@Html.ValidationSummary()
+
+<form asp-action="Json">
+    <div class="form-group">
+        <textarea asp-for="Json" class="form-control mb-2" rows="20"></textarea>
+    </div>
+    <button class="btn btn-primary" type="submit">@T["Import"]</button>
+</form>
+
+<script at="Foot">
+$(function () {
+    var textArea = document.getElementById('@Html.IdFor(x => x.Json)');
+
+    var editor = CodeMirror.fromTextArea(textArea, {
+        autoRefresh: true,
+        lineNumbers: true,
+        styleActiveLine: true,
+        matchBrackets: true,
+        mode: { name: "javascript" },
+    });
+});
+</script>