Skip to content

Commit 4f30207

Browse files
committed
feat: support embedded videos in CMS pages and articles
KK-1001. Upgraded the HCRC-lib, configured the trusted origins and iframe as a safe tag.
1 parent 7f26092 commit 4f30207

8 files changed

Lines changed: 20 additions & 16 deletions

File tree

apps/events-helsinki/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"react-datepicker": "^4.8.0",
7272
"react-dom": "18.2.0",
7373
"react-error-boundary": "3.1.4",
74-
"react-helsinki-headless-cms": "1.0.0-alpha124",
74+
"react-helsinki-headless-cms": "1.0.0-alpha126",
7575
"react-i18next": "12.2.0",
7676
"react-scroll": "^1.8.7",
7777
"react-toastify": "^9.0.3",

apps/hobbies-helsinki/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"react-datepicker": "^4.8.0",
7272
"react-dom": "18.2.0",
7373
"react-error-boundary": "3.1.4",
74-
"react-helsinki-headless-cms": "1.0.0-alpha124",
74+
"react-helsinki-headless-cms": "1.0.0-alpha126",
7575
"react-i18next": "12.2.0",
7676
"react-scroll": "^1.8.7",
7777
"react-toastify": "^9.0.3",

apps/sports-helsinki/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
"react-datepicker": "^4.8.0",
8080
"react-dom": "18.2.0",
8181
"react-error-boundary": "3.1.4",
82-
"react-helsinki-headless-cms": "1.0.0-alpha124",
82+
"react-helsinki-headless-cms": "1.0.0-alpha126",
8383
"react-i18next": "12.2.0",
8484
"react-leaflet": "4.2.0",
8585
"react-scroll": "^1.8.7",

packages/components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"react-datepicker": "^4.8.0",
7272
"react-dom": "18.2.0",
7373
"react-error-boundary": "3.1.4",
74-
"react-helsinki-headless-cms": "1.0.0-alpha124",
74+
"react-helsinki-headless-cms": "1.0.0-alpha126",
7575
"react-i18next": "12.2.0",
7676
"react-leaflet": "4.2.0",
7777
"react-toastify": "^9.0.3",

