magento/adobe-stock-integration#1523: Switching between Views does not change the selected folder. [Media Gallery] - modified functions

Author: joweecaquicla

app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js

@@ -252,19 +252,17 @@ define([
                 isMediaBrowser = !_.isUndefined(window.MediabrowserUtility),
                 currentTreePath;
 
-            currentTreePath = this.isFiltersApplied(currentFilterPath) || !isMediaBrowser ? currentFilterPath :
-                Base64.idDecode(window.MediabrowserUtility.pathId);
-
-            if (this.folderExistsInTree(currentTreePath)) {
-                this.locateNode(currentTreePath);
+            if (_.isUndefined(currentFilterPath)) {
+                this.clearFiltersHandle();
             } else {
-                this.selectStorageRoot();
-            }
+                currentTreePath = this.isFiltersApplied(currentFilterPath) || !isMediaBrowser ? currentFilterPath :
+                    Base64.idDecode(window.MediabrowserUtility.pathId);
 
-            if (_.isUndefined(currentFilterPath)) {
-                $(this.directoryTreeSelector).jstree('deselect_all');
-                this.activeNode(null);
-                this.directories().setInActive();
+                if (this.folderExistsInTree(currentTreePath)) {
+                    this.locateNode(currentTreePath);
+                } else {
+                    this.selectStorageRoot();
+                }
             }
         },
 
@@ -287,7 +285,8 @@ define([
          * @param {String} currentFilterPath
          */
         isFiltersApplied: function (currentFilterPath) {
-            return !_.isUndefined(currentFilterPath);
+            return !_.isUndefined(currentFilterPath) && currentFilterPath !== ''
+                && currentFilterPath !== 'catalog/category';
         },
 
         /**
@@ -307,6 +306,12 @@ define([
 
         },
 
+        clearFiltersHandle: function () {
+            $(this.directoryTreeSelector).jstree('deselect_all');
+            this.activeNode(null);
+            this.directories().setInActive();
+        },
+
         /**
          * Set active node filter, or deselect if the same node clicked
          *