🔃 [EngCom] Public Pull Requests - 2.3-develop Minor Fixes

Accepted Public Pull Requests:
 - #21030: Rename LESS var names to 'darker' vs 'darkie' (by @philwinkle)
 - #20861: Fixed Checkbox radio shadow 20859 (by @abrarpathan19)
 - #20109: Reverting javascript translation refactoring which broke javascript translation (by @mfickers)
 - #20383: issue fixed #20382 (by @irajneeshgupta)
 - #20565: Number of Lines in a Street Address not setting to default when you checked Use system value in Magento 2.1.7 #13675 (by @XxXgeoXxX)
 - #20803: [Backend] Fixed the dashboard statistics refreshing button (by @eduard13)
 - #20787: [CMS] Improving the uploaded images styling view (by @eduard13)
 - #19798: Fixed store switcher doesn't work multistore setup with different product urls issue (by @janakbhimani)
 - #20775: Krishna221993 patch 1 typo fixed (by @krishna221993)
 - #17424: Support for non-FQN classes on web-API interfaces. (by @phoenix128)
 - #20770: Fix Model\Widget#getConfigAsObject losing it's type declaration (by @Stoux)
 - #20769: Fixed issue when only first custom option was validated (by @elevinskii)
 - #20436: Granular Magento_Customer ACL (by @kassner)
 - #20159: Fixed issue #20157 On advanced search page Price field misaligned on mobile view (by @GovindaSharma)
 - #18978: Integration Test Framework AMQP Helper Flexibility (by @pmclain)


Fixed GitHub Issues:
 - #20859: Luma theme - Input Box and Radio Button shadow is not proper (reported by @saphaljha) has been fixed in #20861 by @abrarpathan19 in 2.3-develop branch
   Related commits:
     1. 5f258f2
     2. 394665f
     3. 2cf9413

 - #19705: Javascript translation issue on modal buttons when removing items from product compare page (reported by @mfickers) has been fixed in #20109 by @mfickers in 2.3-develop branch
   Related commits:
     1. dbf5c45
     2. a185ca1

 - #20382: View and Edit Cart link not aligned in middle because bellow the link a blank div (class="minicart-widgets") existing has 15px margin top, this div (class="minicart-widgets" ) should be display none or should not come if has no content, should only display if has content (reported by @irajneeshgupta) has been fixed in #20383 by @irajneeshgupta in 2.3-develop branch
   Related commits:
     1. 5aa0cd0

 - #13675: Magento 2 :-  Number of Lines in a Street Address not setting to default when you checked Use system value in Magento 2.1.7 (reported by @pradeeprcs) has been fixed in #20565 by @XxXgeoXxX in 2.3-develop branch
   Related commits:
     1. f3d410b

 - #20802: [Backend] Dashboard Refresh Statistics action redirects to 404 (reported by @eduard13) has been fixed in #20803 by @eduard13 in 2.3-develop branch
   Related commits:
     1. 124a42f
     2. beffcf1
     3. c1f45e6
     4. d20c863

 - #20786: [CMS] File upload preview style issue (reported by @eduard13) has been fixed in #20787 by @eduard13 in 2.3-develop branch
   Related commits:
     1. 0614a9a
     2. 24221c9

 - #19714: Store switcher doesn't work multistore setup with different product urls (reported by @sreichel) has been fixed in #19798 by @janakbhimani in 2.3-develop branch
   Related commits:
     1. 927ca80
     2. b36dc04
     3. 3d882cf
     4. c7b4aae
     5. 54a4039
     6. 618d8e3
     7. 8a05dbb

 - #1537: Admin menu not showing of my custom module (reported by @Hiteshbb) has been fixed in #17424 by @phoenix128 in 2.3-develop branch
   Related commits:
     1. f281a05
     2. a0379a4
     3. 368969a
     4. 1530c69
     5. 3d0cb54
     6. 2232338
     7. e858f36
     8. 13353c8
     9. 25a5e5b
     10. 229a29a

 - #20157: On advanced search page Price field misaligned on mobile view (reported by @ajay2jcommerce) has been fixed in #20159 by @GovindaSharma in 2.3-develop branch
   Related commits:
     1. 47f5132
     2. 81cd0d4
     3. 2353329
     4. 10f5378

 - #18953: Integration Test AMQP Helper Hardcoded Host (reported by @pmclain) has been fixed in #18978 by @pmclain in 2.3-develop branch
   Related commits:
     1. 789bc9a
     2. 5d2c8c9
     3. 364166e
     4. d711fca
     5. a1b6eee
     6. dc8b170

