From b5f69c701fb211fb2a06ca729316656e41155861 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 09:12:20 +0000 Subject: [PATCH 1/3] [BUMP] Update dependency @1024pix/pix-ui to ^48.7.0 (certif) --- certif/package-lock.json | 8 ++++---- certif/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/certif/package-lock.json b/certif/package-lock.json index b73c4af35a5..46e0fc94f06 100644 --- a/certif/package-lock.json +++ b/certif/package-lock.json @@ -13,7 +13,7 @@ "@1024pix/ember-api-actions": "^1.1.0", "@1024pix/ember-testing-library": "^3.0.6", "@1024pix/eslint-config": "^1.3.8", - "@1024pix/pix-ui": "^48.6.0", + "@1024pix/pix-ui": "^48.7.0", "@1024pix/stylelint-config": "^5.1.22", "@babel/eslint-parser": "^7.22.15", "@babel/plugin-proposal-decorators": "^7.22.15", @@ -832,9 +832,9 @@ } }, "node_modules/@1024pix/pix-ui": { - "version": "48.6.0", - "resolved": "https://registry.npmjs.org/@1024pix/pix-ui/-/pix-ui-48.6.0.tgz", - "integrity": "sha512-e7dBX5VEvn8PDizhhtXHHXP6lYZXajoT1HXbre3nmA57j/7FqkgkJy0J8vxmGrTFr51cC4bJvl3Ns9vMFhCz9Q==", + "version": "48.7.0", + "resolved": "https://registry.npmjs.org/@1024pix/pix-ui/-/pix-ui-48.7.0.tgz", + "integrity": "sha512-DUNprVhcyJSWDThojtSTtbOvDyPIWLjbaOLSCIRLkptM28Q8D10XSU7VEd3EQQmYhKZBJWgly6QbN8TKdWPn2A==", "dev": true, "hasInstallScript": true, "license": "MIT", diff --git a/certif/package.json b/certif/package.json index b34a7ff6e1f..95ebdc3cd45 100644 --- a/certif/package.json +++ b/certif/package.json @@ -53,7 +53,7 @@ "@1024pix/ember-api-actions": "^1.1.0", "@1024pix/ember-testing-library": "^3.0.6", "@1024pix/eslint-config": "^1.3.8", - "@1024pix/pix-ui": "^48.6.0", + "@1024pix/pix-ui": "^48.7.0", "@1024pix/stylelint-config": "^5.1.22", "@babel/eslint-parser": "^7.22.15", "@babel/plugin-proposal-decorators": "^7.22.15", From 9ca6986641ea7d6922760fd2e16fefbc7c9439cf Mon Sep 17 00:00:00 2001 From: AndreiaPena Date: Wed, 20 Nov 2024 12:03:16 +0100 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=94=A5=20certif:=20remove=20css=20fix?= =?UTF-8?q?=20for=20pix-icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- certif/app/styles/app.scss | 23 ------------------- .../pages/authenticated/sessions/details.scss | 6 ----- 2 files changed, 29 deletions(-) diff --git a/certif/app/styles/app.scss b/certif/app/styles/app.scss index 5c5c12922ce..a81e431cf26 100644 --- a/certif/app/styles/app.scss +++ b/certif/app/styles/app.scss @@ -84,26 +84,3 @@ input:invalid { * { box-sizing: border-box; } - -.pix-toast__icon .pix-icon { - fill: var(--pix-neutral-0); -} - -.pix-icon-button { - &:active:enabled, - &:focus:enabled { - .pix-icon { - fill: var(--pix-neutral-0); - } - } -} - -.pix-toast__close-button-container button { - &:hover:enabled, - &:active:enabled, - &:focus:enabled { - .pix-icon { - fill: var(--pix-neutral-0); - } - } -} diff --git a/certif/app/styles/pages/authenticated/sessions/details.scss b/certif/app/styles/pages/authenticated/sessions/details.scss index 6e3c3cf3ed5..9b80cfb1bde 100644 --- a/certif/app/styles/pages/authenticated/sessions/details.scss +++ b/certif/app/styles/pages/authenticated/sessions/details.scss @@ -124,12 +124,6 @@ &__clipboard-button { margin-left: 4px; - - .pix-icon-button { - &:hover { - background-color: var(--pix-neutral-100); - } - } } } From 01e783d226271cb972e5be99d30cba876c1a76e6 Mon Sep 17 00:00:00 2001 From: AndreiaPena Date: Wed, 20 Nov 2024 12:07:02 +0100 Subject: [PATCH 3/3] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20certif:=20=20use=20Pix?= =?UTF-8?q?Label?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...date-creation-modal-complementary-list.gjs | 6 +- .../candidate-creation-modal.gjs | 11 ++-- .../templates/authenticated/sessions/new.hbs | 10 ++-- .../authenticated/sessions/update.hbs | 10 ++-- .../acceptance/session-add-candidate-test.js | 60 +++++++++---------- ...n-details-certification-candidates-test.js | 46 +++++++------- certif/tests/acceptance/session-new-test.js | 20 +++---- .../tests/acceptance/session-update-test.js | 22 +++---- .../candidate-creation-modal-test.gjs | 60 +++++++++---------- 9 files changed, 123 insertions(+), 122 deletions(-) diff --git a/certif/app/components/sessions/session-details/enrolled-candidates/candidate-creation-modal-complementary-list.gjs b/certif/app/components/sessions/session-details/enrolled-candidates/candidate-creation-modal-complementary-list.gjs index 0372a52dc95..3ae24b30972 100644 --- a/certif/app/components/sessions/session-details/enrolled-candidates/candidate-creation-modal-complementary-list.gjs +++ b/certif/app/components/sessions/session-details/enrolled-candidates/candidate-creation-modal-complementary-list.gjs @@ -1,3 +1,4 @@ +import PixLabel from '@1024pix/pix-ui/components/pix-label'; import PixRadioButton from '@1024pix/pix-ui/components/pix-radio-button'; import { fn } from '@ember/helper'; import { on } from '@ember/modifier'; @@ -41,8 +42,9 @@ export default class CandidateCreationModalComplementaryList extends Component {
- - {{this.fieldsetLegend}} + + {{this.fieldsetLegend}} + <:label>{{this.firstInputLabel}} diff --git a/certif/app/components/sessions/session-details/enrolled-candidates/candidate-creation-modal.gjs b/certif/app/components/sessions/session-details/enrolled-candidates/candidate-creation-modal.gjs index 0ff9c4dac28..bfe6c59279c 100644 --- a/certif/app/components/sessions/session-details/enrolled-candidates/candidate-creation-modal.gjs +++ b/certif/app/components/sessions/session-details/enrolled-candidates/candidate-creation-modal.gjs @@ -1,6 +1,7 @@ import PixButton from '@1024pix/pix-ui/components/pix-button'; import PixIcon from '@1024pix/pix-ui/components/pix-icon'; import PixInput from '@1024pix/pix-ui/components/pix-input'; +import PixLabel from '@1024pix/pix-ui/components/pix-label'; import PixMessage from '@1024pix/pix-ui/components/pix-message'; import PixModal from '@1024pix/pix-ui/components/pix-modal'; import PixRadioButton from '@1024pix/pix-ui/components/pix-radio-button'; @@ -265,8 +266,9 @@ export default class CandidateCreationModal extends Component {
- - {{t 'common.labels.candidate.gender.title'}} + + {{t 'common.labels.candidate.gender.title'}} +
- - {{t 'common.labels.candidate.birth-geographical-code'}} + + {{t 'common.labels.candidate.birth-geographical-code'}} +
- +
- +
- +
- + , ); - await fillIn(screen.getByLabelText('* Prénom'), candidateData.firstName); - await fillIn(screen.getByLabelText('* Nom de naissance'), candidateData.lastName); - await fillIn(screen.getByLabelText('* Date de naissance'), '23/08/1985'); + await fillIn(screen.getByLabelText('Prénom *'), candidateData.firstName); + await fillIn(screen.getByLabelText('Nom de naissance *'), candidateData.lastName); + await fillIn(screen.getByLabelText('Date de naissance *'), '23/08/1985'); await click(screen.getByRole('radio', { name: 'Femme' })); - await click(screen.getByLabelText('* Pays de naissance')); + await click(screen.getByLabelText('Pays de naissance *')); await click( await screen.findByRole('option', { name: 'France', @@ -180,7 +180,7 @@ module( ); await click(screen.getByRole('radio', { name: 'Code INSEE' })); await fillIn(screen.getByLabelText('Identifiant externe'), candidateData.externalId); - await fillIn(screen.getByLabelText('* Code INSEE de naissance'), candidateData.birthInseeCode); + await fillIn(screen.getByLabelText('Code INSEE de naissance *'), candidateData.birthInseeCode); await fillIn(screen.getByLabelText('Temps majoré (%)'), candidateData.extraTimePercentage); await fillIn( screen.getByLabelText('E-mail du destinataire des résultats (formateur, enseignant...)'), @@ -224,7 +224,7 @@ module( ); // then - assert.dom(screen.getByRole('button', { name: '* Tarification part Pix' })).isVisible(); + assert.dom(screen.getByRole('button', { name: 'Tarification part Pix *' })).isVisible(); }); module('when the selected billing mode is PREPAID', function () { @@ -252,7 +252,7 @@ module( , ); - await click(screen.getByRole('button', { name: `* ${t('common.forms.certification-labels.pricing')}` })); + await click(screen.getByRole('button', { name: `${t('common.forms.certification-labels.pricing')} *` })); await screen.findByRole('listbox'); await click(screen.getByRole('option', { name: t('common.labels.billing-mode.prepaid') })); @@ -292,7 +292,7 @@ module( , ); - await click(screen.getByRole('button', { name: `* ${t('common.forms.certification-labels.pricing')}` })); + await click(screen.getByRole('button', { name: `${t('common.forms.certification-labels.pricing')} *` })); await screen.findByRole('listbox'); await click(screen.getByRole('option', { name: t('common.labels.billing-mode.paid') })); @@ -333,7 +333,7 @@ module( ); // then - assert.dom(screen.getByRole('button', { name: '* Pays de naissance' })).includesText('France'); + assert.dom(screen.getByRole('button', { name: 'Pays de naissance *' })).includesText('France'); }); module('when close button cross icon is clicked', function () { @@ -418,7 +418,7 @@ module( , ); - await click(screen.getByRole('button', { name: '* Pays de naissance' })); + await click(screen.getByRole('button', { name: 'Pays de naissance *' })); await screen.findByRole('listbox'); @@ -429,9 +429,9 @@ module( ); // then - assert.dom(screen.queryByLabelText('* Code INSEE de naissance')).isNotVisible(); - assert.dom(screen.queryByLabelText('* Code postal de naissance')).isNotVisible(); - assert.dom(screen.getByLabelText('* Commune de naissance')).isVisible(); + assert.dom(screen.queryByLabelText('Code INSEE de naissance *')).isNotVisible(); + assert.dom(screen.queryByLabelText('Code postal de naissance *')).isNotVisible(); + assert.dom(screen.getByLabelText('Commune de naissance *')).isVisible(); }); }); @@ -460,9 +460,9 @@ module( await click(screen.getByRole('radio', { name: 'Code INSEE' })); // then - assert.dom(screen.getByLabelText('* Code INSEE de naissance')).isVisible(); - assert.dom(screen.queryByLabelText('* Code postal de naissance')).isNotVisible(); - assert.dom(screen.queryByLabelText('* Commune de naissance')).isNotVisible(); + assert.dom(screen.getByLabelText('Code INSEE de naissance *')).isVisible(); + assert.dom(screen.queryByLabelText('Code postal de naissance *')).isNotVisible(); + assert.dom(screen.queryByLabelText('Commune de naissance *')).isNotVisible(); }); }); @@ -491,9 +491,9 @@ module( await click(screen.getByRole('radio', { name: 'Code postal' })); // then - assert.dom(screen.queryByLabelText('* Code INSEE de naissance')).isNotVisible(); - assert.dom(screen.queryByLabelText('* Code postal de naissance')).isVisible(); - assert.dom(screen.getByLabelText('* Commune de naissance')).isVisible(); + assert.dom(screen.queryByLabelText('Code INSEE de naissance *')).isNotVisible(); + assert.dom(screen.queryByLabelText('Code postal de naissance *')).isVisible(); + assert.dom(screen.getByLabelText('Commune de naissance *')).isVisible(); }); }); @@ -515,7 +515,7 @@ module( ); // then - assert.dom(screen.getByRole('group', { name: 'Certification complémentaire' })).exists(); + assert.dom(screen.getByRole('group', { name: 'Certification complémentaire *' })).exists(); assert.dom(screen.getByRole('radio', { name: 'Certif complémentaire 1' })).exists(); assert.dom(screen.getByRole('radio', { name: 'Certif complémentaire 2' })).exists(); }); @@ -549,7 +549,7 @@ module( ); // then - assert.dom(screen.getByRole('group', { name: 'Choix de la certification' })).exists(); + assert.dom(screen.getByRole('group', { name: 'Choix de la certification *' })).exists(); assert.dom(screen.getByRole('radio', { name: 'Certification Pix' })).exists(); assert.dom(screen.getByRole('radio', { name: 'Certif complémentaire 1' })).exists(); assert.dom(screen.getByRole('radio', { name: 'Certif complémentaire 2' })).exists();