Merge pull request #1772 from Nazar65/ASI-1771

sivaschenko · web-flow · commit 51ce7a514d6a · 2020-08-24T17:32:05.000+01:00
Refactor image location on Save Preview &amp;&amp; License image
diff --git a/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminAdobeStockMediaGalleryClearFiltersActionGroup.xml b/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminAdobeStockMediaGalleryClearFiltersActionGroup.xml
@@ -0,0 +1,18 @@
+<?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="AdminAdobeStockMediaGalleryClearFiltersActionGroup">
+        <annotations>
+            <description>Clicks on 'Clear Filters' on an media gallery Grid page.</description>
+        </annotations>
+
+        <conditionalClick selector="{{AdminEnhancedMediaGalleryActionsSection.clearFilters}}" dependentSelector="{{AdminEnhancedMediaGalleryActionsSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
+    </actionGroup>
+</actionGroups>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminAdobeStockMediaGallerySearchByKeywordActionGroup.xml b/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminAdobeStockMediaGallerySearchByKeywordActionGroup.xml
@@ -0,0 +1,23 @@
+<?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="AdminAdobeStockMediaGallerySearchByKeywordActionGroup">
+        <annotations>
+            <description>Fills 'Search by keyword' on media galllery grid page page. Clicks on Submit Search.</description>
+        </annotations>
+        <arguments>
+            <argument name="keyword" type="string"/>
+        </arguments>
+
+        <conditionalClick selector="{{AdminEnhancedMediaGalleryActionsSection.clearFilters}}" dependentSelector="{{AdminEnhancedMediaGalleryActionsSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
+        <fillField selector="{{AdminDataGridHeaderSection.search}}" userInput="{{keyword}}" stepKey="fillKeywordSearchField"/>
+        <click selector="{{AdminDataGridHeaderSection.submitSearch}}" stepKey="clickKeywordSearch"/>
+    </actionGroup>
+</actionGroups>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Section/AdminEnhancedMediaGalleryActionsSection.xml b/AdobeStockImageAdminUi/Test/Mftf/Section/AdminEnhancedMediaGalleryActionsSection.xml
@@ -9,5 +9,6 @@
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminEnhancedMediaGalleryActionsSection">
         <element name="searchAdobeStock" type="button" selector="[data-ui-id='search-adobe-stock-button']"/>
+        <element name="clearFilters" type="button" selector="//div[@class='media-gallery-container']//div[@class='admin__data-grid-header']//button[@data-action='grid-filter-reset']" timeout="30"/>
     </section>
 </sections>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImageVerifyLicenseActionOnMediaGallery.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImageVerifyLicenseActionOnMediaGallery.xml
@@ -37,7 +37,7 @@
         <actionGroup ref="AssertAdminAdobeStockImageUnlicensedLabelActionGroup" stepKey="assertUnlicensedLabel"/>
         <actionGroup ref="AssertAdminAdobeStockImageAssertLicenseButtonMediaGalleryActionGroup" stepKey="assertLicenseButton"/>
         <actionGroup ref="AdminEnhancedMediaGalleryImageDeleteActionGroup" stepKey="removeSavedPreview"/>
-
+        <actionGroup ref="AdminAdobeStockMediaGalleryClearFiltersActionGroup" stepKey="clearFilters"/>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
             <argument name="image" value="ImageUpload3"/>
         </actionGroup>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockTryLicenseAlreadyLicensedImageTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockTryLicenseAlreadyLicensedImageTest.xml
@@ -28,6 +28,7 @@
             <actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanel"/>
         </before>
         <after>
+            <actionGroup ref="AdminAdobeStockMediaGalleryClearFiltersActionGroup" stepKey="clearFilters"/>
             <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
         </after>
         <actionGroup ref="AdminAdobeStockImsConditionLogoutActionGroup" stepKey="ensureUserNotLogged"/>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockVerifyUnlicensedLabelTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockVerifyUnlicensedLabelTest.xml
@@ -26,6 +26,8 @@
 
         <after>
             <actionGroup ref="AdminEnhancedMediaGalleryImageDeleteActionGroup" stepKey="removeSavedPreview"/>
+            <actionGroup ref="AdminAdobeStockMediaGalleryClearFiltersActionGroup" stepKey="clearFilters"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminMediaGalleryCategorySavedPreviewAddSelectedTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminMediaGalleryCategorySavedPreviewAddSelectedTest.xml
@@ -27,6 +27,7 @@
         <after>
             <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
             <actionGroup ref="AdminEnhancedMediaGalleryImageDeleteActionGroup" stepKey="removeSavedPreview"/>
+            <actionGroup ref="AdminAdobeStockMediaGalleryClearFiltersActionGroup" stepKey="clearFilters"/>
         </after>
         <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
         <actionGroup ref="AdminAdobeStockSavePreviewActionGroup" stepKey="saveImagePreview"/>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminMediaGalleryPageSavedPreviewAddSelectedTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminMediaGalleryPageSavedPreviewAddSelectedTest.xml
@@ -27,6 +27,7 @@
         <after>
             <actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
             <actionGroup ref="AdminEnhancedMediaGalleryImageDeleteActionGroup" stepKey="removeSavedPreview"/>
+            <actionGroup ref="AdminAdobeStockMediaGalleryClearFiltersActionGroup" stepKey="clearFilters"/>
         </after>
         <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
         <actionGroup ref="AdminAdobeStockSavePreviewActionGroup" stepKey="saveImagePreview"/>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminMediaGalleryViewAdobeStockDetailsTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminMediaGalleryViewAdobeStockDetailsTest.xml
@@ -33,6 +33,8 @@
         <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
         <actionGroup ref="AdminAdobeStockSavePreviewActionGroup" stepKey="saveImagePreview"/>
         <actionGroup ref="AdminSaveAdobeStockImagePreviewActionGroup" stepKey="confirmSaveImagePreview"/>
+        <actionGroup ref="AdminAdobeStockMediaGalleryClearFiltersActionGroup" stepKey="clearFilters"/>
+
         <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewImageDetails"/>
         <actionGroup ref="AdminAdobeStockVerifyImageDetailsActionGroup" stepKey="verifyImageDetails">
             <argument name="image" value="AdobeStockUnlicensedImage"/>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminStandaloneMediaGallerySearchByKeywordTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminStandaloneMediaGallerySearchByKeywordTest.xml
@@ -23,6 +23,7 @@
             <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGalleryForPage"/>
         </before>
         <after>
+            <actionGroup ref="AdminAdobeStockMediaGalleryClearFiltersActionGroup" stepKey="clearFilters"/>
             <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
             <actionGroup ref="AdminEnhancedMediaGalleryImageDeleteActionGroup" stepKey="deleteImage"/>
         </after>
@@ -35,14 +36,14 @@
         <grabValueFrom selector="{{AdminAdobeStockImagePreviewSection.imageNameField}}" stepKey="grabImageFileName"/>
         <click selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="clickOnPopupConfirm"/>
         <waitForPageLoad stepKey="waitForMediaGalleryOpen"/>
-        <actionGroup ref="SearchStandaloneMediaGalleryAdminDataGridByKeywordActionGroup" stepKey="searchImage">
+        <actionGroup ref="AdminAdobeStockMediaGallerySearchByKeywordActionGroup" stepKey="searchImage">
             <argument name="keyword" value="$grabImageName"/>
         </actionGroup>
         <actionGroup ref="AdminAssertImageInStandaloneMediaGalleryActionGroup" stepKey="assertImageIsAvailableInStandaloneGridUsingImageName">
             <argument name="imageName" value="$grabImageFileName"/>
         </actionGroup>
         <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
-        <actionGroup ref="SearchStandaloneMediaGalleryAdminDataGridByKeywordActionGroup" stepKey="searchImageByKeyword">
+        <actionGroup ref="AdminAdobeStockMediaGallerySearchByKeywordActionGroup" stepKey="searchImageByKeyword">
             <argument name="keyword" value="$grabKeyword"/>
         </actionGroup>
         <actionGroup ref="AdminAssertImageInStandaloneMediaGalleryActionGroup" stepKey="assertImageIsAvailableInStandaloneGridUsingKeyword">
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminStandaloneMediaGalleryViewAdobeStockDetailsTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminStandaloneMediaGalleryViewAdobeStockDetailsTest.xml
@@ -24,6 +24,7 @@
         </before>
         <after>
             <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsDeleteActionGroup" stepKey="deleteImage"/>
+            <actionGroup ref="AdminAdobeStockMediaGalleryClearFiltersActionGroup" stepKey="clearFilters"/>
         </after>
 
         <actionGroup ref="AdminEnhancedMediaGallerySearchAdobeStockActionGroup" stepKey="openAdobeStockGrid"/>
