Refactor: Use DesignInterface for Hyvä Theme Detection in ProductGalleryHelper

Api/ProductGalleryManagementInterface.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace Cloudinary\Cloudinary\Api;
+
+interface ProductGalleryManagementInterface
+{
+
+    /**
+     * [!] DEPRECATED, please use addProductMedia() instead.
+     * Add product gallery item from Cloudinary URL.
+     * @method addItem
+     * @param  string        $url
+     * @param  string        $sku
+     * @param  string|null   $publicId
+     * @param  string|null   $roles
+     * @param  string|null   $label
+     * @param  bool|int|null $disabled
+     * @param  string        $cldspinset
+     * @return string
+     */
+    public function addItem($url = null, $sku = null, $publicId = null, $roles = null, $label = null, $disabled = 0, $cldspinset = null);
+
+    /**
+     * Add multiple gallery items to one or more products from Cloudinary URLs.
+     * @method addItems
+     * @param  mixed  $items
+     * @return string
+     */
+    public function addItems($items);
+
+    /**
+     * Add product gallery items from Cloudinary URLs.
+     * @method addItem
+     * @param  string  $sku
+     * @param  mixed   $urls
+     * @return string
+     */
+    public function addProductMedia($sku, $urls);
+
+    /**
+     * Get product gallery items as Cloudinary URLs.
+     * @method getProductMedia
+     * @param  string  $sku
+     * @return string
+     */
+    public function getProductMedia($sku);
+
+    /**
+     * Get products gallery items as Cloudinary URLs.
+     * @method getProductsMedia
+     * @param  mixed  $skus
+     * @return string
+     */
+    public function getProductsMedia($skus);
+
+
+    /** Remove Product images by publicIds
+     * @param string $sku
+     * @param mixed $urls
+     * @param bool | int | null $delete_all_gallery
+     * @return string
+     */
+    public function removeProductMedia($sku, $urls, $delete_all_gallery = 0);
+}

Api/ResourcesManagementInterface.php

@@ -7,13 +7,22 @@ interface ResourcesManagementInterface
 
     /**
      * GET for getImage api
+     *
      * @return string
      */
     public function getImage();
 
     /**
      * GET for getVideo api
+     *
      * @return string
      */
     public function getVideo();
+
+    /**
+     * GET for getSpinestFirstImage api
+     *
+     * @return string
+     */
+    public function getResourcesByTag();
 }

Api/SynchronisationRepositoryInterface.php

