Merge branch '512_content-snapshot-block-admin-page' into 513_content-snapshot-dynamic-block

Lukasz Borowiec · Lukasz Borowiec · commit 17534aa62beb · 2020-08-17T13:57:29.000+02:00
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveSlideItemsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveSlideItemsTest.xml
@@ -58,7 +58,7 @@
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsAfterBlock" after="searchBlockInGrid"/>
         <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen1" after="saveEditPanelSettingsAfterBlock"/>
-        <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageAfterBlock" after="exitPageBuilderFullScreen"/>
+        <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageAfterBlock" after="exitPageBuilderFullScreen1"/>
         <!-- Validate CMS Page Storefront -->
         <actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToStoreFront">
             <argument name="page" value="$$createCMSPage.identifier$$"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCmsPageContentSnapshotTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCmsPageContentSnapshotTest.xml
@@ -19,15 +19,14 @@
             <group value="pagebuilder-cms-page"/>
         </annotations>
         <before>
-            <comment userInput="---merging to remove step---" stepKey="createPreReqCategory"/>
-            <createData entity="_emptyCmsPage" stepKey="createCMSPage" before="navigateToAPageWithPageBuilder"/>
+            <createData entity="_emptyCmsPage" stepKey="createPreReqCategory"/>
             <actionGroup ref="navigateToCMSPage" stepKey="navigateToAPageWithPageBuilder">
-                <argument name="CMSPage" value="$$createCMSPage$$"/>
+                <argument name="CMSPage" value="$$createPreReqCategory$$"/>
+            </actionGroup>
+            <actionGroup ref="expandAdminCategorySection" stepKey="expandContentSection">
+                <argument name="sectionSelector" value="{{CmsNewPagePageContentSection.header}}"/>
+                <argument name="sectionDependentSelector" value="{{CmsNewPagePageContentSection.header}}._show"/>
             </actionGroup>
         </before>
-        <after>
-            <comment userInput="---merging to remove step---" stepKey="deleteCreatedCategory"/>
-            <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage" before="logout"/>
-        </after>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderTextThroughBlockContentTypeTinyMCE4WysiwygEnabledByDefaultTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderTextThroughBlockContentTypeTinyMCE4WysiwygEnabledByDefaultTest.xml
@@ -32,6 +32,13 @@
                 <argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
             </actionGroup>
             <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
+            <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
+                <argument name="contentType" value="PageBuilderRowContentType"/>
+            </actionGroup>
+            <actionGroup ref="fillSlideOutPanelFieldMargins" stepKey="enterMargins">
+                <argument name="property" value="PageBuilderMarginsProperty_50"/>
+            </actionGroup>
+            <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsRow"/>
         </before>
         <after>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/TinyMCE/TinyMCEVerifyCatalogProductsListWidgetTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/TinyMCE/TinyMCEVerifyCatalogProductsListWidgetTest.xml
@@ -34,6 +34,13 @@
                 <argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
             </actionGroup>
             <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
