magento#1515: Add keywords field to the edit image description slide …

…panel - fixed merge conflict

AdobeStockImage/Model/Extract/MediaGalleryAsset.php

@@ -55,7 +55,8 @@ public function convert(Document $document, array $additionalData = []): AssetIn
             'height' => $assetData['height'],
             'size' => $assetData['size'],
             'contentType' => $assetData['content_type'],
-            'source' => $assetData['source']
+            'source' => $assetData['source'],
+            'hash' => $assetData['hash']
         ]);
     }
 }

AdobeStockImage/Model/SaveMediaGalleryAsset.php

@@ -13,6 +13,8 @@
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Filesystem;
 use Magento\MediaGalleryApi\Api\SaveAssetsInterface;
+use Magento\MediaGallerySynchronizationApi\Model\GetContentHashInterface;
+use Magento\Framework\Exception\FileSystemException;
 
 /**
  * Process save action of the media gallery asset.
@@ -29,6 +31,11 @@ class SaveMediaGalleryAsset
      */
     private $documentToMediaGalleryAsset;
 
+    /**
+     * @var GetContentHashInterface
+     */
+    private $getContentHash;
+
     /**
      * @var Filesystem
      */
@@ -37,15 +44,18 @@ class SaveMediaGalleryAsset
     /**
      * @param SaveAssetsInterface $saveMediaAsset
      * @param DocumentToMediaGalleryAsset $documentToMediaGalleryAsset
+     * @param GetContentHashInterface $getContentHash
      * @param Filesystem $fileSystem
      */
     public function __construct(
         SaveAssetsInterface $saveMediaAsset,
         DocumentToMediaGalleryAsset $documentToMediaGalleryAsset,
+        GetContentHashInterface $getContentHash,
         Filesystem $fileSystem
     ) {
         $this->saveMediaAsset = $saveMediaAsset;
         $this->documentToMediaGalleryAsset = $documentToMediaGalleryAsset;
+        $this->getContentHash = $getContentHash;
         $this->fileSystem = $fileSystem;
     }
 
@@ -66,6 +76,7 @@ public function execute(Document $document, string $destinationPath): void
                 'path' => $destinationPath,
                 'source' => 'Adobe Stock',
                 'size' => $fileSize,
+                'hash' => $this->hashImageContent($destinationPath)
             ];
 
             $mediaGalleryAsset = $this->documentToMediaGalleryAsset->convert($document, $additionalData);
@@ -86,4 +97,19 @@ private function calculateFileSize(string $destinationPath): int
         $mediaDirectory = $this->fileSystem->getDirectoryRead(DirectoryList::MEDIA);
         return $mediaDirectory->stat($mediaDirectory->getAbsolutePath($destinationPath))['size'];
     }
+
+    /**
+     * Hash image content.
+     *
+     * @param string $destinationPath
+     * @return string
+     * @throws FileSystemException
+     */
+    private function hashImageContent(string $destinationPath): string
+    {
+        $mediaDirectory = $this->fileSystem->getDirectoryRead(DirectoryList::MEDIA);
+        $imageContent = $mediaDirectory->readFile($mediaDirectory->getAbsolutePath($destinationPath));
+        $hashedImageContent = $this->getContentHash->execute($imageContent);
+        return $hashedImageContent;
+    }
 }

AdobeStockImage/Test/Unit/Model/SaveMediaGalleryAssetTest.php

@@ -17,6 +17,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\MediaGallery\Model\Asset;
 use Magento\MediaGalleryApi\Api\SaveAssetsInterface;
+use Magento\MediaGallerySynchronizationApi\Model\GetContentHashInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -51,12 +52,18 @@ class SaveMediaGalleryAssetTest extends TestCase
      */
     private $saveMediaAsset;
 
+    /**
+     * @var GetContentHashInterface|MockObject
+     */
+    private $getContentHash;
+
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
         $this->saveAssets = $this->createMock(SaveAssetsInterface::class);
+        $this->getContentHash = $this->createMock(GetContentHashInterface::class);
         $this->converter = $this->createMock(DocumentToMediaGalleryAsset::class);
         $this->filesystem = $this->createMock(Filesystem::class);
         $this->mediaDirectory = $this->createMock(Read::class);
