Merge pull request #343 from magento-obsessive-owls/PB-290

[Owls] PB-290: Image Content Type Fails to Render in Admin Through Block/Dynamic Block

Author: davemacaulay

app/code/Magento/PageBuilder/Model/Filter/Template.php

@@ -91,6 +91,15 @@ public function filter(string $result) : string
             if (!empty($matches)) {
                 $docHtml = $matches[1];
 
+                // restore any encoded directives
+                $docHtml = preg_replace_callback(
+                    '/=\"(%7B%7B[^"]*%7D%7D)\"/m',
+                    function ($matches) {
+                        return urldecode($matches[0]);
+                    },
+                    $docHtml
+                );
+
                 if (isset($uniqueNodeNameToDecodedOuterHtmlMap)) {
                     foreach ($uniqueNodeNameToDecodedOuterHtmlMap as $uniqueNodeName => $decodedOuterHtml) {
                         $docHtml = str_replace(

app/code/Magento/PageBuilder/Plugin/Filter/TemplatePlugin.php

@@ -12,7 +12,7 @@
  */
 class TemplatePlugin
 {
-    const BACKGROUND_IMAGE_PATTERN = '/data-background-images/si';
+    const BACKGROUND_IMAGE_PATTERN = '/data-background-images=\"{[^"]+}\"/si';
 
     const HTML_CONTENT_TYPE_PATTERN = '/data-content-type="html"/si';
 

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/products/mass-converter/carousel-widget-directive.ts

@@ -58,7 +58,7 @@ export default class WidgetDirective extends BaseWidgetDirective {
         } as { [key: string]: any; };
 
         if (data.sort_order) {
-            attributes.sort_order = data.sort_order
+            attributes.sort_order = data.sort_order;
         }
 
         if (typeof data[data.condition_option] === "string") {

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/products/mass-converter/widget-directive.ts

@@ -54,11 +54,11 @@ export default class WidgetDirective extends BaseWidgetDirective {
             condition_option: data.condition_option,
             condition_option_value: "",
             type_name: "Catalog Products List",
-            conditions_encoded: this.encodeWysiwygCharacters(data.conditions_encoded || "")
+            conditions_encoded: this.encodeWysiwygCharacters(data.conditions_encoded || ""),
         } as { [key: string]: any; };
 
         if (data.sort_order) {
-            attributes.sort_order = data.sort_order
+            attributes.sort_order = data.sort_order;
         }
 
         if (typeof data[data.condition_option] === "string") {