+            <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
+                <argument name="contentType" value="PageBuilderRowContentType"/>
+            </actionGroup>
+            <actionGroup ref="fillSlideOutPanelFieldMargins" stepKey="enterMargins">
+                <argument name="property" value="PageBuilderMarginsProperty_50"/>
+            </actionGroup>
+            <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsRow"/>
         </before>
         <after>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/observable-updater/attributes.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/observable-updater/attributes.js
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/observable-updater/html.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/observable-updater/html.js
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/wysiwyg.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/wysiwyg.js
@@ -24,6 +24,7 @@ define([
             transitionOut: false,
             elementSelector: '> textarea',
             stageSelector: '.pagebuilder-stage-wrapper',
+            fieldsetSelector: 'fieldset.admin__fieldset',
             overlaySelector: '.pagebuilder-wysiwyg-overlay',
             overlayMouseover: false,
             pageBuilder: false,
@@ -115,6 +116,7 @@ define([
         disableDomObserver: function (node) {
             this.determineIfWithinModal(node);
             domObserver.disableNode(node);
+            domObserver.disableNode($(node).parents(this.fieldsetSelector)[0]);
         },
 
         /**
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/master-format/render/frame.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/master-format/render/frame.js
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/utils/directives.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/utils/directives.js
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater/attributes.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater/attributes.ts
@@ -3,6 +3,7 @@
  * See COPYING.txt for license details.
  */
 
+import Config from "../../config";
 import {ContentTypeConfigAppearanceElementInterface} from "../../content-type-config.types";
 import ConverterPool from "../../converter/converter-pool";
 import {DataObject} from "../../data-store";
@@ -29,6 +30,7 @@ export default function generate(
         if ("read" === attributeConfig.persistence_mode) {
             continue;
         }
+        // @ts-ignore
         let value;
         if (!!attributeConfig.static) {
             value = attributeConfig.value;
@@ -39,7 +41,15 @@ export default function generate(
         if (converterPool.get(converter)) {
             value = converterPool.get(converter).toDom(attributeConfig.var, data);
         }
-        attributeData[attributeConfig.name] = value;
+
+        // Replacing src attribute with data-tmp-src to prevent img requests in iframe during master format rendering
+        if (attributeConfig.name === "src" && !value.indexOf("{{media url=") && Config.getMode() !== "Preview") {
+            attributeData["data-tmp-" + attributeConfig.name] = value;
+            // @ts-ignore
+            Object.defineProperty(attributeData, attributeConfig.name, { get() { return value; } });
+        } else {
+            attributeData[attributeConfig.name] = value;
+        }
     }
 
     attributeData["data-element"] = elementName;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater/html.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater/html.ts
@@ -3,9 +3,11 @@
  * See COPYING.txt for license details.
  */
 
+import Config from "../../config";
 import {ContentTypeConfigAppearanceElementInterface} from "../../content-type-config.types";
 import ConverterPool from "../../converter/converter-pool";
 import {DataObject} from "../../data-store";
+import { replaceWithDataSrc } from "../../utils/directives";
 import {get} from "../../utils/object";
 
 /**
@@ -33,5 +35,11 @@ export default function generate(
     if (typeof value === "string" && !value.length && config.html.placeholder) {
         value = config.html.placeholder;
     }
+
+    // Replacing src attribute with data-tmp-src to prevent img requests in iframe during master format rendering
+    if (Config.getMode() !== "Preview" && typeof value === "string" && value.indexOf("{{media url=") !== -1) {
+        value = replaceWithDataSrc(value);
+    }
+
     return value;
 }
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/render/frame.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/render/frame.ts
@@ -13,7 +13,7 @@ import ConfigInterface from "../../config.types";
 import ContentTypeCollectionInterface from "../../content-type-collection.types";
 import createContentType from "../../content-type-factory";
 import ContentTypeInterface from "../../content-type.types";
-import decodeAllDataUrlsInString from "../../utils/directives";
+import decodeAllDataUrlsInString, { replaceWithSrc } from "../../utils/directives";
 import filterHtml from "../filter-html";
 import { TreeItem } from "./serialize";
 
@@ -160,7 +160,7 @@ function render(message: {stageId: string, tree: TreeItem}) {
                 observer.disconnect();
                 ko.cleanNode(element);
                 const filtered: JQuery = filterHtml($(element));
-                const output = decodeAllDataUrlsInString(filtered.html());
+                const output = replaceWithSrc(decodeAllDataUrlsInString(filtered.html()));
                 resolve(output);
             });
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/directives.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/directives.ts
@@ -131,3 +131,29 @@ export function convertMediaDirectivesToUrls(html: string): string {
     }
     return html;
 }
+
+/**
+ * Replace data-src attribute with src.
+ *
+ * @param {string} html
+ * @returns {string}
+ */
+export function replaceWithSrc(html: string): string {
+    return html.replace(
+        new RegExp("data-tmp-src=\"\{\{", "g"),
+        "src=\"{{",
+    );
+}
+
+/**
+ * Replace src attribute with data-tmp-src.
+ *
+ * @param {string} html
+ * @returns {string}
+ */
+export function replaceWithDataSrc(html: string): string {
+    return html.replace(
+        new RegExp("src=\"\{\{", "g"),
+        "data-tmp-src=\"{{",
+    );
+}
