Merge branch 'main' into jm/feat-refactor-banner-component

Author: juabara

.github/workflows/check-labels.yaml

@@ -6,4 +6,4 @@ on:
     types: [opened, labeled, unlabeled, synchronize, reopened, edited]
 jobs:
   require-label:
-    uses: guardian/.github/.github/workflows/require-label.yaml@d8e99387686ec439e37c883ba9bb8ab2b43a6b81 #  v3.0.0
+    uses: guardian/.github/.github/workflows/require-label.yaml@02937505d39c570351300878870233e0b1a5e073 #  v3.1.0

ab-testing/cdk/package.json

@@ -21,8 +21,8 @@
 		]
 	},
 	"devDependencies": {
-		"@aws-sdk/client-s3": "3.931.0",
-		"@aws-sdk/client-ssm": "3.621.0",
+		"@aws-sdk/client-s3": "3.991.0",
+		"@aws-sdk/client-ssm": "3.991.0",
 		"@guardian/cdk": "62.0.1",
 		"@guardian/eslint-config": "12.0.1",
 		"@guardian/tsconfig": "1.0.1",

ab-testing/config/package.json

@@ -28,8 +28,8 @@
 		]
 	},
 	"devDependencies": {
-		"@aws-sdk/client-s3": "3.931.0",
-		"@aws-sdk/client-ssm": "3.621.0",
+		"@aws-sdk/client-s3": "3.991.0",
+		"@aws-sdk/client-ssm": "3.991.0",
 		"@guardian/cdk": "62.0.1",
 		"@guardian/eslint-config": "12.0.1",
 		"@guardian/tsconfig": "1.0.1",

ab-testing/deploy-lambda/package.json

@@ -12,8 +12,8 @@
 		"prettier:fix": "prettier . --write --cache"
 	},
 	"dependencies": {
-		"@aws-sdk/client-s3": "3.981.0",
-		"@aws-sdk/client-ssm": "3.981.0",
+		"@aws-sdk/client-s3": "3.991.0",
+		"@aws-sdk/client-ssm": "3.991.0",
 		"@guardian/ab-testing-config": "workspace:ab-testing-config",
 		"superstruct": "2.0.2"
 	},

ab-testing/frontend/src/lib/components/GrafanaLink.svelte

@@ -0,0 +1,14 @@
+<script lang="ts">
+	interface Props {
+		testName: string;
+	}
+
+	const { testName }: Props = $props();
+</script>
+
+<a
+	href={`https://metrics.gutools.co.uk/d/bfd4abner943ke/page-views?folderUid=efd48ip6ch3i8f&orgId=1&from=now-7d&to=now&var-test_name=${testName}`}
+	target="_blank"
+>
+	Grafana
+</a>

ab-testing/frontend/src/lib/components/OphanLink.svelte

@@ -10,5 +10,5 @@
 	href={`https://dashboard.ophan.co.uk/graph/breakdown?day=today&ab=${testName}`}
 	target="_blank"
 >
-	graph
+	Ophan
 </a>

ab-testing/frontend/src/lib/components/TableFixed.svelte

@@ -1,7 +1,8 @@
 <script lang="ts">
-	import type { ABTest } from '../../../../types.js';
-	import OphanLink from '$lib/components/OphanLink.svelte';
-	import TestVariants from '$lib/components/TestVariants.svelte';
+	import type { ABTest } from "../../../../types.js";
+	import OphanLink from "$lib/components/OphanLink.svelte";
+	import TestVariants from "$lib/components/TestVariants.svelte";
+	import GrafanaLink from "./GrafanaLink.svelte";
 
 	interface Props {
 		tests: ABTest[];
@@ -39,7 +40,7 @@
 					<th scope="col">Test Groups</th>
 					<th scope="col">Expires In</th>
 					<th scope="col">Audience</th>
-					<th scope="col">Ophan</th>
+					<th scope="col">Page Views</th>
 				</tr>
 			</thead>
 			<tbody>
@@ -49,7 +50,7 @@
 					>
 					<td
 						class="status"
-						class:off={test.status === 'OFF'}
+						class:off={test.status === "OFF"}
 						class:expired
 					>
 						{#if expired}
@@ -69,7 +70,11 @@
 						>{daysToExpiry(test.expirationDate)} days</td
 					>
 					<td>{test.audienceSize * 100}%</td>
-					<td><OphanLink testName={test.name} /></td>
+					<td>
+						<GrafanaLink testName={test.name} /> | <OphanLink
+							testName={test.name}
+						/>
+					</td>
 				</tr>
 				<tr>
 					<th scope="row">Description</th>
@@ -106,7 +111,7 @@
 		padding: 8px;
 	}
 
-	th[scope='col'] {
+	th[scope="col"] {
 		background-color: var(--light-grey);
 	}
 

ab-testing/notification-lambda/package.json

@@ -13,8 +13,8 @@
 		"prettier:fix": "prettier . --write --cache"
 	},
 	"dependencies": {
-		"@aws-sdk/client-ses": "3.981.0",
-		"@aws-sdk/credential-providers": "3.981.0",
+		"@aws-sdk/client-ses": "3.991.0",
+		"@aws-sdk/credential-providers": "3.991.0",
 		"@guardian/ab-testing-config": "workspace:ab-testing-config"
 	},
 	"devDependencies": {

dotcom-rendering/fixtures/manual/footballMatches.ts

@@ -17,7 +17,7 @@ const matchData = {
 	},
 	leg: '1',
 	homeTeam: {
-		id: '1',
+		id: '44',
 		name: 'Home Team',
 	},
 	awayTeam: {
@@ -66,7 +66,7 @@ export const matchDayLive: FEMatchDay = {
 	},
 	awayTeam: {
 		...matchData.awayTeam,
-		score: 3,
+		score: 4,
 	},
 };
 

dotcom-rendering/package.json

@@ -19,7 +19,7 @@
 		"build-storybook": "storybook build"
 	},
 	"dependencies": {
-		"@aws-sdk/client-cloudwatch": "3.981.0",
+		"@aws-sdk/client-cloudwatch": "3.991.0",
 		"@babel/helper-compilation-targets": "7.28.6",
 		"@braze/web-sdk": "5.8.1",
 		"@creditkarma/thrift-server-core": "1.0.4",
@@ -88,7 +88,7 @@
 		"@types/webpack-env": "1.18.8",
 		"@types/webpack-node-externals": "3.0.4",
 		"@types/youtube": "0.0.50",
-		"ajv": "8.17.1",
+		"ajv": "8.18.0",
 		"ajv-formats": "2.1.1",
 		"aws-cdk": "2.1030.0",
 		"aws-cdk-lib": "2.220.0",