Merge branch 'MC-3410' into MC-1413

Author: nathanjosiah

app/code/Magento/PageBuilder/Block/Adminhtml/Form/Element/ProductConditions.php

@@ -52,6 +52,7 @@ private function getConfig(): array
     {
         $formNamespace = $this->getData('formNamespace');
         $attribute = $this->getData('attribute');
+        $jsObjectName = $formNamespace . '_' . $attribute;
 
         return [
             'formNamespace' => $formNamespace,
@@ -62,12 +63,13 @@ private function getConfig(): array
                     'prefix' => $attribute,
                 ]
             ),
-            'jsObjectName' => $formNamespace . '_' . $attribute,
+            'jsObjectName' => $jsObjectName,
             'childComponentUrl' => $this->getUrl(
                 'pagebuilder/form/element_productconditions_child',
                 [
                     'form_namespace' => $formNamespace,
                     'prefix' => $attribute,
+                    'js_object_name' => $jsObjectName,
                 ]
             ),
             'attribute' => $attribute,

app/code/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditions/Child.php

@@ -39,6 +39,7 @@ public function execute()
     {
         $id = $this->getRequest()->getParam('id');
         $formName = $this->getRequest()->getParam('form_namespace');
+        $jsObjectName = $this->getRequest()->getParam('js_object_name');
 
         $typeData = explode('|', str_replace('-', '/', $this->getRequest()->getParam('type')));
         $className = $typeData[0];
@@ -55,7 +56,7 @@ public function execute()
 
         $result = '';
         if ($model instanceof AbstractCondition) {
-            $model->setJsFormObject($formName);
+            $model->setJsFormObject($jsObjectName);
             $model->setFormName($formName);
             $result = $model->asHtmlRecursive();
         }

dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditions/ChildTest.php

@@ -14,17 +14,20 @@ public function testFormLoadsEmptyFormUsingParams()
     {
         $this->getRequest()
             ->setParams([
+                'js_object_name' => 'myobject',
                 'form_namespace' => 'test_namespace',
             ])
             ->setPostValue([
-                'type' => 'Magento\CatalogWidget\Model\Rule\Condition\Product|custom_design_from',
+                'type' => 'Magento\CatalogWidget\Model\Rule\Condition\Product|category_ids',
                 'id' => '1--3',
             ]);
 
         $this->dispatch('backend/pagebuilder/form/element_productconditions_child');
         $responseBody = $this->getResponse()->getBody();
         // Assert form is associated correctly
         $this->assertContains('data-form-part="test_namespace"', $responseBody);
+        // Assert the form object is propagated
+        $this->assertContains('form/myobject', $responseBody);
         // Assert id is used
         $this->assertContains('name="parameters[conditions][1--3][type]"', $responseBody);
         // Assert type is used
@@ -35,17 +38,20 @@ public function testFormLoadsCustomPrefix()
     {
         $this->getRequest()
             ->setParams([
+                'js_object_name' => 'myobject',
                 'form_namespace' => 'test_namespace',
                 'prefix' => 'myprefix',
             ])
             ->setPostValue([
-                'type' => 'Magento\CatalogWidget\Model\Rule\Condition\Product|custom_design_from',
+                'type' => 'Magento\CatalogWidget\Model\Rule\Condition\Product|category_ids',
                 'id' => '1--3',
             ]);
 
         $this->dispatch('backend/pagebuilder/form/element_productconditions_child');
         $responseBody = $this->getResponse()->getBody();
 
+        // Assert the form object is propagated
+        $this->assertContains('form/myobject', $responseBody);
         // Assert id is used
         $this->assertContains('name="parameters[myprefix][1--3][type]"', $responseBody);
     }