Merge pull request #475 from adobe-commerce-tier-4/PR_2025_10_16_muntianu

[Support Tier-4 muntianu] 10-16-2025 Regular delivery of bugfixes and improvements

Author: internal-magento-queue-manager[bot]

app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/file-uploader.js

@@ -16,21 +16,28 @@ define([
              */
             replaceInputTypeFile: function (fileInput) {
                 let fileId = fileInput.id, fileName = fileInput.name, fileClass = fileInput.className,
-                    spanElement =  '<span id=\'' + fileId + fileClass + '\' ></span>';
+                    spanElement = '<span id=\'' + fileId + fileClass + '\' ></span>',
+                    self = this;
 
                 $('#' + fileId).closest('.file-uploader-area').attr('upload-area-id', fileName);
                 $('#' + fileId + fileClass).closest('.file-uploader-area').attr('upload-area-id', fileName);
 
                 $(fileInput).replaceWith(spanElement);
 
-                $('#' + fileId).closest('.file-uploader-area').find('.file-uploader-button:first').on('click', function () {
-                    $(this).closest('.file-uploader-area').find('.uppy-Dashboard-browse').trigger('click');
-                });
+                $('#' + fileId + fileClass)
+                    .closest('.file-uploader-area')
+                    .find('.action-upload-image')
+                    .on('click', function (e) {
+                        let $area = $(this).closest('.file-uploader-area');
 
-                $('#' + fileId + fileClass).closest('.file-uploader-area').find('.action-upload-image').on('click', function () {
-                    $(this).closest('.file-uploader-area').find('.uppy-Dashboard-browse').trigger('click');
-                });
-            },
+                        e.preventDefault();
+                        if (self.triggerFileBrowser) {
+                            self.triggerFileBrowser($area);
+                        } else {
+                            $area.find('.uppy-Dashboard-browse').trigger('click');
+                        }
+                    });
+            }
         });
     };
 });

dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/element/file-uploader.test.js

@@ -0,0 +1,114 @@
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'squire'
+], function (Squire) {
+    'use strict';
+
+    describe('Magento/PageBuilder/js/form/element/file-uploader', function () {
+        let injector = new Squire(),
+            fileUploaderMixin,
+            mockElement,
+            mockJquery,
+            mockFileInput;
+
+        beforeEach(function (done) {
+            mockJquery = jasmine.createSpy('$').and.callFake(function () {
+                return {
+                    closest: jasmine.createSpy('closest').and.returnValue({
+                        attr: jasmine.createSpy('attr'),
+                        find: jasmine.createSpy('find').and.returnValue({
+                            on: jasmine.createSpy('on')
+                        })
+                    }),
+                    replaceWith: jasmine.createSpy('replaceWith')
+                };
+            });
+
+            mockElement = {
+                extend: jasmine.createSpy('extend').and.callFake(function (config) {
+                    return function () {
+                        this.triggerFileBrowser = jasmine.createSpy('triggerFileBrowser');
+                        Object.assign(this, config);
+                    };
+                })
+            };
+
+            injector.mock('jquery', mockJquery);
+
+            injector.require([
+                'Magento_PageBuilder/js/form/element/file-uploader'
+            ], function (FileUploaderMixin) {
+                fileUploaderMixin = FileUploaderMixin;
+                done();
+            });
+        });
+
+        afterEach(function () {
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (error) { // eslint-disable-line no-unused-vars
+            }
+        });
+
+        describe('file-uploader mixin', function () {
+            let FileUploaderClass, fileUploaderInstance;
+
+            beforeEach(function () {
+                FileUploaderClass = fileUploaderMixin(mockElement);
+                fileUploaderInstance = new FileUploaderClass();
+            });
+
+            it('should be a function that returns an extended Element', function () {
+                expect(typeof fileUploaderMixin).toBe('function');
+                expect(mockElement.extend).toHaveBeenCalled();
+            });
+
+            describe('replaceInputTypeFile method', function () {
+                beforeEach(function () {
+                    mockFileInput = {
+                        id: 'test-file-input',
+                        name: 'test-file-name',
+                        className: 'test-class'
+                    };
+                    mockJquery.calls.reset();
+                });
+
+                it('should exist and be a function', function () {
+                    expect(typeof fileUploaderInstance.replaceInputTypeFile).toBe('function');
+                });
+
+                it('should call jQuery with file input selectors (happy path)', function () {
+                    expect(typeof fileUploaderInstance.replaceInputTypeFile).toBe('function');
+
+                    expect(function () {
+                        fileUploaderInstance.replaceInputTypeFile(mockFileInput);
+                    }).not.toThrow();
+                });
+
+                it('should call replaceWith on the file input', function () {
+                    expect(function () {
+                        fileUploaderInstance.replaceInputTypeFile(mockFileInput);
+                    }).not.toThrow();
+
+                    expect(typeof mockFileInput.id).toBe('string');
+                    expect(typeof mockFileInput.name).toBe('string');
+                    expect(typeof mockFileInput.className).toBe('string');
+                });
+
+                it('should register a click handler', function () {
+                    expect(function () {
+                        fileUploaderInstance.replaceInputTypeFile(mockFileInput);
+                    }).not.toThrow();
+
+                    expect(typeof fileUploaderInstance.replaceInputTypeFile).toBe('function');
+                });
+            });
+        });
+    });
+});

dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/mass-converter/widget-directive-abstract.test.js

@@ -0,0 +1,66 @@
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+define([
+    'squire'
+], function (Squire) {
+    'use strict';
+
+    var WidgetDirectiveAbstract,
+        injector = new Squire(),
+        mocks = {
+            'Magento_PageBuilder/js/utils/object': {
+                get: function (data, key) {
+                    return data[key];
+                },
+                set: function (data, key, value) {
+                    data[key] = value;
+                }
+            }
+        };
+
+    beforeEach(function (done) {
+        injector.mock(mocks);
+        injector.require(['Magento_PageBuilder/js/mass-converter/widget-directive-abstract'], function (module) {
+            WidgetDirectiveAbstract = module;
+            done();
+        });
+    });
+
+    afterEach(function () {
+        injector.clean();
+    });
+
+    describe('Magento_PageBuilder/js/mass-converter/widget-directive-abstract', function () {
+        var model;
+
+        beforeEach(function () {
+            model = new WidgetDirectiveAbstract();
+        });
+
+        describe('fromDom - Multiline Widget with WYSIWYG Content', function () {
+            it('Should parse custom widget with multiline WYSIWYG content containing links', function () {
+                // Simulates the reported issue: custom widget with WYSIWYG field containing links
+                var data = {
+                        content: '{{widget type="Custom\\Widget\\Test"\n' +
+                                'wysiwyg_content="<h2>Sample Product Title</h2>\n' +
+                                '<p>Description with <a href=\\"/product/sample\\">product link</a></p>"\n' +
+                                'template="widget/wysiwyg_test.phtml"}}'
+                    },
+                    config = {
+                        html_variable: 'content'
+                    },
+                    result = model.fromDom(data, config);
+
+                // With old regex (.*?): widget won't be parsed, returns empty object
+                // With new regex ([\S\s]*?): widget will be parsed correctly
+                expect(result.type).toBe('Custom\\Widget\\Test');
+                expect(result.wysiwyg_content).toContain('Sample Product Title');
+                expect(result.wysiwyg_content).toContain('href=\\"');
+                expect(result.template).toBe('widget/wysiwyg_test.phtml');
+            });
+        });
+    });
+});
+

dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/utils/editor-regex.test.js

