🔃 [Magento Community Engineering] Community Contributions - 2.4-develop

Accepted Community Pull Requests:
 - #25412: Admin > Advanced Report > Changing link (by @rafaelstz)
 - #30008: Fix missing escape Url method (by @mrtuvn)
 - #28216: Replace hard-coded list of category attributes (by @fredden)
 - #30065: Input type datetime is used in lib styles (by @GrimLink)
 - #29726: Allow specify font type when declare custom font (by @mrtuvn)
 - #28389: Add a head.additional block to adminhtml layout (by @gsomoza)


Fixed GitHub Issues:
 - #25411: Magento_Analytics wrong link (reported by @rafaelstz) has been fixed in #25412 by @rafaelstz in 2.4-develop branch
   Related commits:
     1. 9efef99
     2. c01dd2a
     3. 6a0f133
     4. d69bd9d
     5. 42eb8a0
     6. 1e8b12e
     7. 08c9f33

 - #30036: [Issue] Fix missing escape Url method (reported by @m2-assistant[bot]) has been fixed in #30008 by @mrtuvn in 2.4-develop branch
   Related commits:
     1. 777c7c7
     2. d2f3466
     3. 5f69036

 - #13440: Adding custom attribute to category doesn't show store specific value (reported by @maxxeh1) has been fixed in #28216 by @fredden in 2.4-develop branch
   Related commits:
     1. e9511e8
     2. af9f897
     3. 3bd5fa0
     4. 471dc6b
     5. fd5b12e
     6. d3e011c
     7. 8d899e1
     8. d62b0b5
     9. 223a7f5
     10. 18eaaf1
     11. 13c45d1
     12. fe28e23
     13. 58651f9
     14. d267e3b
     15. e2c42e6
     16. 749ee55
     17. e59de41
     18. cebb5be
     19. c3ce246

 - #30064: Input type datetime is used in lib styles (reported by @GrimLink) has been fixed in #30065 by @GrimLink in 2.4-develop branch
   Related commits:
     1. d15f34d
     2. beb817f

 - #29719: Font format incorrect import in theme (reported by @mrtuvn) has been fixed in #29726 by @mrtuvn in 2.4-develop branch
   Related commits:
     1. 9e48f91

 - #29165: [Issue] Add a head.additional block to adminhtml layout (reported by @m2-assistant[bot]) has been fixed in #28389 by @gsomoza in 2.4-develop branch
   Related commits:
     1. 336b463
     2. 75cc0b4
     3. 01bc9cf

Author: magento-engcom-team

app/code/Magento/Analytics/Model/ReportUrlProvider.php

@@ -47,6 +47,13 @@ class ReportUrlProvider
      */
     private $urlReportConfigPath = 'analytics/url/report';
 
+    /**
+     * Path to Advanced Reporting documentation URL.
+     *
+     * @var string
+     */
+    private $urlReportDocConfigPath = 'analytics/url/documentation';
+
     /**
      * @param AnalyticsToken $analyticsToken
      * @param OTPRequest $otpRequest
@@ -80,13 +87,15 @@ public function getUrl()
             ));
         }
 
-        $url = $this->config->getValue($this->urlReportConfigPath);
         if ($this->analyticsToken->isTokenExist()) {
+            $url = $this->config->getValue($this->urlReportConfigPath);
             $otp = $this->otpRequest->call();
             if ($otp) {
                 $query = http_build_query(['otp' => $otp], '', '&');
                 $url .= '?' . $query;
             }
+        } else {
+            $url = $this->config->getValue($this->urlReportDocConfigPath);
         }
 
         return $url;

app/code/Magento/Analytics/Test/Mftf/ActionGroup/AssertAdminAdvancedReportingPageUrlActionGroup.xml

@@ -15,6 +15,6 @@
 
         <switchToNextTab stepKey="switchToNewTab"/>
         <waitForPageLoad stepKey="waitForAdvancedReportingPageLoad"/>
-        <seeInCurrentUrl url="advancedreporting.rjmetrics.com/report" stepKey="seeAssertAdvancedReportingPageUrl"/>
+        <seeInCurrentUrl url="reports/advanced-reporting" stepKey="seeAssertAdvancedReportingPageUrl"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Analytics/Test/Unit/Model/ReportUrlProviderTest.php

@@ -43,20 +43,10 @@ class ReportUrlProviderTest extends TestCase
      */
     private $flagManagerMock;
 
