Merge remote-tracking branch 'upstream/develop' into fix-invalid-preferences

Author: fredden

.github/.metadata.json

@@ -0,0 +1,30 @@
+{
+  "templateVersion": "0.1",
+  "product": {
+    "name": "Magento 2 Page Builder",
+    "description": "Page Builder introduces an intuitive, drag-and-drop interface for creating digital content, powered by content types like images, videos, banners, etc. with instant preview capabilities that enable non-technical users to take control of their content."
+  },
+  "contacts": {
+    "team": {
+      "name": "Amigos",
+      "DL": "Grp-amigos",
+      "slackChannel": "team-amigos"
+    }
+  },
+  "ticketTracker": {
+    "functionalJiraQueue": {
+      "projectKey": "PB",
+      "component": ""
+    },
+    "securityJiraQueue": {
+      "projectKey": "MAGREQ",
+      "component": "PageBuilder"
+    }
+  },
+  "staticScan": {
+    "enable": true,
+    "frequency": "weekly",
+    "customName": "",
+    "branchesToScan": []
+  }
+}

.github/PULL_REQUEST_TEMPLATE.md

@@ -66,4 +66,5 @@ https://github.com/magento/magento2ce/pull/<related_pr>
  - [ ] Pull request has a meaningful description of its purpose
  - [ ] All commits are accompanied by meaningful commit messages
  - [ ] All new or changed code is covered with unit/integration tests (if applicable)
+ - [ ] README.md files for modified modules are updated and included in the pull request if any [README.md predefined sections](https://github.com/magento/devdocs/wiki/Magento-module-README.md) require an update
  - [ ] All automated tests passed successfully (all builds are green)

README.md

@@ -14,17 +14,18 @@ https://github.com/magento/magento2-page-builder-docs/wiki.
 
 The wiki provides more information on the Page Builder project, such as:
 
+- [Installation Guide](https://github.com/magento/magento2-page-builder-docs/wiki/Installation-Guide)
+- [Community Projects](https://github.com/magento/magento2-page-builder/projects)
 - [Links to User Guide tutorials](https://github.com/magento/magento2-page-builder-docs/wiki#page-builder-tutorials)
 - [Page Builder roadmaps](https://github.com/magento/magento2-page-builder-docs/wiki#roadmap)
 - [MFTF best practices](https://github.com/magento/magento2-page-builder-docs/wiki/%5BRough-Draft%5D-MFTF-Best-Practices)
-- [Partners Acceleration Program](https://github.com/magento/magento2-page-builder-docs/wiki/Partners-Acceleration-Program-Team)
 
 ## Documentation
-Complete documentation located on the [Magento DevDocs](https://devdocs.magento.com/page-builder/docs/), including what you need to know to start local development as described in the [installation guide](https://devdocs.magento.com/page-builder/docs/getting-started/install-pagebuilder.html).
+Complete documentation located on the [Magento DevDocs](https://devdocs.magento.com/page-builder/docs/), including what you need to know to start local development as described in the [installation guide](https://github.com/magento/magento2-page-builder-docs/wiki/Installation-Guide).
 
 ## Community Engineering Slack
 
 To connect with Magento team and the Community, join us on the [Magento Community Engineering Slack](https://magentocommeng.slack.com).
 If you are interested in joining Slack, or a specific channel, use our [self signup](https://opensource.magento.com/slack) link.
 
-Magento 2 Page Builder project slack channel: [#pagebuilder](https://magentocommeng.slack.com/archives/CHB455HPF)
+Magento 2 Page Builder project slack channel: [#pagebuilder](https://magentocommeng.slack.com/archives/CHB455HPF)

app/code/Magento/AwsS3PageBuilder/composer.json

@@ -3,7 +3,7 @@
     "description": "Aws S3 Page Builder module",
     "require": {
         "magento/framework": "*",
-        "php": "~7.3.0||~7.4.0"
+        "php": "~7.4.0||~8.0.0||~8.1.0"
     },
     "suggest": {
         "magento/module-page-builder": "*",

app/code/Magento/CatalogPageBuilderAnalytics/composer.json

@@ -8,7 +8,7 @@
         "magento/module-page-builder-analytics": "*",
         "magento/module-catalog": "*",
         "magento/framework": "*",
-        "php": "~7.3.0||~7.4.0"
+        "php": "~7.4.0||~8.0.0||~8.1.0"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/CmsPageBuilderAnalytics/composer.json

@@ -8,7 +8,7 @@
         "magento/module-page-builder-analytics": "*",
         "magento/module-cms": "*",
         "magento/framework": "*",
-        "php": "~7.3.0||~7.4.0"
+        "php": "~7.4.0||~8.0.0||~8.1.0"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductTotals.php

@@ -9,17 +9,16 @@
 namespace Magento\PageBuilder\Controller\Adminhtml\Form\Element;
 
 use Exception;
-use Magento\Backend\App\Action;
 use Magento\Backend\App\Action\Context;
+use Magento\CatalogWidget\Controller\Adminhtml\Product\Widget;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\Result\JsonFactory;
 
 /**
  * Returns the number of products that match the provided conditions
  */
-class ProductTotals extends Action implements HttpPostActionInterface
+class ProductTotals extends Widget implements HttpPostActionInterface
 {
-    const ADMIN_RESOURCE = 'Magento_Catalog::products';
 
     /**
      * @var \Magento\PageBuilder\Model\Catalog\ProductTotals

app/code/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlock.php

@@ -92,7 +92,7 @@ public function render(array $params): array
             ->load();
 
         if ($blocks->count() === 0) {
-            $result['error'] = sprintf(__('Block with ID: %s doesn\'t exist'), $params['block_id']);
+            $result['error'] = sprintf(__('Block with ID: %s doesn\'t exist')->render(), $params['block_id']);
 
             return $result;
         }

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 | lineheightselect | forecolor backcolor ' .
+                    'toolbar' => 'undo redo | styleselect | fontsizeselect | lineheight | forecolor backcolor ' .
                         '| bold italic underline | alignleft aligncenter alignright | numlist bullist ' .
                         '| link image table charmap',
 
@@ -57,15 +57,11 @@ public function getConfig(\Magento\Framework\DataObject $config): \Magento\Frame
                             'media',
                             'noneditable',
                             'table',
-                            'contextmenu',
                             'paste',
                             'code',
                             'help',
                             'table',
-                            'textcolor',
-                            'image',
-                            'colorpicker',
-                            'lineheight'
+                            'image'
                         ]
                     ),
                     'content_css' => [

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateFallbackImageAfterVideoFinishesPlayingInVideoBackgroundActionGroup.xml

@@ -18,6 +18,7 @@
         </arguments>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <waitForElementVisible selector="{{section.backgroundType(index, 'video')}}" stepKey="waitForVideoBackground"/>
+        <wait time="5" stepKey="waitToPreventVideoFlakiness"/>
         <waitForElementVisible selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideo"/>
         <waitForElementVisible selector="{{section.videoBackgroundFallbackImage(index)}}" stepKey="waitForFallbackImageVisible"/>
         <grabAttributeFrom selector="{{section.videoBackgroundFallbackImageSource(index, fallbackImage.fileName)}}" userInput="src" stepKey="fallbackImageSource"/>