ENGCOM-7573: Provide pathId param on browser.js #28219

Author: slavvka

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

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

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&current_tree_path=d3lzaXd5Zw,,',
+                        '?isAjax=true&current_tree_path=d3lzaXd5Zw--',
                     null,
                     null,
                     'Hello world',

dev/tests/js/jasmine/tests/lib/mage/browser.test.js

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

lib/web/mage/adminhtml/browser.js

@@ -21,6 +21,7 @@ define([
         windowId: 'modal_dialog_message',
         modalLoaded: false,
         targetElementId: false,
+        pathId: '',
 
         /**
          * @return {Number}
@@ -61,6 +62,7 @@ define([
 
                 this.modal.modal('openModal');
                 this.setTargetElementId(options, url);
+                this.setPathId(url);
                 $(window).trigger('reload.MediaGallery');
 
                 return;
@@ -85,10 +87,18 @@ 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
          *