-    /**
-     * @var ObjectManagerHelper
-     */
-    private $objectManagerHelper;
-
     /**
      * @var ReportUrlProvider
      */
-    private $reportUrlProvider;
-
-    /**
-     * @var string
-     */
-    private $urlReportConfigPath = 'path/url/report';
+    private $model;
 
     /**
      * @return void
@@ -71,35 +61,36 @@ protected function setUp(): void
 
         $this->flagManagerMock = $this->createMock(FlagManager::class);
 
-        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $objectManagerHelper = new ObjectManagerHelper($this);
 
-        $this->reportUrlProvider = $this->objectManagerHelper->getObject(
+        $this->model = $objectManagerHelper->getObject(
             ReportUrlProvider::class,
             [
                 'config' => $this->configMock,
                 'analyticsToken' => $this->analyticsTokenMock,
                 'otpRequest' => $this->otpRequestMock,
                 'flagManager' => $this->flagManagerMock,
-                'urlReportConfigPath' => $this->urlReportConfigPath,
             ]
         );
     }
 
     /**
      * @param bool $isTokenExist
      * @param string|null $otp If null OTP was not received.
+     * @param string $configPath
+     * @return void
      *
      * @dataProvider getUrlDataProvider
      */
-    public function testGetUrl($isTokenExist, $otp)
+    public function testGetUrl(bool $isTokenExist, ?string $otp, string $configPath): void
     {
         $reportUrl = 'https://example.com/report';
         $url = '';
 
         $this->configMock
             ->expects($this->once())
             ->method('getValue')
-            ->with($this->urlReportConfigPath)
+            ->with($configPath)
             ->willReturn($reportUrl);
         $this->analyticsTokenMock
             ->expects($this->once())
@@ -114,18 +105,19 @@ public function testGetUrl($isTokenExist, $otp)
         if ($isTokenExist && $otp) {
             $url = $reportUrl . '?' . http_build_query(['otp' => $otp], '', '&');
         }
-        $this->assertSame($url ?: $reportUrl, $this->reportUrlProvider->getUrl());
+
+        $this->assertSame($url ?: $reportUrl, $this->model->getUrl());
     }
 
     /**
      * @return array
      */
-    public function getUrlDataProvider()
+    public function getUrlDataProvider(): array
     {
         return [
-            'TokenDoesNotExist' => [false, null],
-            'TokenExistAndOtpEmpty' => [true, null],
-            'TokenExistAndOtpValid' => [true, '249e6b658877bde2a77bc4ab'],
+            'TokenDoesNotExist' => [false, null, 'analytics/url/documentation'],
+            'TokenExistAndOtpEmpty' => [true, null, 'analytics/url/report'],
+            'TokenExistAndOtpValid' => [true, '249e6b658877bde2a77bc4ab', 'analytics/url/report'],
         ];
     }
 
@@ -140,6 +132,6 @@ public function testGetUrlWhenSubscriptionUpdateRunning()
             ->with(SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE)
             ->willReturn('http://store.com');
         $this->expectException(SubscriptionUpdateException::class);
-        $this->reportUrlProvider->getUrl();
+        $this->model->getUrl();
     }
 }

app/code/Magento/Analytics/etc/config.xml

@@ -15,6 +15,7 @@
                 <otp>https://advancedreporting.rjmetrics.com/otp</otp>
                 <report>https://advancedreporting.rjmetrics.com/report</report>
                 <notify_data_changed>https://advancedreporting.rjmetrics.com/report</notify_data_changed>
+                <documentation>https://docs.magento.com/user-guide/reports/advanced-reporting.html</documentation>
             </url>
             <integration_name>Magento Analytics user</integration_name>
             <general>

