From 25942d62b1a50a37b2b560cda4a6ca024b9bd187 Mon Sep 17 00:00:00 2001 From: Romain Emery Date: Mon, 4 Nov 2024 09:52:59 +0100 Subject: [PATCH 1/3] add gallery label (#3701) --- src/implementations/twig/components/gallery/README.md | 1 + .../components/gallery/__snapshots__/gallery.test.js.snap | 5 +++++ .../twig/components/gallery/gallery.html.twig | 5 +++++ src/specs/components/gallery/demo/data.js | 2 ++ 4 files changed, 13 insertions(+) diff --git a/src/implementations/twig/components/gallery/README.md b/src/implementations/twig/components/gallery/README.md index cc4b8a71e61..f8c0211a312 100644 --- a/src/implementations/twig/components/gallery/README.md +++ b/src/implementations/twig/components/gallery/README.md @@ -36,6 +36,7 @@ npm install --save @ecl/twig-component-gallery - **"visible_items"** (integer) (default: 8) Number of visible items in an expandable gallery - **"expandable"** (boolean) (default: true) collapsible/expandable gallery - **"icon_path"** (string) (default: '') Path to the icon sprite +- **"sr_gallery_label"** (string) (default: ''): additional label for the gallery, providing instruction; for screen readers - **"sr_video_label"** (string) (default: ''): additional label for the video items; for screen readers - **"sr_video_player"** (string) (default: ''): additional label for the video player; for screen readers - **"footer"** (object) (default: {}) Footer link diff --git a/src/implementations/twig/components/gallery/__snapshots__/gallery.test.js.snap b/src/implementations/twig/components/gallery/__snapshots__/gallery.test.js.snap index 4c782577305..8b9d4778ac5 100644 --- a/src/implementations/twig/components/gallery/__snapshots__/gallery.test.js.snap +++ b/src/implementations/twig/components/gallery/__snapshots__/gallery.test.js.snap @@ -3,6 +3,7 @@ exports[`Gallery Default renders correctly 1`] = `
diff --git a/src/specs/components/gallery/demo/data.js b/src/specs/components/gallery/demo/data.js index 59cf416f912..f66a7ef9f9e 100644 --- a/src/specs/components/gallery/demo/data.js +++ b/src/specs/components/gallery/demo/data.js @@ -4,6 +4,8 @@ const exampleLink = `${publicUrl}/example`; module.exports = { id: 'gallery-id', icon_path: '/icons.svg', + sr_gallery_label: + 'Open gallery items to view images in original size, watch videos and share them', sr_video_label: 'Video', sr_video_player: 'Video player', items: [ From f112d4e5f21dd0779a098c241dbcdf058c9e3102 Mon Sep 17 00:00:00 2001 From: Romain Emery Date: Mon, 4 Nov 2024 14:03:14 +0100 Subject: [PATCH 2/3] add label (#3707) --- .../__snapshots__/search-form.test.js.snap | 54 ++++++++++++++++--- .../components/search-form/demo/data--ec.js | 3 +- .../components/search-form/demo/data--eu.js | 3 +- 3 files changed, 52 insertions(+), 8 deletions(-) diff --git a/src/implementations/twig/components/search-form/__snapshots__/search-form.test.js.snap b/src/implementations/twig/components/search-form/__snapshots__/search-form.test.js.snap index 84863074128..89df49372d7 100644 --- a/src/implementations/twig/components/search-form/__snapshots__/search-form.test.js.snap +++ b/src/implementations/twig/components/search-form/__snapshots__/search-form.test.js.snap @@ -9,9 +9,16 @@ exports[`Search Form Default renders correctly 1`] = `
+ @@ -56,9 +63,16 @@ exports[`Search Form Default renders correctly with extra attributes 1`] = `
+ @@ -101,9 +115,16 @@ exports[`Search Form Default renders correctly with extra class names 1`] = `
+ @@ -146,9 +167,16 @@ exports[`Search Form Default renders correctly with extra classes on the button
+ @@ -191,9 +219,16 @@ exports[`Search Form Default renders correctly with extra classes on the input 1
+ @@ -236,9 +271,16 @@ exports[`Search Form Default renders correctly with extra form elements 1`] = `
+ diff --git a/src/specs/components/search-form/demo/data--ec.js b/src/specs/components/search-form/demo/data--ec.js index b1f20cbc375..5ab8a6750db 100644 --- a/src/specs/components/search-form/demo/data--ec.js +++ b/src/specs/components/search-form/demo/data--ec.js @@ -1,7 +1,8 @@ // Simple content for demo module.exports = { + label: 'Search', text_input: { - id: 'search-input', + id: 'search-input-id', label: 'Search', placeholder: 'Placeholder text', }, diff --git a/src/specs/components/search-form/demo/data--eu.js b/src/specs/components/search-form/demo/data--eu.js index 2df8674265d..7cfb2ea9f76 100644 --- a/src/specs/components/search-form/demo/data--eu.js +++ b/src/specs/components/search-form/demo/data--eu.js @@ -1,7 +1,8 @@ // Simple content for demo module.exports = { + label: 'Search', text_input: { - id: 'search-input', + id: 'search-input-id', label: 'Search', placeholder: 'Placeholder text', }, From 778962102bdd7b4c48a0c99e7cfa2ad26744e0bd Mon Sep 17 00:00:00 2001 From: planctus Date: Mon, 4 Nov 2024 16:21:51 +0200 Subject: [PATCH 3/3] chore(website): Using the existing ECL_VERSION to dynamically refer to the proper url of the CDN - FRONT-4671 (#3700) * chore(website): Using the existing ECL_VERSION to dynamically refer to the proper url of the CDN * chore(website): Trying different approach * chore(website): Tested, working solution * chore(website): Prettier * chore(website): Adding ecl-link class * chore(website): Fixing links with dynamic version set --- src/website/src/pages/ec/getting-started/index.mdx | 10 +++++++++- src/website/src/pages/eu/getting-started/index.mdx | 10 +++++++++- src/website/src/preval/getVersion.js | 1 + src/website/webpack.config.prod.js | 5 +---- 4 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 src/website/src/preval/getVersion.js diff --git a/src/website/src/pages/ec/getting-started/index.mdx b/src/website/src/pages/ec/getting-started/index.mdx index 5f0aae94a06..4cd8886e52b 100644 --- a/src/website/src/pages/ec/getting-started/index.mdx +++ b/src/website/src/pages/ec/getting-started/index.mdx @@ -4,6 +4,7 @@ title: Getting started --- import { Link } from '@ecl/website-components'; +import { ECL_VERSION } from '../../../preval/getVersion'; The Europa Component Library is a design system defining the visual identity of the European Commission on the web. @@ -92,7 +93,14 @@ There are also other optional css files distributed that can be used, pikaday is ECL is also distributing its presets on a CDN, all the files distributed in the package mentioned before are also available there, this is the pattern to reach them: `https://cdn{1,2,3 or 4}.fpfis.tech.ec.europa.eu/ecl/{tag}/{system}/{path/to/the/asset}` -Ex: https://cdn1.fpfis.tech.ec.europa.eu/ecl/v3.9.1/ec/styles/optional/ecl-ec-default.css +Ex: + + + {`https://cdn1.fpfis.tech.ec.europa.eu/ecl/v${ECL_VERSION}/ec/styles/optional/ecl-ec-default.css`} + Download a `preset-ec` package from the release page to see all the files available so to know how to reach them in the CDN, the file system is the same. diff --git a/src/website/src/pages/eu/getting-started/index.mdx b/src/website/src/pages/eu/getting-started/index.mdx index bea5143a54e..90e28000ef5 100644 --- a/src/website/src/pages/eu/getting-started/index.mdx +++ b/src/website/src/pages/eu/getting-started/index.mdx @@ -4,6 +4,7 @@ title: Getting started --- import { Link } from '@ecl/website-components'; +import { ECL_VERSION } from '../../../preval/getVersion'; The Europa Component Library is a design system for the European Commission and websites managed by the Commission. @@ -91,7 +92,14 @@ There are also other optional css files distributed that can be used, moment.js ECL is also distributing its presets on a CDN, all the files distributed in the package mentioned before are also available in the CDN, this is the pattern to reach them: `https://cdn{1,2,3 or 4}.fpfis.tech.ec.europa.eu/ecl/{tag}/{system}/{path/to/the/asset}` -Ex: https://cdn1.fpfis.tech.ec.europa.eu/ecl/v3.9.1/eu/styles/optional/ecl-eu-default.css +Ex: + + + {`https://cdn1.fpfis.tech.ec.europa.eu/ecl/v${ECL_VERSION}/eu/styles/optional/ecl-ec-default.css`} + Download a `preset-eu` package to see all the files available to know how to reach them in the CDN, the file system is the same. diff --git a/src/website/src/preval/getVersion.js b/src/website/src/preval/getVersion.js new file mode 100644 index 00000000000..a01a3c04eea --- /dev/null +++ b/src/website/src/preval/getVersion.js @@ -0,0 +1 @@ +export const { ECL_VERSION } = { ECL_VERSION: process.env.ECL_VERSION }; diff --git a/src/website/webpack.config.prod.js b/src/website/webpack.config.prod.js index db3a4067837..9136ca09f30 100644 --- a/src/website/webpack.config.prod.js +++ b/src/website/webpack.config.prod.js @@ -37,10 +37,7 @@ const environmentModulePath = require.resolve( process.env.BABEL_ENV = 'production'; process.env.NODE_ENV = 'production'; -let eclVersion = lernaJson.version; -if (process.env.PULL_REQUEST && process.env.GITHUB_EVENT_NUMBER) { - eclVersion += ` - PR ${process.env.GITHUB_EVENT_NUMBER}`; -} +const eclVersion = lernaJson.version; let sri = {}; if ('CI' in process.env && process.env.GITHUB_REF.includes('refs/tags/')) {