ENGCOM-8194: Fix saving default directory in the default bookmark of media gallery #29959

Author: sidolov

app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDefaultViewWithoutFiltersTest.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMediaGalleryDefaultViewWithoutFiltersTest">
+        <annotations>
+            <features value="AdminMediaGalleryDefaultViewWithoutFiltersTest"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1813"/>
+            <title value="User shouldn't see applied filters if media gallery switched to Default View"/>
+            <stories value="Media gallery default directory"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/5199870"/>
+            <description value="No filters should be applied if Default View selected"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- Open category page -->
+        <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryPage"/>
+        <actionGroup ref="AdminEditCategoryInGridPageActionGroup" stepKey="editCategoryItem">
+            <argument name="categoryName" value="$category.name$"/>
+        </actionGroup>
+
+        <!-- Open media gallery folder -->
+        <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGallery"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectCustomBookmarksViewActionGroup" stepKey="selectDefaultView">
+            <argument name="selectView" value="Default View"/>
+        </actionGroup>
+
+        <!-- Asset folder is empty -->
+        <actionGroup ref="AdminEnhancedMediaGalleryAssertNoActiveFiltersAppliedActionGroup" stepKey="assertEmptyFolder"/>
+    </test>
+</tests>

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

@@ -19,12 +19,14 @@ define([
         defaults: {
             allowedActions: [],
             filterChipsProvider: 'componentType = filters, ns = ${ $.ns }',
+            bookmarkProvider: 'componentType = bookmark, ns = ${ $.ns }',
             directoryTreeSelector: '#media-gallery-directory-tree',
             getDirectoryTreeUrl: 'media_gallery/directories/gettree',
             createDirectoryUrl: 'media_gallery/directories/create',
             deleteDirectoryUrl: 'media_gallery/directories/delete',
             jsTreeReloaded: null,
             modules: {
+                bookmarks: '${ $.bookmarkProvider }',
                 directories: '${ $.name }_directories',
                 filterChips: '${ $.filterChipsProvider }'
             },
@@ -259,6 +261,15 @@ define([
                 return;
             }
 
+            if (!_.isUndefined(this.bookmarks())) {
+                if (!_.size(this.bookmarks().getViewData(this.bookmarks().defaultIndex))) {
+                    setTimeout(function () {
+                        this.updateSelectedDirectory();
+                    }.bind(this), 500);
+
+                    return;
+                }
+            }
             currentTreePath = this.isFilterApplied(currentFilterPath) || _.isNull(requestedDirectory) ?
                 currentFilterPath : requestedDirectory;