Merge remote-tracking branch 'mainline/2.4-develop' into MCP-304

Author: adifucan

.github/stale.yml

@@ -1,11 +1,11 @@
 # Configuration for probot-stale - https://github.com/probot/stale
 
 # Number of days of inactivity before an Issue or Pull Request becomes stale
-daysUntilStale: 76
+daysUntilStale: 152
 
 # Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
 # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
-daysUntilClose: 14
+daysUntilClose: 28
 
 # Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
 onlyLabels: []
@@ -15,6 +15,8 @@ exemptLabels:
   - "Priority: P0"
   - "Priority: P1"
   - "Priority: P2"
+  - "Severity: S0"
+  - "Severity: S1"
   - "Progress: dev in progress"
   - "Progress: PR in progress"
   - "Progress: done"
@@ -39,7 +41,7 @@ staleLabel: "stale issue"
 # Comment to post when marking as stale. Set to `false` to disable
 markComment: >
   This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed after 14 days if no further activity occurs.
+  recent activity. It will be closed after 28 days if no further activity occurs.
   Is this issue still relevant? If so, what is blocking it? Is there anything you can do to help move it forward?
   Thank you for your contributions!
 # Comment to post when removing the stale label.

README.md

@@ -21,13 +21,13 @@ Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a
 
 ## Magento System Requirements
 
-[Magento System Requirements](https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements.html).
+* [Magento System Requirements](https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements.html)
 
 ## Install Magento
 
-* [Installation Guide](https://devdocs.magento.com/guides/v2.4/install-gde/bk-install-guide.html).
+* [Installation Guide](https://devdocs.magento.com/guides/v2.4/install-gde/bk-install-guide.html)
 
-## Learn More About GraphQL in Magento 2
+## Learn About GraphQL in Magento 2
 
 * [GraphQL Developer Guide](https://devdocs.magento.com/guides/v2.4/graphql/index.html)
 
@@ -37,12 +37,14 @@ Contributions can take the form of new components or features, changes to existi
 
 To learn about how to contribute, click [here][1].
 
-To learn about issues, click [here][2]. To open an issue, click [here][3].
+To learn about issues, click [here][2].
+
+To open an issue, click [here][3].
 
 To suggest documentation improvements, click [here][4].
 
-[1]: https://devdocs.magento.com/guides/v2.4/contributor-guide/contributing.html
-[2]: https://devdocs.magento.com/guides/v2.4/contributor-guide/contributing.html#report
+[1]: https://devdocs.magento.com/contributor-guide/contributing.html
+[2]: https://devdocs.magento.com/contributor-guide/contributing.html#report
 [3]: https://github.com/magento/magento2/issues
 [4]: https://devdocs.magento.com
 
@@ -61,7 +63,7 @@ Magento is thankful for any contribution that can improve our codebase, document
 ### Labels Applied by the Magento Team
 
 We apply labels to public Pull Requests and Issues to help other participants retrieve additional information about current progress, component assignments, Magento release lines, and much more.
-Please review the [Code Contributions guide](https://devdocs.magento.com/guides/v2.4/contributor-guide/contributing.html#labels) for detailed information on labels used in Magento 2 repositories.
+Please review the [Code Contributions guide](https://devdocs.magento.com/contributor-guide/contributing.html#labels) for detailed information on labels used in Magento 2 repositories.
 
 ## Reporting Security Issues
 
@@ -85,6 +87,6 @@ To connect with Magento and the Community, join us on the [Magento Community Eng
 
 We have channels for each project. These channels are recommended for new members:
 
-* [general](https://magentocommeng.slack.com/messages/C4YS78WE6): Open chat for introductions and Magento 2 questions
-* [github](https://magentocommeng.slack.com/messages/C7KB93M32): Support for GitHub issues, pull requests, and processes
-* [public-backlog](https://magentocommeng.slack.com/messages/CCV3J3RV5): Discussions of the Magento 2 backlog
+* [general](https://magentocommeng.slack.com/archives/C4YS78WE6): Open chat for introductions and Magento 2 questions
+* [github](https://magentocommeng.slack.com/archives/C7KB93M32): Support for GitHub issues, pull requests, and processes
+* [public-backlog](https://magentocommeng.slack.com/archives/CCV3J3RV5): Discussions of the Magento 2 backlog

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/Block/Widget/Form.php

@@ -230,6 +230,10 @@ protected function _applyTypeSpecificConfig($inputType, $element, \Magento\Eav\M
             case 'date':
                 $element->setDateFormat($this->_localeDate->getDateFormatWithLongYear());
                 break;
+            case 'datetime':
+                $element->setDateFormat($this->_localeDate->getDateFormatWithLongYear());
+                $element->setTimeFormat($this->_localeDate->getTimeFormat());
+                break;
             case 'multiline':
                 $element->setLineCount($attribute->getMultilineCount());
                 break;
@@ -246,7 +250,13 @@ protected function _applyTypeSpecificConfig($inputType, $element, \Magento\Eav\M
      */
     protected function _addElementTypes(\Magento\Framework\Data\Form\AbstractForm $baseElement)
     {
-        $types = $this->_getAdditionalElementTypes();
+        $types = array_merge(
+            [
+                'datetime' => 'date'
+            ],
+            $this->_getAdditionalElementTypes()
+        );
+
         foreach ($types as $code => $className) {
             $baseElement->addType($code, $className);
         }

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'
+                ]
+        ];
+    }
 }