Merge branch 'develop' into fix-child-content-finding

Author: orukusaki

app/code/Magento/PageBuilder/Model/Stage/HtmlFilter.php

@@ -78,17 +78,43 @@ public function filterHtml(string $content): string
         );
         foreach ($htmlContentTypes as $htmlContentType) {
             /* @var \DOMElement $htmlContentType */
-            $innerHTML = '';
-            $children = $htmlContentType->childNodes;
-            foreach ($children as $child) {
-                $innerHTML .= $child->ownerDocument->saveXML($child);
-            }
             $htmlContentType->setAttribute(
                 "class",
                 $htmlContentType->getAttribute("class") . " placeholder-html-code"
             );
+
+            $innerHTML = $this->getChildrenInnerHtml($htmlContentType);
+
             $htmlContentType->nodeValue = htmlentities($innerHTML);
         }
         return substr(trim($dom->saveHTML()), 5, -6);
     }
+
+    /**
+     * Get inner HTML of element's children
+     *
+     * @param \DOMElement $element
+     * @return string
+     */
+    private function getChildrenInnerHtml(\DOMElement $element): string
+    {
+        $innerHTML = '';
+        $childrenIterator = $element->childNodes->getIterator();
+        while ($childrenIterator->valid()) {
+            $child = $childrenIterator->current();
+            try {
+                $ownerDocument = $child->ownerDocument;
+            } catch (\Error $error) {
+                $ownerDocument = null;
+                $this->loggerInterface->critical($error->getMessage());
+            }
+            if ($ownerDocument === null) {
+                $childrenIterator->next();
+                continue;
+            }
+            $innerHTML .= $ownerDocument->saveXML($child);
+            $childrenIterator->next();
+        }
+        return $innerHTML;
+    }
 }

app/code/Magento/PageBuilder/Test/Unit/Model/Filter/TemplateTest.php

@@ -61,7 +61,7 @@ public function testFilter(string $input, string $output): void
     /**
      * @return array
      */
-    public function filterProvider(): array
+    public static function filterProvider(): array
     {
         return [
             [

app/code/Magento/PageBuilder/Test/Unit/Model/Session/RandomKeyTest.php

@@ -84,7 +84,7 @@ function ($length) {
     /**
      * @return array[]
      */
-    public function getValueDataProvider(): array
+    public static function getValueDataProvider(): array
     {
         return [
             [

app/code/Magento/PageBuilder/Test/Unit/Model/Stage/HtmlFilterTest.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Test\Unit\Model\Stage;
+
+use Magento\PageBuilder\Model\Stage\HtmlFilter;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+
+class HtmlFilterTest extends TestCase
+{
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * @var HtmlFilter
+     */
+    private $htmlFilter;
+
+    protected function setUp(): void
+    {
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
+        $this->htmlFilter = new HtmlFilter($this->loggerMock);
+    }
+
+    public function testFilterHtml()
+    {
+        //test for script tag
+        $inputHtml = '<div><script type="text/x-magento-init">alert("test")</script><p>Content</p></div>';
+        $expectedOutput = '<div><p>Content</p></div>';
+
+        $result = $this->htmlFilter->filterHtml($inputHtml);
+        $this->assertEquals($expectedOutput, $result);
+
+        //test for PB placeholder
+        $inputHtml = '
+<div data-content-type="html" data-appearance="default" data-element="main" class="test">
+<div class="block-123">Test</div>
+</div>';
+        $expectedOutput = '
+<div data-content-type="html" data-appearance="default" data-element="main" class="test placeholder-html-code">
+&lt;div class="block-123"&gt;Test&lt;/div&gt;
+</div>';
+
+        $result = $this->htmlFilter->filterHtml($inputHtml);
+        $this->assertEquals($expectedOutput, $result);
+    }
+}

app/code/Magento/PageBuilder/Test/Unit/Model/WidgetInitializerConfigTest.php

@@ -35,7 +35,7 @@ public function testGetConfig(array $config, array $expectedConfig): void
     /**
      * @return array
      */
-    public function configProvider(): array
+    public static function configProvider(): array
     {
         return [
             [

app/code/Magento/PageBuilder/Test/Unit/Plugin/ClearEditorConfigCacheTest.php

@@ -73,7 +73,7 @@ public function testAfterLogin(bool $isUseSecretKey): void
     /**
      * @return array
      */
-    public function afterLoginDataProvider(): array
+    public static function afterLoginDataProvider(): array
     {
         return [
             [false],

app/code/Magento/PageBuilder/view/adminhtml/web/js/form/provider.js

@@ -5,8 +5,9 @@
 
 define([
     'Magento_Ui/js/form/provider',
-    'Magento_PageBuilder/js/events'
-], function (Provider, events) {
+    'Magento_PageBuilder/js/events',
+    'jquery'
+], function (Provider, events, $) {
     'use strict';
 
     return Provider.extend({
@@ -18,8 +19,42 @@ define([
         /** @inheritdoc **/
         save: function () {
             events.trigger('form:' + this.id + ':saveAfter', this.get('data'));
+            this._refreshSlickOnSave();
 
             return this;
+        },
+
+        /**
+         * Refresh slick slide of parent window
+         *
+         * @private
+         */
+        _refreshSlickOnSave: function () {
+            let slickObj = $('.slick-list.draggable'),
+                parentSlick,
+                currentSettings;
+
+            if (slickObj.length === 0) {
+                return;
+            }
+
+            parentSlick = slickObj.parent();
+
+            if (typeof parentSlick.slick !== 'function') {
+                return;
+            }
+
+            currentSettings = parentSlick.slick('getSlick').options;
+
+            if (!currentSettings.infinite) {
+                return;
+            }
+
+            if (currentSettings.rows > 0) {
+                parentSlick.slick('slickSetOption', 'rows', 0);
+            }
+
+            parentSlick.slick('refresh');
         }
     });
 });

dev/tests/integration/testsuite/Magento/CmsPageBuilderAnalytics/Model/ContentTypeUsageReportProviderTest.php

@@ -66,7 +66,7 @@ public function testGetReport($expectedReportData, $ignoredContentTypes)
     /**
      * @return array
      */
-    public function reportDataProvider(): array
+    public static function reportDataProvider(): array
     {
         return [
             [

dev/tests/integration/testsuite/Magento/PageBuilder/Block/Catalog/Product/ViewTest.php

@@ -72,7 +72,7 @@ public function testSectionWrapperWithoutSectionId(string $sectionId): void
      *
      * @return array
      */
-    public function sectionWrapperDataProvider(): array
+    public static function sectionWrapperDataProvider(): array
     {
         return [
             ['description'],

dev/tests/integration/testsuite/Magento/PageBuilder/CatalogWidget/Block/Product/ProductListTest.php

@@ -153,7 +153,7 @@ public function testCategoryFilterAndSort(array $categories, int $categoryId, st
     /**
      * @return array
      */
-    public function priceFilterDataProvider(): array
+    public static function priceFilterDataProvider(): array
     {
         return [
             [
@@ -189,7 +189,7 @@ public function priceFilterDataProvider(): array
     /**
      * @return array
      */
-    public function priceSortDataProvider(): array
+    public static function priceSortDataProvider(): array
     {
         return [
             [
@@ -212,7 +212,7 @@ public function priceSortDataProvider(): array
     /**
      * @return array
      */
-    public function categoryFilterAndSortDataProvider(): array
+    public static function categoryFilterAndSortDataProvider(): array
     {
         $categories = [
             //Category 1