Merge branch 'develop' into 514_content-snapshot-category-admin-page

Author: omiroshnichenko

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderWorksForEachCatalogProductAttributeTest.xml

@@ -77,7 +77,6 @@
         </actionGroup>
         <actionGroup ref="dragContentTypeToContainer" stepKey="dragHeadingIntoRow">
             <argument name="contentType" value="PageBuilderHeadingContentType"/>
-            <argument name="containerTargetType" value="PageBuilderRowContentType"/>
             <argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea($$createProductAttribute.attribute_code$$)}}"/>
         </actionGroup>
         <actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage">
@@ -111,7 +110,6 @@
         </actionGroup>
         <actionGroup ref="dragContentTypeToContainer" stepKey="dragButtonsToRow">
             <argument name="contentType" value="PageBuilderButtonsContentType"/>
-            <argument name="containerTargetType" value="PageBuilderRowContentType"/>
             <argument name="containerTargetIndex" value="2"/>
             <argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea('description')}}"/>
         </actionGroup>
@@ -153,8 +151,7 @@
         </actionGroup>
         <actionGroup ref="dragContentTypeToContainer" stepKey="dragDividerIntoRow">
             <argument name="contentType" value="PageBuilderDividerContentType"/>
-            <argument name="containerTargetType" value="PageBuilderRowContentType"/>
-            <argument name="containerTargetIndex" value="3"/>
+            <argument name="containerTargetIndex" value="2"/>
             <argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea('short_description')}}"/>
         </actionGroup>
         <actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuForDivider">

app/code/Magento/PageBuilderAdminAnalytics/LICENSE_EE.txt

@@ -0,0 +1,4 @@
+# Magento_PageBuilderAdminAnalytics module
+
+The Magento_PageBuilderAdminAnalytics module tracks Page Builder information through AdminAnalytics.
+

app/code/Magento/PageBuilderAdminAnalytics/README.md

@@ -0,0 +1,27 @@
+{
+    "name": "magento/module-page-builder-admin-analytics",
+    "description": "Page Builder Admin Analytics module",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/framework": "*",
+        "php": "~7.3.0||~7.4.0"
+    },
+    "suggest": {
+        "magento/module-admin-analytics": "*",
+        "magento/module-page-builder": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "proprietary"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\PageBuilderAdminAnalytics\\": ""
+        }
+    }
+}

app/code/Magento/PageBuilderAdminAnalytics/composer.json

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_PageBuilderAdminAnalytics">
+        <sequence>
+            <module name="Magento_AdminAnalytics"/>
+            <module name="Magento_PageBuilder"/>
+        </sequence>
+    </module>
+</config>

app/code/Magento/PageBuilderAdminAnalytics/etc/module.xml

@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_PageBuilderAdminAnalytics', __DIR__);

app/code/Magento/PageBuilderAdminAnalytics/registration.php

@@ -0,0 +1,14 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+var config = {
+    config: {
+        mixins: {
+            'Magento_PageBuilder/js/events': {
+                'Magento_PageBuilderAdminAnalytics/js/page-builder/events-mixin': true
+            }
+        }
+    }
+};

app/code/Magento/PageBuilderAdminAnalytics/view/adminhtml/requirejs-config.js

@@ -0,0 +1,37 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define(['underscore'], function (_underscore) {
+    'use strict';
+
+    return function (target) {
+        var originalTarget = target.trigger,
+            isAdminAnalyticsEnabled;
+
+        /**
+         * Invokes custom code to track information regarding Page Builder usage
+         *
+         * @param {String} name
+         * @param {Array} args
+         */
+
+        target.trigger = function (name, args) {
+            originalTarget.apply(originalTarget, [name, args]);
+            isAdminAnalyticsEnabled =
+                !_underscore.isUndefined(window.digitalData) &&
+                !_underscore.isUndefined(window._satellite);
+
+            if (name.indexOf('readyAfter') !== -1 && isAdminAnalyticsEnabled) {
+                window.digitalData.page.url = window.location.href;
+                window.digitalData.page.attributes = {
+                    editedWithPageBuilder: 'true'
+                };
+                window._satellite.track('page');
+            }
+        };
+
+        return target;
+    };
+});

app/code/Magento/PageBuilderAdminAnalytics/view/adminhtml/web/js/page-builder/events-mixin.js

@@ -1,4 +1,5 @@
 magento/module-page-builder
 magento/module-page-builder-analytics
+magento/module-page-builder-admin-analytics
 magento/module-catalog-page-builder-analytics
-magento/module-cms-page-builder-analytics
+magento/module-cms-page-builder-analytics