@@ -8,13 +8,13 @@
 interface SynchronisationRepositoryInterface
 {
     /**
-     * @param SearchCriteriaInterface $searchCriteria
+     * @param  SearchCriteriaInterface $searchCriteria
      * @return SearchResultsInterface
      */
     public function getList(SearchCriteriaInterface $searchCriteria);
 
     /**
-     * @param  string $imagePath
+     * @param string $imagePath
      *
      * @return SearchResultsInterface
      */

Block/Adminhtml/Cms/Wysiwyg/Images/Content.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace Cloudinary\Cloudinary\Block\Adminhtml\Cms\Wysiwyg\Images;
+
+use Cloudinary\Cloudinary\Helper\MediaLibraryHelper;
+use Magento\Backend\Block\Widget\Context;
+use Magento\Framework\Json\EncoderInterface;
+use Magento\Framework\App\ProductMetadataInterface;
+
+/**
+ * Wysiwyg Images content block
+ *
+ * @api
+ * @since 100.0.2
+ */
+class Content extends \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content
+{
+    /**
+     * MediaLibraryHelper
+     * @var array|null
+     */
+    protected $mediaLibraryHelper;
+
+
+    protected $productMetadata;
+
+    /**
+     * @param Context $context
+     * @param EncoderInterface $jsonEncoder
+     * @param MediaLibraryHelper $mediaLibraryHelper
+     * @param array $data
+     */
+    public function __construct(
+        Context $context,
+        EncoderInterface $jsonEncoder,
+        MediaLibraryHelper $mediaLibraryHelper,
+        ProductMetadataInterface $productMetadata,
+        array $data = []
+    ) {
+        parent::__construct($context, $jsonEncoder, $data);
+        $this->mediaLibraryHelper = $mediaLibraryHelper;
+        $this->productMetadata = $productMetadata;
+    }
+
+    /**
+     * Get Cloudinary media library widget options
+     *
+     * @param bool $multiple Allow multiple
+     * @param bool $refresh Refresh options
+     * @return string
+     */
+    public function getCloudinaryMediaLibraryWidgetOptions($multiple = false, $refresh = false)
+    {
+        if (!($cloudinaryMLoptions = $this->mediaLibraryHelper->getCloudinaryMLOptions($multiple, $refresh))) {
+            return null;
+        }
+
+        try {
+            if (version_compare($this->productMetadata->getVersion(), '2.3.5', '<=')) {
+                $imageUploadUrl = $this->_urlBuilder->addSessionParam()->getUrl('cloudinary/cms_wysiwyg_images/upload', ['type' => $this->_getMediaType()]);
+            } else {
+                $imageUploadUrl = $this->_urlBuilder->getUrl('cloudinary/cms_wysiwyg_images/upload', ['type' => $this->_getMediaType()]);
+            }
+
+            //Try to add session param on Magento versions prior to 2.3.5
+
+        } catch (\Exception $e) {
+            //Catch deprecation error on Magento 2.3.5 and above
+            throw new \Exception($e->getMessage());
+        }
+
+        return $this->_jsonEncoder->encode(
+            [
+            'cldMLid' => 'wysiwyg_media_gallery',
+            'imageUploaderUrl' => $imageUploadUrl,
+            'triggerSelector' => '.media-gallery-modal',
+            'triggerEvent' => 'fileuploaddone',
+            'cloudinaryMLoptions' => $cloudinaryMLoptions,
+            'addTmpExtension' => false,
+            'cloudinaryMLshowOptions' => $this->mediaLibraryHelper->getCloudinaryMLshowOptions("image"),
+            ]
+        );
+    }
+
+    /**
+     * Return current media type based on request or data
+     *
+     * @return string
+     */
+    protected function _getMediaType()
+    {
+        if ($this->hasData('media_type')) {
+            return $this->_getData('media_type');
+        }
+        return $this->getRequest()->getParam('type');
+    }
+}

Block/Adminhtml/Form/Field/Free.php

@@ -10,6 +10,7 @@
 
 class Free extends Field
 {
+    const XML_PATH_GLOBAL_TRANSFORMATION = 'cloudinary/transformations/cloudinary_free_transform_global';
     /**
      * @var ConfigurationInterface
      */
@@ -21,10 +22,10 @@ class Free extends Field
     private $model;
 
     /**
-     * @param Context $context
+     * @param Context                $context
      * @param ConfigurationInterface $configuration
-     * @param FreeBackendModel $model
-     * @param array $data
+     * @param FreeBackendModel       $model
+     * @param array                  $data
      */
     public function __construct(
         Context $context,
@@ -47,8 +48,12 @@ protected function _beforeToHtml()
         return $this;
     }
 
+    public function isCanPreviewTransformations() {
+        return $this->_scopeConfig->getValue(self::XML_PATH_GLOBAL_TRANSFORMATION);
+    }
+
     /**
-     * @param AbstractElement $element
+     * @param  AbstractElement $element
      * @return string
      */
     protected function _getElementHtml(AbstractElement $element)

Block/Adminhtml/Product/Edit/NewVideo.php

@@ -5,51 +5,80 @@
  */
 namespace Cloudinary\Cloudinary\Block\Adminhtml\Product\Edit;
 
+use Cloudinary\Cloudinary\Core\ConfigurationBuilder;
+use Cloudinary\Cloudinary\Core\ConfigurationInterface;
+use Magento\Backend\Block\Template\Context;
+use Magento\Framework\Data\FormFactory;
+use Magento\Framework\Json\EncoderInterface;
+use Magento\Framework\Registry;
+use Magento\Framework\UrlInterface;
+use Magento\ProductVideo\Helper\Media;
+
 /**
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  */
 class NewVideo extends \Magento\ProductVideo\Block\Adminhtml\Product\Edit\NewVideo
 {
+    /**
+     * @var array|null
+     */
     protected $_cloudinaryConfig;
 
     /**
-     * @var \Cloudinary\Cloudinary\Core\ConfigurationBuilder
+     * @var ConfigurationInterface
+     */
+    private $configuration;
+
+    /**
+     * @var ConfigurationBuilder
      */
     protected $_cloudinaryConfigurationBuilder;
 
     /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Framework\Data\FormFactory $formFactory
-     * @param \Magento\ProductVideo\Helper\Media $mediaHelper
-     * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
-     * @param \Cloudinary\Cloudinary\Core\ConfigurationBuilder $cloudinaryConfigurationBuilder
-     * @param array $data
+     * @method __construct
+     * @param  Context                $context
+     * @param  Registry               $registry
+     * @param  FormFactory            $formFactory
+     * @param  Media                  $mediaHelper
+     * @param  EncoderInterface       $jsonEncoder
+     * @param  ConfigurationInterface $configuration
+     * @param  ConfigurationBuilder   $cloudinaryConfigurationBuilder
+     * @param  array                  $data
      */
     public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Framework\Registry $registry,
-        \Magento\Framework\Data\FormFactory $formFactory,
-        \Magento\ProductVideo\Helper\Media $mediaHelper,
-        \Magento\Framework\Json\EncoderInterface $jsonEncoder,
-        \Cloudinary\Cloudinary\Core\ConfigurationBuilder $cloudinaryConfigurationBuilder,
+        Context $context,
+        Registry $registry,
+        FormFactory $formFactory,
+        Media $mediaHelper,
+        EncoderInterface $jsonEncoder,
+        ConfigurationInterface $configuration,
+        ConfigurationBuilder $cloudinaryConfigurationBuilder,
         array $data = []
     ) {
-        parent::__construct($context, $registry, $formFactory, $mediaHelper, $jsonEncoder, $data);
+        parent::__construct(
+            $context,
+            $registry,
+            $formFactory,
+            $mediaHelper,
+            $jsonEncoder,
+            $data
+        );
+        $this->configuration = $configuration;
         $this->_cloudinaryConfigurationBuilder = $cloudinaryConfigurationBuilder;
     }
 
     protected function getCloudinaryConfig()
     {
         if (is_null($this->_cloudinaryConfig)) {
             $this->_cloudinaryConfig = $this->_cloudinaryConfigurationBuilder->build();
-            if (!$this->_cloudinaryConfig['api_key'] || !$this->_cloudinaryConfig['api_secret'] || !$this->_cloudinaryConfig['cloud_name']) {
+            if (!$this->_cloudinaryConfig['cloud']['api_key'] || !$this->_cloudinaryConfig['cloud']['api_secret'] || !$this->_cloudinaryConfig['cloud']['cloud_name']) {
                 $this->_cloudinaryConfig = false;
             } else {
-                $this->_cloudinaryConfig['api_url'] = "https://api.cloudinary.com/v1_1/{$this->_cloudinaryConfig['cloud_name']}/";
+                $this->_cloudinaryConfig['cloud']['api_url'] = "https://api.cloudinary.com/v1_1/{$this->_cloudinaryConfig['cloud']['cloud_name']}/";
             }
         }
-        return $this->_cloudinaryConfig;
+
+        return $this->_cloudinaryConfig['cloud'];
     }
 
     /**
@@ -66,7 +95,7 @@ public function getWidgetOptions()
                 'htmlId' => $this->getHtmlId(),
                 'youTubeApiKey' => $this->mediaHelper->getYouTubeApiKey(),
                 'videoSelector' => $this->videoSelector,
-                'cloudinaryPlaceholder' => $this->getViewFileUrl('Cloudinary_Cloudinary::images/cloudinary_logo_for_white_bg.jpg')
+                'cloudinaryPlaceholder' => $this->getPlaceholderUrl(),
             ]
         );
     }
@@ -78,18 +107,24 @@ public function getWidgetOptions()
      */
     protected function getNoteVideoUrl()
     {
+        if (!$this->configuration->isModuleEnabled()) {
+            return parent::getNoteVideoUrl();
+        }
+
         $result = __('Supported: Vimeo');
         $messages = "";
         if ($this->mediaHelper->getYouTubeApiKey() === null) {
             $messages .= __('<br>*To add YouTube video, please <a href="%1">enter YouTube API Key</a> first.', $this->getConfigApiKeyUrl());
         } else {
             $result .= __(', YouTube');
         }
+
         if (!$this->getCloudinaryConfig()) {
             $messages .= __('<br>*To add Cloudinary video, please <a href="%1">enter your Cloudinary Account Credentials</a> first.', $this->getCloudinaryConfigUrl());
         } else {
             $result .= __(', Cloudinary');
         }
+
         return $result . $messages;
     }
 
@@ -107,4 +142,24 @@ protected function getCloudinaryConfigUrl()
             ]
         );
     }
+
+    /**
+     * @return string
+     */
+    protected function getPlaceholderUrl()
+    {
+        $storeManager = $this->configuration->getStoreManager();
+        $configPaths = [
+            'catalog/placeholder/image_placeholder',
+            'catalog/placeholder/small_image_placeholder',
+            'catalog/placeholder/thumbnail_placeholder',
+        ];
+        foreach ($configPaths as $configPath) {
+            if (($path = $storeManager->getStore()->getConfig($configPath))) {
+                return $storeManager->getStore()->getBaseUrl(UrlInterface::URL_TYPE_MEDIA) . 'catalog/product/placeholder/' . $path;
+                break;
+            }
+        }
+        return $this->getViewFileUrl('Cloudinary_Cloudinary::images/cloudinary_cloud_glyph_blue.png');
+    }
 }