diff --git a/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/preview/actions.js b/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/preview/actions.js
@@ -170,32 +170,18 @@ define([
 
             this.mediaGalleryListingFilters().clear();
             this.getAssetDetails(imageId).then(function (assetDetails) {
+                this.mediaGallerySearchInput().apply(assetDetails.title);
                 path = assetDetails.path;
                 path = path.substring(0, path.lastIndexOf('/'));
 
                 if (path !== '') {
                     this.imageDirectory().locateNode(path);
                 }
-                this.mediaGallerySearchInput().apply(assetDetails.title);
+                this.selectRecord(this.getRecordFromMediaGalleryProvider(assetDetails.path));
             }.bind(this));
 
         },
 
-        /**
-         * Selects displayed image in media gallery
-         *
-         * @param {String} path
-         * @param {Boolean|Undefined} openNewest
-         */
-        selectInMediaGallery: function (path, openNewest) {
-            if (!this.isMediaBrowser()) {
-                !openNewest || this.openNewestImage();
-                this.selectDisplayedImageForNewMediaGallery(path);
-            } else {
-                this.selectDisplayedImageForOldMediaGallery(path);
-            }
-        },
-
         /**
          * Open recently saved image and go to first page
          */
@@ -213,38 +199,6 @@ define([
             image ? image.click() : mediaGallery.notLocated();
         },
 
-        /**
-         * Selects displayed image in media gallery for new gallery
-         */
-        selectDisplayedImageForNewMediaGallery: function (path) {
-            var imageFolders = path.substring(0, path.lastIndexOf('/')),
-                record = this.getRecordFromMediaGalleryProvider(path),
-                subscription; // eslint-disable-line no-unused-vars
-
-            if (!record) {
-                subscription = this.imageItems.subscribe(function () {
-                    subscription.dispose();
-                    record = this.getRecordFromMediaGalleryProvider(path);
-
-                    if (!record) {
-                        mediaGallery.notLocated();
-                    }
-
-                    this.selectRecord(record);
-                }.bind(this));
-            }
-
-            if (imageFolders) {
-                this.imageDirectory().selectFolder(imageFolders);
-            } else {
-                this.imageDirectory().selectStorageRoot();
-            }
-
-            if (record) {
-                this.selectRecord(record);
-            }
-        },
-
         /**
          * Get image data by image file name
          *
@@ -288,7 +242,9 @@ define([
                 this.getDestinationDirectoryPath()
             ).then(function (destinationPath) {
                 this.updateDownloadedDisplayedRecord(destinationPath);
-                this.updateGridsAndSelectSavedAsset(destinationPath);
+                this.reloadGrid().done(function () {
+                    this.openInMediaGalleryClick();
+                }.bind(this));
             }.bind(this)).fail(function (error) {
                 if (error) {
                     this.showErrorMessage(error);
@@ -333,24 +289,6 @@ define([
             this.preview().displayedRecord(record);
         },
 
-        /**
-         * Update view
-         */
-        updateGridsAndSelectSavedAsset: function (path) {
-            this.source().reload({
-                refresh: true
-            });
-            this.preview().getAdobeModal().trigger('closeModal');
-            $.ajaxSetup({
-                async: false
-            });
-            this.reloadGrid();
-            $.ajaxSetup({
-                async: true
-            });
-            this.selectInMediaGallery(path, true);
-        },
-
         /**
          * Get image destination path
          *
@@ -398,9 +336,9 @@ define([
             provider = uiRegistry.get('index = media_gallery_listing_data_source'),
                 dataStorage = provider.storage();
 
-            // this.subscriptionOnImageItems();
             dataStorage.clearRequests();
-            provider.reload();
+
+            return provider.reload();
         },
 
         /**
@@ -473,7 +411,9 @@ define([
             ).then(function (destinationPath) {
                 this.updateLicensedDisplayedRecord(destinationPath);
                 this.login().getUserQuota();
-                this.updateGridsAndSelectSavedAsset(destinationPath);
+                this.reloadGrid().done(function () {
+                    this.openInMediaGalleryClick();
+                }.bind(this));
             }.bind(this)).fail(function (error) {
                 if (error) {
                     uiAlert({
@@ -579,7 +519,9 @@ define([
             ).then(function (destinationPath) {
                 this.updateLicensedDisplayedRecord(destinationPath);
                 this.login().getUserQuota();
-                this.updateGridsAndSelectSavedAsset(destinationPath);
+                this.reloadGrid().done(function () {
+                    this.openInMediaGalleryClick();
+                }.bind(this));
             }.bind(this)).fail(function (error) {
                 if (error) {
                     uiAlert({
