Merge branch 'MAGETWO-49195' into MAGETWO-48913

Author: shiftedreality

app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WysiwygTest.php

@@ -21,12 +21,12 @@
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Filter\Translit;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Ui\Component\Form\Element\Checkbox;
 use Magento\Ui\Component\Form\Field;
 use Magento\Ui\Component\Form\Fieldset;
 use Magento\Ui\DataProvider\EavValidationRules;
 use Magento\Ui\DataProvider\Mapper\FormElement as FormElementMapper;
 use Magento\Ui\DataProvider\Mapper\MetaProperties as MetaPropertiesMapper;
+use Magento\Ui\Component\Form\Element\Wysiwyg as WysiwygElement;
 
 /**
  * Class Eav
@@ -225,7 +225,7 @@ protected function getAttributesMeta(array $attributes, $groupCode)
 
             $child = $this->setupMetaProperties($attribute);
 
-            $meta['container_' . $code] = [
+            $meta[static::CONTAINER_PREFIX . $code] = [
                 'arguments' => [
                     'data' => [
                         'config' => [
@@ -240,6 +240,11 @@ protected function getAttributesMeta(array $attributes, $groupCode)
                 ],
             ];
 
+            if ($attribute->getIsWysiwygEnabled()) {
+                $meta[static::CONTAINER_PREFIX . $code]['arguments']['data']['config']['component'] =
+                    'Magento_Ui/js/form/components/group';
+            }
+
             $child['arguments']['data']['config']['code'] = $code;
             $child['arguments']['data']['config']['source'] = $groupCode;
             $child['arguments']['data']['config']['scopeLabel'] = $this->getScopeLabel($attribute);
@@ -456,6 +461,27 @@ protected function setupMetaProperties(ProductAttributeInterface $attribute)
             $meta['arguments']['data']['config']['options'] = $attributeModel->getSource()->getAllOptions();
         }
 
+        $meta = $this->addWysiwyg($attribute, $meta);
+
+        return $meta;
+    }
+
+    /**
+     * Add wysiwyg properties
+     *
+     * @param ProductAttributeInterface $attribute
+     * @param array $meta
+     * @return array
+     */
+    private function addWysiwyg(ProductAttributeInterface $attribute, array $meta)
+    {
+        if (!$attribute->getIsWysiwygEnabled()) {
+            return $meta;
+        }
+
+        $meta['arguments']['data']['config']['formElement'] = WysiwygElement::NAME;
+        $meta['arguments']['data']['config']['wysiwyg'] = true;
+
         return $meta;
     }
 

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php

@@ -129,17 +129,13 @@
                     <item name="class" xsi:type="string">Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Images</item>
                     <item name="sortOrder" xsi:type="number">100</item>
                 </item>
-                <item name="wysiwyg" xsi:type="array">
-                    <item name="class" xsi:type="string">Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Wysiwyg</item>
-                    <item name="sortOrder" xsi:type="number">110</item>
-                </item>
                 <item name="related" xsi:type="array">
                     <item name="class" xsi:type="string">Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Related</item>
-                    <item name="sortOrder" xsi:type="number">120</item>
+                    <item name="sortOrder" xsi:type="number">110</item>
                 </item>
                 <item name="attributes" xsi:type="array">
                     <item name="class" xsi:type="string">Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Attributes</item>
-                    <item name="sortOrder" xsi:type="number">130</item>
+                    <item name="sortOrder" xsi:type="number">120</item>
                 </item>
             </argument>
         </arguments>