Fix Element Tracking element_content entity properties

Author: jethron

plugins/browser-plugin-element-tracking/src/data.ts

@@ -192,17 +192,18 @@ export function buildContentTree(
       const contents = getMatchingElements(contentConfig, element);
 
       contents.forEach((contentElement, i) => {
-        context.push({
+        const entity: ElementContentEntity = {
           schema: Entities.ELEMENT_CONTENT,
           data: {
-            element_name: contentConfig.name,
             parent_name: config.name,
-            parent_position: parentPosition,
-            position: i + 1,
+            parent_index: parentPosition,
+            element_name: contentConfig.name,
+            element_index: i + 1,
             attributes: extractSelectorDetails(contentElement, contentConfig.selector, contentConfig.details),
           },
-        });
+        };
 
+        context.push(entity);
         context.push(...contentConfig.context(contentElement, contentConfig));
         context.push(...buildContentTree(contentConfig, contentElement, i + 1));
       });

plugins/browser-plugin-element-tracking/test/api.test.ts

@@ -241,10 +241,10 @@ describe('Element Tracking Plugin API', () => {
         ]);
         expect(entityOf(eventQueue[0], 'element_content')).toEqual([
           {
-            element_name: 'h1',
             parent_name: '.advanced',
-            parent_position: 1,
-            position: 1,
+            parent_index: 1,
+            element_name: 'h1',
+            element_index: 1,
             attributes: [
               {
                 source: 'content',