Merge branch '2.4-develop' into admin-indexer-massinvalidte

Author: fredden

app/code/Magento/AdminAnalytics/etc/adminhtml/system.xml

@@ -8,9 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
         <section id="admin">
-            <group id="usage" translate="label" type="text" sortOrder="2000" showInDefault="1" showInWebsite="0" showInStore="0">
+            <group id="usage" translate="label" type="text" sortOrder="2000" showInDefault="1">
                 <label>Admin Usage</label>
-                <field id="enabled" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="enabled" translate="label comment" type="select" sortOrder="1" showInDefault="1">
                     <label>Enable Admin Usage Tracking</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Allow Magento to track admin usage in order to improve the quality and user experience.</comment>

app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Adminhtml AdminNotification Severity Renderer
  *
@@ -8,12 +10,16 @@
 
 namespace Magento\AdminNotification\Block\Grid\Renderer;
 
+use Magento\Backend\Block\Context;
+use Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer;
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\DataObject;
+use Magento\Framework\Url\Helper\Data;
+
 /**
  * Renderer class for action in the admin notifications grid
- *
- * @package Magento\AdminNotification\Block\Grid\Renderer
  */
-class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
+class Actions extends AbstractRenderer
 {
     /**
      * @var \Magento\Framework\Url\Helper\Data
@@ -25,11 +31,8 @@ class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstrac
      * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Context $context,
-        \Magento\Framework\Url\Helper\Data $urlHelper,
-        array $data = []
-    ) {
+    public function __construct(Context $context, Data $urlHelper, array $data = [])
+    {
         $this->_urlHelper = $urlHelper;
         parent::__construct($context, $data);
     }
@@ -40,7 +43,7 @@ public function __construct(
      * @param   \Magento\Framework\DataObject $row
      * @return  string
      */
-    public function render(\Magento\Framework\DataObject $row)
+    public function render(DataObject $row)
     {
         $readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' .
             $this->escapeUrl($row->getUrl())
@@ -49,7 +52,7 @@ public function render(\Magento\Framework\DataObject $row)
 
         $markAsReadHtml = !$row->getIsRead() ? '<a class="action-mark" href="' . $this->getUrl(
             '*/*/markAsRead/',
-            ['_current' => true, 'id' => $row->getId()]
+            ['_current' => true, 'id' => $row->getNotificationId()]
         ) . '">' . __(
             'Mark as Read'
         ) . '</a>' : '';
@@ -63,8 +66,8 @@ public function render(\Magento\Framework\DataObject $row)
                 '*/*/remove/',
                 [
                     '_current' => true,
-                    'id' => $row->getId(),
-                    \Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED => $encodedUrl
+                    'id' => $row->getNotificationId(),
+                    ActionInterface::PARAM_NAME_URL_ENCODED => $encodedUrl
                 ]
             ),
             __('Are you sure?'),

app/code/Magento/AdminNotification/Block/Grid/Renderer/Notice.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Adminhtml AdminNotification Severity Renderer
  *
@@ -7,15 +9,21 @@
  */
 namespace Magento\AdminNotification\Block\Grid\Renderer;
 
-class Notice extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
+use Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer;
+use Magento\Framework\DataObject;
+
+/**
+ * Renderer class for notice in the admin notifications grid
+ */
+class Notice extends AbstractRenderer
 {
     /**
      * Renders grid column
      *
      * @param   \Magento\Framework\DataObject $row
      * @return  string
      */
-    public function render(\Magento\Framework\DataObject $row)
+    public function render(DataObject $row)
     {
         return '<span class="grid-row-title">' .
             $this->escapeHtml($row->getTitle()) .

app/code/Magento/AdminNotification/Block/Grid/Renderer/Severity.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Adminhtml AdminNotification Severity Renderer
  *
@@ -7,9 +9,16 @@
  */
 namespace Magento\AdminNotification\Block\Grid\Renderer;
 
+use Magento\AdminNotification\Model\Inbox;
+use Magento\Backend\Block\Context;
+use Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer;
+use Magento\Framework\DataObject;
 use Magento\Framework\Notification\MessageInterface;
 
-class Severity extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
+/**
+ * Renderer class for severity in the admin notifications grid
+ */
+class Severity extends AbstractRenderer
 {
     /**
      * @var \Magento\AdminNotification\Model\Inbox
@@ -21,11 +30,8 @@ class Severity extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
      * @param \Magento\AdminNotification\Model\Inbox $notice
      * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Context $context,
-        \Magento\AdminNotification\Model\Inbox $notice,
-        array $data = []
-    ) {
+    public function __construct(Context $context, Inbox $notice, array $data = [])
+    {
         parent::__construct($context, $data);
         $this->_notice = $notice;
     }
@@ -36,12 +42,14 @@ public function __construct(
      * @param   \Magento\Framework\DataObject $row
      * @return  string
      */
-    public function render(\Magento\Framework\DataObject $row)
+    public function render(DataObject $row)
     {
         $class = '';
         $value = '';
 
-        switch ($row->getData($this->getColumn()->getIndex())) {
+        $column = $this->getColumn();
+        $index  = $column->getIndex();
+        switch ($row->getData($index)) {
             case MessageInterface::SEVERITY_CRITICAL:
                 $class = 'critical';
                 $value = $this->_notice->getSeverities(MessageInterface::SEVERITY_CRITICAL);
@@ -59,6 +67,7 @@ public function render(\Magento\Framework\DataObject $row)
                 $value = $this->_notice->getSeverities(MessageInterface::SEVERITY_NOTICE);
                 break;
         }
+
         return '<span class="grid-severity-' . $class . '"><span>' . $value . '</span></span>';
     }
 }

app/code/Magento/AdminNotification/Test/Unit/Block/Grid/Renderer/ActionsTest.php

@@ -0,0 +1,73 @@
+<?php
+declare(strict_types = 1);
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Test class for \Magento\AdminNotification\Block\Grid\Renderer\Actions
+ */
+
+namespace Magento\AdminNotification\Test\Unit\Block\Grid\Renderer;
+
+use Magento\AdminNotification\Block\Grid\Renderer\Actions;
+use Magento\Backend\Block\Context;
+use Magento\Framework\DataObject;
+use Magento\Framework\Escaper;
+use Magento\Framework\Url\Helper\Data;
+use Magento\Framework\UrlInterface;
+use PHPUnit\Framework\TestCase;
+
+class ActionsTest extends TestCase
+{
+    /**
+     * System under Test
+     * @var Actions
+     */
+    private $sut;
+
+    protected function setUp() : void
+    {
+        parent::setUp();
+
+        /** @var Escaper | \PHPUnit_Framework_MockObject_MockObject $escaperMock */
+        $escaperMock = $this->getMockBuilder(Escaper::class)->disableOriginalConstructor()->getMock();
+        $escaperMock->expects($this->once())->method('escapeUrl')->willReturn('https://magento.com');
+
+        /** @var UrlInterface | \PHPUnit_Framework_MockObject_MockObject $urlBuilder */
+        $urlBuilder = $this->getMockBuilder(UrlInterface::class)->getMock();
+        $urlBuilder->expects($this->once())->method('getUrl')->willReturn('http://magento.com');
+
+        /** @var Context | \PHPUnit_Framework_MockObject_MockObject $contextMock */
+        $contextMock = $this->getMockBuilder(Context::class)->disableOriginalConstructor()->getMock();
+        $contextMock->expects($this->once())->method('getEscaper')->willReturn($escaperMock);
+        $contextMock->expects($this->once())->method('getUrlBuilder')->willReturn($urlBuilder);
+
+        /** @var Data | \PHPUnit_Framework_MockObject_MockObject $urlHelperMock */
+        $urlHelperMock = $this->getMockBuilder(Data::class)->disableOriginalConstructor()->getMock();
+        $urlHelperMock->expects($this->once())->method('getEncodedUrl')->willReturn('http://magento.com');
+
+        $this->sut = new Actions($contextMock, $urlHelperMock);
+    }
+
+    public function testShouldRenderMessageWhenUrlIsGiven() : void
+    {
+        $dataObject = new DataObject();
+        $dataObject->setdata('url', 'https://magento.com');
+        $dataObject->setdata('is_read', true);
+        $dataObject->setdata('id', 1);
+
+        $actual   = $this->sut->render($dataObject);
+
+        // Ignoring Code Style at this point due to the long HEREDOC
+        // phpcs:disable
+        $expected = <<<HTML
+<a class="action-details" target="_blank" href="https://magento.com">Read Details</a><a class="action-delete" href="http://magento.com" onClick="deleteConfirm('Are you sure?', this.href); return false;">Remove</a>
+HTML;
+        // phpcs:enable
+
+        $this->assertEquals($actual, $expected);
+    }
+}

app/code/Magento/AdminNotification/Test/Unit/Block/Grid/Renderer/NoticeTest.php

@@ -0,0 +1,55 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Test class for \Magento\AdminNotification\Block\Grid\Renderer\Actions
+ */
+namespace Magento\AdminNotification\Test\Unit\Block\Grid\Renderer;
+
+use Magento\AdminNotification\Block\Grid\Renderer\Notice;
+use Magento\Framework\DataObject;
+use Magento\Framework\Escaper;
+use Magento\Backend\Block\Context;
+use PHPUnit\Framework\TestCase;
+
+class NoticeTest extends TestCase
+{
+    /**
+     * System under Test
+     *
+     * @var Notice
+     */
+    private $sut;
+
+    protected function setUp() : void
+    {
+        parent::setUp();
+
+        /** @var Escaper | \PHPUnit_Framework_MockObject_MockObject $escaperMock */
+        $escaperMock = $this->getMockBuilder(Escaper::class)->disableOriginalConstructor()->getMock();
+        $escaperMock->expects($this->exactly(2))->method('escapeHtml')->willReturn('<div>Some random html</div>');
+
+        /** @var Context | \PHPUnit_Framework_MockObject_MockObject $contextMock */
+        $contextMock = $this->getMockBuilder(Context::class)->disableOriginalConstructor()->getMock();
+        $contextMock->expects($this->once())->method('getEscaper')->willReturn($escaperMock);
+
+        $this->sut = new Notice($contextMock);
+    }
+
+    public function testShouldRenderNotice() : void
+    {
+        $dataObject = new DataObject();
+        $dataObject->setData('title', 'A great Title');
+        $dataObject->setData('description', 'Handy description right here');
+
+        $actual = $this->sut->render($dataObject);
+        $expected = '<span class="grid-row-title"><div>Some random html</div></span><br /><div>Some random html</div>';
+
+        $this->assertEquals($actual, $expected);
+    }
+}

app/code/Magento/AdminNotification/Test/Unit/Block/Grid/Renderer/SeverityTest.php

@@ -0,0 +1,90 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Test class for \Magento\AdminNotification\Block\Grid\Renderer\Actions
+ */
+namespace Magento\AdminNotification\Test\Unit\Block\Grid\Renderer;
+
+use Magento\AdminNotification\Block\Grid\Renderer\Severity;
+use Magento\AdminNotification\Model\Inbox;
+use Magento\Backend\Block\Context;
+use Magento\Backend\Block\Widget\Grid\Column;
+use Magento\Framework\DataObject;
+use Magento\Framework\Escaper;
+use PHPUnit\Framework\TestCase;
+
+class SeverityTest extends TestCase
+{
+    /**
+     * System under Test
+     *
+     * @var Severity
+     */
+    private $sut;
+
+    protected function setUp() : void
+    {
+        parent::setUp();
+
+        /** @var Inbox |\PHPUnit_Framework_MockObject_MockObject $inboxMock */
+        $inboxMock = $this->getMockBuilder(Inbox::class)->disableOriginalConstructor()->getMock();
+
+        /** @var Context | \PHPUnit_Framework_MockObject_MockObject $contextMock */
+        $contextMock = $this->getMockBuilder(Context::class)->disableOriginalConstructor()->getMock();
+
+        $this->sut = new Severity($contextMock, $inboxMock);
+    }
+
+    public function testShouldRenderSeverity() : void
+    {
+        /** @var Column | \PHPUnit_Framework_MockObject_MockObject $columnMock */
+        $columnMock = $this->getMockBuilder(Column::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getIndex'])
+            ->getMock();
+        $columnMock->expects($this->exactly(5))->method('getIndex')->willReturn('index');
+        $this->sut->setColumn($columnMock);
+        $dataObject = new DataObject();
+
+        // Test critical severity
+        $dataObject->setData('index', 1);
+        $actual = $this->sut->render($dataObject);
+        $expected = '<span class="grid-severity-critical"><span></span></span>';
+
+        $this->assertEquals($actual, $expected);
+
+        // Test major severity
+        $dataObject->setData('index', 2);
+        $actual = $this->sut->render($dataObject);
+        $expected = '<span class="grid-severity-major"><span></span></span>';
+
+        $this->assertEquals($actual, $expected);
+
+        // Test minor severity
+        $dataObject->setData('index', 3);
+        $actual = $this->sut->render($dataObject);
+        $expected = '<span class="grid-severity-minor"><span></span></span>';
+
+        $this->assertEquals($actual, $expected);
+
+        // Test notice severity
+        $dataObject->setData('index', 4);
+        $actual = $this->sut->render($dataObject);
+        $expected = '<span class="grid-severity-notice"><span></span></span>';
+
+        $this->assertEquals($actual, $expected);
+
+        // Test default severity
+        $dataObject->setData('index', 5);
+        $actual = $this->sut->render($dataObject);
+        $expected = '<span class="grid-severity-"><span></span></span>';
+
+        $this->assertEquals($actual, $expected);
+    }
+}