Merge branch 'develop' into 1.4.0-release-sync

Author: omiroshnichenko

app/code/Magento/PageBuilder/Model/WidgetInitializerConfig.php

@@ -47,8 +47,8 @@ public function getConfig(): array
     {
         $resultConfig = [];
         foreach ($this->config as $contentTypeName => $config) {
-            $selector = sprintf('[data-content-type="%s"]', $contentTypeName);
             foreach ($config as $item) {
+                $selector = sprintf('[data-content-type="%s"]', $contentTypeName);
                 if (!isset($item['component'])) {
                     continue;
                 }

app/code/Magento/PageBuilder/Test/Unit/Model/WidgetInitializerConfigTest.php

@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Test\Unit\Model;
+
+use Magento\PageBuilder\Model\WidgetInitializerConfig;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for WidgetInitializerConfig
+ */
+class WidgetInitializerConfigTest extends TestCase
+{
+    /**
+     * Test different config variation.
+     *
+     * @dataProvider configProvider
+     * @param array $config
+     * @param array $expectedConfig
+     */
+    public function testGetConfig(array $config, array $expectedConfig): void
+    {
+        $model = new WidgetInitializerConfig(
+            $config
+        );
+
+        $actualConfig = $model->getConfig();
+        $this->assertEquals($expectedConfig, $actualConfig);
+    }
+
+    /**
+     * @return array
+     */
+    public function configProvider(): array
+    {
+        return [
+            [
+                [
+                    'products' => [
+                        'default' => [
+                            'component' => 'test',
+                            'appearance' => 'default',
+                            'config' => [
+                                'a' => true
+                            ]
+                        ]
+                    ]
+                ],
+                [
+                    '[data-content-type="products"][data-appearance="default"]' => [
+                        'test' => [
+                            'a' => true
+                        ]
+                    ]
+                ]
+            ],
+            [
+                [
+                    'products' => [
+                        'default' => [
+                            'component' => 'test-component',
+                            'appearance' => 'default',
+                            'config' => [
+                                'a' => true
+                            ]
+                        ],
+                        'another' => [
+                            'component' => 'another-test-component',
+                            'appearance' => 'not_default',
+                            'config' => [
+                                'b' => false
+                            ]
+                        ]
+                    ]
+                ],
+                [
+                    '[data-content-type="products"][data-appearance="default"]' => [
+                        'test-component' => [
+                            'a' => true
+                        ]
+                    ],
+                    '[data-content-type="products"][data-appearance="not_default"]' => [
+                        'another-test-component' => [
+                            'b' => false
+                        ]
+                    ]
+                ]
+            ]
+        ];
+    }
+}

app/code/Magento/PageBuilder/view/adminhtml/web/js/master-format/render.js

@@ -80,13 +80,13 @@ export default class MasterFormatRenderer {
         this.channel = new MessageChannel();
         const frame = this.getRenderFrame();
         window.addEventListener("message", (event) => {
-            if (!this.ready && event.data === "PB_RENDER_READY") {
+            if (!this.ready && event.data.name === "PB_RENDER_READY" && this.stageId === event.data.stageId) {
                 frame.contentWindow.postMessage("PB_RENDER_PORT", "*", [this.channel.port2]);
                 this.ready = true;
                 this.readyDeferred.resolve();
             }
         });
-        frame.src = Config.getConfig("render_url");
+        frame.src = Config.getConfig("render_url") + "?stageId=" + this.stageId;
     }
 
     /**

app/code/Magento/PageBuilder/view/adminhtml/web/js/master-format/render/frame.js

@@ -41,6 +41,8 @@ const debounceRender = _.debounce((message: {stageId: string, tree: TreeItem}, r
  * Listen for requests from the parent window for a render
  */
 export default function listen(config: ConfigInterface) {
+    const stageId = window.location.href.split("?")[1].split("=")[1];
+
     Config.setConfig(config);
     Config.setMode("Master");
 
@@ -74,7 +76,7 @@ export default function listen(config: ConfigInterface) {
     );
 
     // Inform the parent iframe that we're ready to receive the port
-    window.parent.postMessage("PB_RENDER_READY", "*");
+    window.parent.postMessage({name: "PB_RENDER_READY", stageId}, "*");
 }
 
 /**