diff --git a/certif/app/components/dropdown/icon-trigger.hbs b/certif/app/components/dropdown/icon-trigger.hbs
index 68ae0addc13..c2d687e71ba 100644
--- a/certif/app/components/dropdown/icon-trigger.hbs
+++ b/certif/app/components/dropdown/icon-trigger.hbs
@@ -1,7 +1,7 @@
diff --git a/certif/app/components/import/step-two-section.hbs b/certif/app/components/import/step-two-section.hbs
index 3c3d24292da..d43cdbf847e 100644
--- a/certif/app/components/import/step-two-section.hbs
+++ b/certif/app/components/import/step-two-section.hbs
@@ -34,12 +34,8 @@
{{/if}}
@@ -71,12 +75,8 @@
{{/if}}
diff --git a/certif/app/components/issue-report-modal/issue-reports-modal.hbs b/certif/app/components/issue-report-modal/issue-reports-modal.hbs
index ac195615ca7..6815661f47c 100644
--- a/certif/app/components/issue-report-modal/issue-reports-modal.hbs
+++ b/certif/app/components/issue-report-modal/issue-reports-modal.hbs
@@ -16,15 +16,17 @@
{{#if (eq @version 3)}}
{{#unless issueReport.isInChallengeIssue}}
{{/unless}}
{{else}}
{{/if}}
diff --git a/certif/app/components/language-switcher.gjs b/certif/app/components/language-switcher.gjs
index b198cdb229d..37df7e27eef 100644
--- a/certif/app/components/language-switcher.gjs
+++ b/certif/app/components/language-switcher.gjs
@@ -29,7 +29,7 @@ export default class LanguageSwitcher extends Component {
{{#if this.shouldDisplayMemberManageButton}}
diff --git a/certif/app/components/session-supervising/candidate-in-list.hbs b/certif/app/components/session-supervising/candidate-in-list.hbs
index c6330b943b7..35d40346f50 100644
--- a/certif/app/components/session-supervising/candidate-in-list.hbs
+++ b/certif/app/components/session-supervising/candidate-in-list.hbs
@@ -57,7 +57,7 @@
@@ -99,8 +99,8 @@
<:triggerElement>
@@ -480,9 +481,10 @@ export default class EnrolledCandidates extends Component {
{{else}}
<:triggerElement>
@@ -510,9 +513,10 @@ export default class EnrolledCandidates extends Component {
{{else}}
<:triggerElement>
{{else}}
diff --git a/certif/app/components/user-logged-menu.hbs b/certif/app/components/user-logged-menu.hbs
index e78981ce771..887aa87acc3 100644
--- a/certif/app/components/user-logged-menu.hbs
+++ b/certif/app/components/user-logged-menu.hbs
@@ -12,9 +12,9 @@
{{t "navigation.user-logged-menu.button-extra-information"}}
{{#if this.isMenuOpen}}
-
+
{{else}}
-
+
{{/if}}
diff --git a/certif/app/styles/pages/authenticated/sessions/details/certification-candidates.scss b/certif/app/styles/pages/authenticated/sessions/details/certification-candidates.scss
index ecbda3ab4c4..b65dd32dcad 100644
--- a/certif/app/styles/pages/authenticated/sessions/details/certification-candidates.scss
+++ b/certif/app/styles/pages/authenticated/sessions/details/certification-candidates.scss
@@ -194,16 +194,6 @@
display: flex;
justify-content: center;
align-items: center;
-
- &-button--disabled {
- background-color: var(--pix-neutral-100);
- color: var(--pix-neutral-0);
- cursor: not-allowed;
-
- &:hover, &:active, &:focus {
- background-color: var(--pix-neutral-100);
- }
- }
}
}
diff --git a/certif/app/styles/pages/authenticated/sessions/import.scss b/certif/app/styles/pages/authenticated/sessions/import.scss
index 31de3de82c4..a20130f11cf 100644
--- a/certif/app/styles/pages/authenticated/sessions/import.scss
+++ b/certif/app/styles/pages/authenticated/sessions/import.scss
@@ -209,12 +209,12 @@
.collapsible-header--blocking {
.pix-collapsible-title__icon {
- color: var(--pix-error-700);
+ fill: var(--pix-error-700);
}
}
.collapsible-header--non-blocking {
.pix-collapsible-title__icon {
- color: var(--pix-warning-500);
+ fill: var(--pix-warning-500);
}
}
diff --git a/certif/app/templates/authenticated/sessions/details/parameters.hbs b/certif/app/templates/authenticated/sessions/details/parameters.hbs
index cb793b43d0a..3f2b194c9aa 100644
--- a/certif/app/templates/authenticated/sessions/details/parameters.hbs
+++ b/certif/app/templates/authenticated/sessions/details/parameters.hbs
@@ -14,7 +14,8 @@
<:triggerElement>
@@ -45,7 +46,8 @@
<:triggerElement>
@@ -77,7 +79,8 @@
<:triggerElement>
diff --git a/certif/config/icons.js b/certif/config/icons.js
deleted file mode 100644
index fabd12d7c3a..00000000000
--- a/certif/config/icons.js
+++ /dev/null
@@ -1,27 +0,0 @@
-module.exports = function () {
- return {
- 'free-solid-svg-icons': [
- 'award',
- 'bell',
- 'book',
- 'clipboard-list',
- 'cloud-arrow-up',
- 'copy',
- 'ellipsis-vertical',
- 'file-arrow-down',
- 'file-download',
- 'info',
- 'link',
- 'pen-to-square',
- 'plus-circle',
- 'power-off',
- 'redo',
- 'sign-out-alt',
- 'trash-alt',
- 'up-right-from-square',
- 'user',
- 'users',
- 'user-circle',
- ],
- };
-};
diff --git a/certif/package-lock.json b/certif/package-lock.json
index c072954e437..012db2d4af9 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": "^46.15.2",
+ "@1024pix/pix-ui": "^48.0.0",
"@1024pix/stylelint-config": "^5.1.21",
"@babel/eslint-parser": "^7.22.15",
"@babel/plugin-proposal-decorators": "^7.22.15",
@@ -784,9 +784,9 @@
}
},
"node_modules/@1024pix/pix-ui": {
- "version": "46.15.2",
- "resolved": "https://registry.npmjs.org/@1024pix/pix-ui/-/pix-ui-46.15.2.tgz",
- "integrity": "sha512-vAq2EcYoQu7G+OIf1EIC6/HXoTyv4X1STEZuufqSIwg0O4pOW8ujisOAH57z4xzYV4LKePG2kxgKJom2tO1tFw==",
+ "version": "48.0.0",
+ "resolved": "https://registry.npmjs.org/@1024pix/pix-ui/-/pix-ui-48.0.0.tgz",
+ "integrity": "sha512-v71bzl+adej6lk36cjtMAWjKycZS6VVnelhvj7tUYhPQJbDEvbRvTis11Xnel+XFMwacw1ddyiiVBVZ8fGbIyw==",
"dev": true,
"hasInstallScript": true,
"license": "MIT",
diff --git a/certif/package.json b/certif/package.json
index e277fdd4674..dcea121c66b 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": "^46.15.2",
+ "@1024pix/pix-ui": "^48.0.0",
"@1024pix/stylelint-config": "^5.1.21",
"@babel/eslint-parser": "^7.22.15",
"@babel/plugin-proposal-decorators": "^7.22.15",
diff --git a/certif/tests/acceptance/routes/authenticated/sessions/import-test.js b/certif/tests/acceptance/routes/authenticated/sessions/import-test.js
index cd810875ba9..1cdeb0f1829 100644
--- a/certif/tests/acceptance/routes/authenticated/sessions/import-test.js
+++ b/certif/tests/acceptance/routes/authenticated/sessions/import-test.js
@@ -141,7 +141,7 @@ module('Acceptance | Routes | Authenticated | Sessions | import', function (hook
await triggerEvent(input, 'change', { files: [file] });
// then
- assert.dom(await screen.getByLabelText('fichier.csv')).hasText('fichier.csv');
+ assert.dom(await screen.getByLabelText('fichier.csv')).exists();
});
module('when leaving page and coming back', function () {
@@ -178,7 +178,7 @@ module('Acceptance | Routes | Authenticated | Sessions | import', function (hook
const input = await screen.findByLabelText('Importer le modèle complété');
await triggerEvent(input, 'change', { files: [file] });
await settled();
- const cancelButton = await screen.findByLabelText("Annuler l'import");
+ const cancelButton = await screen.getByRole('button', { name: "Annuler l'import" });
await click(cancelButton);
await settled();
@@ -617,7 +617,7 @@ module('Acceptance | Routes | Authenticated | Sessions | import', function (hook
.exists();
// when
- await click(screen.getByLabelText("Annuler l'import"));
+ await click(screen.getByRole('button', { name: "Annuler l'import" }));
await settled();
// then
diff --git a/certif/tests/acceptance/session-supervising-test.js b/certif/tests/acceptance/session-supervising-test.js
index ea438dc0e0a..4bf2dfc7cfd 100644
--- a/certif/tests/acceptance/session-supervising-test.js
+++ b/certif/tests/acceptance/session-supervising-test.js
@@ -572,7 +572,7 @@ module('Acceptance | Session supervising', function (hooks) {
await click(screen.getByLabelText('Le site à visiter est indisponible/en maintenance/inaccessible'));
const modal = await screen.findByRole('dialog');
- await click(within(modal).getByLabelText('Fermer'));
+ await click(within(modal).getByRole('button', { name: 'Fermer' }));
// then
const checkedRadioButtons = screen.queryAllByRole('radio', { checked: true });
diff --git a/certif/tests/integration/components/sessions/session-details/enrolled-candidates/index-test.gjs b/certif/tests/integration/components/sessions/session-details/enrolled-candidates/index-test.gjs
index cefe0405a67..ed09dc73375 100644
--- a/certif/tests/integration/components/sessions/session-details/enrolled-candidates/index-test.gjs
+++ b/certif/tests/integration/components/sessions/session-details/enrolled-candidates/index-test.gjs
@@ -12,11 +12,6 @@ import setupIntlRenderingTest from '../../../../../helpers/setup-intl-rendering'
module('Integration | Component | Sessions | SessionDetails | EnrolledCandidates', function (hooks) {
setupIntlRenderingTest(hooks);
- const DELETE_BUTTON_SELECTOR = 'certification-candidates-actions__delete-button';
- const EDIT_BUTTON_SELECTOR = 'certification-candidates-actions__edit-button';
- const DELETE_BUTTON_DISABLED_SELECTOR = `${DELETE_BUTTON_SELECTOR}--disabled`;
- const EDIT_BUTTON_DISABLED_SELECTOR = `${EDIT_BUTTON_SELECTOR}--disabled`;
-
let store;
hooks.beforeEach(async function () {
@@ -235,15 +230,9 @@ module('Integration | Component | Sessions | SessionDetails | EnrolledCandidates
);
// then
- assert
- .dom(screen.getByRole('button', { name: 'Supprimer le candidat Eddy Taurial' }))
- .hasClass(DELETE_BUTTON_SELECTOR);
- assert
- .dom(screen.getByRole('button', { name: 'Supprimer le candidat Lara Pafromage' }))
- .hasClass(DELETE_BUTTON_DISABLED_SELECTOR);
- assert
- .dom(screen.getByRole('button', { name: 'Supprimer le candidat Jean Registre' }))
- .hasClass(DELETE_BUTTON_SELECTOR);
+ assert.dom(screen.getByRole('button', { name: 'Supprimer le candidat Eddy Taurial' })).isNotDisabled();
+ assert.dom(screen.getByRole('button', { name: 'Supprimer le candidat Lara Pafromage' })).isDisabled();
+ assert.dom(screen.getByRole('button', { name: 'Supprimer le candidat Jean Registre' })).isNotDisabled();
});
});
@@ -298,15 +287,9 @@ module('Integration | Component | Sessions | SessionDetails | EnrolledCandidates
// then
// then
- assert
- .dom(screen.getByRole('button', { name: 'Editer le candidat Eddy Taurial' }))
- .hasClass(EDIT_BUTTON_SELECTOR);
- assert
- .dom(screen.getByRole('button', { name: 'Editer le candidat Lara Pafromage' }))
- .hasClass(EDIT_BUTTON_DISABLED_SELECTOR);
- assert
- .dom(screen.getByRole('button', { name: 'Editer le candidat Jean Registre' }))
- .hasClass(EDIT_BUTTON_SELECTOR);
+ assert.dom(screen.getByRole('button', { name: 'Editer le candidat Eddy Taurial' })).isNotDisabled();
+ assert.dom(screen.getByRole('button', { name: 'Editer le candidat Lara Pafromage' })).isDisabled();
+ assert.dom(screen.getByRole('button', { name: 'Editer le candidat Jean Registre' })).isNotDisabled();
assert.strictEqual(
screen.getAllByText("Ce candidat a déjà rejoint la session. Vous ne pouvez pas l'éditer.").length,
1,