Refactor per review comments

Author: Nazar65

app/code/Magento/Cms/Model/Wysiwyg/Gallery/DefaultConfigProvider.php

@@ -77,9 +77,7 @@ public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Fram
 
         if (is_string($this->currentTreePath)) {
             $fileBrowserUrlParams = [
-                'current_tree_path' => $this->imagesHelper->idEncode($this->currentTreePath),
-                'tree_path' => $this->currentTreePath . '&'
-
+                'current_tree_path' => $this->imagesHelper->idEncode($this->currentTreePath)
             ];
         }
 

app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml

@@ -34,7 +34,7 @@
         <element name="WysiwygArrow" type="button" selector="#d3lzaXd5Zw-- &gt; .jstree-icon"/>
         <element name="checkIfWysiwygArrowExpand" type="button" selector="//li[@id='d3lzaXd5Zw--' and contains(@class,'jstree-closed')]"/>
         <element name="confirmDelete" type="button" selector=".action-primary.action-accept"/>
-        <element name="higlightedFolder" type="block" selector="//li[@id='{{folderId}}']/a[@class='jstree-clicked']" parameterized="true"/>
+        <element name="highlightedFolder" type="block" selector="//li[@id='{{folderId}}']/a[@class='jstree-clicked']" parameterized="true"/>
         <element name="imageBlockByName" type="block" selector="//div[@data-row='file'][contains(., '{{imageName}}')]" parameterized="true"/>
     </section>
 </sections>

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

@@ -11,9 +11,9 @@
         <annotations>
             <features value="Cms"/>
             <group value="Cms"/>
-            <stories value="MediaGallery Verify Preselcted folders on Category Page"/>
-            <title value="Admin should be see preselcted default folder in Media Gallery"/>
-            <description value="Admin should be see preselcted default folder in Media Gallery"/>
+            <stories value="MediaGallery verify preselcted folders on Category Page"/>
+            <title value="Admin should be able to see preselected default folder in Media Gallery"/>
+            <description value="Admin should be able to see preselected default folder in Media Gallery"/>
         </annotations>        
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
@@ -26,10 +26,10 @@
         <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
         <!-- Verify catalog/category folder selected -->
         <waitForPageLoad stepKey="waitForFoldersLoad"/>
-        <seeElement selector="{{MediaGallerySection.higlightedFolder('Y2F0YWxvZy9jYXRlZ29yeQ--')}}" stepKey="assertCategoryFolder"/>
-        <actionGroup ref="AdminCloseMediaGalleryActionGroup" stepKey="closeMEdiaGallery"/>
+        <seeElement selector="{{MediaGallerySection.highlightedFolder('Y2F0YWxvZy9jYXRlZ29yeQ--')}}" stepKey="assertCategoryFolder"/>
+        <actionGroup ref="AdminCloseMediaGalleryActionGroup" stepKey="closeMediaGallery"/>
         <actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="opneMediaGalleryFromTinyMce4"/>
          <!-- Verify wysiwyg folder selected -->
-        <seeElement selector="{{MediaGallerySection.higlightedFolder('d3lzaXd5Zw--')}}" stepKey="assertWysiwygFolder"/>
+        <seeElement selector="{{MediaGallerySection.highlightedFolder('d3lzaXd5Zw--')}}" stepKey="assertWysiwygFolder"/>
     </test>
 </tests>

app/code/Magento/Ui/view/base/web/js/form/element/image-uploader.js

@@ -78,7 +78,6 @@ define([
                 '/type/image/?isAjax=true';
 
             if (this.mediaGallery.initialOpenSubpath) {
-                openDialogUrl += '/tree_path/' + this.mediaGallery.initialOpenSubpath;
                 openDialogUrl += '&current_tree_path=' + Base64.mageEncode(this.mediaGallery.initialOpenSubpath);
             }
 

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/image-uploader.test.js

@@ -75,7 +75,7 @@ define([
 
                 expect(browser.openDialog).toHaveBeenCalledWith(
                     'http://example.com/target_element_id/theTargetId/store/3/type/image/' +
-                        '?isAjax=true/tree_path/wysiwyg&current_tree_path=d3lzaXd5Zw,,',
+                        '?isAjax=true&current_tree_path=d3lzaXd5Zw,,',
                     null,
                     null,
                     'Hello world',

lib/web/mage/adminhtml/browser.js

@@ -21,7 +21,6 @@ define([
         windowId: 'modal_dialog_message',
         modalLoaded: false,
         targetElementId: false,
-        currentTreePath: '',
         pathId: '',
 
         /**
@@ -63,6 +62,7 @@ define([
 
                 this.modal.modal('openModal');
                 this.setTargetElementId(options, url);
+                this.setPathId(url);
                 $(window).trigger('reload.MediaGallery');
 
                 return;
@@ -87,19 +87,25 @@ define([
                 this.modal.html(data).trigger('contentUpdated');
                 this.modalLoaded = true;
                 this.setTargetElementId(options, url);
+                this.setPathId(url);
             }.bind(this));
 
         },
 
+        /**
+         * Setter for endcoded path id
+         */
+        setPathId: function (url) {
+            this.pathId = url.match(/(&|\/|%26)current_tree_path(=|\/)([\s\S].*?)(\/|$)/)[3];
+        },
+
         /**
          * Setter for targetElementId property
          *
          * @param {Object} options
          * @param {String} url
          */
         setTargetElementId: function (options, url) {
-            this.currentTreePath = url.match(/\/tree_path\/([\s\S].*?)(&|%26)/)[1];
-            this.pathId = url.match(/(&|\/|%26)current_tree_path(=|\/)([\s\S].*?)(\/|$)/)[3];
             this.targetElementId = options && options.targetElementId ?
                 options.targetElementId
                 : url.match(/\/target_element_id\/([\s\S].*?)\//)[1];