packages/components/src/components/footer/Footer.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ const FooterSection: FunctionComponent<FooterSectionProps> = ({
4848
copyrightText={t('footer:allRightsReserved')}
4949
>
5050
{footerMenu?.menuItems?.nodes?.map(
51-
// FIXME: HCRC-build sometimes fails - this type should not be needed.
52-
(navigationItem: Menu['menuItems']['nodes'][number]) => (
51+
// NOTE: HCRC-build sometimes fails - this type should not be needed.
52+
(navigationItem) => (
5353
<Footer.Item
5454
className={styles.footerLink}
5555
key={navigationItem?.id}

packages/components/src/hooks/useCommonCmsConfig.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ const useCommonCmsConfig = (): Partial<Config> => {
5252
favIconSvgUrl: '/shared-assets/images/favicon.svg',
5353
manifestUrl: '/shared-assets/images/manifest.webmanifest',
5454
},
55+
htmlSanitizer: {
56+
allowedUnsafeTags: ['iframe'],
57+
trustedOrigins: ['https://www.youtube.com', 'https://player.vimeo.com'],
58+
},
5559
};
5660
};
5761

packages/components/src/utils/headless-cms/service.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export const getAllArticles = async (
4040
locale: node.language.code.toLowerCase(),
4141
slug: node.slug,
4242
});
43-
node.translations?.forEach((translation: PageType['translations']) => {
43+
node.translations?.forEach((translation) => {
4444
if (
4545
translation?.uri &&
4646
translation.slug &&
@@ -88,7 +88,7 @@ export const getAllPages = async (
8888
locale: node.language.code.toLowerCase(),
8989
slug: node.slug,
9090
});
91-
node.translations?.forEach((translation: PageType['translations']) => {
91+
node.translations?.forEach((translation) => {
9292
if (
9393
translation?.uri &&
9494
translation.slug &&

yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2672,7 +2672,7 @@ __metadata:
26722672
react-datepicker: "npm:^4.8.0"
26732673
react-dom: "npm:18.2.0"
26742674
react-error-boundary: "npm:3.1.4"
2675-
react-helsinki-headless-cms: "npm:1.0.0-alpha124"
2675+
react-helsinki-headless-cms: "npm:1.0.0-alpha126"
26762676
react-i18next: "npm:12.2.0"
26772677
react-leaflet: "npm:4.2.0"
26782678
react-toastify: "npm:^9.0.3"
@@ -14102,7 +14102,7 @@ __metadata:
1410214102
react-datepicker: "npm:^4.8.0"
1410314103
react-dom: "npm:18.2.0"
1410414104
react-error-boundary: "npm:3.1.4"
14105-
react-helsinki-headless-cms: "npm:1.0.0-alpha124"
14105+
react-helsinki-headless-cms: "npm:1.0.0-alpha126"
1410614106
react-i18next: "npm:12.2.0"
1410714107
react-scroll: "npm:^1.8.7"
1410814108
react-toastify: "npm:^9.0.3"
@@ -16280,7 +16280,7 @@ __metadata:
1628016280
react-datepicker: "npm:^4.8.0"
1628116281
react-dom: "npm:18.2.0"
1628216282
react-error-boundary: "npm:3.1.4"
16283-
react-helsinki-headless-cms: "npm:1.0.0-alpha124"
16283+
react-helsinki-headless-cms: "npm:1.0.0-alpha126"
1628416284
react-i18next: "npm:12.2.0"
1628516285
react-scroll: "npm:^1.8.7"
1628616286
react-toastify: "npm:^9.0.3"
@@ -23988,9 +23988,9 @@ __metadata:
2398823988
languageName: node
2398923989
linkType: hard
2399023990

23991-
"react-helsinki-headless-cms@npm:1.0.0-alpha124":
23992-
version: 1.0.0-alpha124
23993-
resolution: "react-helsinki-headless-cms@npm:1.0.0-alpha124"
23991+
"react-helsinki-headless-cms@npm:1.0.0-alpha126":
23992+
version: 1.0.0-alpha126
23993+
resolution: "react-helsinki-headless-cms@npm:1.0.0-alpha126"
2399423994
dependencies:
2399523995
hds-design-tokens: "npm:^2.3.0"
2399623996
html-react-parser: "npm:^1.4.8"
@@ -24004,7 +24004,7 @@ __metadata:
2400424004
peerDependenciesMeta:
2400524005
"@apollo/client":
2400624006
optional: true
24007-
checksum: e5b3f70518ba3a99261c2ef037d7f655b67ec6366dc678b8f32f2af332de4621ed7857e6682cad5dfc9eb857da7ae4246ea4502c1e621dd07b3972e213104302
24007+
checksum: ffbbfb99b6e49b2df7c0e1770e7cac1d69c0daeccc70076dcc679c64c3993ec868120598c224ab3504b645c72d86fbbd2d5aea9d874a480c98e77fbc62797ad8
2400824008
languageName: node
2400924009
linkType: hard
2401024010

@@ -26344,7 +26344,7 @@ __metadata:
2634426344
react-datepicker: "npm:^4.8.0"
2634526345
react-dom: "npm:18.2.0"
2634626346
react-error-boundary: "npm:3.1.4"
26347-
react-helsinki-headless-cms: "npm:1.0.0-alpha124"
26347+
react-helsinki-headless-cms: "npm:1.0.0-alpha126"
2634826348
react-i18next: "npm:12.2.0"
2634926349
react-leaflet: "npm:4.2.0"
2635026350
react-scroll: "npm:^1.8.7"

0 commit comments

Comments
 (0)