@@ -0,0 +1,46 @@
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'Magento_PageBuilder/js/utils/editor'
+], function (utils) {
+    'use strict';
+
+    describe('Magento_PageBuilder/js/utils/editor.js - Multiline Widget Tests', function () {
+
+        describe('escapeDoubleQuoteWithinWidgetDirective', function () {
+            it('Should process multiline widget with WYSIWYG content containing links', function () {
+                // Simulates the issue: custom widget with WYSIWYG field containing multiline content with links
+                var content = 'Page content {{widget type="Custom\\Widget\\Test"\n' +
+                             'wysiwyg_content="<h2>Sample Product Title</h2>\n' +
+                             '<p>Description with <a href=&quot;/product/sample&quot;>product link</a></p>"\n' +
+                             'template="widget/wysiwyg_test.phtml"}} more content',
+                    result = utils.escapeDoubleQuoteWithinWidgetDirective(content);
+
+                // With old regex (.*?): widget won't be found, quotes won't be escaped
+                // With new regex ([\S\s]*?): widget will be found and quotes properly escaped
+                expect(result).toContain('href=\\"');
+                expect(result).not.toContain('&quot;');
+            });
+        });
+
+        describe('unescapeDoubleQuoteWithinWidgetDirective', function () {
+            it('Should process multiline widget with escaped quotes in WYSIWYG content', function () {
+                var content = 'Page content {{widget type="Custom\\Widget\\Test"\n' +
+                             'wysiwyg_content="<h2>Sample Product Title</h2>\n' +
+                             '<p>Description with <a href=\\"product/sample\\">product link</a></p>"\n' +
+                             'template="widget/wysiwyg_test.phtml"}} more content',
+                    result = utils.unescapeDoubleQuoteWithinWidgetDirective(content);
+
+                // With old regex: multiline widget won't be processed
+                // With new regex: quotes will be properly unescaped
+                expect(result).toContain('href=&quot;');
+                expect(result).not.toContain('\\"');
+            });
+        });
+    });
+});
+

dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/utils/nesting-widget-dialog.test.js

@@ -0,0 +1,90 @@
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+define([
+    'squire',
+    'jquery'
+], function (Squire, $) {
+    'use strict';
+
+    var nestingWidgetDialog,
+        injector = new Squire(),
+        mocks = {
+            'mage/translate': function (text) {
+                return text; // Simple mock that returns the input text
+            },
+            'Magento_PageBuilder/js/modal/dismissible-confirm': jasmine.createSpy('dismissibleConfirm')
+        };
+
+    beforeEach(function (done) {
+        injector.mock(mocks);
+        injector.require(['Magento_PageBuilder/js/utils/nesting-widget-dialog'], function (module) {
+            nestingWidgetDialog = module;
+            done();
+        });
+    });
+
+    afterEach(function () {
+        injector.clean();
+    });
+
+    describe('Magento_PageBuilder/js/utils/nesting-widget-dialog', function () {
+        var mockDataStore, mockWysiwyg, mockElement;
+
+        beforeEach(function () {
+            // Create mock element
+            mockElement = $('<div id="test-wysiwyg">Test content</div>');
+            $('body').append(mockElement);
+
+            mockDataStore = {
+                getState: jasmine.createSpy('getState'),
+                set: jasmine.createSpy('set')
+            };
+
+            mockWysiwyg = {
+                elementId: 'test-wysiwyg'
+            };
+
+            // Reset the spy
+            mocks['Magento_PageBuilder/js/modal/dismissible-confirm'].calls.reset();
+        });
+
+        afterEach(function () {
+            mockElement.remove();
+        });
+
+        describe('Multiline Widget Detection - WYSIWYG Content Issue', function () {
+            it('Should detect custom widget with multiline WYSIWYG content containing links', function () {
+                // Simulates the reported issue: custom widget with WYSIWYG field containing links
+                var inlineMessage = 'Page content {{widget type="Custom\\Widget\\Test"\n' +
+                                   'wysiwyg_content="<h2>Sample Product Title</h2>\n' +
+                                   '<p>Description with <a href=\\"/product/sample\\">product link</a></p>"\n' +
+                                   'template="widget/wysiwyg_test.phtml"}} more content',
+                    linkUrl = {
+                        type: 'page',
+                        page: ['page-1']
+                    },
+                    dialogConfig;
+
+                mockDataStore.getState.and.returnValue({
+                    'inline_message': inlineMessage,
+                    'link_url': linkUrl
+                });
+
+                nestingWidgetDialog(mockDataStore, mockWysiwyg, 'inline_message', 'link_url');
+
+                // With old regex (.*?): multiline widget won't be detected, no dialog
+                // With new regex ([\S\s]*?): multiline widget will be detected, dialog shown
+                expect(mocks['Magento_PageBuilder/js/modal/dismissible-confirm']).toHaveBeenCalled();
+
+                // Test widget removal functionality
+                dialogConfig = mocks['Magento_PageBuilder/js/modal/dismissible-confirm'].calls.mostRecent().args[0];
+                dialogConfig.actions.always();
+
+                // Verify widget is removed from content
+                expect(mockDataStore.set).toHaveBeenCalledWith('inline_message', 'Page content  more content');
+            });
+        });
+    });
+});