Merge remote-tracking branch 'origin/MC-37117' into 2.4-develop-pr83

Author: Viktor Sevch

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

@@ -27,15 +27,10 @@ protected function _construct()
         $this->_mode = 'add';
         $this->buttonList->update('save', 'label', __('Save Review'));
         $this->buttonList->update('save', 'id', 'save_button');
+        $this->buttonList->update('save', 'style', 'display: none;');
         $this->buttonList->update('reset', 'id', 'reset_button');
+        $this->buttonList->update('reset', 'style', 'display: none;');
         $this->buttonList->update('reset', 'onclick', 'window.review.formReset()');
-        $this->_formScripts[] = '
-            require(["prototype"], function(){
-                toggleParentVis("add_review_form");
-                toggleVis("save_button");
-                toggleVis("reset_button");
-            });
-        ';
         // @codingStandardsIgnoreStart
         $this->_formInitScripts[] = '
             require(["jquery","Magento_Review/js/rating","prototype"], function(jQuery, rating){

app/code/Magento/Review/Block/Adminhtml/Add/Form.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\Review\Block\Adminhtml\Add;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Adminhtml add product review form
  *
@@ -26,24 +29,32 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      */
     protected $_systemStore;
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Store\Model\System\Store $systemStore
      * @param \Magento\Review\Helper\Data $reviewData
      * @param array $data
+     * @param SecureHtmlRenderer|null $htmlRenderer
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\Registry $registry,
         \Magento\Framework\Data\FormFactory $formFactory,
         \Magento\Store\Model\System\Store $systemStore,
         \Magento\Review\Helper\Data $reviewData,
-        array $data = []
+        array $data = [],
+        ?SecureHtmlRenderer $htmlRenderer = null
     ) {
         $this->_reviewData = $reviewData;
         $this->_systemStore = $systemStore;
+        $this->secureRenderer = $htmlRenderer ?: ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
         parent::__construct($context, $registry, $formFactory, $data);
     }
 
@@ -59,6 +70,8 @@ protected function _prepareForm()
         $form = $this->_formFactory->create();
 
         $fieldset = $form->addFieldset('add_review_form', ['legend' => __('Review Details')]);
+        $beforeHtml = $this->secureRenderer->renderStyleAsTag('display: none;', '#edit_form');
+        $fieldset->setBeforeElementHtml($beforeHtml);
 
         $fieldset->addField('product_name', 'note', ['label' => __('Product'), 'text' => 'product_name']);