Resolved merge conflict

Author: konarshankar07

.coveralls.yml

@@ -88,7 +88,7 @@ public function execute() : ResultInterface
             $message = __('An error occurred during test Adobe Stock API connection');
             $isConnectionEstablished = false;
         }
-        /** @var Json $resultJson */
+
         $resultJson = $this->resultJsonFactory->create();
         return $resultJson->setData(
             [

.travis.yml

@@ -5,6 +5,6 @@
  */
 -->
 <div if="visible" attr="class: messageClass" translate="message"></div>
-<button class="scalable" type="button" data-bind="click: testConnection" data-ui-id="adobe-stock-integration-buttons-test-connection">
+<button class="scalable" type="button" click="testConnection" data-ui-id="adobe-stock-integration-buttons-test-connection">
     <span text="buttonLabel"></span>
 </button>

AdobeStockAdminUi/Controller/Adminhtml/System/Config/TestConnection.php

@@ -11,7 +11,7 @@
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Api\Search\Document;
 use Magento\Framework\Api\Search\SearchResultInterface;
-use Magento\MediaGalleryApi\Model\Asset\Command\GetByIdInterface;
+use Magento\MediaGalleryApi\Api\GetAssetsByIdsInterface;
 
 /**
  * Class is used for adding an additional assets attributes such as is_downloaded or path to the search results
@@ -33,23 +33,23 @@ class AppendAttributes
     private $loadByIds;
 
     /**
-     * @var GetByIdInterface
+     * @var GetAssetsByIdsInterface
      */
-    private $getMediaGalleryAssetById;
+    private $getMediaGalleryAssetsByIds;
 
     /**
      * @param AttributeValueFactory $attributeValueFactory
      * @param LoadByIdsInterface $loadByIds
-     * @param GetByIdInterface $getMediaGalleryAssetById
+     * @param GetAssetsByIdsInterface $getMediaGalleryAssetById
      */
     public function __construct(
         AttributeValueFactory $attributeValueFactory,
         LoadByIdsInterface $loadByIds,
-        GetByIdInterface $getMediaGalleryAssetById
+        GetAssetsByIdsInterface $getMediaGalleryAssetById
     ) {
         $this->attributeValueFactory = $attributeValueFactory;
         $this->loadByIds = $loadByIds;
-        $this->getMediaGalleryAssetById = $getMediaGalleryAssetById;
+        $this->getMediaGalleryAssetsByIds = $getMediaGalleryAssetById;
     }
 
     /**
@@ -89,9 +89,9 @@ static function ($item) {
                 continue;
             }
 
-            $path = $this->getMediaGalleryAssetById->execute(
-                $assets[$item->getId()]->getMediaGalleryId()
-            )->getPath();
+            $path = $this->getMediaGalleryAssetsByIds->execute(
+                [$assets[$item->getId()]->getMediaGalleryId()]
+            )[0]->getPath();
 
             $this->addAttributes(
                 $item,

AdobeStockAdminUi/view/adminhtml/web/template/connection.html

@@ -116,7 +116,6 @@ public function save(AssetInterface $asset): void
     public function getList(SearchCriteriaInterface $searchCriteria): AssetSearchResultsInterface
     {
         try {
-            /** @var AssetCollection $collection */
             $collection = $this->collectionFactory->create();
             $this->joinProcessor->process(
                 $collection,
@@ -125,7 +124,6 @@ public function getList(SearchCriteriaInterface $searchCriteria): AssetSearchRes
 
             $this->collectionProcessor->process($searchCriteria, $collection);
 
-            /** @var AssetSearchResultsInterface $searchResults */
             $searchResults = $this->searchResultFactory->create();
             $searchResults->setItems($collection->getItems());
             $searchResults->setSearchCriteria($searchCriteria);

AdobeStockAsset/Model/AppendAttributes.php

@@ -116,7 +116,6 @@ public function delete(CategoryInterface $item): void
      */
     public function getList(SearchCriteriaInterface $searchCriteria) : CategorySearchResultsInterface
     {
-        /** @var CategoryCollection $collection */
         $collection = $this->collectionFactory->create();
         $this->joinProcessor->process(
             $collection,
@@ -125,7 +124,6 @@ public function getList(SearchCriteriaInterface $searchCriteria) : CategorySearc
 
         $this->collectionProcessor->process($searchCriteria, $collection);
 
-        /** @var CategorySearchResultsInterface $searchResults */
         $searchResults = $this->searchResultFactory->create();
         $searchResults->setItems($collection->getItems());
         $searchResults->setSearchCriteria($searchCriteria);

AdobeStockAsset/Model/AssetRepository.php

@@ -113,7 +113,6 @@ public function delete(CreatorInterface $item): void
      */
     public function getList(SearchCriteriaInterface $searchCriteria) : CreatorSearchResultsInterface
     {
-        /** @var CreatorCollection $collection */
         $collection = $this->collectionFactory->create();
         $this->joinProcessor->process(
             $collection,
@@ -122,7 +121,6 @@ public function getList(SearchCriteriaInterface $searchCriteria) : CreatorSearch
 
         $this->collectionProcessor->process($searchCriteria, $collection);
 
-        /** @var CreatorSearchResultsInterface $searchResults */
         $searchResults = $this->searchResultFactory->create();
         $searchResults->setItems($collection->getItems());
         $searchResults->setSearchCriteria($searchCriteria);

AdobeStockAsset/Model/CategoryRepository.php

@@ -76,7 +76,13 @@ public function execute(SearchCriteriaInterface $searchCriteria): SearchResultIn
                 __(
                     'Failed to authenticate to Adobe Stock API. <br> Please correct the API credentials in '
                     . '<a href="%1">Configuration → System → Adobe Stock Integration.</a>',
-                    $this->url->getUrl('adminhtml/system_config/edit/section/system')
+                    $this->url->getUrl(
+                        'adminhtml/system_config/edit',
+                        [
+                            'section' => 'system',
+                            '_fragment' => 'system_adobe_stock_integration-link'
+                        ]
+                    )
                 ),
                 $exception
             );

AdobeStockAsset/Model/CreatorRepository.php

@@ -57,7 +57,6 @@ public function __construct(
     public function execute(int $adobeStockAssetId): void
     {
         try {
-            /** @var AdapterInterface $connection */
             $connection = $this->resourceConnection->getConnection();
             $tableName = $this->resourceConnection->getTableName(self::ADOBE_STOCK_ASSET_TABLE_NAME);
             $connection->delete($tableName, [self::ADOBE_STOCK_ASSET_ID . ' = ?' => $adobeStockAssetId]);