WS-1816: Ensure correct Piano L2 tracking for Magyarul & Romania

data/romania/homePage/index.json

@@ -0,0 +1,83 @@
+{
+  "data": {
+    "title": "Home - BBC România",
+    "description": "Add a description",
+    "pageType": "home",
+    "curations": [
+      {
+        "summaries": [
+          {
+            "type": "article",
+            "isLive": false,
+            "title": "„Flota fantomă\" a Rusiei are până la 1.000 de nave, afirmă Macron",
+            "firstPublished": "2025-10-01T14:25:45.586Z",
+            "lastPublished": "2025-10-01T14:25:45.586Z",
+            "link": "https://www.bbc.com/romania/articles/c0peyevn99no",
+            "imageUrl": "https://ichef.bbci.co.uk/ace/ws/{width}/cpsdevpb/fd8f/test/107a80f0-9ed2-11f0-8743-fdd152a2466d.jpg.webp",
+            "description": "Președintele francez Emmanuel Macron a afirmat miercuri că este „un lucru bun\" faptul că Franța anchetează o presupusă încălcare a legii de către petrolierul Boracay",
+            "imageAlt": "„Flota fantomă\" a Rusiei are până la 1.000 de nave",
+            "isPortraitImage": false,
+            "id": "c0peyevn99no",
+            "visualProminence": "NORMAL"
+          },
+          {
+            "type": "article",
+            "isLive": false,
+            "title": "„Flota fantomă\" a Rusiei are până la 1.000 de nave, afirmă Macron",
+            "firstPublished": "2025-10-01T14:25:00.077Z",
+            "lastPublished": "2025-10-01T14:25:00.077Z",
+            "link": "https://www.bbc.com/romania/articles/c81p8pkxv53o",
+            "imageUrl": "https://ichef.bbci.co.uk/ace/ws/{width}/cpsdevpb/fd8f/test/107a80f0-9ed2-11f0-8743-fdd152a2466d.jpg.webp",
+            "description": "Președintele francez Emmanuel Macron a afirmat miercuri că este „un lucru bun\" faptul că Franța anchetează o presupusă încălcare a legii de către petrolierul Boracay",
+            "imageAlt": "„Flota fantomă\" a Rusiei are până la 1.000 de nave",
+            "isPortraitImage": false,
+            "id": "c81p8pkxv53o",
+            "visualProminence": "NORMAL"
+          },
+          {
+            "type": "article",
+            "isLive": false,
+            "title": "„Flota fantomă\" a Rusiei are până la 1.000 de nave, afirmă Macron",
+            "firstPublished": "2025-10-01T14:23:31.982Z",
+            "lastPublished": "2025-10-01T14:23:31.982Z",
+            "link": "https://www.bbc.com/romania/articles/cqr353vwv57o",
+            "imageUrl": "https://ichef.bbci.co.uk/ace/ws/{width}/cpsdevpb/fd8f/test/107a80f0-9ed2-11f0-8743-fdd152a2466d.jpg.webp",
+            "description": "Președintele francez Emmanuel Macron a afirmat miercuri că este „un lucru bun\" faptul că Franța anchetează o presupusă încălcare a legii ",
+            "imageAlt": "„Flota fantomă\" a Rusiei are până la 1.000 de nave",
+            "isPortraitImage": false,
+            "id": "cqr353vwv57o",
+            "visualProminence": "NORMAL"
+          }
+        ],
+        "activePage": 1,
+        "pageCount": 1,
+        "curationId": "urn:bbc:tipo:list:eb5458d5-256e-42a7-a1a9-9b1d046d3d4a",
+        "curationType": "tipo-curation",
+        "position": 0,
+        "visualProminence": "HIGH",
+        "title": "Top Stories",
+        "visualStyle": "COLLECTION"
+      },
+      {
+        "summaries": [],
+        "activePage": 1,
+        "pageCount": 1,
+        "curationId": "urn:bbc:tipo:list:c60935d1-26bd-4c10-b923-4544c2050bb6",
+        "curationType": "tipo-curation",
+        "position": 1,
+        "visualProminence": "HIGH",
+        "title": "Editor's choice",
+        "visualStyle": "COLLECTION"
+      }
+    ],
+    "metadata": {
+      "atiAnalytics": {
+        "contentId": "urn:bbc:tipo:topic:cj4p63k4kxw6t",
+        "contentType": "index-home",
+        "pageIdentifier": "romania.page",
+        "pageTitle": "Home - BBC România"
+      }
+    }
+  },
+  "contentType": "application/json; charset=utf-8"
+}

