From 09f1d5d86f6a3e226eb22e1d086c6971e2feafe2 Mon Sep 17 00:00:00 2001
From: Volodymyr Vygovskyi <v.vygovskyi@atwix.com>
Date: Sat, 31 Aug 2019 17:48:59 +0300
Subject: [PATCH 1/6] #359: added Locate button for saved preview images

---
 .../Model/AddIsDownloadedToSearchResult.php   | 80 +++++++++++++++++++
 AdobeStockAsset/Model/GetAssetList.php        | 17 +++-
 .../components/grid/column/image-preview.js   | 26 ++++++
 .../template/grid/column/image-preview.html   |  5 +-
 4 files changed, 124 insertions(+), 4 deletions(-)
 create mode 100644 AdobeStockAsset/Model/AddIsDownloadedToSearchResult.php

diff --git a/AdobeStockAsset/Model/AddIsDownloadedToSearchResult.php b/AdobeStockAsset/Model/AddIsDownloadedToSearchResult.php
new file mode 100644
index 000000000000..31f157a457d9
--- /dev/null
+++ b/AdobeStockAsset/Model/AddIsDownloadedToSearchResult.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AdobeStockAsset\Model;
+
+use Magento\Framework\Api\AttributeValueFactory;
+use Magento\Framework\Api\Search\SearchResultInterface;
+use Magento\Framework\App\ResourceConnection;
+
+/**
+ * Class AddIsDownloadedToSearchResult
+ */
+class AddIsDownloadedToSearchResult
+{
+    const TABLE_ASSET                  = 'adobe_stock_asset';
+    const ATTRIBUTE_CODE_IS_DOWNLOADED = 'is_downloaded';
+
+    /**
+     * @var AttributeValueFactory
+     */
+    private $attributeValueFactory;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * AddIsDownloadedToSearchResult constructor.
+     * @param ResourceConnection $resourceConnection
+     * @param AttributeValueFactory $attributeValueFactory
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        AttributeValueFactory $attributeValueFactory
+    ) {
+        $this->resourceConnection = $resourceConnection;
+        $this->attributeValueFactory = $attributeValueFactory;
+    }
+
+    /**
+     * @param SearchResultInterface $searchResult
+     * @return SearchResultInterface
+     */
+    public function execute(SearchResultInterface $searchResult): SearchResultInterface
+    {
+        $items = $searchResult->getItems();
+        $itemIds = [];
+
+        foreach ($items as $key => $item) {
+            $itemIds[$key] = $item->getId();
+        }
+
+        if (count($itemIds)) {
+            $connection = $this->resourceConnection->getConnection();
+            $select = $connection->select()
+                ->from(self::TABLE_ASSET, ['id'])
+                ->where('id in (?)', $itemIds);
+            $downloadedIds = $connection->fetchCol($select, 'id');
+
+            foreach ($items as $key => $item) {
+                $customAttributes = $item->getCustomAttributes();
+
+                $attribute = $this->attributeValueFactory->create();
+                $attribute->setAttributeCode(self::ATTRIBUTE_CODE_IS_DOWNLOADED);
+                $attribute->setValue((int)in_array($item->getId(), $downloadedIds));
+
+                $customAttributes[self::ATTRIBUTE_CODE_IS_DOWNLOADED] = $attribute;
+                $item->setCustomAttributes($customAttributes);
+            }
+        }
+
+        return $searchResult;
+    }
+}
diff --git a/AdobeStockAsset/Model/GetAssetList.php b/AdobeStockAsset/Model/GetAssetList.php
index 7a0b4d4acd82..97c992d3e6e8 100644
--- a/AdobeStockAsset/Model/GetAssetList.php
+++ b/AdobeStockAsset/Model/GetAssetList.php
@@ -22,6 +22,11 @@
  */
 class GetAssetList implements GetAssetListInterface
 {
+    /**
+     * @var AddIsDownloadedToSearchResult
+     */
+    private $addIsDownloadedToSearchResult;
+
     /**
      * @var ClientInterface
      */
@@ -40,17 +45,20 @@ class GetAssetList implements GetAssetListInterface
     /**
      * GetAssetList constructor.
      * @param ClientInterface $client
-     * @param UrlInterface    $url
+     * @param UrlInterface $url
      * @param LoggerInterface $log
+     * @param AddIsDownloadedToSearchResult $addIsDownloadedToSearchResult
      */
     public function __construct(
         ClientInterface $client,
         UrlInterface $url,
-        LoggerInterface $log
+        LoggerInterface $log,
+        AddIsDownloadedToSearchResult $addIsDownloadedToSearchResult
     ) {
         $this->client = $client;
         $this->url = $url;
         $this->log = $log;
+        $this->addIsDownloadedToSearchResult = $addIsDownloadedToSearchResult;
     }
 
     /**
@@ -59,7 +67,10 @@ public function __construct(
     public function execute(SearchCriteriaInterface $searchCriteria): SearchResultInterface
     {
         try {
-            return $this->client->search($searchCriteria);
+            $searchResult = $this->client->search($searchCriteria);
+            $this->addIsDownloadedToSearchResult->execute($searchResult);
+
+            return $searchResult;
         } catch (AuthenticationException $exception) {
             throw new LocalizedException(
                 __(
diff --git a/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/image-preview.js b/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/image-preview.js
index a73cd77fef89..ff730c567eea 100644
--- a/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/image-preview.js
+++ b/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/image-preview.js
@@ -300,6 +300,20 @@ define([
             return this.visibility()[record._rowIndex] || false;
         },
 
+        /**
+         * Returns is_downloaded flag as observable for given record
+         *
+         * @param record
+         * @returns {observable}
+         */
+        isDownloaded: function(record) {
+            if (!ko.isObservable((record.is_downloaded))){
+                record.is_downloaded = ko.observable(record.is_downloaded);
+            }
+
+            return record.is_downloaded;
+        },
+
         /**
          * Get styles for preview
          *
@@ -327,6 +341,17 @@ define([
             });
         },
 
+        /**
+         * Locate downloaded in media browser (draft)
+         *
+         * @param record
+         */
+        locate: function (record) {
+            var mediaBrowser = $(this.mediaGallerySelector).data('mageMediabrowser');
+            $(this.adobeStockModalSelector).trigger('closeModal');
+            mediaBrowser.reload(true);
+        },
+
         /**
          * Save record as image
          *
@@ -347,6 +372,7 @@ define([
                     },
                     context: this,
                     success: function () {
+                        record.is_downloaded(1);
                         $(this.adobeStockModalSelector).trigger('processStop');
                         $(this.adobeStockModalSelector).trigger('closeModal');
                         mediaBrowser.reload(true);
diff --git a/AdobeStockImageAdminUi/view/adminhtml/web/template/grid/column/image-preview.html b/AdobeStockImageAdminUi/view/adminhtml/web/template/grid/column/image-preview.html
index b6d0321a78d0..66ea4dea69bb 100644
--- a/AdobeStockImageAdminUi/view/adminhtml/web/template/grid/column/image-preview.html
+++ b/AdobeStockImageAdminUi/view/adminhtml/web/template/grid/column/image-preview.html
@@ -35,9 +35,12 @@ <h3 class="title" text="$col.getTitle($row())" if="$col.getTitle($row())"/>
                 </div>
                 <!-- /ko -->
             </ul>
-            <button class="action-secondary" type="button" data-bind="click: function(){ $col.save($row()) }">
+            <button class="action-secondary" type="button" data-bind="visible: !$col.isDownloaded($row())(), click: function(){ $col.save($row()) }">
                 <span translate="'Save Preview'"/>
             </button>
+            <button class="action-secondary" type="button" data-bind="visible: $col.isDownloaded($row())(), click: function(){ $col.locate($row()) }">
+                <span translate="'Locate'"/>
+            </button>
             <button class="action-default primary"
                     type="button"
                     attr="title: $t('License and Save')"

From 55dd365bf942db2b54bc228f3dd32e4d6461648e Mon Sep 17 00:00:00 2001
From: Volodymyr Vygovskyi <v.vygovskyi@atwix.com>
Date: Wed, 11 Sep 2019 22:52:01 +0300
Subject: [PATCH 2/6] #359: locate downloaded image in media browser

---
 ...oSearchResult.php => AppendAttributes.php} | 23 +++++++++++++++----
 AdobeStockAsset/Model/GetAssetList.php        | 12 +++++-----
 .../components/grid/column/image-preview.js   | 11 ++++++---
 3 files changed, 32 insertions(+), 14 deletions(-)
 rename AdobeStockAsset/Model/{AddIsDownloadedToSearchResult.php => AppendAttributes.php} (71%)

diff --git a/AdobeStockAsset/Model/AddIsDownloadedToSearchResult.php b/AdobeStockAsset/Model/AppendAttributes.php
similarity index 71%
rename from AdobeStockAsset/Model/AddIsDownloadedToSearchResult.php
rename to AdobeStockAsset/Model/AppendAttributes.php
index 31f157a457d9..5aecb13b55f5 100644
--- a/AdobeStockAsset/Model/AddIsDownloadedToSearchResult.php
+++ b/AdobeStockAsset/Model/AppendAttributes.php
@@ -8,6 +8,7 @@
 
 namespace Magento\AdobeStockAsset\Model;
 
+use Magento\AdobeStockAssetApi\Api\Data\AssetInterface;
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Api\Search\SearchResultInterface;
 use Magento\Framework\App\ResourceConnection;
@@ -15,10 +16,11 @@
 /**
  * Class AddIsDownloadedToSearchResult
  */
-class AddIsDownloadedToSearchResult
+class AppendAttributes
 {
     const TABLE_ASSET                  = 'adobe_stock_asset';
     const ATTRIBUTE_CODE_IS_DOWNLOADED = 'is_downloaded';
+    const ATTRIBUTE_CODE_PATH          = 'path';
 
     /**
      * @var AttributeValueFactory
@@ -44,6 +46,8 @@ public function __construct(
     }
 
     /**
+     * Add additional asset attributes
+     *
      * @param SearchResultInterface $searchResult
      * @return SearchResultInterface
      */
@@ -59,18 +63,27 @@ public function execute(SearchResultInterface $searchResult): SearchResultInterf
         if (count($itemIds)) {
             $connection = $this->resourceConnection->getConnection();
             $select = $connection->select()
-                ->from(self::TABLE_ASSET, ['id'])
+                ->from(self::TABLE_ASSET)
                 ->where('id in (?)', $itemIds);
-            $downloadedIds = $connection->fetchCol($select, 'id');
+            $downloadedAssets = $connection->fetchAssoc($select);
 
             foreach ($items as $key => $item) {
                 $customAttributes = $item->getCustomAttributes();
 
+                //adding is_downloaded attribute
+                $isDownloadedValue = (int)isset($downloadedAssets[$item->getId()]);
                 $attribute = $this->attributeValueFactory->create();
                 $attribute->setAttributeCode(self::ATTRIBUTE_CODE_IS_DOWNLOADED);
-                $attribute->setValue((int)in_array($item->getId(), $downloadedIds));
-
+                $attribute->setValue($isDownloadedValue);
                 $customAttributes[self::ATTRIBUTE_CODE_IS_DOWNLOADED] = $attribute;
+
+                //adding path attribute
+                $pathValue = $downloadedAssets[$item->getId()][AssetInterface::PATH] ?? '';
+                $attribute = $this->attributeValueFactory->create();
+                $attribute->setAttributeCode(self::ATTRIBUTE_CODE_PATH);
+                $attribute->setValue($pathValue);
+                $customAttributes[self::ATTRIBUTE_CODE_PATH] = $attribute;
+
                 $item->setCustomAttributes($customAttributes);
             }
         }
diff --git a/AdobeStockAsset/Model/GetAssetList.php b/AdobeStockAsset/Model/GetAssetList.php
index 97c992d3e6e8..248472442eca 100644
--- a/AdobeStockAsset/Model/GetAssetList.php
+++ b/AdobeStockAsset/Model/GetAssetList.php
@@ -23,9 +23,9 @@
 class GetAssetList implements GetAssetListInterface
 {
     /**
-     * @var AddIsDownloadedToSearchResult
+     * @var AppendAttributes
      */
-    private $addIsDownloadedToSearchResult;
+    private $appendAttributes;
 
     /**
      * @var ClientInterface
@@ -47,18 +47,18 @@ class GetAssetList implements GetAssetListInterface
      * @param ClientInterface $client
      * @param UrlInterface $url
      * @param LoggerInterface $log
-     * @param AddIsDownloadedToSearchResult $addIsDownloadedToSearchResult
+     * @param AppendAttributes $appendAttributes
      */
     public function __construct(
         ClientInterface $client,
         UrlInterface $url,
         LoggerInterface $log,
-        AddIsDownloadedToSearchResult $addIsDownloadedToSearchResult
+        AppendAttributes $appendAttributes
     ) {
         $this->client = $client;
         $this->url = $url;
         $this->log = $log;
-        $this->addIsDownloadedToSearchResult = $addIsDownloadedToSearchResult;
+        $this->appendAttributes = $appendAttributes;
     }
 
     /**
@@ -68,7 +68,7 @@ public function execute(SearchCriteriaInterface $searchCriteria): SearchResultIn
     {
         try {
             $searchResult = $this->client->search($searchCriteria);
-            $this->addIsDownloadedToSearchResult->execute($searchResult);
+            $this->appendAttributes->execute($searchResult);
 
             return $searchResult;
         } catch (AuthenticationException $exception) {
diff --git a/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/image-preview.js b/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/image-preview.js
index ff730c567eea..fcf123abff90 100644
--- a/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/image-preview.js
+++ b/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/image-preview.js
@@ -342,14 +342,18 @@ define([
         },
 
         /**
-         * Locate downloaded in media browser (draft)
+         * Locate downloaded image in media browser
          *
          * @param record
          */
         locate: function (record) {
-            var mediaBrowser = $(this.mediaGallerySelector).data('mageMediabrowser');
             $(this.adobeStockModalSelector).trigger('closeModal');
-            mediaBrowser.reload(true);
+
+            var fileSelector = 'div[data-row="file"]:has(img[alt="' + record.path.replace(/^\/+/, '') + '"])';
+            var file = $(fileSelector);
+            if (file.length){
+                file.click();
+            }
         },
 
         /**
@@ -373,6 +377,7 @@ define([
                     context: this,
                     success: function () {
                         record.is_downloaded(1);
+                        record.path = destinationPath;
                         $(this.adobeStockModalSelector).trigger('processStop');
                         $(this.adobeStockModalSelector).trigger('closeModal');
                         mediaBrowser.reload(true);

From f8152154338ebc685bdbd6f7deffd5c0b7b3acdc Mon Sep 17 00:00:00 2001
From: Volodymyr Vygovskyi <v.vygovskyi@atwix.com>
Date: Sun, 22 Sep 2019 15:21:07 +0300
Subject: [PATCH 3/6] #359 attempt to locate image in folder

---
 .../components/grid/column/image-preview.js   | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/image-preview.js b/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/image-preview.js
index 2a2e02b90e41..fba291005a83 100644
--- a/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/image-preview.js
+++ b/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/image-preview.js
@@ -349,7 +349,34 @@ define([
          */
         locate: function (record) {
             $(this.adobeStockModalSelector).trigger('closeModal');
+            var imageFilename, imagePath = record.path.replace(/^\/+/, '');
+            var imagePathParts = imagePath.split( '/' );
+            var imageFolder = false;
+            var folderFileNameMaxLength = 20;
+            var rootFolderName = 'Storage Root';
+
+            /* folder name is being cut in file browser */
+            if (imagePathParts.length > 1){
+                imageFilename = imagePathParts[imagePathParts.length - 1];
+                imageFolder = imagePathParts[0];
+                if (imageFolder.length > folderFileNameMaxLength){
+                    imageFolder = imageFolder.substring(0, folderFileNameMaxLength) + '...';
+                }
+            } else {
+                imageFilename = imagePath;
+                imageFolder = rootFolderName;
+            }
+
+            //select folder
+            if (imageFolder !== false){
+                var folderSelector = ".jstree a:contains('" + imageFolder+ "')";
+                var folder = $(folderSelector);
+                if (folder.length){
+                    folder[0].click();
+                }
+            }
 
+            /** TODO: if image is in folder it can not be found because "select folder" step is not completed yet */
             var fileSelector = 'div[data-row="file"]:has(img[alt="' + record.path.replace(/^\/+/, '') + '"])';
             var file = $(fileSelector);
             if (file.length){

From 020b861b0f0c6f8f46afa5da5327aadab261170f Mon Sep 17 00:00:00 2001
From: Volodymyr Vygovskyi <v.vygovskyi@atwix.com>
Date: Fri, 27 Sep 2019 16:41:06 +0300
Subject: [PATCH 4/6] #359 fixed case with image location in subfolders

---
 AdobeStockAsset/Model/AppendAttributes.php    | 48 ++++++++++-----
 .../components/grid/column/image-preview.js   | 58 ++++++++++---------
 2 files changed, 67 insertions(+), 39 deletions(-)

diff --git a/AdobeStockAsset/Model/AppendAttributes.php b/AdobeStockAsset/Model/AppendAttributes.php
index 5aecb13b55f5..55cb7e21095e 100644
--- a/AdobeStockAsset/Model/AppendAttributes.php
+++ b/AdobeStockAsset/Model/AppendAttributes.php
@@ -70,19 +70,11 @@ public function execute(SearchResultInterface $searchResult): SearchResultInterf
             foreach ($items as $key => $item) {
                 $customAttributes = $item->getCustomAttributes();
 
-                //adding is_downloaded attribute
-                $isDownloadedValue = (int)isset($downloadedAssets[$item->getId()]);
-                $attribute = $this->attributeValueFactory->create();
-                $attribute->setAttributeCode(self::ATTRIBUTE_CODE_IS_DOWNLOADED);
-                $attribute->setValue($isDownloadedValue);
-                $customAttributes[self::ATTRIBUTE_CODE_IS_DOWNLOADED] = $attribute;
-
-                //adding path attribute
-                $pathValue = $downloadedAssets[$item->getId()][AssetInterface::PATH] ?? '';
-                $attribute = $this->attributeValueFactory->create();
-                $attribute->setAttributeCode(self::ATTRIBUTE_CODE_PATH);
-                $attribute->setValue($pathValue);
-                $customAttributes[self::ATTRIBUTE_CODE_PATH] = $attribute;
+                if (isset($downloadedAssets[$item->getId()])) {
+                    $assetData = $downloadedAssets[$item->getId()];
+                    $this->addIsDownloaded($customAttributes, $assetData);
+                    $this->addPath($customAttributes, $assetData);
+                }
 
                 $item->setCustomAttributes($customAttributes);
             }
@@ -90,4 +82,34 @@ public function execute(SearchResultInterface $searchResult): SearchResultInterf
 
         return $searchResult;
     }
+
+    /**
+     * Add is_downloaded attribute
+     *
+     * @param array|null $customAttributes
+     * @param array|null $assetData
+     */
+    private function addIsDownloaded(?array &$customAttributes, ?array $assetData)
+    {
+        $isDownloadedValue = (int)isset($assetData[AssetInterface::ID]);
+        $attribute = $this->attributeValueFactory->create();
+        $attribute->setAttributeCode(self::ATTRIBUTE_CODE_IS_DOWNLOADED);
+        $attribute->setValue($isDownloadedValue);
+        $customAttributes[self::ATTRIBUTE_CODE_IS_DOWNLOADED] = $attribute;
+    }
+
+    /**
+     * Add path attribute
+     *
+     * @param array|null $customAttributes
+     * @param array|null $assetData
+     */
+    private function addPath(?array &$customAttributes, ?array $assetData)
+    {
+        $pathValue = $assetData[AssetInterface::PATH] ?? '';
+        $attribute = $this->attributeValueFactory->create();
+        $attribute->setAttributeCode(self::ATTRIBUTE_CODE_PATH);
+        $attribute->setValue($pathValue);
+        $customAttributes[self::ATTRIBUTE_CODE_PATH] = $attribute;
+    }
 }
diff --git a/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/image-preview.js b/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/image-preview.js
index fba291005a83..fd2b0f5c5583 100644
--- a/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/image-preview.js
+++ b/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/image-preview.js
@@ -22,6 +22,8 @@ define([
             adobeStockModalSelector: '#adobe-stock-images-search-modal',
             chipsProvider: 'componentType = filtersChips, ns = ${ $.ns }',
             searchChipsProvider: 'componentType = keyword_search, ns = ${ $.ns }',
+            jsTreeRootFolderName: 'Storage Root',
+            jsTreeFolderNameMaxLength: 20,
             inputValue: '',
             chipInputValue: '',
             keywordsLimit: 5,
@@ -348,40 +350,44 @@ define([
          * @param record
          */
         locate: function (record) {
+            $.ajaxSetup({async: false});
             $(this.adobeStockModalSelector).trigger('closeModal');
-            var imageFilename, imagePath = record.path.replace(/^\/+/, '');
-            var imagePathParts = imagePath.split( '/' );
-            var imageFolder = false;
-            var folderFileNameMaxLength = 20;
-            var rootFolderName = 'Storage Root';
-
-            /* folder name is being cut in file browser */
-            if (imagePathParts.length > 1){
+            var imagePath = record.path.replace(/^\/+/, '');
+            var imagePathParts = imagePath.split('/');
+            var imageFilename = imagePath;
+            var imageFolderName = this.jsTreeRootFolderName;
+
+            if (imagePathParts.length > 1) {
                 imageFilename = imagePathParts[imagePathParts.length - 1];
-                imageFolder = imagePathParts[0];
-                if (imageFolder.length > folderFileNameMaxLength){
-                    imageFolder = imageFolder.substring(0, folderFileNameMaxLength) + '...';
+                imageFolderName = imagePathParts[imagePathParts.length - 2];
+
+                for (var i = 0; i < imagePathParts.length - 2; i++) {
+                    var folderName = imagePathParts[i];
+
+                    /* folder name is being cut in file browser */
+                    if (folderName.length > this.jsTreeFolderNameMaxLength) {
+                        folderName = folderName.substring(0, this.jsTreeFolderNameMaxLength) + '...';
+                    }
+
+                    //var folderSelector = ".jstree a:contains('" + folderName + "')";
+                    var openFolderChildrenButton = $(".jstree a:contains('" + folderName + "')").prev('.jstree-icon');
+                    if (openFolderChildrenButton.length) {
+                        openFolderChildrenButton.click();
+                    }
                 }
-            } else {
-                imageFilename = imagePath;
-                imageFolder = rootFolderName;
             }
 
             //select folder
-            if (imageFolder !== false){
-                var folderSelector = ".jstree a:contains('" + imageFolder+ "')";
-                var folder = $(folderSelector);
-                if (folder.length){
-                    folder[0].click();
+            var imageFolder = $(".jstree a:contains('" + imageFolderName + "')");
+            if (imageFolder.length) {
+                imageFolder.click();
+                //select image
+                var locatedImage = $("div[data-row='file']:has(img[alt=\"" + imageFilename + "\"])");
+                if (locatedImage.length) {
+                    locatedImage.click();
                 }
             }
-
-            /** TODO: if image is in folder it can not be found because "select folder" step is not completed yet */
-            var fileSelector = 'div[data-row="file"]:has(img[alt="' + record.path.replace(/^\/+/, '') + '"])';
-            var file = $(fileSelector);
-            if (file.length){
-                file.click();
-            }
+            $.ajaxSetup({async: true});
         },
 
         /**

From 97d134375e7426e85efdd25b8204d6ed280fbde5 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 1 Oct 2019 12:39:02 +0100
Subject: [PATCH 5/6] magento/adobe-stock-integration#406: Extracted loading
 from db and locate functionality to separate classes

---
 AdobeStockAsset/Model/AppendAttributes.php    | 101 ++++++++++--------
 .../ResourceModel/Asset/Command/Save.php      |   8 +-
 .../Model/ResourceModel/Asset/LoadByIds.php   |  75 +++++++++++++
 AdobeStockAsset/etc/di.xml                    |  10 ++
 .../components/grid/column/image-preview.js   |  43 +-------
 .../view/adminhtml/web/js/media-gallery.js    |  59 ++++++++++
 6 files changed, 207 insertions(+), 89 deletions(-)
 create mode 100644 AdobeStockAsset/Model/ResourceModel/Asset/LoadByIds.php
 create mode 100644 AdobeStockImageAdminUi/view/adminhtml/web/js/media-gallery.js

diff --git a/AdobeStockAsset/Model/AppendAttributes.php b/AdobeStockAsset/Model/AppendAttributes.php
index 55cb7e21095e..3bee9f271238 100644
--- a/AdobeStockAsset/Model/AppendAttributes.php
+++ b/AdobeStockAsset/Model/AppendAttributes.php
@@ -8,8 +8,9 @@
 
 namespace Magento\AdobeStockAsset\Model;
 
-use Magento\AdobeStockAssetApi\Api\Data\AssetInterface;
+use Magento\AdobeStockAsset\Model\ResourceModel\Asset\LoadByIds;
 use Magento\Framework\Api\AttributeValueFactory;
+use Magento\Framework\Api\Search\DocumentInterface;
 use Magento\Framework\Api\Search\SearchResultInterface;
 use Magento\Framework\App\ResourceConnection;
 
@@ -18,9 +19,8 @@
  */
 class AppendAttributes
 {
-    const TABLE_ASSET                  = 'adobe_stock_asset';
     const ATTRIBUTE_CODE_IS_DOWNLOADED = 'is_downloaded';
-    const ATTRIBUTE_CODE_PATH          = 'path';
+    const ATTRIBUTE_CODE_PATH = 'path';
 
     /**
      * @var AttributeValueFactory
@@ -33,16 +33,24 @@ class AppendAttributes
     private $resourceConnection;
 
     /**
-     * AddIsDownloadedToSearchResult constructor.
+     * @var LoadByIds
+     */
+    private $loadByIds;
+
+    /**
+     * AppendAttributes constructor.
      * @param ResourceConnection $resourceConnection
      * @param AttributeValueFactory $attributeValueFactory
+     * @param LoadByIds $loadByIds
      */
     public function __construct(
         ResourceConnection $resourceConnection,
-        AttributeValueFactory $attributeValueFactory
+        AttributeValueFactory $attributeValueFactory,
+        LoadByIds $loadByIds
     ) {
         $this->resourceConnection = $resourceConnection;
         $this->attributeValueFactory = $attributeValueFactory;
+        $this->loadByIds = $loadByIds;
     }
 
     /**
@@ -54,62 +62,65 @@ public function __construct(
     public function execute(SearchResultInterface $searchResult): SearchResultInterface
     {
         $items = $searchResult->getItems();
-        $itemIds = [];
 
-        foreach ($items as $key => $item) {
-            $itemIds[$key] = $item->getId();
+        if (empty($items)) {
+            return $searchResult;
         }
 
-        if (count($itemIds)) {
-            $connection = $this->resourceConnection->getConnection();
-            $select = $connection->select()
-                ->from(self::TABLE_ASSET)
-                ->where('id in (?)', $itemIds);
-            $downloadedAssets = $connection->fetchAssoc($select);
+        $ids = array_map(
+            function($item) {
+                return $item->getId();
+            },
+            $items
+        );
 
-            foreach ($items as $key => $item) {
-                $customAttributes = $item->getCustomAttributes();
 
-                if (isset($downloadedAssets[$item->getId()])) {
-                    $assetData = $downloadedAssets[$item->getId()];
-                    $this->addIsDownloaded($customAttributes, $assetData);
-                    $this->addPath($customAttributes, $assetData);
-                }
+        $assets = $this->loadByIds->execute($ids);
 
-                $item->setCustomAttributes($customAttributes);
+        foreach ($items as $key => $item) {
+            if (!isset($assets[$item->getId()])) {
+                $this->addAttributes(
+                    $item,
+                    [
+                        self::ATTRIBUTE_CODE_IS_DOWNLOADED => 0,
+                        self::ATTRIBUTE_CODE_PATH => ''
+                    ]
+                );
+                continue;
             }
+
+            $this->addAttributes(
+                $item,
+                [
+                    self::ATTRIBUTE_CODE_IS_DOWNLOADED => 1,
+                    self::ATTRIBUTE_CODE_PATH => $assets[$item->getId()]->getPath()
+                ]
+            );
         }
 
         return $searchResult;
     }
 
     /**
-     * Add is_downloaded attribute
+     * Add attributes to document
      *
-     * @param array|null $customAttributes
-     * @param array|null $assetData
+     * @param DocumentInterface $document
+     * @param array $attributes [code => value]
+     * @return DocumentInterface
      */
-    private function addIsDownloaded(?array &$customAttributes, ?array $assetData)
+    private function addAttributes(DocumentInterface $document, array $attributes): DocumentInterface
     {
-        $isDownloadedValue = (int)isset($assetData[AssetInterface::ID]);
-        $attribute = $this->attributeValueFactory->create();
-        $attribute->setAttributeCode(self::ATTRIBUTE_CODE_IS_DOWNLOADED);
-        $attribute->setValue($isDownloadedValue);
-        $customAttributes[self::ATTRIBUTE_CODE_IS_DOWNLOADED] = $attribute;
-    }
+        $customAttributes = $document->getCustomAttributes();
 
-    /**
-     * Add path attribute
-     *
-     * @param array|null $customAttributes
-     * @param array|null $assetData
-     */
-    private function addPath(?array &$customAttributes, ?array $assetData)
-    {
-        $pathValue = $assetData[AssetInterface::PATH] ?? '';
-        $attribute = $this->attributeValueFactory->create();
-        $attribute->setAttributeCode(self::ATTRIBUTE_CODE_PATH);
-        $attribute->setValue($pathValue);
-        $customAttributes[self::ATTRIBUTE_CODE_PATH] = $attribute;
+        foreach ($attributes as $code => $value) {
+            $attribute = $this->attributeValueFactory->create();
+            $attribute->setAttributeCode($code);
+            $attribute->setValue($value);
+            $customAttributes[$code] = $attribute;
+        }
+
+        $document->setCustomAttributes($customAttributes);
+
+        return $document;
     }
 }
diff --git a/AdobeStockAsset/Model/ResourceModel/Asset/Command/Save.php b/AdobeStockAsset/Model/ResourceModel/Asset/Command/Save.php
index 71e64d833be1..26a2b078219c 100644
--- a/AdobeStockAsset/Model/ResourceModel/Asset/Command/Save.php
+++ b/AdobeStockAsset/Model/ResourceModel/Asset/Command/Save.php
@@ -43,14 +43,14 @@ public function __construct(
     }
 
     /**
-     * Multiple save category
+     * Save asset
      *
-     * @param AssetInterface $assets
+     * @param AssetInterface $asset
      * @return void
      */
-    public function execute(AssetInterface $assets): void
+    public function execute(AssetInterface $asset): void
     {
-        $data = $this->hydrator->extract($assets);
+        $data = $this->hydrator->extract($asset);
         $tableName = $this->resourceConnection->getTableName(
             AssetResourceModel::ADOBE_STOCK_ASSET_TABLE_NAME
         );
diff --git a/AdobeStockAsset/Model/ResourceModel/Asset/LoadByIds.php b/AdobeStockAsset/Model/ResourceModel/Asset/LoadByIds.php
new file mode 100644
index 000000000000..b697dc891898
--- /dev/null
+++ b/AdobeStockAsset/Model/ResourceModel/Asset/LoadByIds.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AdobeStockAsset\Model\ResourceModel\Asset;
+
+use Magento\AdobeStockAssetApi\Api\Data\AssetInterfaceFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\AdobeStockAssetApi\Api\Data\AssetInterface;
+use Magento\AdobeStockAsset\Model\ResourceModel\Asset as AssetResourceModel;
+use Magento\Framework\EntityManager\Hydrator;
+
+/**
+ * Save multiple asset service.
+ */
+class LoadByIds
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var Hydrator $hydrator
+     */
+    private $hydrator;
+
+    /**
+     * @var AssetInterfaceFactory
+     */
+    private $factory;
+
+    /**
+     * Save constructor.
+     *
+     * @param ResourceConnection $resourceConnection
+     * @param Hydrator $hydrate
+     */
+    public function __construct(
+        AssetInterfaceFactory $factory,
+        ResourceConnection $resourceConnection,
+        Hydrator $hydrate
+    ) {
+        $this->factory = $factory;
+        $this->resourceConnection = $resourceConnection;
+        $this->hydrator = $hydrate;
+    }
+
+    /**
+     * Load assets by ids
+     *
+     * @param \int[] $ids
+     * @return AssetInterface[]
+     */
+    public function execute(array $ids): array
+    {
+        $connection = $this->resourceConnection->getConnection();
+        $select = $connection->select()
+            ->from(AssetResourceModel::ADOBE_STOCK_ASSET_TABLE_NAME)
+            ->where('id in (?)', $ids);
+        $data = $connection->fetchAssoc($select);
+
+        $assets = [];
+
+        foreach ($data as $id => $assetData) {
+            $asset = $this->factory->create();
+            $assets[$id] = $this->hydrator->hydrate($asset, $assetData);
+        }
+
+        return $assets;
+    }
+}
diff --git a/AdobeStockAsset/etc/di.xml b/AdobeStockAsset/etc/di.xml
index 2916ddeebaf9..decbdacfee01 100644
--- a/AdobeStockAsset/etc/di.xml
+++ b/AdobeStockAsset/etc/di.xml
@@ -69,4 +69,14 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\EntityManager\MetadataPool">
+        <arguments>
+            <argument name="metadata" xsi:type="array">
+                <item name="Magento\AdobeStockAssetApi\Api\Data\AssetInterface" xsi:type="array">
+                    <item name="entityTableName" xsi:type="string">adobe_stock_asset</item>
+                    <item name="identifierField" xsi:type="string">id</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/image-preview.js b/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/image-preview.js
index 02b0f424cf58..e63f9c251e03 100644
--- a/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/image-preview.js
+++ b/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/image-preview.js
@@ -10,20 +10,19 @@ define([
     'Magento_AdobeIms/js/action/authorization',
     'Magento_AdobeUi/js/components/grid/column/image-preview',
     'Magento_AdobeStockImageAdminUi/js/model/messages',
+    'Magento_AdobeStockImageAdminUi/js/media-gallery',
     'Magento_Ui/js/modal/confirm',
     'Magento_Ui/js/modal/prompt',
     'Magento_AdobeIms/js/user',
     'Magento_AdobeStockAdminUi/js/config',
     'mage/backend/tabs'
-], function (_, $, ko, translate, authorizationAction, imagePreview, messages, confirmation, prompt, user, config) {
+], function (_, $, ko, translate, authorizationAction, imagePreview, messages, mediaGallery, confirmation, prompt, user, config) {
     'use strict';
 
     return imagePreview.extend({
         defaults: {
             chipsProvider: 'componentType = filtersChips, ns = ${ $.ns }',
             searchChipsProvider: 'componentType = keyword_search, ns = ${ $.ns }',
-            jsTreeRootFolderName: 'Storage Root',
-            jsTreeFolderNameMaxLength: 20,
             filterChipsProvider: 'componentType = filters, ns = ${ $.ns }',
             inputValue: '',
             chipInputValue: '',
@@ -369,44 +368,8 @@ define([
          * @param record
          */
         locate: function (record) {
-            $.ajaxSetup({async: false});
             $(config.adobeStockModalSelector).trigger('closeModal');
-            var imagePath = record.path.replace(/^\/+/, '');
-            var imagePathParts = imagePath.split('/');
-            var imageFilename = imagePath;
-            var imageFolderName = this.jsTreeRootFolderName;
-
-            if (imagePathParts.length > 1) {
-                imageFilename = imagePathParts[imagePathParts.length - 1];
-                imageFolderName = imagePathParts[imagePathParts.length - 2];
-
-                for (var i = 0; i < imagePathParts.length - 2; i++) {
-                    var folderName = imagePathParts[i];
-
-                    /* folder name is being cut in file browser */
-                    if (folderName.length > this.jsTreeFolderNameMaxLength) {
-                        folderName = folderName.substring(0, this.jsTreeFolderNameMaxLength) + '...';
-                    }
-
-                    //var folderSelector = ".jstree a:contains('" + folderName + "')";
-                    var openFolderChildrenButton = $(".jstree a:contains('" + folderName + "')").prev('.jstree-icon');
-                    if (openFolderChildrenButton.length) {
-                        openFolderChildrenButton.click();
-                    }
-                }
-            }
-
-            //select folder
-            var imageFolder = $(".jstree a:contains('" + imageFolderName + "')");
-            if (imageFolder.length) {
-                imageFolder[0].click();
-                //select image
-                var locatedImage = $("div[data-row='file']:has(img[alt=\"" + imageFilename + "\"])");
-                if (locatedImage.length) {
-                    locatedImage.click();
-                }
-            }
-            $.ajaxSetup({async: true});
+            mediaGallery.locate(record.path);
         },
 
         /**
diff --git a/AdobeStockImageAdminUi/view/adminhtml/web/js/media-gallery.js b/AdobeStockImageAdminUi/view/adminhtml/web/js/media-gallery.js
new file mode 100644
index 000000000000..a98a0449dc3b
--- /dev/null
+++ b/AdobeStockImageAdminUi/view/adminhtml/web/js/media-gallery.js
@@ -0,0 +1,59 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    return {
+        jsTreeRootFolderName: 'Storage Root',
+        jsTreeFolderNameMaxLength: 20,
+
+        /**
+         * Locate downloaded image in media browser
+         *
+         * @param {String} path
+         */
+        locate: function (path) {
+            $.ajaxSetup({async: false});
+            var imagePath = path.replace(/^\/+/, '');
+            var imagePathParts = imagePath.split('/');
+            var imageFilename = imagePath;
+            var imageFolderName = this.jsTreeRootFolderName;
+
+            if (imagePathParts.length > 1) {
+                imageFilename = imagePathParts[imagePathParts.length - 1];
+                imageFolderName = imagePathParts[imagePathParts.length - 2];
+
+                for (var i = 0; i < imagePathParts.length - 2; i++) {
+                    var folderName = imagePathParts[i];
+
+                    /* folder name is being cut in file browser */
+                    if (folderName.length > this.jsTreeFolderNameMaxLength) {
+                        folderName = folderName.substring(0, this.jsTreeFolderNameMaxLength) + '...';
+                    }
+
+                    //var folderSelector = ".jstree a:contains('" + folderName + "')";
+                    var openFolderChildrenButton = $(".jstree a:contains('" + folderName + "')").prev('.jstree-icon');
+                    if (openFolderChildrenButton.length) {
+                        openFolderChildrenButton.click();
+                    }
+                }
+            }
+
+            //select folder
+            var imageFolder = $(".jstree a:contains('" + imageFolderName + "')");
+            if (imageFolder.length) {
+                imageFolder[0].click();
+                //select image
+                var locatedImage = $("div[data-row='file']:has(img[alt=\"" + imageFilename + "\"])");
+                if (locatedImage.length) {
+                    locatedImage.click();
+                }
+            }
+            $.ajaxSetup({async: true});
+        }
+    }
+});

From caf2c35faf9bacf87e5252d5441e03be519e0e8b Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 1 Oct 2019 14:25:53 +0100
Subject: [PATCH 6/6] magento/adobe-stock-integration#406: Fixed static tests

---
 AdobeStockAsset/Model/AppendAttributes.php              | 3 +--
 AdobeStockAsset/Model/ResourceModel/Asset/LoadByIds.php | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/AdobeStockAsset/Model/AppendAttributes.php b/AdobeStockAsset/Model/AppendAttributes.php
index 3bee9f271238..1cc75d07bec3 100644
--- a/AdobeStockAsset/Model/AppendAttributes.php
+++ b/AdobeStockAsset/Model/AppendAttributes.php
@@ -68,13 +68,12 @@ public function execute(SearchResultInterface $searchResult): SearchResultInterf
         }
 
         $ids = array_map(
-            function($item) {
+            function ($item) {
                 return $item->getId();
             },
             $items
         );
 
-
         $assets = $this->loadByIds->execute($ids);
 
         foreach ($items as $key => $item) {
diff --git a/AdobeStockAsset/Model/ResourceModel/Asset/LoadByIds.php b/AdobeStockAsset/Model/ResourceModel/Asset/LoadByIds.php
index b697dc891898..43a5b313ef5e 100644
--- a/AdobeStockAsset/Model/ResourceModel/Asset/LoadByIds.php
+++ b/AdobeStockAsset/Model/ResourceModel/Asset/LoadByIds.php
@@ -34,8 +34,7 @@ class LoadByIds
     private $factory;
 
     /**
-     * Save constructor.
-     *
+     * @param AssetInterfaceFactory $factory
      * @param ResourceConnection $resourceConnection
      * @param Hydrator $hydrate
      */