Switching between Media Gallery bookmarks does not change the selected folder

app/code/Magento/MediaGallery/Model/Directory/Command/CreateByPaths.php

@@ -78,7 +78,7 @@ public function execute(array $paths): void
         if (!empty($failedPaths)) {
             throw new CouldNotSaveException(
                 __(
-                    'Could not save directories: %paths',
+                    'Could not create directories: %paths',
                     [
                         'paths' => implode(' ,', $failedPaths)
                     ]

app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertFolderIsChangedActionGroup.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertFolderIsChangedActionGroup">
+        <annotations>
+            <description>Assert that folder is changed</description>
+        </annotations>
+        <arguments>
+            <argument name="newSelectedFolder" type="string"/>
+            <argument name="oldSelectedFolder" type="string" defaultValue="{{AdminMediaGalleryFolderData.name}}"/>
+        </arguments>
+
+        <assertNotEquals stepKey="assertNotEqual">
+            <actualResult type="string">{{newSelectedFolder}}</actualResult>
+            <expectedResult type="string">{{oldSelectedFolder}}</expectedResult>
+        </assertNotEquals>
+    </actionGroup>
+</actionGroups>

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

@@ -0,0 +1,63 @@
+<?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="AdminMediaGallerySwitchingBetweenViewsTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1523"/>
+            <title value="User switches between Views and checks if the folder is changed"/>
+            <stories value="User switches between Views and checks if the folder is changed"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1337102/scenarios/5060037"/>
+            <description value="User switches between Views and checks if the folder is changed"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryDeleteGridViewActionGroup" stepKey="deleteView">
+                <argument name="viewToDelete" value="New View"/>
+            </actionGroup>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolderForDelete"/>
+            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFolder"/>
+            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFolderWasDeleted"/>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+        </after>
+        <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="openNewPage"/>
+        <actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilters"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder"/>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderCreated"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForFolderContents"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySaveCustomViewActionGroup" stepKey="saveCustomView">
+            <argument name="viewName" value="New View"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
+        <actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategory">
+            <argument name="category" value="$$category$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromImageUploader"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectCustomBookmarksViewActionGroup" stepKey="selectDefaultView">
+            <argument name="selectView" value="Default View"/>
+        </actionGroup>
+        <actionGroup ref="AssertFolderIsChangedActionGroup" stepKey="assertFolderIsChanged">
+            <argument name="newSelectedFolder" value="category" />
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectCustomBookmarksViewActionGroup" stepKey="switchBackToNewView">
+            <argument name="selectView" value="New View"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryAssertActiveFiltersActionGroup" stepKey="assertFilterApplied">
+            <argument name="resultValue" value="{{AdminMediaGalleryFolderData.name}}"/>
+        </actionGroup>
+    </test>
+</tests>

app/code/Magento/MediaGalleryUi/Ui/Component/DirectoriesTree.php → app/code/Magento/MediaGalleryUi/Ui/Component/DirectoryTree.php

@@ -14,7 +14,7 @@
 /**
  * Directories tree component
  */
-class DirectoriesTree extends Container
+class DirectoryTree extends Container
 {
     /**
      * @var UrlInterface
@@ -50,9 +50,9 @@ public function prepare(): void
             array_replace_recursive(
                 (array) $this->getData('config'),
                 [
-                    'getDirectoryTreeUrl' => $this->url->getUrl("media_gallery/directories/gettree"),
-                    'deleteDirectoryUrl' => $this->url->getUrl("media_gallery/directories/delete"),
-                    'createDirectoryUrl' => $this->url->getUrl("media_gallery/directories/create")
+                    'getDirectoryTreeUrl' => $this->url->getUrl('media_gallery/directories/gettree'),
+                    'deleteDirectoryUrl' => $this->url->getUrl('media_gallery/directories/delete'),
+                    'createDirectoryUrl' => $this->url->getUrl('media_gallery/directories/create')
                 ]
             )
         );

app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/media_gallery_listing.xml

@@ -211,7 +211,7 @@
         </container>
     </listingToolbar>
     <container name="media_gallery_directories"
-               class="Magento\MediaGalleryUi\Ui\Component\DirectoriesTree"
+               class="Magento\MediaGalleryUi\Ui\Component\DirectoryTree"
                template="Magento_MediaGalleryUi/grid/directories/directoryTree"
                component="Magento_MediaGalleryUi/js/directory/directoryTree"/>
     <columns name="media_gallery_columns" component="Magento_MediaGalleryUi/js/grid/masonry">

app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml

@@ -198,7 +198,7 @@
         </container>
     </listingToolbar>
     <container name="media_gallery_directories"
-               class="Magento\MediaGalleryUi\Ui\Component\DirectoriesTree"
+               class="Magento\MediaGalleryUi\Ui\Component\DirectoryTree"
                template="Magento_MediaGalleryUi/grid/directories/directoryTree"
                component="Magento_MediaGalleryUi/js/directory/directoryTree"/>
     <columns name="media_gallery_columns" component="Magento_MediaGalleryUi/js/grid/masonry">

app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImageWithDetailConfirmation.js

@@ -21,25 +21,24 @@ define([
          * @param {String} deleteImageUrl
          */
         deleteImageAction: function (recordsIds, imageDetailsUrl, deleteImageUrl) {
-            var confirmationContent = $t('%1 Are you sure you want to delete "%2" image(s)?')
+            var confirmationContent = $t('%1Are you sure you want to delete "%2" image(s)?')
                 .replace('%2', Object.keys(recordsIds).length),
                 deferred = $.Deferred();
 
-            getDetails(imageDetailsUrl, recordsIds)
-                .then(function (imageDetails) {
+            getDetails(imageDetailsUrl, recordsIds).then(function (images) {
                         confirmationContent = confirmationContent.replace(
                             '%1',
-                            this.getRecordRelatedContentMessage(imageDetails)
+                            this.getRecordRelatedContentMessage(images) + ' '
                         );
                     }.bind(this)).fail(function () {
-                confirmationContent = confirmationContent.replace('%1', '');
-            }).always(function () {
-                deleteImages(recordsIds, deleteImageUrl, confirmationContent).then(function (status) {
-                    deferred.resolve(status);
-                }).fail(function (error) {
-                    deferred.reject(error);
-                });
-            });
+                        confirmationContent = confirmationContent.replace('%1', '');
+                    }).always(function () {
+                        deleteImages(recordsIds, deleteImageUrl, confirmationContent).then(function (status) {
+                            deferred.resolve(status);
+                        }).fail(function (error) {
+                            deferred.reject(error);
+                        });
+                    });
 
             return deferred.promise();
         },

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

@@ -23,6 +23,7 @@ define([
             deleteButtonSelector: '#delete_folder',
             createFolderButtonSelector: '#create_folder',
             messageDelay: 5,
+            selectedFolder: null,
             messagesName: 'media_gallery_listing.media_gallery_listing.messages',
             modules: {
                 directoryTree: '${ $.parentName }.media_gallery_directories',
@@ -47,51 +48,57 @@ define([
           */
         initEvents: function () {
             $(this.deleteButtonSelector).on('delete_folder', function () {
-                this.getConfirmationPopupDeleteFolder();
+                this.deleteFolder();
             }.bind(this));
 
             $(this.createFolderButtonSelector).on('create_folder', function () {
-                this.getPrompt({
-                    title: $t('New Folder Name:'),
-                    content: '',
-                    actions: {
-                        /**
-                         * Confirm action
-                         */
-                        confirm: function (folderName) {
-                            createDirectory(
-                                this.directoryTree().createDirectoryUrl,
-                                [this.getNewFolderPath(folderName)]
-                            ).then(function () {
-                                this.directoryTree().reloadJsTree().then(function () {
-                                    $(this.directoryTree().directoryTreeSelector).on('loaded.jstree', function () {
-                                        this.directoryTree().locateNode(this.getNewFolderPath(folderName));
-                                    }.bind(this));
-                                }.bind(this));
+                this.createFolder();
+            }.bind(this));
+        },
 
-                            }.bind(this)).fail(function (error) {
-                                uiAlert({
-                                    content: error
-                                });
+        /**
+         * Show confirmation popup and create folder based on user input
+         */
+        createFolder: function () {
+            this.getPrompt({
+                title: $t('New Folder Name:'),
+                content: '',
+                actions: {
+                    /**
+                     * Confirm action
+                     */
+                    confirm: function (folderName) {
+                        createDirectory(
+                            this.directoryTree().createDirectoryUrl,
+                            [this.getNewFolderPath(folderName)]
+                        ).then(function () {
+                            this.directoryTree().reloadJsTree().then(function () {
+                                $(this.directoryTree().directoryTreeSelector).on('loaded.jstree', function () {
+                                    this.directoryTree().locateNode(this.getNewFolderPath(folderName));
+                                }.bind(this));
+                            }.bind(this));
+                        }.bind(this)).fail(function (error) {
+                            uiAlert({
+                                content: error
                             });
-                        }.bind(this)
-                    },
-                    buttons: [{
-                        text: $t('Cancel'),
-                        class: 'action-secondary action-dismiss',
+                        });
+                    }.bind(this)
+                },
+                buttons: [{
+                    text: $t('Cancel'),
+                    class: 'action-secondary action-dismiss',
 
-                        /**
-                         * Close modal
-                         */
-                        click: function () {
-                            this.closeModal();
-                        }
-                    }, {
-                        text: $t('Confirm'),
-                        class: 'action-primary action-accept'
-                    }]
-                });
-            }.bind(this));
+                    /**
+                     * Close modal
+                     */
+                    click: function () {
+                        this.closeModal();
+                    }
+                }, {
+                    text: $t('Confirm'),
+                    class: 'action-primary action-accept'
+                }]
+            });
         },
 
         /**
@@ -101,11 +108,11 @@ define([
          * @returns {String}
          */
         getNewFolderPath: function (folderName) {
-            var selectedFolder = _.isUndefined(this.selectedFolder()) ||
-                                 _.isNull(this.selectedFolder()) ? '/' : this.selectedFolder(),
-               folderToCreate = selectedFolder !== '/' ? selectedFolder + '/' + folderName : folderName;
+            if (_.isUndefined(this.selectedFolder()) || _.isNull(this.selectedFolder())) {
+                return folderName;
+            }
 
-            return folderToCreate;
+            return this.selectedFolder() + '/' + folderName;
         },
 
         /**
@@ -136,7 +143,7 @@ define([
         /**
           * Confirmation popup for delete folder action.
           */
-        getConfirmationPopupDeleteFolder: function () {
+        deleteFolder: function () {
             confirm({
                 title: $t('Are you sure you want to delete this folder?'),
                 modalClass: 'delete-folder-confirmation-popup',