Skip to content

Commit 17b2ec3

Browse files
committed
MC-14937: Complete Page Builder Analytics data collection
- Swap query if staging is enabled
1 parent 7d64019 commit 17b2ec3

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Analytics:etc/reports.xsd">
9-
<report name="pagebuilder_page_test" connection="default">
9+
<report name="pagebuilder_page_cms_test" connection="default">
1010
<source name="cms_page">
1111
<attribute name="content"/>
1212
<link-source name="cms_page_store" link-type="inner">
@@ -20,4 +20,18 @@
2020
</filter>
2121
</source>
2222
</report>
23+
<report name="pagebuilder_page_cms_staging_test" connection="default">
24+
<source name="cms_page">
25+
<attribute name="content"/>
26+
<link-source name="cms_page_store" link-type="inner">
27+
<using glue="and">
28+
<condition attribute="row_id" operator="eq" type="identifier">row_id</condition>
29+
<condition attribute="store_id" operator="in">0,1</condition>
30+
</using>
31+
</link-source>
32+
<filter glue="and">
33+
<condition attribute="identifier" operator="eq">page-builder-analytics-test-page</condition>
34+
</filter>
35+
</source>
36+
</report>
2337
</config>

dev/tests/integration/testsuite/Magento/CmsPageBuilderAnalytics/Model/ContentTypeUsageReportProviderTest.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,13 @@ public function testGetReport($expectedReportData, $ignoredContentTypes)
3737
'connectionFactory' => $connectionFactoryMock
3838
]
3939
);
40-
$reportData = $contentTypeUsageReportProvider->getReport('pagebuilder_page_test');
40+
$moduleManager = Bootstrap::getObjectManager()->get(\Magento\Framework\Module\Manager::class);
41+
// If CMS Staging is enabled we need to use an alternative query
42+
if ($moduleManager->isEnabled('Magento_CmsStaging')) {
43+
$reportData = $contentTypeUsageReportProvider->getReport('pagebuilder_page_cms_staging_test');
44+
} else {
45+
$reportData = $contentTypeUsageReportProvider->getReport('pagebuilder_page_cms_test');
46+
}
4147

4248
foreach ($reportData->getInnerIterator() as $reportItem) {
4349
// Ignore the header within the report

0 commit comments

Comments
 (0)