envConfig/live.env

@@ -2,7 +2,7 @@
 SIMORGH_BASE_URL=https://www.bbc.com
 SIMORGH_PUBLIC_STATIC_ASSETS_ORIGIN=https://static.files.bbci.co.uk
 SIMORGH_PUBLIC_STATIC_ASSETS_PATH=/ws/simorgh-assets/public/
-SIMORGH_ATI_BASE_URL=https://a1.api.bbc.co.uk/hit.xiti?
+SIMORGH_ATI_BASE_URL=https://a1.api.bbc.co.uk
 SIMORGH_CONFIG_URL=https://config.api.bbci.co.uk/
 SIMORGH_INCLUDES_BASE_URL=https://www.bbc.com/ws/includes
 SIMORGH_INCLUDES_BASE_AMP_URL=https://news.files.bbci.co.uk
@@ -24,7 +24,7 @@ AWS_EMF_LOG_GROUP_NAME=SimorghServer
 AWS_EMF_ENVIRONMENT=EC2
 
 # Reverb Reporting
-SIMORGH_REVERB_SOURCE=https://static.files.bbci.co.uk/ws/simorgh-assets/public/static/js/reverb/reverb-3.10.2.js
+SIMORGH_REVERB_SOURCE=https://mybbc-analytics.files.bbci.co.uk/reverb-client-js/reverb-3.10.2.js
 
 ## WebVitals Reporting
 SIMORGH_WEBVITALS_REPORTING_ENDPOINT=https://ws.bbc-reporting-api.app/report-endpoint 

envConfig/local.env

@@ -2,7 +2,7 @@
 SIMORGH_BASE_URL=http://localhost:7080
 SIMORGH_PUBLIC_STATIC_ASSETS_ORIGIN=http://localhost:7080
 SIMORGH_PUBLIC_STATIC_ASSETS_PATH=/
-SIMORGH_ATI_BASE_URL=https://logws1363.ati-host.net?
+SIMORGH_ATI_BASE_URL=https://logws1363.ati-host.net
 SIMORGH_CONFIG_URL=https://config.test.api.bbci.co.uk/
 SIMORGH_INCLUDES_BASE_URL=https://www.test.bbc.com/ws/includes
 SIMORGH_INCLUDES_BASE_AMP_URL=https://news.test.files.bbci.co.uk
@@ -25,7 +25,7 @@ AWS_EMF_LOG_GROUP_NAME=SimorghServer
 AWS_EMF_ENVIRONMENT=Local
 
 # Reverb Reporting
-SIMORGH_REVERB_SOURCE=http://localhost:7080/static/js/reverb/reverb-3.10.2.js
+SIMORGH_REVERB_SOURCE= https://mybbc-analytics.files.bbci.co.uk/reverb-client-js/reverb-3.10.2.js
 
 ## WebVitals Reporting
 SIMORGH_WEBVITALS_REPORTING_ENDPOINT=https://ws.bbc-reporting-api.app/report-endpoint 

envConfig/preview1.env

@@ -2,7 +2,7 @@
 SIMORGH_BASE_URL=https://www.test.bbc.com
 SIMORGH_PUBLIC_STATIC_ASSETS_ORIGIN=https://static.test.files.bbci.co.uk
 SIMORGH_PUBLIC_STATIC_ASSETS_PATH=/ws/simorgh1-preview-assets/public/
-SIMORGH_ATI_BASE_URL=https://logws1363.ati-host.net?
+SIMORGH_ATI_BASE_URL=https://logws1363.ati-host.net
 SIMORGH_CONFIG_URL=https://config.test.api.bbci.co.uk/
 SIMORGH_INCLUDES_BASE_URL=https://www.test.bbc.com/ws/includes
 SIMORGH_INCLUDES_BASE_AMP_URL=https://news.test.files.bbci.co.uk
@@ -24,7 +24,7 @@ AWS_EMF_LOG_GROUP_NAME=SimorghServer
 AWS_EMF_ENVIRONMENT=EC2
 
 # Reverb Reporting
