Merge pull request #7805 from magento-amigos/2.4-develop-prs

ishakhsuvarov · web-flow · commit 471f4d3280f8 · 2022-08-07T19:08:57.000-05:00
[Amigos] Community Contributions - 2.4-develop
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
@@ -164,6 +164,7 @@ public function __construct(
      */
     abstract public function execute($ids);
 
+    // phpcs:disable
     /**
      * Synchronize data between index storage and original storage
      *
@@ -196,6 +197,7 @@ protected function _syncData(array $processIds = [])
         return $this;
     }
 
+    // phpcs:enable
     /**
      * Prepare website current dates table
      *
@@ -456,6 +458,7 @@ private function deleteOutdatedData(array $entityIds, string $temporaryTable, st
      */
     private function deleteIndexData(array $entityIds)
     {
+        $entityIds = array_unique(array_map('intval', $entityIds));
         foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
             $select = $this->getConnection()->select()->from(
                 ['index_price' => $this->tableMaintainer->getMainTableByDimensions($dimensions)],
@@ -466,6 +469,7 @@ private function deleteIndexData(array $entityIds)
         }
     }
 
+    // phpcs:disable
     /**
      * Copy relations product index from primary index to temporary index table by parent entity
      *
@@ -516,6 +520,7 @@ protected function _copyRelationIndexData($parentIds, $excludeIds = null)
         return $this;
     }
 
+    // phpcs:enable
     /**
      * Retrieve index table by dimension that will be used for write operations.
      *
diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
@@ -192,6 +192,16 @@
                 <label translate="true">Websites</label>
             </settings>
         </column>
+        <column name="updated_at"
+                class="Magento\Ui\Component\Listing\Columns\Date"
+                component="Magento_Ui/js/grid/columns/date"
+                sortOrder="110">
+            <settings>
+                <filter>dateRange</filter>
+                <dataType>date</dataType>
+                <label translate="true">Last Updated At</label>
+            </settings>
+        </column>
         <actionsColumn name="actions" class="Magento\Catalog\Ui\Component\Listing\Columns\ProductActions" sortOrder="200">
             <settings>
                 <indexField>entity_id</indexField>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js
@@ -412,7 +412,7 @@ define([
             product = {
                 'id': row.productId,
                 'product_link': row.productUrl,
-                'name': $('<i></i>').text(row.name).html(),
+                'name': row.name,
                 'sku': row.sku,
                 'status': row.status,
                 'price': row.price,
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
@@ -29,6 +29,20 @@ class Collection extends \Magento\Rule\Model\ResourceModel\Rule\Collection\Abstr
      */
     protected $_associatedEntitiesMap;
 
+    /**
+     * SaleRule Event prefix
+     *
+     * @var string
+     */
+    protected $_eventPrefix = 'salesrule_rule_collection';
+
+    /**
+     * SaleRule Event object
+     *
+     * @var string
+     */
+    protected $_eventObject = 'rule_collection';
+
     /**
      * @var \Magento\SalesRule\Model\ResourceModel\Rule\DateApplier
      * @since 100.1.0
@@ -427,6 +441,7 @@ public function addCustomerGroupFilter($customerGroupId)
         return $this;
     }
 
+    // phpcs:disable
     /**
      * Getter for _associatedEntitiesMap property
      *
@@ -437,6 +452,7 @@ private function getAssociatedEntitiesMap()
     {
         if (!$this->_associatedEntitiesMap) {
             $this->_associatedEntitiesMap = \Magento\Framework\App\ObjectManager::getInstance()
+                // phpstan:ignore "Class Magento\SalesRule\Model\ResourceModel\Rule\AssociatedEntityMap not found."
                 ->get(\Magento\SalesRule\Model\ResourceModel\Rule\AssociatedEntityMap::class)
                 ->getData();
         }
@@ -458,4 +474,5 @@ private function getDateApplier()
 
         return $this->dateApplier;
     }
+    // phpcs:enable
 }
diff --git a/lib/internal/Magento/Framework/Amqp/Config.php b/lib/internal/Magento/Framework/Amqp/Config.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Framework\Amqp;
 
+use Magento\Framework\Amqp\Connection\Factory as ConnectionFactory;
 use Magento\Framework\Amqp\Connection\FactoryOptions;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
-use PhpAmqpLib\Connection\AbstractConnection;
 use PhpAmqpLib\Channel\AMQPChannel;
-use Magento\Framework\Amqp\Connection\Factory as ConnectionFactory;
+use PhpAmqpLib\Connection\AbstractConnection;
 
 /**
  * Reads the Amqp config in the deployed environment configuration
@@ -140,7 +140,7 @@ public function getValue($key)
      */
     private function createConnection(): AbstractConnection
     {
-        $sslEnabled = $this->getValue(self::SSL) && trim($this->getValue(self::SSL)) === 'true';
+        $sslEnabled = trim($this->getValue(self::SSL) ?? '') === 'true';
         $options = new FactoryOptions();
         $options->setHost($this->getValue(self::HOST));
         $options->setPort($this->getValue(self::PORT));
diff --git a/lib/web/jquery/bootstrap/collapse.js b/lib/web/jquery/bootstrap/collapse.js
@@ -201,7 +201,7 @@ define([
             this._element.style[dimension] = '';
 
             EventHandler.trigger(this._element, EVENT_SHOWN);
-        }
+        };
 
         const capitalizedDimension = dimension[0].toUpperCase() + dimension.slice(1);
         const scrollSize = `scroll${capitalizedDimension}`;
@@ -246,7 +246,7 @@ define([
             this._element.classList.remove(CLASS_NAME_COLLAPSING);
             this._element.classList.add(CLASS_NAME_COLLAPSE);
             EventHandler.trigger(this._element, EVENT_HIDDEN);
-        }
+        };
 
         this._element.style[dimension] = '';
 
diff --git a/lib/web/jquery/bootstrap/dom/data.js b/lib/web/jquery/bootstrap/dom/data.js
@@ -14,15 +14,15 @@ define([], function() {
      * ------------------------------------------------------------------------
      */
 
-    const elementMap = new Map()
+    const elementMap = new Map();
 
     return {
         set: function (element, key, instance) {
             if (!elementMap.has(element)) {
                 elementMap.set(element, new Map())
             }
 
-            const instanceMap = elementMap.get(element)
+            const instanceMap = elementMap.get(element);
 
             // make it clear we only want one instance per element
             // can be removed later when multiple key/instances are fine to be used
@@ -48,7 +48,7 @@ define([], function() {
                 return
             }
 
-            const instanceMap = elementMap.get(element)
+            const instanceMap = elementMap.get(element);
 
             instanceMap.delete(key)
 
diff --git a/lib/web/jquery/bootstrap/dom/event-handler.js b/lib/web/jquery/bootstrap/dom/event-handler.js
@@ -18,16 +18,16 @@ define([
      * ------------------------------------------------------------------------
      */
 
-    const namespaceRegex = /[^.]*(?=\..*)\.|.*/
-    const stripNameRegex = /\..*/
-    const stripUidRegex = /::\d+$/
-    const eventRegistry = {} // Events storage
-    let uidEvent = 1
+    const namespaceRegex = /[^.]*(?=\..*)\.|.*/;
+    const stripNameRegex = /\..*/;
+    const stripUidRegex = /::\d+$/;
+    const eventRegistry = {}; // Events storage
+    let uidEvent = 1;
     const customEvents = {
         mouseenter: 'mouseover',
         mouseleave: 'mouseout'
-    }
-    const customEventsRegex = /^(mouseenter|mouseleave)/i
+    };
+    const customEventsRegex = /^(mouseenter|mouseleave)/i;
     const nativeEvents = new Set([
         'click',
         'dblclick',
@@ -75,7 +75,7 @@ define([
         'error',
         'abort',
         'scroll'
-    ])
+    ]);
 
     /**
      * ------------------------------------------------------------------------
@@ -88,7 +88,7 @@ define([
     }
 
     function getEvent(element) {
-        const uid = getUidEvent(element)
+        const uid = getUidEvent(element);
 
         element.uidEvent = uid
         eventRegistry[uid] = eventRegistry[uid] || {}
@@ -110,7 +110,7 @@ define([
 
     function bootstrapDelegationHandler(element, selector, fn) {
         return function handler(event) {
-            const domElements = element.querySelectorAll(selector)
+            const domElements = element.querySelectorAll(selector);
 
             for (let {target} = event; target && target !== this; target = target.parentNode) {
                 for (let i = domElements.length; i--;) {
@@ -132,10 +132,10 @@ define([
     }
 
     function findHandler(events, handler, delegationSelector = null) {
-        const uidEventList = Object.keys(events)
+        const uidEventList = Object.keys(events);
 
         for (let i = 0, len = uidEventList.length; i < len; i++) {
-            const event = events[uidEventList[i]]
+            const event = events[uidEventList[i]];
 
             if (event.originalHandler === handler && event.delegationSelector === delegationSelector) {
                 return event
@@ -146,11 +146,11 @@ define([
     }
 
     function normalizeParams(originalTypeEvent, handler, delegationFn) {
-        const delegation = typeof handler === 'string'
-        const originalHandler = delegation ? delegationFn : handler
+        const delegation = typeof handler === 'string';
+        const originalHandler = delegation ? delegationFn : handler;
 
-        let typeEvent = getTypeEvent(originalTypeEvent)
-        const isNative = nativeEvents.has(typeEvent)
+        let typeEvent = getTypeEvent(originalTypeEvent);
+        const isNative = nativeEvents.has(typeEvent);
 
         if (!isNative) {
             typeEvent = originalTypeEvent
@@ -178,7 +178,7 @@ define([
                         return fn.call(this, event)
                     }
                 }
-            }
+            };
 
             if (delegationFn) {
                 delegationFn = wrapFn(delegationFn)
@@ -187,21 +187,21 @@ define([
             }
         }
 
-        const [delegation, originalHandler, typeEvent] = normalizeParams(originalTypeEvent, handler, delegationFn)
-        const events = getEvent(element)
-        const handlers = events[typeEvent] || (events[typeEvent] = {})
-        const previousFn = findHandler(handlers, originalHandler, delegation ? handler : null)
+        const [delegation, originalHandler, typeEvent] = normalizeParams(originalTypeEvent, handler, delegationFn);
+        const events = getEvent(element);
+        const handlers = events[typeEvent] || (events[typeEvent] = {});
+        const previousFn = findHandler(handlers, originalHandler, delegation ? handler : null);
 
         if (previousFn) {
             previousFn.oneOff = previousFn.oneOff && oneOff
 
             return
         }
 
-        const uid = getUidEvent(originalHandler, originalTypeEvent.replace(namespaceRegex, ''))
+        const uid = getUidEvent(originalHandler, originalTypeEvent.replace(namespaceRegex, ''));
         const fn = delegation ?
             bootstrapDelegationHandler(element, handler, delegationFn) :
-            bootstrapHandler(element, handler)
+            bootstrapHandler(element, handler);
 
         fn.delegationSelector = delegation ? handler : null
         fn.originalHandler = originalHandler
@@ -213,7 +213,7 @@ define([
     }
 
     function removeHandler(element, events, typeEvent, handler, delegationSelector) {
-        const fn = findHandler(events[typeEvent], handler, delegationSelector)
+        const fn = findHandler(events[typeEvent], handler, delegationSelector);
 
         if (!fn) {
             return
@@ -224,11 +224,11 @@ define([
     }
 
     function removeNamespacedHandlers(element, events, typeEvent, namespace) {
-        const storeElementEvent = events[typeEvent] || {}
+        const storeElementEvent = events[typeEvent] || {};
 
         Object.keys(storeElementEvent).forEach(handlerKey => {
             if (handlerKey.includes(namespace)) {
-                const event = storeElementEvent[handlerKey]
+                const event = storeElementEvent[handlerKey];
 
                 removeHandler(element, events, typeEvent, event.originalHandler, event.delegationSelector)
             }
@@ -255,10 +255,10 @@ define([
                 return
             }
 
-            const [delegation, originalHandler, typeEvent] = normalizeParams(originalTypeEvent, handler, delegationFn)
-            const inNamespace = typeEvent !== originalTypeEvent
-            const events = getEvent(element)
-            const isNamespace = originalTypeEvent.startsWith('.')
+            const [delegation, originalHandler, typeEvent] = normalizeParams(originalTypeEvent, handler, delegationFn);
+            const inNamespace = typeEvent !== originalTypeEvent;
+            const events = getEvent(element);
+            const isNamespace = originalTypeEvent.startsWith('.');
 
             if (typeof originalHandler !== 'undefined') {
                 // Simplest case: handler is passed, remove that listener ONLY.
@@ -276,12 +276,12 @@ define([
                 })
             }
 
-            const storeElementEvent = events[typeEvent] || {}
+            const storeElementEvent = events[typeEvent] || {};
             Object.keys(storeElementEvent).forEach(keyHandlers => {
-                const handlerKey = keyHandlers.replace(stripUidRegex, '')
+                const handlerKey = keyHandlers.replace(stripUidRegex, '');
 
                 if (!inNamespace || originalTypeEvent.includes(handlerKey)) {
-                    const event = storeElementEvent[keyHandlers]
+                    const event = storeElementEvent[keyHandlers];
 
                     removeHandler(element, events, typeEvent, event.originalHandler, event.delegationSelector)
                 }
@@ -293,16 +293,16 @@ define([
                 return null
             }
 
-            const $ = getjQuery()
-            const typeEvent = getTypeEvent(event)
-            const inNamespace = event !== typeEvent
-            const isNative = nativeEvents.has(typeEvent)
+            const $ = getjQuery();
+            const typeEvent = getTypeEvent(event);
+            const inNamespace = event !== typeEvent;
+            const isNative = nativeEvents.has(typeEvent);
 
-            let jQueryEvent
-            let bubbles = true
-            let nativeDispatch = true
-            let defaultPrevented = false
-            let evt = null
+            let jQueryEvent;
+            let bubbles = true;
+            let nativeDispatch = true;
+            let defaultPrevented = false;
+            let evt = null;
 
             if (inNamespace && $) {
                 jQueryEvent = $.Event(event, args)
diff --git a/lib/web/jquery/bootstrap/dom/manipulator.js b/lib/web/jquery/bootstrap/dom/manipulator.js
@@ -46,12 +46,12 @@ define([], function() {
                 return {}
             }
 
-            const attributes = {}
+            const attributes = {};
 
             Object.keys(element.dataset)
                 .filter(key => key.startsWith('bs'))
                 .forEach(key => {
-                    let pureKey = key.replace(/^bs/, '')
+                    let pureKey = key.replace(/^bs/, '');
                     pureKey = pureKey.charAt(0).toLowerCase() + pureKey.slice(1, pureKey.length)
                     attributes[pureKey] = normalizeData(element.dataset[key])
                 })
@@ -64,7 +64,7 @@ define([], function() {
         },
 
         offset: function(element) {
-            const rect = element.getBoundingClientRect()
+            const rect = element.getBoundingClientRect();
 
             return {
                 top: rect.top + window.pageYOffset,
diff --git a/lib/web/jquery/bootstrap/dom/selector-engine.js b/lib/web/jquery/bootstrap/dom/selector-engine.js
diff --git a/lib/web/jquery/bootstrap/tab.js b/lib/web/jquery/bootstrap/tab.js
diff --git a/lib/web/jquery/bootstrap/util/index.js b/lib/web/jquery/bootstrap/util/index.js

Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,7 @@ public function __construct(`
`164`	`164`	`*/`
`165`	`165`	`abstract public function execute($ids);`
`166`	`166`
	`167`	`+ // phpcs:disable`
`167`	`168`	`/**`
`168`	`169`	`* Synchronize data between index storage and original storage`
`169`	`170`	`*`
`@@ -196,6 +197,7 @@ protected function _syncData(array $processIds = [])`
`196`	`197`	`return $this;`
`197`	`198`	`}`
`198`	`199`
	`200`	`+ // phpcs:enable`
`199`	`201`	`/**`
`200`	`202`	`* Prepare website current dates table`
`201`	`203`	`*`
`@@ -456,6 +458,7 @@ private function deleteOutdatedData(array $entityIds, string $temporaryTable, st`
`456`	`458`	`*/`
`457`	`459`	`private function deleteIndexData(array $entityIds)`
`458`	`460`	`{`
	`461`	`+ $entityIds = array_unique(array_map('intval', $entityIds));`
`459`	`462`	`foreach ($this->dimensionCollectionFactory->create() as $dimensions) {`
`460`	`463`	`$select = $this->getConnection()->select()->from(`
`461`	`464`	`['index_price' => $this->tableMaintainer->getMainTableByDimensions($dimensions)],`
`@@ -466,6 +469,7 @@ private function deleteIndexData(array $entityIds)`
`466`	`469`	`}`
`467`	`470`	`}`
`468`	`471`
	`472`	`+ // phpcs:disable`
`469`	`473`	`/**`
`470`	`474`	`* Copy relations product index from primary index to temporary index table by parent entity`
`471`	`475`	`*`
`@@ -516,6 +520,7 @@ protected function _copyRelationIndexData($parentIds, $excludeIds = null)`
`516`	`520`	`return $this;`
`517`	`521`	`}`
`518`	`522`
	`523`	`+ // phpcs:enable`
`519`	`524`	`/**`
`520`	`525`	`* Retrieve index table by dimension that will be used for write operations.`
`521`	`526`	`*`