ENGCOM-8199: The "three dots" context menu is not closed after unsucc…

…essful licensing from Media Gallery #29967
magento · Sep 14, 2020 · 4d73b70 · 4d73b70
2 parents 4ae0f74 + 1e114f5
commit 4d73b70
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/...iaGalleryUi/Test/Mftf/ActionGroup/AssertAdminMediaGalleryContextMenuOpenedActionGroup.xml b/...iaGalleryUi/Test/Mftf/ActionGroup/AssertAdminMediaGalleryContextMenuOpenedActionGroup.xml
@@ -0,0 +1,16 @@
+<?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="AssertAdminMediaGalleryContextMenuOpenedActionGroup">
+        <annotations>
+            <description>Verify that context menu is closed in Media Gallery.</description>
+        </annotations>
+        <dontSeeElement selector="{{AdminEnhancedMediaGalleryImageActionsSection.contextMenuItem}}" stepKey="verifyContextMenuIsClosed" />
+    </actionGroup>
+</actionGroups>
diff --git a/...Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml b/...Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
@@ -9,6 +9,7 @@
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminEnhancedMediaGalleryImageActionsSection">
         <element name="openContextMenu" type="button" selector=".three-dots"/>
+        <element name="contextMenuItem" type="block" selector="//div[@class='media-gallery-image']//ul[@class='action-menu _active']//li//a[@class='action-menu-item']"/>
         <element name="viewDetails" type="button" selector="[data-ui-id='action-image-details']"/>
         <element name="delete" type="button" selector="[data-ui-id='action-delete']"/>
         <element name="edit" type="button" selector="[data-ui-id='action-edit']"/>

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image.js
@@ -18,6 +18,7 @@ define([
             deleteImageUrl: 'media_gallery/image/delete',
             addSelectedBtnSelector: '#add_selected',
             deleteSelectedBtnSelector: '#delete_selected',
+            gridSelector: '[data-id="media-gallery-masonry-grid"]',
             selected: null,
             allowedActions: [],
             fields: {
@@ -281,6 +282,7 @@ define([
          */
         addMessage: function (code, message) {
             this.messages().add(code, message);
+            this.closeContextMenu();
             this.scrollToMessageContent();
             this.messages().scheduleCleanup();
         },
@@ -298,6 +300,13 @@ define([
             }
         },
 
+        /**
+         * Action to close the context menu in media gallery.
+         */
+        closeContextMenu: function () {
+            $(this.gridSelector).click();
+        },
+
         /**
          * Scroll to the top of media gallery page
          */