magento/magento2-page-builder#543: Content Product Attributes Default…

app/code/Magento/Catalog/Setup/CategorySetup.php

@@ -421,9 +421,9 @@ public function getDefaultEntities()
                         'comparable' => true,
                         'visible_in_advanced_search' => true,
                     ],
-                    'description' => [
+                    'short_description' => [
                         'type' => 'text',
-                        'label' => 'Description',
+                        'label' => 'Short Description',
                         'input' => 'textarea',
                         'sort_order' => 3,
                         'global' => ScopedAttributeInterface::SCOPE_STORE,
@@ -432,10 +432,14 @@ public function getDefaultEntities()
                         'wysiwyg_enabled' => true,
                         'is_html_allowed_on_front' => true,
                         'visible_in_advanced_search' => true,
+                        'used_in_product_listing' => true,
+                        'is_used_in_grid' => true,
+                        'is_visible_in_grid' => false,
+                        'is_filterable_in_grid' => false,
                     ],
-                    'short_description' => [
+                    'description' => [
                         'type' => 'text',
-                        'label' => 'Short Description',
+                        'label' => 'Description',
                         'input' => 'textarea',
                         'sort_order' => 4,
                         'global' => ScopedAttributeInterface::SCOPE_STORE,
@@ -444,10 +448,6 @@ public function getDefaultEntities()
                         'wysiwyg_enabled' => true,
                         'is_html_allowed_on_front' => true,
                         'visible_in_advanced_search' => true,
-                        'used_in_product_listing' => true,
-                        'is_used_in_grid' => true,
-                        'is_visible_in_grid' => false,
-                        'is_filterable_in_grid' => false,
                     ],
                     'price' => [
                         'type' => 'decimal',

app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php

@@ -0,0 +1,107 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Setup\Patch\Data;
+
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\Catalog\Setup\CategorySetupFactory;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+
+/**
+ * Class UpdateProductDescriptionOrder
+ *
+ * @package Magento\Catalog\Setup\Patch
+ */
+class UpdateProductDescriptionOrder implements DataPatchInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var CategorySetupFactory
+     */
+    private $categorySetupFactory;
+
+    /**
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param CategorySetupFactory $categorySetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        CategorySetupFactory $categorySetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->categorySetupFactory = $categorySetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /** @var CategorySetup $categorySetup */
+        $categorySetup = $this->categorySetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $attributeSetId = $categorySetup->getDefaultAttributeSetId(\Magento\Catalog\Model\Product::ENTITY);
+
+        // Content
+        $categorySetup->addAttributeGroup(
+            \Magento\Catalog\Model\Product::ENTITY,
+            $attributeSetId,
+            'Content',
+            15
+        );
+        $categorySetup->updateAttributeGroup(
+            \Magento\Catalog\Model\Product::ENTITY,
+            $attributeSetId,
+            'Content',
+            'tab_group_code',
+            'basic'
+        );
+        $categorySetup->addAttributeToGroup(
+            \Magento\Catalog\Model\Product::ENTITY,
+            $attributeSetId,
+            'Content',
+            'short_description',
+            100
+        );
+        $categorySetup->addAttributeToGroup(
+            \Magento\Catalog\Model\Product::ENTITY,
+            $attributeSetId,
+            'Content',
+            'description',
+            110
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            UpdateMediaAttributesBackendTypes::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.3.5';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}