Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dotcom-rendering/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@guardian/shimport": "1.0.2",
"@guardian/source": "11.3.0",
"@guardian/source-development-kitchen": "18.1.1",
"@guardian/support-dotcom-components": "8.4.2",
"@guardian/support-dotcom-components": "8.5.0",
"@guardian/tsconfig": "0.2.0",
"@playwright/test": "1.58.0",
"@sentry/browser": "10.39.0",
Expand Down
2 changes: 2 additions & 0 deletions dotcom-rendering/src/components/Island.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ describe('Island: server-side rendering', () => {
pageId={''}
keywordIds={''}
renderingTarget={'Web'}
isSensitive={false}
/>,
),
).not.toThrow();
Expand Down Expand Up @@ -430,6 +431,7 @@ describe('Island: server-side rendering', () => {
renderAds={true}
isLabs={false}
articleEndSlot={true}
isSensitive={false}
/>
</WithConfig>,
),
Expand Down
6 changes: 6 additions & 0 deletions dotcom-rendering/src/components/LiveBlogEpic.island.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ type Props = {
pageId: string;
keywordIds: string;
renderingTarget: RenderingTarget;
isSensitive: boolean;
};

const useEpic = ({ name }: { name: string }) => {
Expand Down Expand Up @@ -90,13 +91,15 @@ const usePayload = ({
isPaidContent,
tags,
pageId,
isSensitive,
}: {
shouldHideReaderRevenue: boolean;
sectionId: string;
isPaidContent: boolean;
tags: TagType[];
pageId: string;
keywordIds: string;
isSensitive: boolean;
}): EpicPayload | undefined => {
const articleCounts = useArticleCounts(pageId, tags, 'LiveBlog');
const hasOptedOutOfArticleCount = useHasOptedOutOfArticleCount();
Expand Down Expand Up @@ -134,6 +137,7 @@ const usePayload = ({
isSignedIn,
pageId,
inHoldbackGroup,
isSensitive,
},
};
};
Expand Down Expand Up @@ -243,6 +247,7 @@ export const LiveBlogEpic = ({
pageId,
keywordIds,
renderingTarget,
isSensitive,
}: Props) => {
log('dotcom', 'LiveBlogEpic started');

Expand All @@ -262,6 +267,7 @@ export const LiveBlogEpic = ({
tags,
pageId,
keywordIds,
isSensitive,
});
if (!ophanPageViewId || !payload || !pageUrl) return null;

Expand Down
1 change: 1 addition & 0 deletions dotcom-rendering/src/components/LiveBlogRenderer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ export const LiveBlogRenderer = ({
pageId={pageId}
keywordIds={keywordIds}
renderingTarget={renderingTarget}
isSensitive={isSensitive}
/>
</Island>
)}
Expand Down
4 changes: 4 additions & 0 deletions dotcom-rendering/src/components/SlotBodyEnd.island.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ type Props = {
renderAds: boolean;
isLabs: boolean;
articleEndSlot: boolean;
isSensitive: boolean;
};

const slotStyles = css`
Expand Down Expand Up @@ -118,6 +119,7 @@ export const SlotBodyEnd = ({
renderAds,
isLabs,
articleEndSlot,
isSensitive,
}: Props) => {
const { renderingTarget } = useConfig();
const { brazeMessages, braze } = useBraze(idApiUrl, renderingTarget);
Expand Down Expand Up @@ -175,6 +177,7 @@ export const SlotBodyEnd = ({
'growth-holdback-group',
'control',
) ?? false,
isSensitive,
});
const brazeArticleContext: BrazeArticleContext = {
section: sectionId,
Expand Down Expand Up @@ -230,6 +233,7 @@ export const SlotBodyEnd = ({
pageId,
braze,
abTests,
isSensitive,
]);

useEffect(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ export type CanShowData = {
ophanPageViewId: string;
pageId?: string;
inHoldbackGroup?: boolean;
isSensitive: boolean;
};

const buildPayload = async (
Expand All @@ -75,6 +76,7 @@ const buildPayload = async (
isSignedIn: data.isSignedIn,
pageId: data.pageId,
inHoldbackGroup: data.inHoldbackGroup,
isSensitive: data.isSensitive,
},
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ const buildPayload = async ({
pageId,
inHoldbackGroup,
inAuxiaVariant,
isSensitive,
}: BuildPayloadProps): Promise<BannerPayload> => {
const getBrowserId = (): string | undefined => {
if (!inAuxiaVariant) return undefined;
Expand Down Expand Up @@ -170,6 +171,7 @@ const buildPayload = async ({
pageId,
inHoldbackGroup,
browserId: getBrowserId(),
isSensitive,
},
};
};
Expand Down
3 changes: 3 additions & 0 deletions dotcom-rendering/src/layouts/AudioLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,9 @@ export const AudioLayout = (props: WebProps) => {
!!article.config.switches
.articleEndSlot
}
isSensitive={
article.config.isSensitive
}
/>
</Island>
)}
Expand Down
3 changes: 3 additions & 0 deletions dotcom-rendering/src/layouts/CommentLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -629,6 +629,9 @@ export const CommentLayout = (props: WebProps | AppsProps) => {
!!article.config.switches
.articleEndSlot
}
isSensitive={
article.config.isSensitive
}
/>
</Island>
)}
Expand Down
3 changes: 3 additions & 0 deletions dotcom-rendering/src/layouts/ImmersiveLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,9 @@ export const ImmersiveLayout = (props: WebProps | AppProps) => {
!!article.config.switches
.articleEndSlot
}
isSensitive={
article.config.isSensitive
}
/>
</Island>
)}
Expand Down
1 change: 1 addition & 0 deletions dotcom-rendering/src/layouts/InteractiveLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,7 @@ export const InteractiveLayout = (props: WebProps | AppsProps) => {
articleEndSlot={
!!article.config.switches.articleEndSlot
}
isSensitive={article.config.isSensitive}
/>
</Island>
</div>
Expand Down
3 changes: 3 additions & 0 deletions dotcom-rendering/src/layouts/ShowcaseLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,9 @@ export const ShowcaseLayout = (props: WebProps | AppsProps) => {
!!article.config.switches
.articleEndSlot
}
isSensitive={
article.config.isSensitive
}
/>
</Island>
)}
Expand Down
3 changes: 3 additions & 0 deletions dotcom-rendering/src/layouts/StandardLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,9 @@ export const StandardLayout = (props: WebProps | AppProps) => {
!!article.config.switches
.articleEndSlot
}
isSensitive={
article.config.isSensitive
}
/>
</Island>
)}
Expand Down
17 changes: 12 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading