Merge branch '2.4-develop' into MC-42249

Author: devarul

app/code/Magento/AdminAnalytics/i18n/en_US.csv

@@ -0,0 +1,3 @@
+"Allow Adobe to collect usage data to improve user experience and offer in-product guidance", "Allow Adobe to collect usage data to improve user experience and offer in-product guidance"
+"<p>By clicking on <b>Allow</b>, you agree that we may collect anonymous usage data from you to:</p> <ol class=""modal-list""> <li>Help us improve the Magento Admin user experience</li> <li>Provide interactive in-product guidance, such as technical support and tips to improve utilization of the product from within the Admin UI. This may include notifications of new features, product support/guidance, onboarding information, tooltips, and more.</li> </ol> <p>All usage data that we collect for this purpose cannot be used to individually identify you and is used only to improve the Magento Admin UI and related products and services.</p> <p>You can learn more and opt-out at any time by following the instructions in <a href=""https://docs.magento.com/user-guide/configuration/advanced/admin.html#admin-usage"">merchant documentation</a>.</p>", "<p>By clicking on <b>Allow</b>, you agree that we may collect anonymous usage data from you to:</p> <ol class=""modal-list""> <li>Help us improve the Magento Admin user experience</li> <li>Provide interactive in-product guidance, such as technical support and tips to improve utilization of the product from within the Admin UI. This may include notifications of new features, product support/guidance, onboarding information, tooltips, and more.</li> </ol> <p>All usage data that we collect for this purpose cannot be used to individually identify you and is used only to improve the Magento Admin UI and related products and services.</p> <p>You can learn more and opt-out at any time by following the instructions in <a href=""https://docs.magento.com/user-guide/configuration/advanced/admin.html#admin-usage"">merchant documentation</a>.</p>"
+

app/code/Magento/AdminAnalytics/view/adminhtml/layout/adminhtml_dashboard_index.xml

@@ -19,4 +19,4 @@
             </block>
         </referenceContainer>
     </body>
-</page>
+</page>

app/code/Magento/AdminAnalytics/view/adminhtml/ui_component/admin_usage_notification.xml

@@ -49,7 +49,7 @@
             <state>true</state>
             <options>
                 <option name="modalClass" xsi:type="string">admin-usage-notification</option>
-                <option name="title" xsi:type="string" translate="true">Allow admin usage data collection</option>
+                <option name="title" xsi:type="string" translate="true">Allow Adobe to collect usage data to improve user experience and offer in-product guidance</option>
                 <option name="autoOpen" xsi:type="boolean">true</option>
                 <option name="type" xsi:type="string">popup</option>
                 <option name="clickableOverlay" xsi:type="boolean">false</option>
@@ -82,11 +82,7 @@
                     <item name="config" xsi:type="array">
                         <item name="label" xsi:type="string"/>
                         <item name="additionalClasses" xsi:type="string">release-notification-text</item>
-                        <item name="text" xsi:type="string" translate="true"><![CDATA[
-                        <p>Help us improve Magento Admin by allowing us to collect usage data.</p>
-                        <p>All usage data that we collect for this purpose cannot be used to individually identify you and is used only to improve the Magento Admin and related products and services.</p>
-                        <p>You can learn more and opt out at any time by following the instructions in <a href="https://docs.magento.com/user-guide/stores/admin.html" target="_blank" tabindex="0">merchant documentation</a>.</p>
-]]></item>
+                        <item name="text" xsi:type="string" translate="true"><![CDATA[<p>By clicking on <b>Allow</b>, you agree that we may collect anonymous usage data from you to:</p> <ol class="modal-list"> <li>Help us improve the Magento Admin user experience</li> <li>Provide interactive in-product guidance, such as technical support and tips to improve utilization of the product from within the Admin UI. This may include notifications of new features, product support/guidance, onboarding information, tooltips, and more.</li> </ol> <p>All usage data that we collect for this purpose cannot be used to individually identify you and is used only to improve the Magento Admin UI and related products and services.</p> <p>You can learn more and opt-out at any time by following the instructions in <a href="https://docs.magento.com/user-guide/configuration/advanced/admin.html#admin-usage">merchant documentation</a>.</p>]]></item>
                     </item>
                 </argument>
             </container>

app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js

@@ -52,7 +52,7 @@ define([
                 tmpl = $(tmpl);
 
                 this.element.html(
-                    $('<ul />', {
+                    $('<ul></ul>', {
                         'class': 'message-system-list'
                     }).append(tmpl)
                 ).trigger('contentUpdated');

app/code/Magento/Backend/Block/Store/Switcher.php

@@ -7,6 +7,8 @@
 
 namespace Magento\Backend\Block\Store;
 
+use Magento\Framework\Exception\LocalizedException;
+
 /**
  * Store switcher block
  *
@@ -471,9 +473,17 @@ public function getCurrentSelectionName()
      */
     public function getCurrentWebsiteName()
     {
-        if ($this->getWebsiteId() !== null) {
+        $websiteId = $this->getWebsiteId();
+        if ($websiteId !== null) {
+            if ($this->hasData('get_data_from_request')) {
+                $requestedWebsite = $this->getRequest()->getParams('website');
+                if (!empty($requestedWebsite)
+                    && array_key_exists('website', $requestedWebsite)) {
+                    $websiteId = $requestedWebsite['website'];
+                }
+            }
             $website = $this->_websiteFactory->create();
-            $website->load($this->getWebsiteId());
+            $website->load($websiteId);
             if ($website->getId()) {
                 return $website->getName();
             }
@@ -504,12 +514,21 @@ public function getCurrentStoreGroupName()
      * Get current store view name
      *
      * @return string
+     * @throws LocalizedException
      */
     public function getCurrentStoreName()
     {
-        if ($this->getStoreId() !== null) {
+        $storeId = $this->getStoreId();
+        if ($storeId !== null) {
+            if ($this->hasData('get_data_from_request')) {
+                $requestedStore = $this->getRequest()->getParams('store');
+                if (!empty($requestedStore)
+                    && array_key_exists('store', $requestedStore)) {
+                    $storeId = $requestedStore['store'];
+                }
+            }
             $store = $this->_storeFactory->create();
-            $store->load($this->getStoreId());
+            $store->load($storeId);
             if ($store->getId()) {
                 return $store->getName();
             }

app/code/Magento/Backend/Test/Unit/Block/Store/SwitcherTest.php

@@ -8,10 +8,15 @@
 namespace Magento\Backend\Test\Unit\Block\Store;
 
 use Magento\Backend\Block\Store\Switcher;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Store\Model\StoreFactory;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\WebsiteFactory;
+use Magento\Store\Model\Website;
 use Magento\Backend\Block\Template\Context;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Store\Model\Website;
 use PHPUnit\Framework\TestCase;
 
 class SwitcherTest extends TestCase
@@ -23,20 +28,81 @@ class SwitcherTest extends TestCase
 
     private $storeManagerMock;
 
+    /**
+     * @var RequestInterface|MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @var WebsiteFactory|MockObject
+     */
+    private $websiteFactoryMock;
+
+    /**
+     * @var StoreFactory|MockObject
+     */
+    private $storeFactoryMock;
+
+    /**
+     * @var Website|MockObject
+     */
+    private $websiteMock;
+
+    /**
+     * @var Store|MockObject
+     */
+    private $storeMock;
+
     protected function setUp(): void
     {
         $this->storeManagerMock = $this->getMockForAbstractClass(StoreManagerInterface::class);
         $objectHelper = new ObjectManager($this);
+        $this->requestMock = $this->getMockBuilder(RequestInterface::class)
+            ->getMockForAbstractClass();
+        $this->websiteFactoryMock = $this->getMockBuilder(WebsiteFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->storeFactoryMock = $this->getMockBuilder(StoreFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->websiteMock = $this->getMockBuilder(Website::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['load', 'getId', 'getName'])
+            ->getMock();
+        $this->storeMock = $this->getMockBuilder(Store::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['load', 'getId', 'getName'])
+            ->getMock();
+        $this->websiteFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->websiteMock);
+        $this->storeFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->storeMock);
+        $this->websiteMock->expects($this->any())
+            ->method('load')
+            ->willReturnSelf();
+        $this->storeMock->expects($this->any())
+            ->method('load')
+            ->willReturnSelf();
         $context = $objectHelper->getObject(
             Context::class,
             [
                 'storeManager' => $this->storeManagerMock,
+                'request' => $this->requestMock
             ]
         );
 
         $this->switcherBlock = $objectHelper->getObject(
             Switcher::class,
-            ['context' => $context]
+            [
+                'context' => $context,
+                'data' => ['get_data_from_request' => 1],
+                'websiteFactory' => $this->websiteFactoryMock,
+                'storeFactory' => $this->storeFactoryMock
+            ]
         );
     }
 
@@ -58,4 +124,91 @@ public function testGetWebsitesIfSetWebsiteIds()
         $expected = [1 => $websiteMock];
         $this->assertEquals($expected, $this->switcherBlock->getWebsites());
     }
+
+    /**
+     * Test case for after current store name plugin
+     *
+     * @param array $requestedStore
+     * @param string $expectedResult
+     * @return void
+     * @dataProvider getStoreNameDataProvider
+     * @throws LocalizedException
+     */
+    public function testAfterGetCurrentStoreName(array $requestedStore, string $expectedResult): void
+    {
+        $this->requestMock->expects($this->any())
+            ->method('getParams')
+            ->willReturn($requestedStore);
+        $this->storeMock->expects($this->any())
+            ->method('getId')
+            ->willReturn($requestedStore);
+        $this->storeMock->expects($this->any())
+            ->method('getName')
+            ->willReturn($expectedResult);
+        $this->assertSame($expectedResult, $this->switcherBlock->getCurrentStoreName());
+    }
+
+    /**
+     * Data provider for getStoreName plugin
+     *
+     * @return array
+     */
+    public function getStoreNameDataProvider(): array
+    {
+        return [
+            'test storeName with valid requested store' =>
+                [
+                    ['store' => 'test store'],
+                    'base store'
+                ],
+            'test storeName with invalid requested store' =>
+                [
+                    ['store' => 'test store'],
+                    'test store'
+                ]
+        ];
+    }
+
+    /**
+     * Test case for get current website name
+     *
+     * @param array $requestedWebsite
+     * @param string $expectedResult
+     * @return void
+     * @dataProvider getWebsiteNameDataProvider
+     */
+    public function testGetCurrentWebsiteName(array $requestedWebsite, string $expectedResult): void
+    {
+        $this->requestMock->expects($this->any())
+            ->method('getParams')
+            ->willReturn($requestedWebsite);
+        $this->websiteMock->expects($this->any())
+            ->method('getId')
+            ->willReturn($requestedWebsite);
+        $this->websiteMock->expects($this->any())
+            ->method('getName')
+            ->willReturn($expectedResult);
+        $this->assertSame($expectedResult, $this->switcherBlock->getCurrentWebsiteName());
+    }
+
+    /**
+     * Data provider for getWebsiteName plugin
+     *
+     * @return array
+     */
+    public function getWebsiteNameDataProvider(): array
+    {
+        return [
+            'test websiteName with valid requested website' =>
+                [
+                    ['website' => 'test website'],
+                    'base website'
+                ],
+            'test websiteName with invalid requested website' =>
+                [
+                    ['website' => 'test website'],
+                    'test website'
+                ]
+        ];
+    }
 }

app/code/Magento/Catalog/Model/Product/Copier.php

@@ -6,12 +6,13 @@
 namespace Magento\Catalog\Model\Product;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Catalog\Model\Product\Option\Repository as OptionRepository;
 use Magento\Catalog\Model\ProductFactory;
-use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Model\ResourceModel\DuplicatedProductAttributesCopier;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Store\Model\Store;
 use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
@@ -50,25 +51,41 @@ class Copier
      */
     private $scopeOverriddenValue;
 
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var DuplicatedProductAttributesCopier
+     */
+    private $attributeCopier;
+
     /**
      * @param CopyConstructorInterface $copyConstructor
      * @param ProductFactory $productFactory
      * @param ScopeOverriddenValue $scopeOverriddenValue
      * @param OptionRepository|null $optionRepository
      * @param MetadataPool|null $metadataPool
+     * @param ProductRepositoryInterface $productRepository
+     * @param DuplicatedProductAttributesCopier $attributeCopier
      */
     public function __construct(
         CopyConstructorInterface $copyConstructor,
         ProductFactory $productFactory,
         ScopeOverriddenValue $scopeOverriddenValue,
         OptionRepository $optionRepository,
-        MetadataPool $metadataPool
+        MetadataPool $metadataPool,
+        ProductRepositoryInterface $productRepository,
+        DuplicatedProductAttributesCopier $attributeCopier
     ) {
         $this->productFactory = $productFactory;
         $this->copyConstructor = $copyConstructor;
         $this->scopeOverriddenValue = $scopeOverriddenValue;
         $this->optionRepository = $optionRepository;
         $this->metadataPool = $metadataPool;
+        $this->productRepository = $productRepository;
+        $this->attributeCopier = $attributeCopier;
     }
 
     /**
@@ -79,11 +96,13 @@ public function __construct(
      */
     public function copy(Product $product): Product
     {
-        $product->getWebsiteIds();
-        $product->getCategoryIds();
-
         $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
 
+        /*  Regardless in what scope the product was provided,
+            for duplicating we want to clone product in Global scope first */
+        if ((int)$product->getStoreId() !== Store::DEFAULT_STORE_ID) {
+            $product = $this->productRepository->getById($product->getId(), true, Store::DEFAULT_STORE_ID);
+        }
         /** @var Product $duplicate */
         $duplicate = $this->productFactory->create();
         $productData = $product->getData();
@@ -102,6 +121,7 @@ public function copy(Product $product): Product
         $duplicate->setStoreId(Store::DEFAULT_STORE_ID);
         $this->copyConstructor->build($product, $duplicate);
         $this->setDefaultUrl($product, $duplicate);
+        $this->attributeCopier->copyProductAttributes($product, $duplicate);
         $this->setStoresUrl($product, $duplicate);
         $this->optionRepository->duplicate($product, $duplicate);