Skip to content

Commit fd8381a

Browse files
authored
Merge branch 'main' into cricket-mini-match-stats
2 parents 12a44b7 + d9e3f24 commit fd8381a

135 files changed

Lines changed: 588 additions & 555 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ab-testing/config/abTests.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,6 @@ const ABTests: ABTest[] = [
5757
groups: ["control"],
5858
shouldForceMetricsCollection: false,
5959
},
60-
{
61-
name: "commercial-hosted-gallery",
62-
description: "Preview the Hosted Gallery pages using dotcom-rendering",
63-
owners: ["commercial.dev@guardian.co.uk"],
64-
expirationDate: "2026-09-01",
65-
type: "server",
66-
status: "ON",
67-
audienceSize: 0 / 100,
68-
audienceSpace: "A",
69-
groups: ["preview"],
70-
shouldForceMetricsCollection: false,
71-
},
7260
{
7361
name: "growth-auxia-banner",
7462
description: "Use Auxia API for deciding when to show a RR banner",
@@ -125,14 +113,26 @@ const ABTests: ABTest[] = [
125113
description:
126114
"Test to measure impact of adding full width to spacefinder",
127115
owners: ["commercial.dev@guardian.co.uk"],
128-
expirationDate: "2026-07-04",
116+
expirationDate: "2026-07-14",
129117
type: "client",
130118
status: "ON",
131119
audienceSize: 5 / 100,
132120
audienceSpace: "A",
133121
groups: ["holdback", "control"],
134122
shouldForceMetricsCollection: true,
135123
},
124+
{
125+
name: "commercial-ozone-outstream",
126+
description: "A test to ensure correct integration of Ozone outstream.",
127+
owners: ["commercial.dev@guardian.co.uk"],
128+
expirationDate: "2026-09-23",
129+
type: "client",
130+
status: "ON",
131+
audienceSize: 0 / 100,
132+
audienceSpace: "A",
133+
groups: ["control", "variant"],
134+
shouldForceMetricsCollection: false,
135+
},
136136
{
137137
name: "fronts-and-curation-loop-click-through",
138138
description:

dotcom-rendering/docs/contributing/how-to.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,13 @@ We currently use [SWR](https://swr.vercel.app/) to manage AJAX requests on the
4949
client. Your starting point should be the [`useApi` hook](/dotcom-rendering/src/lib/useApi.ts),
5050
which is DCR's wrapper around SWR's own hook. Because this hook requires
5151
client-side React code, you will need to place your component in an `<Island>` wrapper.
52+
53+
## How can I interact with the API on CODE/PROD?
54+
55+
The DCR load balancers are configured to accept requests from within the VPC; they are not available on the public internet.
56+
To make requests to the API from your local machine, use the [SOCKS proxy](https://github.com/guardian/platform/blob/main/cdk/lib/socks-proxy.ts):
57+
58+
1. Obtain AWS credentials via Janus, preferably using the minimal `socks-proxy` Developer Policy (`DeveloperPolicyGrants.frontendSocksProxy`)
59+
2. Run the `browse-with-socks-proxy` script from the [`guardian/platform` repo](https://github.com/guardian/platform/blob/main/scripts/browse-with-socks-proxy):
60+
This will start a new instance of the Chrome browser with a SOCKS proxy configured to route request via an EC2 instance in the VPC.
61+
You can now browse the DCR API on CODE/PROD from this browser instance.

dotcom-rendering/fixtures/config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ module.exports = {
155155
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
156156
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
157157
mmaUrl: 'https://manage.theguardian.com',
158-
abTests: {},
159158
serverSideABTests: {},
160159
edition: 'UK',
161160
ipsosTag: 'environment',

dotcom-rendering/fixtures/generated/cricket-match.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1884,7 +1884,6 @@ export const cricketMatchData: FECricketMatchPage = {
18841884
shouldLoadGoogletag: true,
18851885
inizio: true,
18861886
},
1887-
abTests: {},
18881887
serverSideABTests: {},
18891888
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
18901889
stage: 'PROD',

dotcom-rendering/fixtures/generated/fe-articles/AffiliateProductShowcase.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4080,7 +4080,6 @@ export const AffiliateProductShowcase: FEArticle = {
40804080
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
40814081
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
40824082
mmaUrl: 'https://manage.theguardian.com',
4083-
abTests: {},
40844083
serverSideABTests: {},
40854084
edition: 'UK',
40864085
ipsosTag: 'environment',

dotcom-rendering/fixtures/generated/fe-articles/AffiliateProductStandard.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2723,7 +2723,6 @@ export const AffiliateProductStandard: FEArticle = {
27232723
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
27242724
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
27252725
mmaUrl: 'https://manage.theguardian.com',
2726-
abTests: {},
27272726
serverSideABTests: {},
27282727
edition: 'UK',
27292728
ipsosTag: 'environment',

dotcom-rendering/fixtures/generated/fe-articles/Analysis.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,6 @@ export const Analysis: FEArticle = {
815815
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
816816
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
817817
mmaUrl: 'https://manage.theguardian.com',
818-
abTests: {},
819818
serverSideABTests: {},
820819
edition: 'UK',
821820
ipsosTag: 'environment',

dotcom-rendering/fixtures/generated/fe-articles/Audio.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,6 @@ export const Audio: FEArticle = {
456456
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
457457
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
458458
mmaUrl: 'https://manage.theguardian.com',
459-
abTests: {},
460459
serverSideABTests: {},
461460
edition: 'UK',
462461
ipsosTag: 'environment',

dotcom-rendering/fixtures/generated/fe-articles/Comment.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,6 @@ export const Comment: FEArticle = {
783783
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
784784
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
785785
mmaUrl: 'https://manage.theguardian.com',
786-
abTests: {},
787786
serverSideABTests: {},
788787
edition: 'UK',
789788
ipsosTag: 'environment',

dotcom-rendering/fixtures/generated/fe-articles/Dead.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3192,7 +3192,6 @@ export const Dead: FEArticle = {
31923192
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
31933193
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
31943194
mmaUrl: 'https://manage.theguardian.com',
3195-
abTests: {},
31963195
serverSideABTests: {},
31973196
edition: 'UK',
31983197
ipsosTag: 'environment',

0 commit comments

Comments
 (0)