@@ -84,12 +91,12 @@ public function testExecute(): void
         $document = $this->createMock(Document::class);
         $destinationPath = 'path';
 
-        $this->filesystem->expects($this->once())
+        $this->filesystem->expects($this->atLeastOnce())
             ->method('getDirectoryRead')
             ->with(DirectoryList::MEDIA)
             ->willReturn($this->mediaDirectory);
 
-        $this->mediaDirectory->expects($this->once())
+        $this->mediaDirectory->expects($this->atLeastOnce())
             ->method('getAbsolutePath')
             ->with($destinationPath)
             ->willReturn('root/pub/media/catalog/test-image.jpeg');
@@ -99,11 +106,18 @@ public function testExecute(): void
             ->method('stat')
             ->willReturn(['size' => $fileSize]);
 
+        $hash = 'hash';
+
+        $this->mediaDirectory->expects($this->once())
+            ->method('readFile')
+            ->willReturn($hash);
+
         $additionalData = [
             'id' => null,
             'path' => $destinationPath,
             'source' => 'Adobe Stock',
             'size' => $fileSize,
+            'hash' => $this->getContentHash->execute($hash)
         ];
         $mediaGalleryAssetMock = $this->createMock(Asset::class);
         $this->converter->expects($this->once())

AdobeStockImage/composer.json

@@ -8,6 +8,7 @@
         "magento/module-adobe-stock-asset-api": "*",
         "magento/module-adobe-stock-image-api": "*",
         "magento/module-media-gallery-api": "*",
