Merge pull request #1777 from Nazar65/ASI-1766

Update is_downloaded for displayed record that was applied from related or series tab

Author: sivaschenko

AdobeStockImageAdminUi/Controller/Adminhtml/Asset/GetMediaGalleryAsset.php

@@ -13,6 +13,7 @@
 use Magento\Framework\Controller\ResultFactory;
 use Psr\Log\LoggerInterface;
 use Magento\AdobeStockImageAdminUi\Model\Asset\GetMediaGalleryAssetByAdobeId;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * Backend controller for retrieving asset information by adobeId
@@ -61,7 +62,6 @@ public function execute()
     {
         $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
         try {
-
             $params = $this->getRequest()->getParams();
             $adobeId = isset($params['adobe_id']) ? $params['adobe_id'] : null;
 
@@ -78,6 +78,9 @@ public function execute()
 
             $responseCode = self::HTTP_OK;
             $responseContent = $this->getAssetByAdobeId->execute((int) $adobeId);
+        } catch (NoSuchEntityException $execption) {
+            $responseCode = self::HTTP_OK;
+            $responseContent = [];
         } catch (\Exception $exception) {
             $responseCode = self::HTTP_INTERNAL_ERROR;
             $this->logger->critical($exception);

AdobeStockImageAdminUi/Model/Asset/GetMediaGalleryAssetByAdobeId.php

@@ -12,6 +12,7 @@
 use Magento\MediaGalleryApi\Api\GetAssetsByIdsInterface;
 use Magento\MediaGalleryApi\Api\Data\AssetInterface;
 use Magento\Framework\Reflection\DataObjectProcessor;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * Return media gallery asset by adobe id
@@ -55,10 +56,22 @@ public function __construct(
      *
      * @param int $adobeId
      * @return array
+     * @throws NoSuchEntityException
      */
     public function execute(int $adobeId): array
     {
-        $mediaGalleryId = $this->getAssetByAdobeId->execute([$adobeId])[$adobeId]->getMediaGalleryId();
+        $mediaGalleryAsset = $this->getAssetByAdobeId->execute([$adobeId]);
+
+        if (!isset($mediaGalleryAsset[$adobeId])) {
+            throw new NoSuchEntityException(
+                __(
+                    'Media Gallery asset with adobe id %id does not exist.',
+                    ['id' => $adobeId]
+                )
+            );
+        }
+
+        $mediaGalleryId = $mediaGalleryAsset[$adobeId]->getMediaGalleryId();
         $asset = $this->getMediaGalleryAssetsById->execute([$mediaGalleryId]);
 
         return $this->objectProcessor->buildOutputDataArray(current($asset), AssetInterface::class);

AdobeStockImageAdminUi/view/adminhtml/web/css/source/_module.less

@@ -45,7 +45,7 @@
 
             &-preview {
                 position: fixed;
-                z-index: 299;
+                z-index: 289;
 
                 .container {
                     padding-top: 0;

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

@@ -170,6 +170,9 @@ define([
 
             this.mediaGalleryListingFilters().clear();
             this.getAssetDetails(imageId).then(function (assetDetails) {
+                if (assetDetails.length === 0) {
+                    return;
+                }
                 this.mediaGallerySearchInput().apply(assetDetails.title);
                 path = assetDetails.path;
                 path = path.substring(0, path.lastIndexOf('/'));