Merge branch '2.4-develop' into feature/fix_24091_configurable_product_options_on_wishlist

Author: Gabriel da Gama

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/Bundle/view/adminhtml/ui_component/bundle_product_listing.xml

@@ -58,7 +58,7 @@
                     <label translate="true">Status</label>
                     <dataScope>status</dataScope>
                     <imports>
-                        <link name="visible">componentType = column, index = ${ $.index }:visible</link>
+                        <link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
                     </imports>
                 </settings>
             </filterSelect>

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php

@@ -7,6 +7,7 @@
 namespace Magento\Catalog\Controller\Adminhtml\Product\Initialization;
 
 use Magento\Backend\Helper\Js;
+use Magento\Catalog\Api\Data\CategoryLinkInterfaceFactory;
 use Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory as CustomOptionFactory;
 use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory as ProductLinkFactory;
 use Magento\Catalog\Api\Data\ProductLinkTypeInterface;
@@ -115,6 +116,11 @@ class Helper
      */
     private $dateTimeFilter;
 
+    /**
+     * @var CategoryLinkInterfaceFactory
+     */
+    private $categoryLinkFactory;
+
     /**
      * Constructor
      *
@@ -132,6 +138,7 @@ class Helper
      * @param FormatInterface|null $localeFormat
      * @param ProductAuthorization|null $productAuthorization
      * @param DateTimeFilter|null $dateTimeFilter
+     * @param CategoryLinkInterfaceFactory|null $categoryLinkFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -148,7 +155,8 @@ public function __construct(
         AttributeFilter $attributeFilter = null,
         FormatInterface $localeFormat = null,
         ?ProductAuthorization $productAuthorization = null,
-        ?DateTimeFilter $dateTimeFilter = null
+        ?DateTimeFilter $dateTimeFilter = null,
+        ?CategoryLinkInterfaceFactory $categoryLinkFactory = null
     ) {
         $this->request = $request;
         $this->storeManager = $storeManager;
@@ -166,6 +174,7 @@ public function __construct(
         $this->localeFormat = $localeFormat ?: $objectManager->get(FormatInterface::class);
         $this->productAuthorization = $productAuthorization ?? $objectManager->get(ProductAuthorization::class);
         $this->dateTimeFilter = $dateTimeFilter ?? $objectManager->get(DateTimeFilter::class);
+        $this->categoryLinkFactory = $categoryLinkFactory ?? $objectManager->get(CategoryLinkInterfaceFactory::class);
     }
 
     /**
@@ -238,6 +247,7 @@ public function initializeFromData(Product $product, array $productData)
 
         $product = $this->setProductLinks($product);
         $product = $this->fillProductOptions($product, $productOptions);
+        $this->setCategoryLinks($product);
 
         $product->setCanSaveCustomOptions(
             !empty($productData['affect_product_custom_options']) && !$product->getOptionsReadonly()
@@ -484,4 +494,30 @@ function ($valueData) {
 
         return $product->setOptions($customOptions);
     }
+
+    /**
+     * Set category links based on initialized category ids
+     *
+     * @param Product $product
+     */
+    private function setCategoryLinks(Product $product): void
+    {
+        $extensionAttributes = $product->getExtensionAttributes();
+        $categoryLinks = [];
+        foreach ((array) $extensionAttributes->getCategoryLinks() as $categoryLink) {
+            $categoryLinks[$categoryLink->getCategoryId()] = $categoryLink;
+        }
+
+        $newCategoryLinks = [];
+        foreach ($product->getCategoryIds() as $categoryId) {
+            $categoryLink = $categoryLinks[$categoryId] ??
+                $this->categoryLinkFactory->create()
+                    ->setCategoryId($categoryId)
+                    ->setPosition(0);
+            $newCategoryLinks[] = $categoryLink;
+        }
+
+        $extensionAttributes->setCategoryLinks(!empty($newCategoryLinks) ? $newCategoryLinks : null);
+        $product->setExtensionAttributes($extensionAttributes);
+    }
 }

app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php

@@ -15,7 +15,8 @@
 use Magento\Framework\App\Request\DataPersistorInterface;
 
 /**
- * Class Save
+ * Product save controller
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Save extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpPostActionInterface
@@ -141,10 +142,6 @@ public function execute()
                 $canSaveCustomOptions = $product->getCanSaveCustomOptions();
                 $product->save();
                 $this->handleImageRemoveError($data, $product->getId());
-                $this->categoryLinkManagement->assignProductToCategories(
-                    $product->getSku(),
-                    $product->getCategoryIds()
-                );
                 $productId = $product->getEntityId();
                 $productAttributeSetId = $product->getAttributeSetId();
                 $productTypeId = $product->getTypeId();