Merge branch 'develop' of github.com:magento/magento2-page-builder into PB-416-phpgtdom

Author: omiroshnichenko

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

@@ -14,7 +14,7 @@ import "../binding/sortable";
 import "../binding/sortable-children";
 import ContentTypeCollection from "../content-type-collection";
 import ContentTypeCollectionInterface from "../content-type-collection.types";
-import ContentTypeConfigInterface from "../content-type-config.types";
+import ContentTypeConfigInterface, {ConfigFieldInterface} from "../content-type-config.types";
 import createContentType from "../content-type-factory";
 import ContentTypeMenu from "../content-type-menu";
 import Edit from "../content-type-menu/edit";
@@ -46,6 +46,13 @@ export default class Preview implements PreviewInterface {
     public isPlaceholderVisible: KnockoutObservable<boolean> = ko.observable(true);
     public isEmpty: KnockoutObservable<boolean> = ko.observable(true);
 
+    /**
+     * Provide preview data as an object which can be queried
+     *
+     * @deprecated please use getOptionValue directly
+     */
+    public previewData: {[key: string]: KnockoutObservable<any>} = {};
+
     /**
      * Fields that should not be considered when evaluating whether an object has been configured.
      *
@@ -82,6 +89,7 @@ export default class Preview implements PreviewInterface {
             "empty-placeholder-background": this.isPlaceholderVisible,
         });
         this.bindEvents();
+        this.populatePreviewData();
     }
 
     /**
@@ -144,6 +152,15 @@ export default class Preview implements PreviewInterface {
         this.contentType.dataStore.set(key, value);
     }
 
+    /**
+     * Retrieve the value for an option
+     *
+     * @param key
+     */
+    public getOptionValue(key: string) {
+        return this.contentType.dataStore.get(key);
+    }
+
     /**
      * Set state based on mouseover event for the preview
      *
@@ -581,4 +598,37 @@ export default class Preview implements PreviewInterface {
 
         this.isPlaceholderVisible(paddingBottom + paddingTop + minHeight >= 130);
     }
+
+    /**
+     * Populate the preview data with calls to the supported getOptionValue method
+     *
+     * @deprecated this function is only included to preserve backwards compatibility, use getOptionValue directly
+     */
+    private populatePreviewData(): void {
+        if (this.config.fields) {
+            _.each(this.config.fields, (fields) => {
+                _.keys(fields).forEach((key: string) => {
+                    this.previewData[key] = ko.observable("");
+                });
+            });
+        }
+
+        // Subscribe to this content types data in the store
+        this.contentType.dataStore.subscribe(
+            (data: DataObject) => {
+                _.forEach(data, (value, key) => {
+                    const optionValue = this.getOptionValue(key);
+                    if (ko.isObservable(this.previewData[key])) {
+                        this.previewData[key](optionValue);
+                    } else {
+                        if (_.isArray(optionValue)) {
+                            this.previewData[key] = ko.observableArray(optionValue);
+                        } else {
+                            this.previewData[key] = ko.observable(optionValue);
+                        }
+                    }
+                });
+            },
+        );
+    }
 }

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

@@ -101,10 +101,13 @@ public function getReport($name) : \IteratorIterator
                 foreach ($batchQuery->fetchAll() as $row) {
                     foreach ($contentTypes as $type) {
                         // Count the amount of content types within the content
-                        $typeCounts[$type['name']] += substr_count(
-                            $row['content'],
-                            'data-content-type="' . $type['name'] . '"'
-                        );
+                        $rowContent = $row['content'] ?? '';
+                        if (strlen($rowContent) > 0) {
+                            $typeCounts[$type['name']] += substr_count(
+                                $rowContent,
+                                'data-content-type="' . $type['name'] . '"'
+                            );
+                        }
                     }
                 }
             }

app/code/Magento/PageBuilderAnalytics/Model/ContentTypeUsageReportProvider.php

@@ -16,7 +16,7 @@
                 </using>
             </link-source>
             <filter glue="and">
-                <condition attribute="identifier" operator="eq">page-builder-analytics-test-page</condition>
+                <condition attribute="identifier" operator="like">page-builder-analytics-test-page%</condition>
             </filter>
         </source>
     </report>
@@ -30,8 +30,8 @@
                 </using>
             </link-source>
             <filter glue="and">
-                <condition attribute="identifier" operator="eq">page-builder-analytics-test-page</condition>
+                <condition attribute="identifier" operator="like">page-builder-analytics-test-page%</condition>
             </filter>
         </source>
     </report>
-</config>
+</config>

dev/tests/integration/_files/Magento/TestModuleCmsPageBuilderAnalytics/etc/reports.xml

@@ -390,3 +390,25 @@
     ->setContent($content)
     ->setPageLayout('cms-full-width')
     ->save();
+
+/** @var $emptyContentPage \Magento\Cms\Model\Page */
+$emptyContentPage = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Cms\Model\Page::class);
+$emptyContentPage->setTitle('Page Builder Analytics Test Page - Empty Content')
+    ->setIdentifier('page-builder-analytics-test-page-empty')
+    ->setStores([0, 1])
+    ->setIsActive(1)
+    ->setCreatedIn(1)
+    ->setContent('')
+    ->setPageLayout('cms-full-width')
+    ->save();
+
+/** @var $nullContentPage \Magento\Cms\Model\Page */
+$nullContentPage = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Cms\Model\Page::class);
+$nullContentPage->setTitle('Page Builder Analytics Test Page - Null Content')
+    ->setIdentifier('page-builder-analytics-test-page-null')
+    ->setStores([0, 1])
+    ->setIsActive(1)
+    ->setCreatedIn(1)
+    ->setContent(null)
+    ->setPageLayout('cms-full-width')
+    ->save();