Merge branch 'MC-35104' of github.com:magento-epam/magento2-page-builder into 513_content-snapshot-dynamic-block

Author: omiroshnichenko

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type-menu/edit.js

@@ -29,7 +29,7 @@ export default class Edit {
      */
     public open(): void {
         const contentTypeData = this.dataStore.getState();
-
+        events.trigger("contentType:editBefore", { contentType: this.instance } );
         events.trigger("form:renderAfter", {
             data: contentTypeData,
             appearances: this.instance.config.appearances,

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/preview.js

@@ -310,6 +310,7 @@ export default class Preview implements PreviewInterface {
     public onOptionVisibilityToggle(): void {
         const display = this.contentType.dataStore.get<boolean>("display");
         this.contentType.dataStore.set("display", !display);
+        this.dispatchContentTypeVisibilityEvents(this.contentType, !display);
     }
 
     /**
@@ -496,6 +497,25 @@ export default class Preview implements PreviewInterface {
         events.trigger(originalContentType.config.name + ":duplicateAfter", duplicateEventParams);
     }
 
+    /**
+     * Dispatch content type visibility events
+     *
+     * @param {ContentTypeInterface | ContentTypeCollectionInterface} contentType
+     * @param {boolean} visibility
+     */
+    protected dispatchContentTypeVisibilityEvents(
+        contentType: ContentTypeInterface | ContentTypeCollectionInterface,
+        visibility: boolean,
+    ) {
+        const visibilityEventParams = {
+            contentType,
+            visibility,
+        };
+
+        events.trigger("contentType:visibilityAfter", visibilityEventParams);
+        events.trigger(contentType.config.name + ":visibilityAfter", visibilityEventParams);
+    }
+
     /**
      * Bind events
      */

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/edit.ts

@@ -0,0 +1,75 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define(['underscore'], function (_) {
+    'use strict';
+
+    return {
+
+        /**
+         * Sets up event attributes and action depending on name and args
+         *
+         * @param {String} name
+         * @param {Array} args
+         */
+
+        build: function (name, args) {
+            var arrayName = name.split(':'),
+                action = '',
+                eventAttributes = {},
+                event;
+
+            if (_.isUndefined(args)) {
+                return;
+            }
+
+            switch (arrayName[arrayName.length - 1]) {
+                case 'duplicateAfter':
+                    action = 'duplicate';
+                    break;
+
+                case 'removeAfter':
+                    action = 'remove';
+                    break;
+
+                case 'createAfter':
+                    action = 'create';
+                    break;
+
+                case 'editBefore':
+                    action = 'edit';
+                    break;
+
+                case 'visibilityAfter':
+                    action = args.visibility ? 'show' : 'hide';
+                    break;
+
+                default:
+                    break;
+            }
+
+            if (!_.isUndefined(args.contentType)) {
+                eventAttributes = args.contentType.config;
+            } else if (!_.isUndefined(args.originalContentType)) {
+                eventAttributes = args.originalContentType.config;
+            }
+
+            if (action !== '' && !_.isEmpty(eventAttributes)) {
+                event = {
+                    element: eventAttributes.label,
+                    type: eventAttributes.name,
+                    action: action,
+                    widget: {
+                        name: eventAttributes.form,
+                        type: eventAttributes['menu_section']
+                    },
+                    feature: 'page-builder-tracker'
+                };
+            }
+
+            return event;
+        }
+    };
+});

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview.ts

@@ -3,35 +3,44 @@
  * 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');
-            }
-        };
+define(['underscore', 'Magento_PageBuilderAdminAnalytics/js/page-builder/event-builder'],
+    function (_, EventBuilder) {
+        'use strict';
+
+        return function (target) {
+            var originalTarget = target.trigger,
+                isAdminAnalyticsEnabled,
+                event;
+
+            /**
+             * 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 =
+                    !_.isUndefined(window.digitalData) &&
+                    !_.isUndefined(window._satellite);
 
-        return target;
-    };
-});
+                if (name.indexOf('readyAfter') !== -1 && isAdminAnalyticsEnabled) {
+                    window.digitalData.page.url = window.location.href;
+                    window.digitalData.page.attributes = {
+                        editedWithPageBuilder: 'true'
+                    };
+                    window._satellite.track('page');
+                }
+
+                event = EventBuilder.build(name, args);
+
+                if (isAdminAnalyticsEnabled && !_.isUndefined(window.digitalData.event) && !_.isUndefined(event)) {
+                    window.digitalData.event.push(event);
+                    window._satellite.track('event');
+                }
+            };
+
+            return target;
+        };
+    });