Remove AdobeStockImageAdminUi Hard Dependency + fix to UpdateAdminImage

Author: arielien

Controller/Adminhtml/Ajax/UpdateAdminImage.php

@@ -107,12 +107,23 @@ public function execute()
                 }
 
                 $cleanUrl = $parsedUrl['scheme'] . '://' . $parsedUrl['host'] . $parsedUrl['path'];
-                $baseUrl = $this->storeManager->getStore()->getBaseUrl();
-                $relativePath = str_replace($baseUrl, '', $cleanUrl);
-                $relativePath = ltrim($relativePath, '/');
+
+                // Derive the relative path from the URL path component directly — the admin
+                // store's base URL doesn't always match the public storefront URL used by the
+                // media gallery, so str_replace($baseUrl, ...) can leave the host in the path.
+                $relativePath = ltrim($parsedUrl['path'], '/');
+
+                // Strip leading `pub/` when Magento is served from <docroot>/pub/.
+                $relativePath = preg_replace('#^pub/#', '', $relativePath);
+
+                // Strip the `.renditions/` segment so Cloudinary fetches the original image
+                // instead of the local PageBuilder/admin-gallery rendition derivative, which
+                // 404s through the auto-upload mapping (mapping points at the original path).
+                $relativePath = preg_replace('#(^|/)\.renditions/#', '$1', $relativePath);
+                $cleanUrl = preg_replace('#/\.renditions/#', '/', $cleanUrl);
 
                 // Create Image object and use UrlGenerator (same as storefront)
-                $image = Image::fromPath($remoteImageUrl, $relativePath);
+                $image = Image::fromPath($cleanUrl, $relativePath);
 
                 // Use UrlGenerator which handles all the logic including database mapping
                 $cloudinaryUrl = $this->urlGenerator->generateFor($image, $this->transformation);

view/adminhtml/ui_component/media_gallery_listing.xml

@@ -23,21 +23,4 @@
             <dep>media_gallery_listing.media_gallery_listing_data_source</dep>
         </deps>
     </settings>
-    <columns name="media_gallery_columns">
-        <column sortOrder="1" name="overlay" component="Magento_Ui/js/grid/columns/overlay" class="Magento\AdobeStockImageAdminUi\Ui\Component\Listing\Columns\UnlicensedOverlay">
-            <settings>
-                <label translate="true">Overlay</label>
-                <visible>true</visible>
-                <sortable>false</sortable>
-            </settings>
-        </column>
-        <column name="thumbnail_url" component="Magento_AdobeStockImageAdminUi/js/mediaGallery/grid/columns/licenseImage">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="imageDetailsurl" xsi:type="url" path="media_gallery/image/details"/>
-                    <item name="imageComponent" xsi:type="string">adobe_stock_images_listing.adobe_stock_images_listing.adobe_stock_images_columns.preview</item>
-                </item>
-            </argument>
-        </column>
-    </columns>
 </listing>