Merge remote-tracking branch 'tier4/ACP2E-2957' into PR-Tier3-04-29-2024-olga

Author: veloraven

app/code/Magento/Cms/Test/Mftf/ActionGroup/InsertImageFromMediaGalleryFromCmsActionGroup.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/************************************************************************
+ *
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * ************************************************************************
+ */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Insert image from Media Gallery -->
+    <actionGroup name="InsertImageFromMediaGalleryFromCmsActionGroup">
+        <arguments>
+            <argument name="imageFileName" defaultValue="magento.jpg" type="string"/>
+            <argument name="imageFilePath" defaultValue="magento.jpg" type="string"/>
+        </arguments>
+        <!--Insert image-->
+        <waitForElementVisible selector="{{MediaGallerySection.UploadImageSelector}}" stepKey="waitAttacheButton"/>
+        <attachFile selector="{{MediaGallerySection.UploadImageWithUploaderId}}" userInput="{{imageFilePath}}" stepKey="attachFile"/>
+        <waitForPageLoad stepKey="waitFileUpload"/>
+        <waitForElementVisible selector="{{MediaGallerySection.imageBlockByName(imageFileName)}}" stepKey="waitImage"/>
+        <conditionalClick selector="{{MediaGallerySection.imageBlockByName(imageFileName)}}" dependentSelector="{{MediaGallerySection.imageSelected(imageFileName)}}" visible="false" stepKey="clickOnImage"/>
+        <waitForElementVisible selector="{{MediaGallerySection.InsertFile}}" stepKey="waitForAddSelectButton"/>
+        <click selector="{{MediaGallerySection.InsertFile}}" stepKey="clickSelectImage"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImages.js

@@ -8,15 +8,16 @@ define([
     'mage/url',
     'Magento_MediaGalleryUi/js/grid/messages',
     'Magento_Ui/js/modal/confirm',
-    'mage/translate'
+    'mage/translate',
+    'jquery/jquery-storageapi'
 ], function ($, _, urlBuilder, messages, confirmation, $t) {
     'use strict';
 
     return function (ids, deleteUrl, confirmationContent) {
         var deferred = $.Deferred(),
-               title = $t('Delete assets'),
-               cancelText = $t('Cancel'),
-               deleteImageText = $t('Delete');
+            title = $t('Delete assets'),
+            cancelText = $t('Cancel'),
+            deleteImageText = $t('Delete');
 
         /**
          * Send deletion request with redords ids
@@ -25,6 +26,17 @@ define([
          * @param {String} serviceUrl
          */
         function sendRequest(recordIds, serviceUrl) {
+            let imageLinks = [];
+
+            Object.values(recordIds).forEach(function (recordId) {
+                if (typeof recordId === 'string') {
+                    let imageUrl = new URL(
+                        $('div[data-id=' + recordId + ']').find('img').attr('src').replace('.thumbs', '')
+                    );
+
+                    imageLinks.push(imageUrl.pathname);
+                }
+            });
 
             $.ajax({
                 type: 'POST',
@@ -63,6 +75,11 @@ define([
                         code: 'success'
                     });
                     deferred.resolve(message);
+
+                    if ($.localStorage.get('deleted_images')) {
+                        imageLinks = imageLinks.concat($.localStorage.get('deleted_images'));
+                    }
+                    $.localStorage.set('deleted_images', [...new Set(imageLinks)]);
                 },
 
                 /**

app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js

@@ -307,7 +307,7 @@ define([
             file.previewType = this.getFilePreviewType(file);
 
             if (!file.id && file.name) {
-                file.id = Base64.mageEncode(file.name);
+                file.id = Base64.idEncode(file.name);
             }
 
             this.observe.call(file, true, [
@@ -400,6 +400,11 @@ define([
                 return 'document';
             }
 
+            if (file.name.indexOf('?rand') !== -1 && file.type.indexOf('?rand') !== -1) {
+                file.name = file.name.split('?')[0];
+                file.type = file.type.split('?')[0];
+            }
+
             type = file.type.split('/')[0];
 
             return type !== 'image' && type !== 'video' ? 'document' : type;
@@ -620,6 +625,11 @@ define([
         onPreviewLoad: function (file, event) {
             var img = event.currentTarget;
 
+            if (img.alt === file.name && /gif|png|jpe?g|webp/.test(file.url) && file.url.indexOf('?rand') === -1) {
+                file.url += '?rand=' + Date.now();
+                img.src = file.url;
+            }
+
             file.previewWidth = img.naturalWidth;
             file.previewHeight = img.naturalHeight;
         },

app/code/Magento/Ui/view/base/web/js/form/element/image-uploader.js

@@ -11,7 +11,8 @@ define([
     'Magento_Ui/js/modal/alert',
     'Magento_Ui/js/lib/validation/validator',
     'Magento_Ui/js/form/element/file-uploader',
-    'mage/adminhtml/browser'
+    'mage/adminhtml/browser',
+    'jquery/jquery-storageapi'
 ], function ($, _, utils, uiAlert, validator, Element, browser) {
     'use strict';
 
@@ -54,7 +55,13 @@ define([
                 fileSize = $buttonEl.data('size'),
                 fileMimeType = $buttonEl.data('mime-type'),
                 filePathname = $buttonEl.val(),
-                fileBasename = filePathname.split('/').pop();
+                fileBasename = filePathname.split('/').pop(),
+                deletedFiles = $.localStorage.get('deleted_images');
+
+            if (deletedFiles && deletedFiles.indexOf(filePathname) !== -1) {
+                $.localStorage.set('deleted_images', deletedFiles.splice(deletedFiles.indexOf(filePathname), 1));
+                filePathname += '?rand=' + Date.now();
+            }
 
             this.addFile({
                 type: fileMimeType,

dev/tests/acceptance/tests/_data/duplicatesamename/magento.jpg

@@ -15,7 +15,8 @@ define([
     'Magento_Ui/js/modal/modal',
     'jquery/ui',
     'jquery/jstree/jquery.jstree',
-    'mage/mage'
+    'mage/mage',
+    'jquery/jquery-storageapi'
 ], function ($, wysiwyg, prompt, confirm, alert, _) {
     window.MediabrowserUtility = {
         windowId: 'modal_dialog_message',
@@ -467,6 +468,11 @@ define([
                         var selectedFiles = self.element.find('[data-row=file].selected'),
                             ids = selectedFiles.map(function () {
                                 return $(this).attr('id');
+                            }).toArray(),
+                            imageLinks = selectedFiles.find('img').map(function () {
+                                let imageUrl = new URL($(this).attr('src').replace('.thumbs', ''));
+
+                                return imageUrl.pathname;
                             }).toArray();
 
                         return $.ajax({
@@ -489,6 +495,11 @@ define([
                                     self.options.hidden, true
                                 );
 
+                                if ($.localStorage.get('deleted_images')) {
+                                    imageLinks = imageLinks.concat($.localStorage.get('deleted_images'));
+                                }
+                                $.localStorage.set('deleted_images', [...new Set(imageLinks)]);
+
                                 $(window).trigger('fileDeleted.mediabrowser', {
                                     ids: ids
                                 });