Merge pull request #1811 from sivaschenko/locate-fix

Locate functionality fix and ACL renaming

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/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);
         },
 
         /**