Merge pull request #5271 from magento-tsg/2.4-develop-pr8

[TSG] Fixes for 2.4 (pr8) (2.4-develop)

Author: zakdma

app/code/Magento/Customer/Block/Account/Dashboard.php

@@ -129,16 +129,6 @@ public function getOrdersUrl()
         return '';
     }
 
-    /**
-     * Retrieve the Url for customer reviews.
-     *
-     * @return string
-     */
-    public function getReviewsUrl()
-    {
-        return $this->_urlBuilder->getUrl('review/customer/index', ['_secure' => true]);
-    }
-
     /**
      * Retrieve the Url for managing customer wishlist.
      *

app/code/Magento/Customer/Controller/Adminhtml/Index/ProductReviews.php

@@ -19,7 +19,6 @@
         "magento/module-newsletter": "*",
         "magento/module-page-cache": "*",
         "magento/module-quote": "*",
-        "magento/module-review": "*",
         "magento/module-sales": "*",
         "magento/module-store": "*",
         "magento/module-tax": "*",

app/code/Magento/Customer/Controller/Review.php

@@ -3,18 +3,23 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Customer\Block\Adminhtml\Edit\Tab;
+declare(strict_types=1);
+
+namespace Magento\Review\Block\Adminhtml\Edit\Tab;
+
+use Magento\Review\Block\Adminhtml\Grid;
 
 /**
+ * Review tab in adminhtml area.
+ *
  * @api
- * @since 100.0.2
  */
-class Reviews extends \Magento\Review\Block\Adminhtml\Grid
+class Reviews extends Grid
 {
     /**
-     * Hide grid mass action elements
+     * Hide grid mass action elements.
      *
-     * @return \Magento\Customer\Block\Adminhtml\Edit\Tab\Reviews
+     * @return Reviews
      */
     protected function _prepareMassaction()
     {
@@ -28,6 +33,6 @@ protected function _prepareMassaction()
      */
     public function getGridUrl()
     {
-        return $this->getUrl('customer/*/productReviews', ['_current' => true]);
+        return $this->getUrl('review/customer/productReviews', ['_current' => true]);
     }
 }

app/code/Magento/Customer/Controller/Review/Index.php

@@ -11,9 +11,7 @@
 use Magento\Ui\Component\Layout\Tabs\TabWrapper;
 
 /**
- * Class ReviewTab
- *
- * @package Magento\Review\Block\Adminhtml
+ * Review tab block.
  */
 class ReviewTab extends TabWrapper
 {
@@ -30,8 +28,6 @@ class ReviewTab extends TabWrapper
     protected $isAjaxLoaded = true;
 
     /**
-     * Constructor
-     *
      * @param Context $context
      * @param Registry $registry
      * @param array $data
@@ -67,6 +63,6 @@ public function getTabLabel()
      */
     public function getTabUrl()
     {
-        return $this->getUrl('customer/*/productReviews', ['_current' => true]);
+        return $this->getUrl('review/customer/productReviews', ['_current' => true]);
     }
 }

app/code/Magento/Customer/Controller/Review/View.php

@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Review\Controller\Adminhtml\Customer;
+
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Customer\Model\CustomerIdProvider;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\View\Result\Layout;
+
+/**
+ * Customer product reviews page.
+ */
+class ProductReviews extends Action implements HttpPostActionInterface
+{
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Review::reviews_all';
+
+    /** @var CustomerIdProvider */
+    private $customerIdProvider;
+
+    /**
+     * @param Context $context
+     * @param CustomerIdProvider $customerIdProvider
+     */
+    public function __construct(Context $context, CustomerIdProvider $customerIdProvider)
+    {
+        $this->customerIdProvider = $customerIdProvider;
+        parent::__construct($context);
+    }
+
+    /**
+     * Get customer's product reviews list.
+     *
+     * @return Layout
+     */
+    public function execute()
+    {
+        $customerId = $this->customerIdProvider->getCustomerId();
+        /** @var \Magento\Framework\View\Result\Layout $resultLayout */
+        $resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT);
+        $block = $resultLayout->getLayout()->getBlock('admin.customer.reviews');
+        $block->setCustomerId($customerId)->setUseAjax(true);
+
+        return $resultLayout;
+    }
+}

app/code/Magento/Customer/composer.json

@@ -7,6 +7,6 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
     <container name="root" label="Root">
-        <block class="Magento\Customer\Block\Adminhtml\Edit\Tab\Reviews" name="admin.customer.reviews"/>
+        <block class="Magento\Review\Block\Adminhtml\Edit\Tab\Reviews" name="admin.customer.reviews"/>
     </container>
 </layout>

app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Reviews.php renamed to app/code/Magento/Review/Block/Adminhtml/Edit/Tab/Reviews.php

@@ -437,17 +437,6 @@ public function testCartAction()
         $this->assertContains('<div id="customer_cart_grid1"', $body);
     }
 
-    /**
-     * @magentoDataFixture Magento/Customer/_files/customer_sample.php
-     */
-    public function testProductReviewsAction()
-    {
-        $this->getRequest()->setParam('id', 1);
-        $this->dispatch('backend/customer/index/productReviews');
-        $body = $this->getResponse()->getBody();
-        $this->assertContains('<div id="reviewGrid"', $body);
-    }
-
     /**
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_address.php

app/code/Magento/Review/Block/Adminhtml/ReviewTab.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Review\Controller\Adminhtml\Customer;
+
+use Magento\Framework\App\Request\Http;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * Test for customer product reviews page.
+ */
+class ProductReviewsTest extends AbstractBackendController
+{
+    /**
+     * Check Customer product review action.
+     *
+     * @magentoDataFixture Magento/Customer/_files/customer_sample.php
+     * @return void
+     */
+    public function testProductReviewsAction(): void
+    {
+        $this->getRequest()->setPostValue(['id' => 1])->setMethod(Http::METHOD_POST);
+        $this->dispatch('backend/review/customer/productReviews');
+        $body = $this->getResponse()->getBody();
+        $this->assertContains('<div id="reviewGrid"', $body);
+    }
+}