Merge branch 'v0.19.4' of https://github.com/GiritInteractive/magento…

…2-module-cloudinary
cloudinary · Feb 7, 2023 · 48dc7fb · 48dc7fb
2 parents e69bc91 + ea137b0
commit 48dc7fb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/Core/CloudinaryImageProvider.php b/Core/CloudinaryImageProvider.php
@@ -99,6 +99,11 @@ public function upload(Image $image)
                 (string)$image,
                 $this->configuration->getUploadConfig()->toArray() + [ "folder" => $image->getRelativeFolder()]
             );
+            if (isset($uploadResult['public_id'])) {
+                $publicIds = [$uploadResult['public_id']];
+                $metadata = "cld_mag_plugin=1";
+                $this->uploader->addContext($metadata, $publicIds);
+            }
             return $this->uploadResponseValidator->validateResponse($image, $uploadResult);
         } catch (\Exception $e) {
             ApiError::throwWith($image, $e->getMessage());

diff --git a/Plugin/Ui/Component/Form/Element/DataType/Media.php b/Plugin/Ui/Component/Form/Element/DataType/Media.php
@@ -62,8 +62,11 @@ protected function isGallerySupported()
      */
     public function afterPrepare(\Magento\Ui\Component\Form\Element\DataType\Media $component, $result = null)
     {
-        if ($this->appState->getAreaCode() === Area::AREA_ADMINHTML && ($cloudinaryMLoptions = $this->mediaLibraryHelper->getCloudinaryMLOptions(false))) {
-            $uploaderConfigUrl = $component->getData('config/uploaderConfig/url');
+        if ($this->appState->getAreaCode() === Area::AREA_ADMINHTML
+            && ($cloudinaryMLoptions = $this->mediaLibraryHelper->getCloudinaryMLOptions(false))
+            && ($uploaderConfigUrl = $component->getData('config/uploaderConfig/url'))
+        ) {
+
             if (strpos($uploaderConfigUrl, '/design_config_fileUploader/') !== false) {
                 $type = 'design_config_fileUploader';
             } elseif (strpos($uploaderConfigUrl, '/category_image/') !== false) {

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "cloudinary/cloudinary-magento2",
     "description": "Cloudinary Magento 2 Integration.",
     "type": "magento2-module",
-    "version": "1.19.3",
+    "version": "1.19.4",
     "license": "MIT",
     "require": {
         "cloudinary/cloudinary_php": ">=2.7 <2.8.1",

diff --git a/etc/module.xml b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-  <module name="Cloudinary_Cloudinary" setup_version="1.19.3">
+  <module name="Cloudinary_Cloudinary" setup_version="1.19.4">
       <sequence>
           <module name="Magento_ProductVideo"/>
           <module name="Magento_PageBuilder"/>