Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const DatasetStructuredData = config => {
structuredData.distribution.forEach(d => (d.contentUrl = getUrl(config)));
structuredData.temporalCoverage = setTemporalCoverage(config);

return JSON.stringify(structuredData);
return JSON.stringify(structuredData).replace(/</g, '\\u003c');
};

export default DatasetStructuredData;
18 changes: 8 additions & 10 deletions src/components/page-helmet/page-helmet.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,14 @@ const PageHelmet = ({
{/* Version info is placed inside a script comment below because both react jsx
and gatsby are unfriendly toward rendering <!-- html comments --> into built pages.
*/}
<script data-testid="version-info">
{`/*
TAG: ${latestTag}
CURRENT BRANCH: ${currentBranch}
COMMIT HASH: ${latestCommit?.hash}
COMMIT MESSAGE: ${latestCommit?.message}
COMMIT DATE: ${latestCommit?.date}
ENV ID: ${ENV_ID}
*/`}
</script>
<meta
data-testid="version-info"
name="build-info"
content={
`\nTAG: ${latestTag} \nCURRENT BRANCH: ${currentBranch} \nCOMMIT MESSAGE: ${latestCommit?.message} ` +
`\nCOMMIT DATE: ${latestCommit?.date} \nENV ID: ${ENV_ID} \nCOMMIT HASH: ${latestCommit?.hash} `
}
/>
<meta charSet="utf-8" />
<meta name="viewport" content="width=device-width" />
<title>{title}</title>
Expand Down
14 changes: 7 additions & 7 deletions src/components/page-helmet/page-helmet.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ describe('page helmet', () => {
});

it('includes version-info', () => {
const versionInfoScript = document.head.querySelector('script[data-testid="version-info"]');
const versionInfoScript = document.head.querySelector('meta[data-testid="version-info"]').content;
expect(versionInfoScript).toBeDefined();
expect(versionInfoScript.innerHTML).toContain('TAG: 2021.5.1');
expect(versionInfoScript.innerHTML).toContain('CURRENT BRANCH: prod');
expect(versionInfoScript.innerHTML).toContain('COMMIT HASH: 123abc');
expect(versionInfoScript.innerHTML).toContain('COMMIT MESSAGE: mock commit msg');
expect(versionInfoScript.innerHTML).toContain('COMMIT DATE: date of commit');
expect(versionInfoScript.innerHTML).toContain('ENV ID: production');
expect(versionInfoScript).toContain('TAG: 2021.5.1');
expect(versionInfoScript).toContain('CURRENT BRANCH: prod');
expect(versionInfoScript).toContain('COMMIT HASH: 123abc');
expect(versionInfoScript).toContain('COMMIT MESSAGE: mock commit msg');
expect(versionInfoScript).toContain('COMMIT DATE: date of commit');
expect(versionInfoScript).toContain('ENV ID: production');
});

it('does not include structured data when not needed', () => {
Expand Down
Loading