ACP2E-2957: refresh image thumbnail when an image with same name is re-uploaded

Author: alzota

app/code/Magento/PageBuilder/Test/Mftf/Data/ImageData.xml

@@ -64,6 +64,16 @@
         <data key="extension">jpg</data>
         <data key="path">wysiwyg</data>
     </entity>
+    <entity name="PageBuilderImagePropertyJpgCopyOtherFolder" type="pagebuilder_image_property">
+        <data key="name">Image</data>
+        <data key="section">general</data>
+        <data key="fieldName">image</data>
+        <data key="value">magento.jpg</data>
+        <data key="file">duplicatesamename/magento.jpg</data>
+        <data key="fileName">magento</data>
+        <data key="extension">jpg</data>
+        <data key="path">wysiwyg</data>
+    </entity>
     <entity name="PageBuilderBackgroundImagePropertyJpg" type="pagebuilder_image_property">
         <data key="name">Image</data>
         <data key="section">background</data>

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/image/preview.js

@@ -59,8 +59,12 @@ export default class Preview extends BasePreview {
     public getViewportImageData() {
         const desktopImageData = this.data.desktop_image;
         const mobileImageData = this.data.mobile_image;
-        return this.viewport() === "mobile" && typeof mobileImageData !== "undefined"
+        const result = this.viewport() === "mobile" && typeof mobileImageData !== "undefined"
             ? mobileImageData : desktopImageData;
+        if (result && result.attributes() && result.attributes().src.length > 0 && result.attributes().src.indexOf("?rand") === -1) {
+            result.attributes().src += "?rand=" + Date.now();
+        }
+        return result;
     }
 
     /**

app/code/Magento/PageBuilder/view/adminhtml/web/js/utils/image.js

@@ -17,7 +17,7 @@ import {convertUrlToPathIfOtherUrlIsOnlyAPath} from "./url";
 export function decodeUrl(value: string): string | [object] {
     let result: any = "";
     value = decodeURIComponent((value).replace(window.location.href, ""));
-    const regexp = /{{.*\s*url="?(.*\.([a-z|A-Z]*))"?\s*}}/;
+    const regexp = /{{.*\s*url="?(.*\.([a-z|A-Z|0-9?=]*))\"?\s*}}/;
     if (regexp.test(value)) {
         const [, url, type] = regexp.exec(value);
         const image = {