-SIMORGH_REVERB_SOURCE=https://static.test.files.bbci.co.uk/ws/simorgh1-preview-assets/public/static/js/reverb/reverb-3.10.2.js
+SIMORGH_REVERB_SOURCE=https://mybbc-analytics.files.bbci.co.uk/reverb-client-js/reverb-3.10.2.js
 
 ## WebVitals Reporting
 SIMORGH_WEBVITALS_REPORTING_ENDPOINT=https://ws.bbc-reporting-api.app/report-endpoint 

envConfig/preview2.env

@@ -2,7 +2,7 @@
 SIMORGH_BASE_URL=https://www.test.bbc.com
 SIMORGH_PUBLIC_STATIC_ASSETS_ORIGIN=https://static.test.files.bbci.co.uk
 SIMORGH_PUBLIC_STATIC_ASSETS_PATH=/ws/simorgh2-preview-assets/public/
-SIMORGH_ATI_BASE_URL=https://logws1363.ati-host.net?
+SIMORGH_ATI_BASE_URL=https://logws1363.ati-host.net
 SIMORGH_CONFIG_URL=https://config.test.api.bbci.co.uk/
 SIMORGH_INCLUDES_BASE_URL=https://www.test.bbc.com/ws/includes
 SIMORGH_INCLUDES_BASE_AMP_URL=https://news.test.files.bbci.co.uk
@@ -24,7 +24,7 @@ AWS_EMF_LOG_GROUP_NAME=SimorghServer
 AWS_EMF_ENVIRONMENT=EC2
 
 # Reverb Reporting
-SIMORGH_REVERB_SOURCE=https://static.test.files.bbci.co.uk/ws/simorgh2-preview-assets/public/static/js/reverb/reverb-3.10.2.js
+SIMORGH_REVERB_SOURCE=https://mybbc-analytics.files.bbci.co.uk/reverb-client-js/reverb-3.10.2.js
 
 ## WebVitals Reporting
 SIMORGH_WEBVITALS_REPORTING_ENDPOINT=https://ws.bbc-reporting-api.app/report-endpoint 

envConfig/test.env

@@ -2,7 +2,7 @@
 SIMORGH_BASE_URL=https://www.test.bbc.com
 SIMORGH_PUBLIC_STATIC_ASSETS_ORIGIN=https://static.test.files.bbci.co.uk
 SIMORGH_PUBLIC_STATIC_ASSETS_PATH=/ws/simorgh-assets/public/
-SIMORGH_ATI_BASE_URL=https://logws1363.ati-host.net?
+SIMORGH_ATI_BASE_URL=https://logws1363.ati-host.net
 SIMORGH_CONFIG_URL=https://config.test.api.bbci.co.uk/
 SIMORGH_INCLUDES_BASE_URL=https://www.test.bbc.com/ws/includes
 SIMORGH_INCLUDES_BASE_AMP_URL=https://news.test.files.bbci.co.uk
@@ -24,7 +24,7 @@ AWS_EMF_LOG_GROUP_NAME=SimorghServer
 AWS_EMF_ENVIRONMENT=EC2
 
 # Reverb Reporting
-SIMORGH_REVERB_SOURCE=https://static.test.files.bbci.co.uk/ws/simorgh-assets/public/static/js/reverb/reverb-3.10.2.js
+SIMORGH_REVERB_SOURCE=https://mybbc-analytics.files.bbci.co.uk/reverb-client-js/reverb-3.10.2.js
 
 ## WebVitals Reporting
 SIMORGH_WEBVITALS_REPORTING_ENDPOINT=https://ws.bbc-reporting-api.app/report-endpoint 

src/server/Document/__snapshots__/component.test.jsx.snap

@@ -142,7 +142,7 @@ exports[`Document Component should render APP version correctly 1`] = `
               window.__reverb.__rejectReverbLoaded();
             }, 5000);
             const reverbScript = document.createElement('script');
-            reverbScript.setAttribute('src','http://localhost:7080/static/js/reverb/reverb-3.10.2.js');
+            reverbScript.setAttribute('src','https://mybbc-analytics.files.bbci.co.uk/reverb-client-js/reverb-3.10.2.js');
             document.head.appendChild(reverbScript);
 
     </script>
@@ -152,7 +152,7 @@ exports[`Document Component should render APP version correctly 1`] = `
       .css-7prgni-StyledLink{display:inline-block;}
     </style>
     <script>