Author: magento-engcom-team

app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php

@@ -6,7 +6,13 @@
 
 namespace Magento\Backend\Controller\Adminhtml\Dashboard;
 
-class RefreshStatistics extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Reports\Controller\Adminhtml\Report\Statistics;
+
+/**
+ * Refresh Dashboard statistics action.
+ */
+class RefreshStatistics extends Statistics implements HttpPostActionInterface
 {
     /**
      * @param \Magento\Backend\App\Action\Context $context
@@ -25,6 +31,8 @@ public function __construct(
     }
 
     /**
+     * Refresh statistics.
+     *
      * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()

app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php

@@ -431,7 +431,10 @@ protected function _initMessageTemplates()
         );
         $this->_productEntity->addMessageTemplate(
             self::ERROR_INVALID_TYPE,
-            __('Value for \'type\' sub attribute in \'custom_options\' attribute contains incorrect value, acceptable values are: \'dropdown\', \'checkbox\'')
+            __(
+                'Value for \'type\' sub attribute in \'custom_options\' attribute contains incorrect value, acceptable values are: %1',
+                '\''.implode('\', \'', array_keys($this->_specificTypes)).'\''
+            )
         );
         $this->_productEntity->addMessageTemplate(self::ERROR_EMPTY_TITLE, __('Please enter a value for title.'));
         $this->_productEntity->addMessageTemplate(
@@ -629,7 +632,7 @@ public function validateAmbiguousData()
             $this->_addRowsErrors(self::ERROR_AMBIGUOUS_NEW_NAMES, $errorRows);
             return false;
         }
-        if ($this->getBehavior() == \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND) {
+        if ($this->getBehavior() == Import::BEHAVIOR_APPEND) {
             $errorRows = $this->_findOldOptionsWithTheSameTitles();
             if ($errorRows) {
                 $this->_addRowsErrors(self::ERROR_AMBIGUOUS_OLD_NAMES, $errorRows);
@@ -967,11 +970,10 @@ public function validateRow(array $rowData, $rowNumber)
                         return false;
                     }
                 }
-                return true;
             }
         }
 
-        return false;
+        return true;
     }
 
     /**
@@ -1381,7 +1383,7 @@ private function setLastOptionTitle(array &$titles) : void
      */
     private function removeExistingOptions(array $products, array $optionsToRemove): void
     {
-        if ($this->getBehavior() != \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND) {
+        if ($this->getBehavior() != Import::BEHAVIOR_APPEND) {
             $this->_deleteEntities(array_keys($products));
         } elseif (!empty($optionsToRemove)) {
             // Remove options for products with empty "custom_options" row
@@ -2108,7 +2110,7 @@ private function savePreparedCustomOptions(
         array $types
     ): void {
         if ($this->_isReadyForSaving($options, $titles, $types['values'])) {
-            if ($this->getBehavior() == \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND) {
+            if ($this->getBehavior() == Import::BEHAVIOR_APPEND) {
                 $this->_compareOptionsWithExisting($options, $titles, $prices, $types['values']);
                 $this->restoreOriginalOptionTypeIds($types['values'], $types['prices'], $types['titles']);
             }

app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/OptionTest.php

@@ -702,7 +702,7 @@ public function testValidateRowNoCustomOption()
     {
         $rowData = include __DIR__ . '/_files/row_data_no_custom_option.php';
         $this->_bypassModelMethodGetMultiRowFormat($rowData);
-        $this->assertFalse($this->modelMock->validateRow($rowData, 0));
+        $this->assertTrue($this->modelMock->validateRow($rowData, 0));
     }
 
     /**

app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php

@@ -21,6 +21,7 @@
  *
  * This collection should be refactored to not have dependencies on MySQL-specific implementation.
  *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2
@@ -296,7 +297,7 @@ private function getSearchCriteriaBuilder()
     }
 
     /**
-     * Get fielter builder.
+     * Get filter builder.
      *
      * @return FilterBuilder
      */

app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html

@@ -97,7 +97,7 @@
         </div>
     </div>
 
-    <div id="minicart-widgets" class="minicart-widgets">
+    <div id="minicart-widgets" class="minicart-widgets" if="getRegion('promotion').length">
         <each args="getRegion('promotion')" render=""/>
     </div>
 </div>

app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml

@@ -21,7 +21,7 @@ $_height = $block->getImagesHeight();
         data-size="<?= $block->escapeHtmlAttr($file->getSize()) ?>"
         data-mime-type="<?= $block->escapeHtmlAttr($file->getMimeType()) ?>"
     >
-        <p class="nm" style="height:<?= $block->escapeHtmlAttr($_height) ?>px;width:<?= $block->escapeHtmlAttr($_width) ?>px;">
+        <p class="nm" style="height:<?= $block->escapeHtmlAttr($_height) ?>px;">
         <?php if ($block->getFileThumbUrl($file)):?>
             <img src="<?= $block->escapeHtmlAttr($block->getFileThumbUrl($file)) ?>" alt="<?= $block->escapeHtmlAttr($block->getFileName($file)) ?>"/>
         <?php endif; ?>

app/code/Magento/Customer/Block/Adminhtml/Edit/DeleteButton.php

@@ -10,6 +10,7 @@
 
 /**
  * Class DeleteButton
+ *
  * @package Magento\Customer\Block\Adminhtml\Edit
  */
 class DeleteButton extends GenericButton implements ButtonProviderInterface
@@ -36,6 +37,8 @@ public function __construct(
     }
 
     /**
+     * Get button data.
+     *
      * @return array
      */
     public function getButtonData()
@@ -53,12 +56,15 @@ public function getButtonData()
                 ],
                 'on_click' => '',
                 'sort_order' => 20,
+                'aclResource' => 'Magento_Customer::delete',
             ];
         }
         return $data;
     }
 
     /**
+     * Get delete url.
+     *
      * @return string
      */
     public function getDeleteUrl()

app/code/Magento/Customer/Block/Adminhtml/Edit/InvalidateTokenButton.php

@@ -9,11 +9,14 @@
 
 /**
  * Class InvalidateTokenButton
+ *
  * @package Magento\Customer\Block\Adminhtml\Edit
  */
 class InvalidateTokenButton extends GenericButton implements ButtonProviderInterface
 {
     /**
+     * Get button data.
+     *
      * @return array
      */
     public function getButtonData()
@@ -27,12 +30,15 @@ public function getButtonData()
                 'class' => 'invalidate-token',
                 'on_click' => 'deleteConfirm("' . $deleteConfirmMsg . '", "' . $this->getInvalidateTokenUrl() . '")',
                 'sort_order' => 65,
+                'aclResource' => 'Magento_Customer::invalidate_tokens',
             ];
         }
         return $data;
     }
 
     /**
+     * Get invalidate token url.
+     *
      * @return string
      */
     public function getInvalidateTokenUrl()

app/code/Magento/Customer/Block/Adminhtml/Edit/ResetPasswordButton.php

@@ -27,6 +27,7 @@ public function getButtonData()
                 'class' => 'reset reset-password',
                 'on_click' => sprintf("location.href = '%s';", $this->getResetPasswordUrl()),
                 'sort_order' => 60,
+                'aclResource' => 'Magento_Customer::reset_password',
             ];
         }
         return $data;

app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php

@@ -7,6 +7,7 @@
 
 namespace Magento\Customer\Controller\Adminhtml\Customer;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\AddressRepositoryInterface;
@@ -25,8 +26,15 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  */
-class InvalidateToken extends \Magento\Customer\Controller\Adminhtml\Index
+class InvalidateToken extends \Magento\Customer\Controller\Adminhtml\Index implements HttpGetActionInterface
 {
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Customer::invalidate_tokens';
+
     /**
      * @var CustomerTokenServiceInterface
      */