MC-14937: Complete Page Builder Analytics data collection

- Resolve staging issues

Author: davemacaulay

app/code/Magento/CatalogPageBuilderAnalytics/etc/reports.xml

@@ -17,7 +17,7 @@
             </link-source>
             <link-source name="catalog_category_entity" link-type="inner">
                 <using glue="and">
-                    <condition attribute="row_id" operator="eq" type="identifier">row_id</condition>
+                    <condition attribute="entity_id" operator="eq" type="identifier">entity_id</condition>
                 </using>
             </link-source>
             <filter glue="and">
@@ -42,12 +42,12 @@
             </link-source>
             <link-source name="catalog_product_entity" link-type="inner">
                 <using glue="and">
-                    <condition attribute="row_id" operator="eq" type="identifier">row_id</condition>
+                    <condition attribute="entity_id" operator="eq" type="identifier">entity_id</condition>
                 </using>
             </link-source>
             <link-source name="catalog_product_super_link" link-type="left">
                 <using glue="and">
-                    <condition attribute="product_id" operator="eq" type="identifier">row_id</condition>
+                    <condition attribute="product_id" operator="eq" type="identifier">entity_id</condition>
                 </using>
                 <filter glue="and">
                     <condition attribute="link_id" operator="null" />

app/code/Magento/CmsPageBuilderAnalytics/etc/reports.xml

@@ -11,7 +11,7 @@
             <attribute name="content"/>
             <link-source name="cms_page_store" link-type="inner">
                 <using glue="and">
-                    <condition attribute="row_id" operator="eq" type="identifier">row_id</condition>
+                    <condition attribute="page_id" operator="eq" type="identifier">page_id</condition>
                     <condition attribute="store_id" operator="in">0,1</condition>
                 </using>
             </link-source>
@@ -22,7 +22,7 @@
             <attribute name="content"/>
             <link-source name="cms_block_store" link-type="inner">
                 <using glue="and">
-                    <condition attribute="row_id" operator="eq" type="identifier">row_id</condition>
+                    <condition attribute="block_id" operator="eq" type="identifier">block_id</condition>
                     <condition attribute="store_id" operator="in">0,1</condition>
                 </using>
             </link-source>