+        "magento/module-media-gallery-synchronization-api": "*",
         "magento/module-cms": "*"
     },
     "suggest": {

AdobeStockImageAdminUi/view/adminhtml/web/js/mediaGallery/grid/columns/image/licenseActions.js

@@ -83,14 +83,14 @@ define([
          * @param {Number} imageId
          */
         getImageRecord: function (imageId) {
-            getDetails(this.imageDetailsUrl, imageId).then(function (imageDetails) {
-                var id = imageDetails['adobe_stock'][0].value;
+            getDetails(this.imageDetailsUrl, [imageId]).then(function (imageDetails) {
+                var id = imageDetails[imageId]['adobe_stock'][0].value;
 
                 this.image().actions().licenseProcess(
                     id,
-                    imageDetails.title,
-                    imageDetails.path,
-                    imageDetails['content_type'],
+                    imageDetails[imageId].title,
+                    imageDetails[imageId].path,
+                    imageDetails[imageId]['content_type'],
                     true
                 ).then(function () {
                     this.image().actions().login().getUserQuota();

MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js

@@ -19,6 +19,7 @@ define([
             filterChipsProvider: 'componentType = filters, ns = ${ $.ns }',
             directoryTreeSelector: '#media-gallery-directory-tree',
             getDirectoryTreeUrl: 'media_gallery/directories/gettree',
+            jsTreeReloaded: null,
             modules: {
                 directories: '${ $.name }_directories',
                 filterChips: '${ $.filterChipsProvider }'
@@ -45,8 +46,9 @@ define([
                     return $(this.directoryTreeSelector).length === 0;
                 }.bind(this),
                 function () {
-                    this.renderDirectoryTree();
-                    this.initEvents();
+                    this.renderDirectoryTree().then(function () {
+                        this.initEvents();
+                    }.bind(this));
                 }.bind(this)
             );
 
@@ -57,17 +59,32 @@ define([
          * Render directory tree component.
          */
         renderDirectoryTree: function () {
+            var deferred = $.Deferred();
+
             this.getJsonTree().then(function (data) {
                 this.createFolderIfNotExists(data).then(function (isFolderCreated) {
                     if (isFolderCreated) {
                         this.getJsonTree().then(function (newData) {
                             this.createTree(newData);
+                            deferred.resolve();
                         }.bind(this));
                     } else {
                         this.createTree(data);
+                        deferred.resolve();
                     }
                 }.bind(this));
             }.bind(this));
+
+            return deferred.promise();
+        },
+
+        /**
+         * Set jstree reloaded
+         *
+         * @param {Boolean} value
+         */
+        setJsTreeReloaded: function (value) {
+            this.jsTreeReloaded = value;
         },
 
         /**
@@ -98,19 +115,13 @@ define([
                         this.createDirectoryUrl,
                         pathArray
                     ).then(function () {
-                        deferred.resolve({
-                            result: true
-                        });
+                        deferred.resolve(true);
                     });
                 } else {
-                    deferred.resolve({
-                        result: false
-                    });
+                    deferred.resolve(false);
                 }
             } else {
-                deferred.resolve({
-                    result: false
-                });
+                deferred.resolve(false);
             }
 
             return deferred.promise();
@@ -203,21 +214,40 @@ define([
          *  Handle jstree events
          */
         initEvents: function () {
+            this.firejsTreeEvents();
             this.overrideMultiselectBehavior();
 
-            $(this.directoryTreeSelector).on('loaded.jstree', function () {
-                this.checkChipFiltersState();
-            }.bind(this));
-
             $(window).on('reload.MediaGallery', function () {
-                this.checkChipFiltersState();
+                this.getJsonTree().then(function (data) {
+                    this.createFolderIfNotExists(data).then(function (isCreated) {
+                        if (isCreated) {
+                            this.renderDirectoryTree().then(function () {
+                                this.setJsTreeReloaded(true);
+                                this.firejsTreeEvents();
+                            }.bind(this));
+                        } else {
+                            this.checkChipFiltersState();
+                        }
+                    }.bind(this));
+                }.bind(this));
             }.bind(this));
+        },
 
+        /**
+         * Fire event for jstree component
+         */
+        firejsTreeEvents: function () {
             $(this.directoryTreeSelector).on('select_node.jstree', function (element, data) {
                 var path = $(data.rslt.obj).data('path');
 
                 this.setActiveNodeFilter(path);
+                this.setJsTreeReloaded(false);
             }.bind(this));
+
+            $(this.directoryTreeSelector).on('loaded.jstree', function () {
+                this.checkChipFiltersState();
+            }.bind(this));
+
         },
 
         /**
@@ -295,7 +325,8 @@ define([
          * @param {String} nodePath
          */
         setActiveNodeFilter: function (nodePath) {
-            if (this.activeNode() === nodePath) {
+
+            if (this.activeNode() === nodePath && !this.jsTreeReloaded) {
                 this.selectStorageRoot();
             } else {
                 this.selectFolder(nodePath);
@@ -376,13 +407,8 @@ define([
 
             this.getJsonTree().then(function (data) {
                 this.createTree(data);
-                this.overrideMultiselectBehavior();
-                $(this.directoryTreeSelector).on('select_node.jstree', function (element, object) {
-                    var path = $(object.rslt.obj).data('path');
-
-                    this.setActiveNodeFilter(path);
-                }.bind(this));
-
+                this.setJsTreeReloaded(true);
+                this.initEvents();
                 deferred.resolve();
             }.bind(this));
 

MediaGalleryUi/view/adminhtml/web/js/image/image-actions.js

@@ -9,7 +9,8 @@ define([
     'uiElement',
     'Magento_MediaGalleryUi/js/action/deleteImageWithDetailConfirmation',
     'Magento_MediaGalleryUi/js/grid/columns/image/insertImageAction',
-    'Magento_MediaGalleryUi/js/action/saveDetails'
+    'Magento_MediaGalleryUi/js/action/saveDetails',
+    'mage/validation'
 ], function ($, _, Element, deleteImageWithDetailConfirmation, addSelected, saveDetails) {
     'use strict';
 
@@ -74,14 +75,17 @@ define([
             var saveDetailsUrl = this.mediaGalleryEditDetails().saveDetailsUrl,
                 modalElement = $(this.modalSelector);
 
-            saveDetails(
-                saveDetailsUrl,
-                modalElement.find('#image-edit-details-form')
-            ).then(function () {
-                this.closeModal();
-                this.imageModel().reloadGrid();
-            }.bind(this));
+            modalElement.find('#image-edit-details-form').validation();
 
+            if (modalElement.find('#image-edit-details-form').validation('isValid')) {
+                saveDetails(
+                    saveDetailsUrl,
+                    modalElement.find('#image-edit-details-form')
+                ).then(function () {
+                    this.closeModal();
+                    this.imageModel().reloadGrid();
+                }.bind(this));
+            }
         },
 
         /**