app/code/Magento/Backend/view/adminhtml/layout/default.xml

@@ -17,6 +17,7 @@
     <body>
         <attribute name="id" value="html-body"/>
         <block name="require.js" class="Magento\Backend\Block\Page\RequireJs" template="Magento_Backend::page/js/require_js.phtml"/>
+        <block class="Magento\Framework\View\Element\Template" name="head.additional" template="Magento_Backend::page/container.phtml"/>
         <referenceContainer name="global.notices">
             <block class="Magento\Backend\Block\Page\Notices" name="global_notices" as="global_notices" template="Magento_Backend::page/notices.phtml"/>
         </referenceContainer>

app/code/Magento/Backend/view/adminhtml/templates/page/container.phtml

@@ -0,0 +1,7 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<?= $block->getChildHtml(); ?>

app/code/Magento/Catalog/Model/Category/DataProvider.php

@@ -22,6 +22,8 @@
 use Magento\Eav\Model\Entity\Type;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\Config\DataInterfaceFactory;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Registry;
@@ -32,7 +34,6 @@
 use Magento\Ui\Component\Form\Field;
 use Magento\Ui\DataProvider\EavValidationRules;
 use Magento\Ui\DataProvider\Modifier\PoolInterface;
-use Magento\Framework\AuthorizationInterface;
 use Magento\Ui\DataProvider\ModifierPoolDataProvider;
 
 /**
@@ -153,6 +154,11 @@ class DataProvider extends ModifierPoolDataProvider
      */
     private $categoryFactory;
 
+    /**
+     * @var DataInterfaceFactory
+     */
+    private $uiConfigFactory;
+
     /**
      * @var ScopeOverriddenValue
      */
@@ -177,6 +183,7 @@ class DataProvider extends ModifierPoolDataProvider
      * @var AuthorizationInterface
      */
     private $auth;
+
     /**
      * @var Image
      */
@@ -202,6 +209,7 @@ class DataProvider extends ModifierPoolDataProvider
      * @param ArrayManager|null $arrayManager
      * @param FileInfo|null $fileInfo
      * @param Image|null $categoryImage
+     * @param DataInterfaceFactory|null $uiConfigFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -223,7 +231,8 @@ public function __construct(
         ScopeOverriddenValue $scopeOverriddenValue = null,
         ArrayManager $arrayManager = null,
         FileInfo $fileInfo = null,
-        ?Image $categoryImage = null
+        ?Image $categoryImage = null,
+        ?DataInterfaceFactory $uiConfigFactory = null
     ) {
         $this->eavValidationRules = $eavValidationRules;
         $this->collection = $categoryCollectionFactory->create();
@@ -240,6 +249,10 @@ public function __construct(
         $this->arrayManager = $arrayManager ?: ObjectManager::getInstance()->get(ArrayManager::class);
         $this->fileInfo = $fileInfo ?: ObjectManager::getInstance()->get(FileInfo::class);
         $this->categoryImage = $categoryImage ?? ObjectManager::getInstance()->get(Image::class);
+        $this->uiConfigFactory = $uiConfigFactory ?? ObjectManager::getInstance()->create(
+            DataInterfaceFactory::class,
+            ['instanceName' => \Magento\Ui\Config\Data::class]
+        );
 
         parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data, $pool);
     }
@@ -611,7 +624,7 @@ private function convertValues($category, $categoryData): array
 
                     $categoryData[$attributeCode][0]['url'] = $this->categoryImage->getUrl($category, $attributeCode);
 
-                    $categoryData[$attributeCode][0]['size'] = isset($stat) ? $stat['size'] : 0;
+                    $categoryData[$attributeCode][0]['size'] = $stat['size'];
                     $categoryData[$attributeCode][0]['type'] = $mime;
                 }
             }
