Merge pull request #3250 from magento-obsessive-owls/owls-delivery

[Owls] PageBuilder Bug Fixes with core updates

Author: Cari Spruiell

app/code/Magento/CatalogWidget/Block/Product/ProductsList.php

@@ -14,7 +14,7 @@
 
 /**
  * Catalog Products List widget block
- * Class ProductsList
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implements BlockInterface, IdentityInterface
@@ -130,7 +130,9 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * Internal constructor, that is called from real constructor
+     *
+     * @return void
      */
     protected function _construct()
     {
@@ -174,7 +176,14 @@ public function getCacheKeyInfo()
     }
 
     /**
-     * {@inheritdoc}
+     * Return HTML block with tier price
+     *
+     * @param \Magento\Catalog\Model\Product $product
+     * @param string $priceType
+     * @param string $renderZone
+     * @param array $arguments
+     * @return string
+     *
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function getProductPriceHtml(
@@ -198,20 +207,27 @@ public function getProductPriceHtml(
 
             /** @var \Magento\Framework\Pricing\Render $priceRender */
         $priceRender = $this->getLayout()->getBlock('product.price.render.default');
-
-        $price = '';
-        if ($priceRender) {
-            $price = $priceRender->render(
-                \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-                $product,
-                $arguments
+        if (!$priceRender) {
+            $priceRender = $this->getLayout()->createBlock(
+                \Magento\Framework\Pricing\Render::class,
+                'product.price.render.default',
+                ['data' => ['price_render_handle' => 'catalog_product_prices']]
             );
         }
+
+        $price = $priceRender->render(
+            \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
+            $product,
+            $arguments
+        );
+        
         return $price;
     }
 
     /**
-     * {@inheritdoc}
+     * Before rendering html, but after trying to load cache
+     *
+     * @return $this
      */
     protected function _beforeToHtml()
     {
@@ -249,6 +265,8 @@ public function createCollection()
     }
 
     /**
+     * Get conditions
+     *
      * @return \Magento\Rule\Model\Condition\Combine
      */
     protected function getConditions()
@@ -386,8 +404,9 @@ public function getTitle()
     }
 
     /**
-     * @return PriceCurrencyInterface
+     * Get currency of product
      *
+     * @return PriceCurrencyInterface
      * @deprecated 100.2.0
      */
     private function getPriceCurrency()

app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultImageDownloadableProductTest.xml

@@ -17,9 +17,6 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-201"/>
             <group value="Downloadable"/>
-            <skip>
-                <issueId value="MC-4063"/>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

app/code/Magento/Ui/view/base/web/js/lib/view/utils/dom-observer.js

@@ -12,7 +12,8 @@ define([
 
     var counter = 1,
         watchers,
-        globalObserver;
+        globalObserver,
+        disabledNodes = [];
 
     watchers = {
         selectors: {},
@@ -238,11 +239,58 @@ define([
         };
     }
 
+    /**
+     * Verify if the DOM node is a child of a defined disabled node, if so we shouldn't observe provided mutation.
+     *
+     * @param {Object} mutation - a single mutation
+     * @returns {Boolean}
+     */
+    function shouldObserveMutation(mutation) {
+        var isDisabled;
+
+        if (disabledNodes.length > 0) {
+            // Iterate through the disabled nodes and determine if this mutation is occurring inside one of them
+            isDisabled = _.find(disabledNodes, function (node) {
+                return node === mutation.target || $.contains(node, mutation.target);
+            });
+
+            // If we find a matching node we should not observe the mutation
+            return !isDisabled;
+        }
+
+        return true;
+    }
+
+    /**
+     * Should we observe these mutations? Check the first and last mutation to determine if this is a disabled mutation,
+     * we check both the first and last in case one has been removed from the DOM during the process of the mutation.
+     *
+     * @param {Array} mutations - An array of mutation records.
+     * @returns {Boolean}
+     */
+    function shouldObserveMutations(mutations) {
+        var firstMutation,
+            lastMutation;
+
+        if (mutations.length > 0) {
+            firstMutation = mutations[0];
+            lastMutation = mutations[mutations.length - 1];
+
+            return shouldObserveMutation(firstMutation) && shouldObserveMutation(lastMutation);
+        }
+
+        return true;
+    }
+
     globalObserver = new MutationObserver(function (mutations) {
-        var changes = formChangesLists(mutations);
+        var changes;
+
+        if (shouldObserveMutations(mutations)) {
+            changes = formChangesLists(mutations);
 
-        changes.removed.forEach(processRemoved);
-        changes.added.forEach(processAdded);
+            changes.removed.forEach(processRemoved);
+            changes.added.forEach(processAdded);
+        }
     });
 
     globalObserver.observe(document.body, {
@@ -251,6 +299,16 @@ define([
     });
 
     return {
+        /**
+         * Disable a node from being observed by the mutations, you may want to disable specific aspects of the
+         * application which are heavy on DOM changes. The observer running on some actions could cause significant
+         * delays and degrade the performance of that specific part of the application exponentially.
+         *
+         * @param {HTMLElement} node - a HTML node within the document
+         */
+        disableNode: function (node) {
+            disabledNodes.push(node);
+        },
 
         /**
          * Adds listener for the appearance of nodes that matches provided

app/code/Magento/Ui/view/base/web/js/modal/modal.js

@@ -363,14 +363,7 @@ define([
             this.modal.data('active', false);
 
             if (this.overlay) {
-                // In cases when one modal is closed but there is another modal open (e.g. admin notifications)
-                // to avoid collisions between overlay and modal zIndexes
-                // overlay zIndex is set to be less than modal one
-                if (this._getVisibleCount() === 1) {
-                    this.overlay.zIndex(this.prevOverlayIndex - 1);
-                } else {
-                    this.overlay.zIndex(this.prevOverlayIndex);
-                }
+                this.overlay.zIndex(this.prevOverlayIndex - 1);
             }
         },
 

dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsPage.xml

@@ -7,6 +7,6 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
     <page name="CmsPage" mca="cms/page" module="Magento_Cms">
-        <block name="cmsPageBlock" class="Magento\Cms\Test\Block\Page" locator=".page-main" strategy="css selector" />
+        <block name="cmsPageBlock" class="Magento\Cms\Test\Block\Page" locator="#maincontent" strategy="css selector" />
     </page>
 </config>