Provide pathId parameter to media browser

Author: Nazar65

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

@@ -77,7 +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)
+                'current_tree_path' => $this->imagesHelper->idEncode($this->currentTreePath),
             ];
         }
 

app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCloseMediaGalleryActionGroup.xml

@@ -34,7 +34,6 @@
         <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="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/ActionGroup/AdminOpenMediaGalleryTinyMce4ActionGroup.xml

@@ -3,7 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-/* global Base64 */
 define([
     'jquery',
     'jquery/ui',
@@ -79,92 +78,30 @@ define([
             var path = this.options.currentPath,
                 tree = this.element,
                 lastExistentFolderEl,
-                pathId,
 
-            /**
-             * Recursively open folders specified in path array.
-             */
-            recursiveOpen = function () {
-                var folderEl = $('[data-id="' + path.pop() + '"]');
+                /**
+                 * Recursively open folders specified in path array.
+                 */
+                recursiveOpen = function () {
+                    var folderEl = $('[data-id="' + path.pop() + '"]');
 
-                // if folder doesn't exist, select the last opened folder
-                if (!folderEl.length) {
-                    tree.jstree('select_node', lastExistentFolderEl);
+                    // if folder doesn't exist, select the last opened folder
+                    if (!folderEl.length) {
+                        tree.jstree('select_node', lastExistentFolderEl);
 
-                    return;
-                }
-
-                lastExistentFolderEl = folderEl;
-
-                if (path.length) {
-                    tree.jstree('open_node', folderEl, recursiveOpen);
-                } else {
-                    tree.jstree('open_node', folderEl, function () {
-                        tree.jstree('select_node', folderEl);
-                    });
-                }
-            },
-
-            /**
-             * Encode path value
-             *
-             * @param {String} val
-             */
-            _encodePathId = function (val) {
-                return Base64.encode(val)
-                    .replace(/\+/g, ':')
-                    .replace(/\//g, '_')
-                    .replace(/=/g, '-');
-            },
-
-            /**
-             * Decode path value
-             *
-             * @param {String} val
-             */
-            _decodePathId = function (val) {
-                return Base64.decode(val)
-                    .replace(/\:/g, '+')
-                    .replace(/\_/g, '/')
-                    .replace(/-/g, '=');
-            },
-
-            /**
-             * Get currentPath decode it returns new path array
-             */
-            _parseCurrentPath = function () {
-                var paths = [],
-                    decodedPath = _decodePathId(window.MediabrowserUtility.pathId.replace(/--|,,/, '==')).split('/');
+                        return;
+                    }
 
-                $.each(decodedPath, function (i, val) {
-                    var isLastElement = i === decodedPath.length - 1;
+                    lastExistentFolderEl = folderEl;
 
-                    if (isLastElement) {
-                        paths[i] = window.MediabrowserUtility.pathId.replace(',,', '--');
+                    if (path.length) {
+                        tree.jstree('open_node', folderEl, recursiveOpen);
                     } else {
-                        paths[i] = _encodePathId(val);
+                        tree.jstree('open_node', folderEl, function () {
+                            tree.jstree('select_node', folderEl);
+                        });
                     }
-                });
-                paths.unshift('root');
-                paths.reverse();
-
-                return paths;
-            };
-
-            $(window).on('reload.MediaGallery', function () {
-                pathId =  window.MediabrowserUtility.pathId.replace(',,', '--');
-                path = _parseCurrentPath();
-
-                tree.jstree('deselect_all');
-
-                if (path.length > 1) {
-                    recursiveOpen();
-                } else {
-                    tree.jstree('open_node', $('[data-id="' + pathId + '"]'), function () {
-                        tree.jstree('select_node',  $('[data-id="' + pathId + '"]'));
-                    });
-                }
-            });
+                };
 
             recursiveOpen();
         },

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

@@ -9,8 +9,7 @@ define([
 ], function (browser, $) {
     'use strict';
 
-    var obj,
-        openUrl = 'http://example.com/target_element_id/theTargetId/tree_path/wysiwyg&current_tree_path=d3lzaXd5Zw,';
+    var obj;
 
     beforeEach(function () {
         /**
@@ -42,8 +41,8 @@ define([
                         }
                     };
                 });
-            obj.openDialog(openUrl, 100, 100, 'title', options);
-            obj.openDialog(openUrl, 100, 100, 'title', options);
+            obj.openDialog('instance/url', 100, 100, 'title', options);
+            obj.openDialog('instance/url', 100, 100, 'title', options);
             expect($.ajax.calls.count()).toBe(1);
         });
 
@@ -60,8 +59,8 @@ define([
                         }
                     };
                 });
-            obj.openDialog(openUrl, 100, 100, 'title', undefined);
-            obj.openDialog(openUrl, 100, 100, 'title', undefined);
+            obj.openDialog('instance/url/target_element_id/YDW2424/', 100, 100, 'title', undefined);
+            obj.openDialog('instance/target_element_id/Y45GDRg/', 100, 100, 'title', undefined);
             expect($.ajax.calls.count()).toBe(1);
         });
     });