-      window.SIMORGH_ENV_VARS={"SIMORGH_APP_ENV":"local","SIMORGH_ATI_BASE_URL":"https://logws1363.ati-host.net?","SIMORGH_BASE_URL":"http://localhost:7080","SIMORGH_CONFIG_CACHE_ITEMS":"400","SIMORGH_CONFIG_CACHE_MAX_AGE_SECONDS":"300","SIMORGH_CONFIG_TIMEOUT_SECONDS":"5","SIMORGH_CONFIG_URL":"https://config.test.api.bbci.co.uk/","SIMORGH_CSP_REPORTING_ENDPOINT":"https://ws.bbc-reporting-api.app/report-endpoint","SIMORGH_ICHEF_BASE_URL":"https://ichef.bbci.co.uk","SIMORGH_INCLUDES_BASE_URL":"https://www.test.bbc.com/ws/includes","SIMORGH_INCLUDES_BASE_AMP_URL":"https://news.test.files.bbci.co.uk","SIMORGH_MOST_READ_CDN_URL":"http://localhost:7080","SIMORGH_OPTIMIZELY_SDK_KEY":"LptPKDnHyAFu9V12s5xCz","SIMORGH_PUBLIC_STATIC_ASSETS_ORIGIN":"http://localhost:7080","SIMORGH_PUBLIC_STATIC_ASSETS_PATH":"/","SIMORGH_REVERB_SOURCE":"http://localhost:7080/static/js/reverb/reverb-3.10.2.js","SIMORGH_WEBVITALS_REPORTING_ENDPOINT":"https://ws.bbc-reporting-api.app/report-endpoint","SIMORGH_WEBVITALS_DEFAULT_SAMPLING_RATE":"100"}
+      window.SIMORGH_ENV_VARS={"SIMORGH_APP_ENV":"local","SIMORGH_ATI_BASE_URL":"https://logws1363.ati-host.net?","SIMORGH_BASE_URL":"http://localhost:7080","SIMORGH_CONFIG_CACHE_ITEMS":"400","SIMORGH_CONFIG_CACHE_MAX_AGE_SECONDS":"300","SIMORGH_CONFIG_TIMEOUT_SECONDS":"5","SIMORGH_CONFIG_URL":"https://config.test.api.bbci.co.uk/","SIMORGH_CSP_REPORTING_ENDPOINT":"https://ws.bbc-reporting-api.app/report-endpoint","SIMORGH_ICHEF_BASE_URL":"https://ichef.bbci.co.uk","SIMORGH_INCLUDES_BASE_URL":"https://www.test.bbc.com/ws/includes","SIMORGH_INCLUDES_BASE_AMP_URL":"https://news.test.files.bbci.co.uk","SIMORGH_MOST_READ_CDN_URL":"http://localhost:7080","SIMORGH_OPTIMIZELY_SDK_KEY":"LptPKDnHyAFu9V12s5xCz","SIMORGH_PUBLIC_STATIC_ASSETS_ORIGIN":"http://localhost:7080","SIMORGH_PUBLIC_STATIC_ASSETS_PATH":"/","SIMORGH_REVERB_SOURCE":"https://mybbc-analytics.files.bbci.co.uk/reverb-client-js/reverb-3.10.2.js","SIMORGH_WEBVITALS_REPORTING_ENDPOINT":"https://ws.bbc-reporting-api.app/report-endpoint","SIMORGH_WEBVITALS_DEFAULT_SAMPLING_RATE":"100"}
     </script>
     <script
       type="text/javascript"
@@ -398,7 +398,7 @@ exports[`Document Component should render correctly 1`] = `
               window.__reverb.__rejectReverbLoaded();
             }, 5000);
             const reverbScript = document.createElement('script');
-            reverbScript.setAttribute('src','http://localhost:7080/static/js/reverb/reverb-3.10.2.js');
+            reverbScript.setAttribute('src','https://mybbc-analytics.files.bbci.co.uk/reverb-client-js/reverb-3.10.2.js');
             document.head.appendChild(reverbScript);
 
     </script>
@@ -408,7 +408,7 @@ exports[`Document Component should render correctly 1`] = `
       .css-7prgni-StyledLink{display:inline-block;}
     </style>
     <script>
