Merge pull request #368 from magento-cia/cia-2.4.8-beta1-develop-2.4-…

…develop-sync-09122024 Cia 2.4.8 beta1 develop 2.4 develop sync 09122024
magento · Sep 13, 2024 · 1587588 · 1587588
2 parents e17987d + 9df39ae
commit 1587588
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 12 deletions.
diff --git a/app/code/Magento/PageBuilder/Model/Filter/Template.php b/app/code/Magento/PageBuilder/Model/Filter/Template.php
@@ -221,7 +221,7 @@ private function generateDecodedHtmlPlaceholderMappingInDocument(DOMDocument $do
             $htmlContentTypeNode->setAttribute('data-decoded', 'true');
 
             // if nothing exists inside the node, continue
-            if (!strlen(trim($htmlContentTypeNode->nodeValue))) {
+            if (!strlen(trim($htmlContentTypeNode->nodeValue ?? ''))) {
                 continue;
             }
 

diff --git a/app/code/Magento/PageBuilder/Model/Wysiwyg/DefaultConfigProvider.php b/app/code/Magento/PageBuilder/Model/Wysiwyg/DefaultConfigProvider.php
@@ -42,7 +42,7 @@ public function getConfig(\Magento\Framework\DataObject $config): \Magento\Frame
         $config->addData(
             [
                 'tinymce' => [
-                    'toolbar' => 'undo redo | styleselect | fontsizeselect | lineheight | forecolor backcolor ' .
+                    'toolbar' => 'undo redo | styles | fontsizeselect | lineheight | forecolor backcolor ' .
                         '| bold italic underline | alignleft aligncenter alignright | numlist bullist ' .
                         '| link image table charmap',
 
@@ -55,9 +55,7 @@ public function getConfig(\Magento\Framework\DataObject $config): \Magento\Frame
                             'link',
                             'charmap',
                             'media',
-                            'noneditable',
                             'table',
-                            'paste',
                             'code',
                             'help',
                             'table',

diff --git a/...PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGInsertLinkModalSection.xml b/...PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGInsertLinkModalSection.xml
@@ -12,11 +12,11 @@
         <element name="title" type="input" selector="//div[@aria-label='Insert link']//div[contains(@id,'-title') and .='Insert link']"/>
         <element name="xButton" type="button" selector="[aria-label='Insert link'] button.mce-close"/>
         <element name="urlInput" type="input" selector="//div[@class='tox-dialog']//label[text()='URL']/..//input"/>
-        <element name="browseMediaGalleryButton" type="button" selector="//div[@class='tox-dialog']//label[text()='URL']//..//button[@title='URL']"/>
+        <element name="browseMediaGalleryButton" type="button" selector="//div[@class='tox-dialog']//label[text()='URL']//..//button[@aria-label='Browse links']"/>
         <element name="textToDisplayInput" type="input" selector="//div[@class='tox-dialog']//label[text()='Text to display']/..//input"/>
         <element name="titleInput" type="input" selector="//div[@class='tox-dialog']//label[text()='Title']/..//input"/>
         <element name="targetInput" type="input" selector="button[title='Open link in...']"/>
-        <element name="okButton" type="button" selector="//div[@class='tox-dialog']//button[@title='Save']"/>
+        <element name="okButton" type="button" selector="//div[@class='tox-dialog']//button[@aria-label='Save']"/>
         <element name="cancelButton" type="button" selector="//div[@aria-label='Insert link']//button//span[.='Cancel']"/>
     </section>
 </sections>
diff --git a/...Builder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderInlineSection.xml b/...Builder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderInlineSection.xml
@@ -43,7 +43,7 @@
         <element name="specialCharacter" type="button" selector=".tox-tinymce-inline button[aria-label='Special character']"/>
         <element name="insertWidget" type="button" selector=".tox-tinymce-inline button[aria-label='Insert Widget']"/>
         <element name="insertVariable" type="button" selector=".tox-tinymce-inline button[aria-label='Insert Variable']"/>
-        <element name="imageSelectorBrowse" type="button" selector="button[title='Source']"/>
+        <element name="imageSelectorBrowse" type="button" selector="button[aria-label='Browse files']"/>
         <element name="imageSelectorOk" type="button" selector="//div[contains(@aria-label, 'Insert/edit image')]//span[contains(@class, 'mce-txt')][text()='Ok']"/>
         <element name="formatOption" type="text" parameterized="true" selector="div[title='{{label}}']"/>
         <element name="HeadSelector" type="text" selector="div[title='Headings']"/>

diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/TinyMCESection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/TinyMCESection.xml
@@ -8,6 +8,6 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="TinyMCESection">
-        <element name="Style" type="button" selector="button[title='Formats']"/>
+        <element name="Style" type="button" selector="button[aria-label='Format Paragraph']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/PageBuilder/etc/adminhtml/di.xml b/app/code/Magento/PageBuilder/etc/adminhtml/di.xml
@@ -587,14 +587,14 @@
     <type name="Magento\PageBuilder\Model\Wysiwyg\InlineEditingSupportedAdapterList">
         <arguments>
             <argument name="wysiwygAdaptersSupportingInlineEditing" xsi:type="array">
-                <item name="mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter" xsi:type="boolean">true</item>
+                <item name="mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter" xsi:type="boolean">true</item>
             </argument>
         </arguments>
     </type>
     <type name="Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Provider\Wysiwyg\Config">
         <arguments>
             <argument name="editors" xsi:type="array">
-                <item name="mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter" xsi:type="array">
+                <item name="mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter" xsi:type="array">
                     <item name="component" xsi:type="string">Magento_PageBuilder/js/wysiwyg/tinymce</item>
                     <item name="component_initializers" xsi:type="array">
                         <item name="text" xsi:type="string">Magento_PageBuilder/js/content-type/text/wysiwyg/tinymce/component-initializer</item>
@@ -618,7 +618,7 @@
     <virtualType name="Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Provider\Wysiwyg\BannerConfig" type="Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Provider\Wysiwyg\Config">
         <arguments>
             <argument name="editors" xsi:type="array">
-                <item name="mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter" xsi:type="array">
+                <item name="mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter" xsi:type="array">
                     <item name="parentSelectorsToUnderlay" xsi:type="null"/>
                 </item>
             </argument>

diff --git a/app/code/Magento/PageBuilderAnalytics/Model/ContentTypeUsageReportProvider.php b/app/code/Magento/PageBuilderAnalytics/Model/ContentTypeUsageReportProvider.php
@@ -80,6 +80,7 @@ public function getReport($name) : \IteratorIterator
     {
         $query = $this->queryFactory->create($name);
 
+        $reportData = [];
         // Prepare our type count data
         $typeCounts = [];
         $contentTypes = $this->config->getContentTypes();
@@ -102,7 +103,7 @@ public function getReport($name) : \IteratorIterator
                     foreach ($contentTypes as $type) {
                         // Count the amount of content types within the content
                         $rowContent = $row['content'] ?? '';
-                        if (strlen($rowContent) > 0) {
+                        if ($rowContent !== null && strlen($rowContent) > 0) {
                             $typeCounts[$type['name']] += substr_count(
                                 $rowContent,
                                 'data-content-type="' . $type['name'] . '"'