Merge pull request #1814 from magento/2.1.0-develop

2.1.0 develop to master sync

Author: sivaschenko

AdobeStockAsset/etc/acl.xml

@@ -10,8 +10,8 @@
         <resources>
             <resource id="Magento_Backend::admin">
                 <resource id="Magento_Backend::system">
-                    <resource id="Magento_AdobeStockAsset::adobe_stock_asset" title="Adobe Stock" translate="title" sortOrder="5">
-                        <resource id="Magento_AdobeStockAsset::actions" title="Actions" translate="title">
+                    <resource id="Magento_AdobeStockAsset::adobe_stock_asset" title="Adobe Stock WebAPI" translate="title" sortOrder="5">
+                        <resource id="Magento_AdobeStockAsset::actions" title="WebAPI Actions" translate="title">
                             <resource id="Magento_AdobeStockAsset::actions_delete" title="Delete" translate="title"/>
                             <resource id="Magento_AdobeStockAsset::actions_save" title="Save" translate="title"/>
                             <resource id="Magento_AdobeStockAsset::actions_view" title="View" translate="title"/>

AdobeStockImageAdminUi/Test/Mftf/Section/AdminAdobeStockSection.xml

@@ -25,7 +25,6 @@
         <element name="recordsFound" type="text" selector="//*[@id='adobe-stock-images-search-modal']//*[text()='records found']/parent::div"/>
         <element name="mediaGalleryImage" type="button" selector="//img[contains(@alt,'{{imageName}}')]" parameterized="true"/>
         <element name="mediaGalleryDeleteButton" type="button" selector="[data-ui-id=wysiwyg-images-content-delete-files-button]"/>
-        <element name="systemAclActions" type="checkbox" selector="//a[text()='Adobe Stock']/parent::li[contains(.,'Actions')]//a"/>
         <element name="adobeImsACL" type="checkbox" selector="//a[text()='Adobe IMS']"/>
         <element name="adobeSignIn" type="button" selector=".adobe-sign-in-button"/>
         <element name="adobeImsPopupUserEmail" type="button" selector="#adobeid_username"/>

AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockACLTest.xml

@@ -17,11 +17,10 @@
             <description value="User controls access to Adobe Stock images from Admin Panel in ACL"/>
             <testCaseId value="https://app.hiptest.com/projects/131313/test-plan/folders/943908/scenarios/3218882"/>
             <severity value="MAJOR"/>
-            <group value="adobe_stock_integration_configuration"/>
+            <group value="adobe_stock_integration"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdminBefore"/>
-            <actionGroup ref="AdminAdobeStockSetConfigActionGroup" stepKey="setCorrectModuleConfig"/>
         </before>
         <after>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdminAfter"/>
@@ -47,9 +46,6 @@
             <argument name="User" value="adminRole"/>
             <argument name="restrictedRole" value="Adobe Stock"/>
         </actionGroup>
-        <scrollTo selector="{{AdminAdobeStockSection.systemAclActions}}"  x="0" y="-100" stepKey="scrollToResourceElement"/>
-        <click stepKey="clickAdobeSystemActions" selector="{{AdminAdobeStockSection.systemAclActions}}"/>
-
         <actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="addRestrictedRoleAddEditNewPages">
             <argument name="User" value="adminRole"/>
             <argument name="restrictedRole" value="Pages"/>

AdobeStockImageAdminUi/Test/Mftf/Test/AdminMediaGalleryPageSavedPreviewAddSelectedTest.xml

@@ -9,6 +9,9 @@
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminMediaGalleryPageSavedPreviewAddSelectedTest">
         <annotations>
+            <skip>
+                <issueId value="https://github.com/magento/adobe-stock-integration/issues/1817"/>
+            </skip>
             <features value="AdobeStockImagePanel"/>
             <stories value="[Story #4] User selects saved image preview in Page"/>
             <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1688"/>

AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/preview/actions.js

@@ -180,7 +180,7 @@ define([
                 if (path !== '') {
                     this.imageDirectory().locateNode(path);
                 }
-                this.selectRecord(this.getRecordFromMediaGalleryProvider(assetDetails.path));
+                this.selectRecordFromMediaGalleryProvider(assetDetails.path);
             }.bind(this));
 
         },
@@ -203,23 +203,27 @@ define([
         },
 
         /**
-         * Get image data by image file name
+         * Select record by image file name
          *
          * @param {String} path
-         * @returns {null|Object}
          */
-        getRecordFromMediaGalleryProvider: function (path) {
-            var report = null;
+        selectRecordFromMediaGalleryProvider: function (path) {
+            var subscription;
 
-            this.imageItems.each(function (item) {
-                if (item.path === path) {
-                    report = item;
+            subscription = this.imageItems.subscribe(function (items) {
+                subscription.dispose();
+                items.each(function (item) {
+                    if (item.path === path) {
+                        this.selectRecord(item);
 
-                    return false;
-                }
-            });
+                        return false;
+                    }
+                }.bind(this));
+            }.bind(this));
 
-            return report;
+            setTimeout(function () {
+                subscription.dispose();
+            }, 1500);
         },
 
         /**