-      window.SIMORGH_ENV_VARS={"SIMORGH_APP_ENV":"local","SIMORGH_ATI_BASE_URL":"https://logws1363.ati-host.net?","SIMORGH_BASE_URL":"http://localhost:7080","SIMORGH_CONFIG_CACHE_ITEMS":"400","SIMORGH_CONFIG_CACHE_MAX_AGE_SECONDS":"300","SIMORGH_CONFIG_TIMEOUT_SECONDS":"5","SIMORGH_CONFIG_URL":"https://config.test.api.bbci.co.uk/","SIMORGH_CSP_REPORTING_ENDPOINT":"https://ws.bbc-reporting-api.app/report-endpoint","SIMORGH_ICHEF_BASE_URL":"https://ichef.bbci.co.uk","SIMORGH_INCLUDES_BASE_URL":"https://www.test.bbc.com/ws/includes","SIMORGH_INCLUDES_BASE_AMP_URL":"https://news.test.files.bbci.co.uk","SIMORGH_MOST_READ_CDN_URL":"http://localhost:7080","SIMORGH_OPTIMIZELY_SDK_KEY":"LptPKDnHyAFu9V12s5xCz","SIMORGH_PUBLIC_STATIC_ASSETS_ORIGIN":"http://localhost:7080","SIMORGH_PUBLIC_STATIC_ASSETS_PATH":"/","SIMORGH_REVERB_SOURCE":"http://localhost:7080/static/js/reverb/reverb-3.10.2.js","SIMORGH_WEBVITALS_REPORTING_ENDPOINT":"https://ws.bbc-reporting-api.app/report-endpoint","SIMORGH_WEBVITALS_DEFAULT_SAMPLING_RATE":"100"}
+      window.SIMORGH_ENV_VARS={"SIMORGH_APP_ENV":"local","SIMORGH_ATI_BASE_URL":"https://logws1363.ati-host.net?","SIMORGH_BASE_URL":"http://localhost:7080","SIMORGH_CONFIG_CACHE_ITEMS":"400","SIMORGH_CONFIG_CACHE_MAX_AGE_SECONDS":"300","SIMORGH_CONFIG_TIMEOUT_SECONDS":"5","SIMORGH_CONFIG_URL":"https://config.test.api.bbci.co.uk/","SIMORGH_CSP_REPORTING_ENDPOINT":"https://ws.bbc-reporting-api.app/report-endpoint","SIMORGH_ICHEF_BASE_URL":"https://ichef.bbci.co.uk","SIMORGH_INCLUDES_BASE_URL":"https://www.test.bbc.com/ws/includes","SIMORGH_INCLUDES_BASE_AMP_URL":"https://news.test.files.bbci.co.uk","SIMORGH_MOST_READ_CDN_URL":"http://localhost:7080","SIMORGH_OPTIMIZELY_SDK_KEY":"LptPKDnHyAFu9V12s5xCz","SIMORGH_PUBLIC_STATIC_ASSETS_ORIGIN":"http://localhost:7080","SIMORGH_PUBLIC_STATIC_ASSETS_PATH":"/","SIMORGH_REVERB_SOURCE":"https://mybbc-analytics.files.bbci.co.uk/reverb-client-js/reverb-3.10.2.js","SIMORGH_WEBVITALS_REPORTING_ENDPOINT":"https://ws.bbc-reporting-api.app/report-endpoint","SIMORGH_WEBVITALS_DEFAULT_SAMPLING_RATE":"100"}
     </script>
     <script
       type="text/javascript"

src/server/index.jsx

@@ -168,19 +168,21 @@ const injectPlatformToRequestChainHeader = (req, res, next) => {
 };
 
 const injectResourceHintsHeader = (req, res, next) => {
-  const assetOrigins = getAssetOrigins();
-  res.set(
-    'Link',
-    assetOrigins
-      .map(domainName => {
-        const crossOrigin =
-          domainName === 'https://static.files.bbci.co.uk'
-            ? `,<${domainName}>; rel="preconnect"; crossorigin`
-            : '';
-        return `<${domainName}>; rel="dns-prefetch", <${domainName}>; rel="preconnect"${crossOrigin}`;
-      })
-      .join(','),
+  const { dnsPrefetchOrigins, preconnectOrigins } = getAssetOrigins(
+    req.originalUrl,
   );
+
+  const resourceHintsConfig = [
+    ...dnsPrefetchOrigins.map(
+      domainName => `<${domainName}>; rel="dns-prefetch"`,
+    ),
+    ...preconnectOrigins.map(
+      domainName => `<${domainName}>; rel="preconnect"; crossorigin`,
+    ),
+  ];
+
+  res.set('Link', resourceHintsConfig.join(','));
+
   next();
 };
 // Set Referrer-Policy