ENGCOM-5727: #23966: WYSIWYG image upload dialog hangs up. #24333

Author: sidolov

app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml

@@ -16,9 +16,6 @@
             <description value="Admin should be able to add image to WYSIWYG Editor on Product Page"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-84375"/>
-            <skip>
-                <issueId value="MC-17232"/>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginActionGroup" stepKey="login"/>
@@ -78,6 +75,8 @@
         <waitForLoadingMaskToDisappear stepKey="waitForLoading13"/>
         <see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.CreateFolder}}" userInput="Create Folder" stepKey="seeCreateFolderBtn2" />
         <waitForLoadingMaskToDisappear stepKey="waitForLoading14"/>
+        <click userInput="Storage Root" stepKey="clickOnRootFolder" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading15"/>
         <dontSeeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="dontSeeAddSelectedBtn3" />
         <attachFile selector="{{ProductShortDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload3.value}}" stepKey="uploadImage3"/>
         <waitForLoadingMaskToDisappear stepKey="waitForFileUpload3"/>

app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml

@@ -16,9 +16,6 @@
             <description value="Admin should be able to add image to WYSIWYG content of Block"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-84376"/>
-            <skip>
-                <issueId value="MC-17232"/>
-            </skip>
         </annotations>
         <before>
             <createData entity="_defaultCmsPage" stepKey="createCMSPage" />

app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGCMSTest.xml

@@ -16,9 +16,6 @@
             <description value="Admin should be able to add image to WYSIWYG content of CMS Page"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-85825"/>
-            <skip>
-                <issueId value="MC-17232"/>
-            </skip>
         </annotations>
         <before>
             <createData entity="_defaultCmsPage" stepKey="createCMSPage" />

app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml

@@ -16,9 +16,6 @@
             <description value="Admin should be able to add image to WYSIWYG content Newsletter"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-84377"/>
-            <skip>
-                <issueId value="MC-17233"/>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginActionGroup" stepKey="login"/>

lib/web/mage/adminhtml/browser.js

@@ -52,8 +52,11 @@ define([
                 content = '<div class="popup-window" id="' + windowId + '"></div>',
                 self = this;
 
-            if (this.modalLoaded === true) {
-                if (options && typeof options.closed !== 'undefined') {
+            if (this.modalLoaded === true
+                && options
+                && self.targetElementId
+                && self.targetElementId === options.targetElementId) {
+                if (typeof options.closed !== 'undefined') {
                     this.modal.modal('option', 'closed', options.closed);
                 }
                 this.modal.modal('openModal');
@@ -85,6 +88,7 @@ define([
             }).done(function (data) {
                 self.modal.html(data).trigger('contentUpdated');
                 self.modalLoaded = true;
+                self.targetElementId = options.targetElementId;
             });
         },
 

lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js

@@ -377,6 +377,7 @@ define([
             var typeTitle = this.translate('Select Images'),
                 storeId = this.config['store_id'] !== null ? this.config['store_id'] : 0,
                 frameDialog = jQuery('div.mce-container[role="dialog"]'),
+                self = this,
                 wUrl = this.config['files_browser_window_url'] +
                     'target_element_id/' + this.getId() + '/' +
                     'store/' + storeId + '/';
@@ -393,14 +394,17 @@ define([
 
             require(['mage/adminhtml/browser'], function () {
                 MediabrowserUtility.openDialog(wUrl, false, false, typeTitle, {
-                    /**
-                     * Closed.
-                     */
-                    closed: function () {
-                        frameDialog.show();
-                        jQuery('#mce-modal-block').show();
+                        /**
+                         * Closed.
+                         */
+                        closed: function () {
+                            frameDialog.show();
+                            jQuery('#mce-modal-block').show();
+                        },
+
+                        targetElementId: self.activeEditor() ? self.activeEditor().id : null
                     }
-                });
+                );
             });
         },