PB-341: Save content as template

- Final bug fixes

Author: davemacaulay

app/code/Magento/PageBuilder/Controller/Adminhtml/Template/Save.php

@@ -23,6 +23,7 @@
 use Magento\PageBuilder\Api\TemplateRepositoryInterface;
 use Magento\PageBuilder\Model\TemplateFactory;
 use Psr\Log\LoggerInterface;
+use \Magento\MediaStorage\Helper\File\Storage\Database;
 
 /**
  * Save a template within template manager
@@ -68,6 +69,11 @@ class Save extends Action implements HttpPostActionInterface
      */
     private $imageContentFactory;
 
+    /**
+     * @var Database
+     */
+    private $mediaStorage;
+
     /**
      * @param Context $context
      * @param LoggerInterface $logger
@@ -77,6 +83,7 @@ class Save extends Action implements HttpPostActionInterface
      * @param Filesystem $filesystem
      * @param ImageContentValidator $imageContentValidator
      * @param ImageContentFactory $imageContentFactory
+     * @param Database $mediaStorage
      */
     public function __construct(
         Context $context,
@@ -86,7 +93,8 @@ public function __construct(
         SearchCriteriaBuilder $searchCriteriaBuilder,
         Filesystem $filesystem,
         ImageContentValidator $imageContentValidator,
-        ImageContentFactory $imageContentFactory
+        ImageContentFactory $imageContentFactory,
+        Database $mediaStorage
     ) {
         parent::__construct($context);
 
@@ -97,6 +105,7 @@ public function __construct(
         $this->filesystem = $filesystem;
         $this->imageContentValidator = $imageContentValidator;
         $this->imageContentFactory = $imageContentFactory;
+        $this->mediaStorage = $mediaStorage;
     }
 
     /**
@@ -237,6 +246,13 @@ private function storePreviewImage(RequestInterface $request) : ?string
                 $decodedImage
             );
 
+            // If the media storage is set to DB also save the file into the DB
+            if ($this->mediaStorage->checkDbUsage()) {
+                $this->mediaStorage->saveFile(
+                    $filePath
+                );
+            }
+
             // Store the preview image within the new entity
             return $filePath;
         }

app/code/Magento/PageBuilder/etc/adminhtml/menu.xml

@@ -7,6 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
     <menu>
-        <add id="Magento_PageBuilder::templates" title="Templates" translate="title" module="Magento_PageBuilder" sortOrder="100" parent="Magento_Backend::content_elements" action="pagebuilder/template" resource="Magento_PageBuilder::templates"/>
+        <add id="Magento_PageBuilder::templates" title="Templates" translate="title" module="Magento_PageBuilder" sortOrder="100" parent="Magento_Backend::content_elements" dependsOnConfig="cms/pagebuilder/enabled" action="pagebuilder/template" resource="Magento_PageBuilder::templates"/>
     </menu>
 </config>

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/buttons/preview.js

@@ -41,7 +41,8 @@ define([
          */
         applySelected: function (template) {
             if (template) {
-                this.stage.rootContainer.children([]);
+                // Destroy the old content in the stage
+                this.stage.pageBuilder.destroy();
                 $('body').trigger('processStart');
 
                 stageBuilder(this.stage, template).then(function () {

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/row/preview.js

@@ -92,11 +92,6 @@ export default class Preview extends PreviewCollection {
                 this.buildJarallax();
             }
         });
-        events.on(`stage:${this.contentType.stageId}:fullScreenModeChangeAfter`, () => {
-            _.delay(() => {
-                this.buildJarallax();
-            }, 350);
-        });
     }
 
     /**

app/code/Magento/PageBuilder/view/adminhtml/web/js/modal/template-manager-modal.js

@@ -10,6 +10,7 @@ import alertDialog from "Magento_PageBuilder/js/modal/confirm-alert";
 import templateManagerSave from "Magento_PageBuilder/js/modal/template-manager-save";
 import promptContentTmpl from "text!Magento_PageBuilder/template/modal/template-manager/save-content-modal.html";
 import registry from "uiRegistry";
+import _ from "underscore";
 import {isAllowed, resources} from "./acl";
 import Config from "./config";
 import Stage from "./stage";
@@ -169,7 +170,7 @@ function createCapture(stage: Stage) {
 function disableParallax(stageElement: Element): ResetRowInterface[] {
     const rowsToReset: ResetRowInterface[] = [];
     const parallaxRows = stageElement.querySelectorAll("[data-jarallax-original-styles]");
-    parallaxRows.forEach((row: HTMLElement) => {
+    _.each(parallaxRows, (row: HTMLElement) => {
         const originalStyles = row.getAttribute("data-jarallax-original-styles");
         const jarallaxStyle = row.style.cssText;
         row.style.cssText = originalStyles;
@@ -191,7 +192,7 @@ function disableParallax(stageElement: Element): ResetRowInterface[] {
  * @param rows
  */
 function restoreParallax(rows: ResetRowInterface[]) {
-    rows.forEach(({element, styles, container}) => {
+    _.each(rows, ({element, styles, container}) => {
         element.style.cssText = styles;
         container.style.display = "";
     });