@@ -645,56 +658,42 @@ public function getDefaultMetaData($result)
      */
     protected function getFieldsMap()
     {
-        return [
-            'general' => [
-                'parent',
-                'path',
-                'is_active',
-                'include_in_menu',
-                'name',
-            ],
-            'content' => [
-                'image',
-                'description',
-                'landing_page',
-            ],
-            'display_settings' => [
-                'display_mode',
-                'is_anchor',
-                'available_sort_by',
-                'use_config.available_sort_by',
-                'default_sort_by',
-                'use_config.default_sort_by',
-                'filter_price_range',
-                'use_config.filter_price_range',
-            ],
-            'search_engine_optimization' => [
-                'url_key',
-                'url_key_create_redirect',
-                'url_key_group',
-                'meta_title',
-                'meta_keywords',
-                'meta_description',
-            ],
-            'assign_products' => [
-            ],
-            'design' => [
-                'custom_use_parent_settings',
-                'custom_apply_to_products',
-                'custom_design',
-                'page_layout',
-                'custom_layout_update',
-                'custom_layout_update_file'
-            ],
-            'schedule_design_update' => [
-                'custom_design_from',
-                'custom_design_to',
-            ],
-            'category_view_optimization' => [
-            ],
-            'category_permissions' => [
-            ],
-        ];
+        $referenceName = 'category_form';
+        $config = $this->uiConfigFactory
+            ->create(['componentName' => $referenceName])
+            ->get($referenceName);
+
+        if (empty($config)) {
+            return [];
+        }
+
+        $fieldsMap = [];
+
+        foreach ($config['children'] as $group => $node) {
+            // Skip disabled components (required for Commerce Edition)
+            if ($node['arguments']['data']['config']['componentDisabled'] ?? false) {
+                continue;
+            }
+
+            $fields = [];
+
+            foreach ($node['children'] as $childName => $childNode) {
+                if (!empty($childNode['children'])) {
+                    // <container/> nodes need special handling
+                    foreach (array_keys($childNode['children']) as $grandchildName) {
+                        $fields[] = $grandchildName;
+                    }
+                } else {
+                    $fields[] = $childName;
+                }
+            }
+
+            if (!empty($fields)) {
+                $fieldsMap[$group] = $fields;
+            }
+        }
+
+        return $fieldsMap;
     }
 
     /**

app/code/Magento/Catalog/Test/Unit/Model/Category/DataProviderTest.php

@@ -20,6 +20,8 @@
 use Magento\Eav\Model\Entity\Type;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\Config\Data;
+use Magento\Framework\Config\DataInterfaceFactory;
 use Magento\Framework\Registry;
 use Magento\Framework\Stdlib\ArrayUtils;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -70,6 +72,11 @@ class DataProviderTest extends TestCase
      */
     private $categoryFactory;
 
+    /**
+     * @var DataInterfaceFactory|MockObject
+     */
+    private $uiConfigFactory;
+
     /**
      * @var Collection|MockObject
      */
@@ -151,6 +158,15 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
 
+        $dataMock = $this->getMockBuilder(Data::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->uiConfigFactory = $this->getMockBuilder(DataInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->uiConfigFactory->method('create')
+            ->willReturn($dataMock);
+
         $this->fileInfo = $this->getMockBuilder(FileInfo::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -198,6 +214,7 @@ private function getModel()
                 'eavConfig' => $this->eavConfig,
                 'request' => $this->request,
                 'categoryFactory' => $this->categoryFactory,
+                'uiConfigFactory' => $this->uiConfigFactory,
                 'pool' => $this->modifierPool,
                 'auth' => $this->auth,
                 'arrayUtils' => $this->arrayUtils,

app/code/Magento/Catalog/etc/di.xml

@@ -80,6 +80,9 @@
         <plugin name="catalogLog" type="Magento\Catalog\Model\Plugin\Log" />
     </type>
     <type name="Magento\Catalog\Model\Category\DataProvider">
+        <arguments>
+            <argument name="uiConfigFactory" xsi:type="object">uiComponentConfigFactory</argument>
+        </arguments>
         <plugin name="set_page_layout_default_value" type="Magento\Catalog\Model\Plugin\SetPageLayoutDefaultValue" />
     </type>
     <type name="Magento\Theme\Block\Html\Topmenu">