Merge pull request #6865 from magento-cia/cia-2.4.3-2.4-sync-05142021

[cia] MC-41647: SKU Search very slow on Admin Panel

Author: mmansoor-magento

app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml

@@ -11,6 +11,12 @@
             <policy id="script-src">
                 <values>
                     <value id="adobedtm" type="host">assets.adobedtm.com</value>
+                    <value id="adobe" type="host">*.adobe.com</value>
+                </values>
+            </policy>
+            <policy id="style-src">
+                <values>
+                    <value id="adobe" type="host">*.adobe.com</value>
                 </values>
             </policy>
             <policy id="img-src">
@@ -19,6 +25,7 @@
                     <value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
                     <value id="dpmdemdex" type="host">dpm.demdex.net</value>
                     <value id="everesttech" type="host">cm.everesttech.net</value>
+                    <value id="adobe" type="host">*.adobe.com</value>
                 </values>
             </policy>
             <policy id="connect-src">
@@ -27,9 +34,15 @@
                     <value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
                 </values>
             </policy>
+            <policy id="media-src">
+                <values>
+                    <value id="adobe" type="host">*.adobe.com</value>
+                </values>
+            </policy>
             <policy id="frame-src">
                 <values>
                     <value id="amcdemdex" type="host">fast.amc.demdex.net</value>
+                    <value id="adobe" type="host">*.adobe.com</value>
                 </values>
             </policy>
         </policies>

app/code/Magento/Backend/Block/Dashboard/Bar.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Backend\Block\Dashboard;
 
+use Magento\Directory\Model\Currency;
 use Magento\Store\Model\Store;
 
 /**
@@ -20,10 +21,15 @@ class Bar extends \Magento\Backend\Block\Dashboard\AbstractDashboard
     protected $_totals = [];
 
     /**
-     * @var \Magento\Directory\Model\Currency|null
+     * @var Currency|null
      */
     protected $_currentCurrencyCode = null;
 
+    /**
+     * @var Currency
+     */
+    private $_currency;
+
     /**
      * Get totals
      *
@@ -67,7 +73,7 @@ public function format($price)
     /**
      * Setting currency model
      *
-     * @param \Magento\Directory\Model\Currency $currency
+     * @param Currency $currency
      * @return void
      */
     public function setCurrency($currency)
@@ -78,7 +84,7 @@ public function setCurrency($currency)
     /**
      * Retrieve currency model if not set then return currency model for current store
      *
-     * @return \Magento\Directory\Model\Currency
+     * @return Currency
      * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getCurrency()

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

@@ -6,25 +6,33 @@
 
 namespace Magento\Backend\Controller\Adminhtml\Dashboard;
 
+use Magento\Backend\App\Action\Context;
 use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Stdlib\DateTime\Filter\Date;
 use Magento\Reports\Controller\Adminhtml\Report\Statistics;
+use Psr\Log\LoggerInterface;
 
 /**
  * Refresh Dashboard statistics action.
  */
 class RefreshStatistics extends Statistics implements HttpPostActionInterface
 {
     /**
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param Context $context
+     * @param Date $dateFilter
      * @param array $reportTypes
-     * @param \Psr\Log\LoggerInterface $logger
+     * @param LoggerInterface $logger
      */
     public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
+        Context $context,
+        Date $dateFilter,
         array $reportTypes,
-        \Psr\Log\LoggerInterface $logger
+        LoggerInterface $logger
     ) {
         parent::__construct($context, $dateFilter, $reportTypes);
         $this->logger = $logger;

app/code/Magento/Backend/Model/Menu/Config.php

@@ -63,6 +63,11 @@ class Config
      */
     protected $_appState;
 
+    /**
+     * @var Builder
+     */
+    private $_menuBuilder;
+
     /**
      * @param \Magento\Backend\Model\Menu\Builder $menuBuilder
      * @param \Magento\Backend\Model\Menu\AbstractDirector $menuDirector

app/code/Magento/Backend/view/adminhtml/templates/dashboard/chart.phtml

@@ -19,7 +19,7 @@ $viewModel = $block->getViewModel();
 ?>
 <div class="dashboard-diagram">
     <div class="dashboard-diagram-graph">
-        <canvas id="chart_<?= $escaper->escapeHtmlAttr($block->getData('html_id')) ?>_period"/>
+        <canvas id="chart_<?= $escaper->escapeHtmlAttr($block->getData('html_id')) ?>_period"></canvas>
         <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
             'display:none',
             '#chart_' . $escaper->escapeJs($block->getData('html_id')) . '_period'

app/code/Magento/Backend/view/adminhtml/web/js/store-switcher.js

@@ -69,7 +69,7 @@ define([
 
                 } else {
                     $('#preview_selected_store').val(scopeId);
-                    $('#preview_form').submit();
+                    $('#preview_form').trigger('submit');
 
                     $('.store-switcher .dropdown-menu li a').each(function () {
                         var $this = $(this);

app/code/Magento/Backup/Model/Fs/Collection.php

@@ -42,6 +42,10 @@ class Collection extends \Magento\Framework\Data\Collection\Filesystem
      */
     protected $_backup = null;
 
+    /**
+     * @var \Magento\Framework\Filesystem
+     */
+    private $_filesystem;
     /**
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
      * @param \Magento\Backup\Helper\Data $backupData

app/code/Magento/Backup/Test/Mftf/Data/BackupConfigData.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="EnableBackupFunctionality">
+        <data key="path">system/backup/functionality_enabled</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="DisableBackupFunctionality">
+        <!-- Magento default value -->
+        <data key="path">system/backup/functionality_enabled</data>
+        <data key="value">0</data>
+    </entity>
+</entities>

app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml

@@ -17,10 +17,13 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-94176"/>
             <group value="backup"/>
-            <skip>
-                <issueId value="MC-5807"/>
-            </skip>
         </annotations>
+        <before>
+            <magentoCLI command="config:set {{EnableBackupFunctionality.path}} {{EnableBackupFunctionality.value}}" stepKey="setEnableBackup"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set {{DisableBackupFunctionality.path}} {{DisableBackupFunctionality.value}}" stepKey="setDisableBackup"/>
+        </after>
 
         <!--Login to admin area-->
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/Bundle/Model/ResourceModel/Indexer/BundleOptionStockDataSelectBuilder.php

@@ -17,6 +17,16 @@
  */
 class BundleOptionStockDataSelectBuilder
 {
+    /**
+     * @var \Magento\Framework\App\ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var \Magento\Framework\EntityManager\MetadataPool
+     */
+    private $metadataPool;
+
     /**
      * @param \Magento\Framework\App\ResourceConnection $resourceConnection
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool