Merge pull request #2479 from magento-panda/PANDA-FIXES-2.2

Fixed issues:
  - MAGETWO-87731: An error happens when you have a new Critical Admin Notification and Release Notification window is opened

Author: igrybkov

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

@@ -336,11 +336,12 @@ define([
          * Set z-index and margin for modal and overlay.
          */
         _setActive: function () {
-            var zIndex = this.modal.zIndex();
+            var zIndex = this.modal.zIndex(),
+                baseIndex = zIndex + this._getVisibleCount();
 
+            this.overlay.zIndex(++baseIndex);
             this.prevOverlayIndex = this.overlay.zIndex();
-            this.modal.zIndex(zIndex + this._getVisibleCount());
-            this.overlay.zIndex(zIndex + (this._getVisibleCount() - 1));
+            this.modal.zIndex(this.overlay.zIndex() + 1);
 
             if (this._getVisibleSlideCount()) {
                 this.modal.css('marginLeft', this.options.modalLeftMargin * this._getVisibleSlideCount());
@@ -354,7 +355,14 @@ define([
             this.modal.removeAttr('style');
 
             if (this.overlay) {
-                this.overlay.zIndex(this.prevOverlayIndex);
+                // 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);
+                }
             }
         },
 

dev/tests/functional/tests/app/Magento/CatalogRule/Test/Page/Adminhtml/CatalogRuleNew.xml

@@ -9,6 +9,6 @@
     <page name="CatalogRuleNew" area="Adminhtml" mca="catalog_rule/promo_catalog/new" module="Magento_CatalogRule">
         <block name="formPageActions" class="Magento\CatalogRule\Test\Block\Adminhtml\FormPageActions" locator=".page-main-actions" strategy="css selector"/>
         <block name="editForm" class="Magento\CatalogRule\Test\Block\Adminhtml\Promo\Catalog\Edit\PromoForm" locator="[id='page:main-container']" strategy="css selector"/>
-        <block name="modalBlock" class="Magento\Ui\Test\Block\Adminhtml\Modal" locator="._show[data-role=modal][style='z-index: 900;']" strategy="css selector"/>
+        <block name="modalBlock" class="Magento\Ui\Test\Block\Adminhtml\Modal" locator="._show[data-role=modal][style='z-index: 902;']" strategy="css selector"/>
     </page>
 </config>