diff --git a/src/frontend/apps/desk/src/features/footer/Footer.tsx b/src/frontend/apps/desk/src/features/footer/Footer.tsx
index ee9a22914..9d92364a0 100644
--- a/src/frontend/apps/desk/src/features/footer/Footer.tsx
+++ b/src/frontend/apps/desk/src/features/footer/Footer.tsx
@@ -83,7 +83,7 @@ export const Footer = () => {
`}
>
{label}
-
+
))}
@@ -157,7 +157,7 @@ export const Footer = () => {
`}
>
licence etalab-2.0
-
+
diff --git a/src/frontend/apps/desk/src/features/header/AccountDropdown.tsx b/src/frontend/apps/desk/src/features/header/AccountDropdown.tsx
index 13c77b5ca..eca93d4f3 100644
--- a/src/frontend/apps/desk/src/features/header/AccountDropdown.tsx
+++ b/src/frontend/apps/desk/src/features/header/AccountDropdown.tsx
@@ -15,7 +15,7 @@ export const AccountDropdown = () => {
button={
{t('My account')}
-
+
arrow_drop_down
@@ -24,7 +24,11 @@ export const AccountDropdown = () => {
}
size={ModalSize.MEDIUM}
title={
-
+
{t('Add a member')}
diff --git a/src/frontend/apps/desk/src/features/teams/member-management/components/MemberAction.tsx b/src/frontend/apps/desk/src/features/teams/member-management/components/MemberAction.tsx
index 1fe3da65e..367ebb34e 100644
--- a/src/frontend/apps/desk/src/features/teams/member-management/components/MemberAction.tsx
+++ b/src/frontend/apps/desk/src/features/teams/member-management/components/MemberAction.tsx
@@ -53,7 +53,11 @@ export const MemberAction = ({
setIsDropOpen(false);
}}
color="primary-text"
- icon={edit}
+ icon={
+
+ edit
+
+ }
>
{t('Update role')}
@@ -64,7 +68,11 @@ export const MemberAction = ({
setIsDropOpen(false);
}}
color="primary-text"
- icon={delete}
+ icon={
+
+ delete
+
+ }
>
{t('Remove from group')}
diff --git a/src/frontend/apps/desk/src/features/teams/member-management/components/ModalDelete.tsx b/src/frontend/apps/desk/src/features/teams/member-management/components/ModalDelete.tsx
index 56eb0e4a4..9ca6eaaa0 100644
--- a/src/frontend/apps/desk/src/features/teams/member-management/components/ModalDelete.tsx
+++ b/src/frontend/apps/desk/src/features/teams/member-management/components/ModalDelete.tsx
@@ -75,7 +75,7 @@ export const ModalDelete = ({ access, onClose, team }: ModalDeleteProps) => {
}}
disabled={isNotAllowed}
>
- {t('Validate')}
+ {t('Remove from the group')}
}
size={ModalSize.MEDIUM}
@@ -128,7 +128,7 @@ export const ModalDelete = ({ access, onClose, team }: ModalDeleteProps) => {
$background={colorsTokens()['primary-150']}
$theme="primary"
>
-
+
{access.user.name}
diff --git a/src/frontend/apps/desk/src/features/teams/team-management/components/CardCreateTeam.tsx b/src/frontend/apps/desk/src/features/teams/team-management/components/CardCreateTeam.tsx
index 30b9cc361..46b914ce8 100644
--- a/src/frontend/apps/desk/src/features/teams/team-management/components/CardCreateTeam.tsx
+++ b/src/frontend/apps/desk/src/features/teams/team-management/components/CardCreateTeam.tsx
@@ -40,9 +40,9 @@ export const CardCreateTeam = () => {
{t('Create a new group')}
diff --git a/src/frontend/apps/desk/src/features/teams/team-management/components/InputTeamName.tsx b/src/frontend/apps/desk/src/features/teams/team-management/components/InputTeamName.tsx
index fe8df73ae..3a58903c3 100644
--- a/src/frontend/apps/desk/src/features/teams/team-management/components/InputTeamName.tsx
+++ b/src/frontend/apps/desk/src/features/teams/team-management/components/InputTeamName.tsx
@@ -40,7 +40,6 @@ export const InputTeamName = ({
setTeamName(e.target.value);
setIsInputError(false);
}}
- rightIcon={edit}
state={isInputError ? 'error' : 'default'}
/>
{isError && error && }
diff --git a/src/frontend/apps/desk/src/features/teams/team-management/components/ModalRemoveTeam.tsx b/src/frontend/apps/desk/src/features/teams/team-management/components/ModalRemoveTeam.tsx
index d50224d6f..9b1ae5c04 100644
--- a/src/frontend/apps/desk/src/features/teams/team-management/components/ModalRemoveTeam.tsx
+++ b/src/frontend/apps/desk/src/features/teams/team-management/components/ModalRemoveTeam.tsx
@@ -72,7 +72,11 @@ export const ModalRemoveTeam = ({ onClose, team }: ModalRemoveTeamProps) => {
size={ModalSize.MEDIUM}
title={
-
+
{t('Deleting the {{teamName}} team', { teamName: team.name })}
@@ -105,7 +109,7 @@ export const ModalRemoveTeam = ({ onClose, team }: ModalRemoveTeamProps) => {
>
{
size={ModalSize.MEDIUM}
title={
-
+
{t('Update team {{teamName}}', { teamName: team.name })}
diff --git a/src/frontend/apps/desk/src/features/teams/team-management/components/TeamActions.tsx b/src/frontend/apps/desk/src/features/teams/team-management/components/TeamActions.tsx
index d29c65a5b..77e716f5d 100644
--- a/src/frontend/apps/desk/src/features/teams/team-management/components/TeamActions.tsx
+++ b/src/frontend/apps/desk/src/features/teams/team-management/components/TeamActions.tsx
@@ -43,7 +43,11 @@ export const TeamActions = ({ currentRole, team }: TeamActionsProps) => {
setIsDropOpen(false);
}}
color="primary-text"
- icon={edit}
+ icon={
+
+ edit
+
+ }
>
{t('Update the team')}
@@ -54,7 +58,11 @@ export const TeamActions = ({ currentRole, team }: TeamActionsProps) => {
setIsDropOpen(false);
}}
color="primary-text"
- icon={delete}
+ icon={
+
+ delete
+
+ }
>
{t('Delete the team')}
diff --git a/src/frontend/apps/desk/src/features/teams/team-management/components/TeamInfo.tsx b/src/frontend/apps/desk/src/features/teams/team-management/components/TeamInfo.tsx
index 25bc6cb1e..dda36606f 100644
--- a/src/frontend/apps/desk/src/features/teams/team-management/components/TeamInfo.tsx
+++ b/src/frontend/apps/desk/src/features/teams/team-management/components/TeamInfo.tsx
@@ -44,9 +44,9 @@ export const TeamInfo = ({ team, currentRole }: TeamInfoProps) => {
{
expect(screen.getByRole('status')).toBeInTheDocument();
- expect(
- await screen.findByLabelText('Empty teams icon'),
- ).toBeInTheDocument();
+ expect(await screen.findByLabelText('Empty team icon')).toBeInTheDocument();
});
it('renders a team with only 1 member', async () => {
@@ -81,12 +79,10 @@ describe('PanelTeams', () => {
expect(screen.getByRole('status')).toBeInTheDocument();
- expect(
- await screen.findByLabelText('Empty teams icon'),
- ).toBeInTheDocument();
+ expect(await screen.findByLabelText('Empty team icon')).toBeInTheDocument();
});
- it('renders a non-empty team', async () => {
+ it('renders a non-empty team', () => {
fetchMock.mock(`end:/teams/?page=1&ordering=-created_at`, {
count: 1,
results: [
@@ -110,8 +106,6 @@ describe('PanelTeams', () => {
render(, { wrapper: AppWrapper });
expect(screen.getByRole('status')).toBeInTheDocument();
-
- expect(await screen.findByLabelText('Teams icon')).toBeInTheDocument();
});
it('renders the error', async () => {
diff --git a/src/frontend/apps/desk/src/features/teams/teams-panel/components/PanelActions.tsx b/src/frontend/apps/desk/src/features/teams/teams-panel/components/PanelActions.tsx
index 277c629a1..bbdb1a5fb 100644
--- a/src/frontend/apps/desk/src/features/teams/teams-panel/components/PanelActions.tsx
+++ b/src/frontend/apps/desk/src/features/teams/teams-panel/components/PanelActions.tsx
@@ -41,7 +41,7 @@ export const PanelActions = () => {
$background={isSortAsc ? colorsTokens()['primary-200'] : 'transparent'}
$color={colorsTokens()['primary-600']}
>
-
+
{
$color={colorsTokens()['primary-600']}
tabIndex={-1}
>
-
+
diff --git a/src/frontend/apps/desk/src/features/teams/teams-panel/components/TeamItem.tsx b/src/frontend/apps/desk/src/features/teams/teams-panel/components/TeamItem.tsx
index 957ce2b08..0e56e3572 100644
--- a/src/frontend/apps/desk/src/features/teams/teams-panel/components/TeamItem.tsx
+++ b/src/frontend/apps/desk/src/features/teams/teams-panel/components/TeamItem.tsx
@@ -67,7 +67,7 @@ export const TeamItem = ({ team }: TeamProps) => {
{hasMembers ? (
{
/>
) : (
Défenseur des droits dans votre région1>",
"accessibility-form-defenseurdesdroits": "Écrire un message au<1>Défenseur des droits1>",
- "icon group": "icône groupe",
"mail domains list loading": "chargement de la liste des domaines de messagerie",
"{{count}} member_many": "{{count}} membres",
"{{count}} member_one": "{{count}} membre",
"{{count}} member_other": "{{count}} membres",
- "{{label}} button": "Bouton {{label}}",
- "{{label}} icon": "Icône {{label}}"
+ "{{label}} button": "Bouton {{label}}"
}
}
}
diff --git a/src/frontend/apps/desk/src/pages/404.tsx b/src/frontend/apps/desk/src/pages/404.tsx
index ac2e61eb0..898b36e5f 100644
--- a/src/frontend/apps/desk/src/pages/404.tsx
+++ b/src/frontend/apps/desk/src/pages/404.tsx
@@ -19,10 +19,10 @@ const Page: NextPageWithLayout = () => {
return (
-
+
- {t('Ouch !')}
+ {t('Ouch!')}
diff --git a/src/frontend/apps/e2e/__tests__/app-desk/common.ts b/src/frontend/apps/e2e/__tests__/app-desk/common.ts
index 70ac65c80..3ebc7e0e5 100644
--- a/src/frontend/apps/e2e/__tests__/app-desk/common.ts
+++ b/src/frontend/apps/e2e/__tests__/app-desk/common.ts
@@ -74,7 +74,7 @@ export const addNewMember = async (
// Choose a role
await page.getByRole('radio', { name: role }).click();
- await page.getByRole('button', { name: 'Validate' }).click();
+ await page.getByRole('button', { name: 'Add to group' }).click();
const table = page.getByLabel('List members card').getByRole('table');
diff --git a/src/frontend/apps/e2e/__tests__/app-desk/header.spec.ts b/src/frontend/apps/e2e/__tests__/app-desk/header.spec.ts
index f681e2a36..30a407bc0 100644
--- a/src/frontend/apps/e2e/__tests__/app-desk/header.spec.ts
+++ b/src/frontend/apps/e2e/__tests__/app-desk/header.spec.ts
@@ -19,7 +19,8 @@ test.describe('Header', () => {
header.getByAltText('Freedom Equality Fraternity Logo'),
).toBeVisible();
- await expect(header.getByAltText('Régie Logo')).toBeVisible();
+ await expect(header.getByRole('link', { name: 'Régie' })).toBeVisible();
+
await expect(header.locator('h2').getByText('Régie')).toHaveCSS(
'color',
'rgb(0, 0, 145)',
@@ -35,7 +36,7 @@ test.describe('Header', () => {
}),
).toBeVisible();
- await expect(header.getByAltText('Language Icon')).toBeVisible();
+ await expect(header.getByRole('combobox').getByText('EN')).toBeVisible();
await expect(header.getByText('My account')).toBeVisible();
});
diff --git a/src/frontend/apps/e2e/__tests__/app-desk/mail-domain.spec.ts b/src/frontend/apps/e2e/__tests__/app-desk/mail-domain.spec.ts
index 2da30e56d..439a524fb 100644
--- a/src/frontend/apps/e2e/__tests__/app-desk/mail-domain.spec.ts
+++ b/src/frontend/apps/e2e/__tests__/app-desk/mail-domain.spec.ts
@@ -119,7 +119,9 @@ test.describe('Mail domain', () => {
page.getByRole('heading', { name: /domain\.fr/ }).first(),
).toBeVisible();
- await expect(page.getByText('This table is empty')).toBeVisible();
+ await expect(
+ page.getByText('No mail box was created with this mail domain.'),
+ ).toBeVisible();
});
test('checks all the elements are visible when domain exists and contains 2 pages of mailboxes', async ({
diff --git a/src/frontend/apps/e2e/__tests__/app-desk/member-create.spec.ts b/src/frontend/apps/e2e/__tests__/app-desk/member-create.spec.ts
index 1b6b62739..1c7e3b658 100644
--- a/src/frontend/apps/e2e/__tests__/app-desk/member-create.spec.ts
+++ b/src/frontend/apps/e2e/__tests__/app-desk/member-create.spec.ts
@@ -23,7 +23,9 @@ test.describe('Members Create', () => {
page.getByLabel(/Find a member to add to the team/),
).toBeVisible();
- await expect(page.getByRole('button', { name: 'Validate' })).toBeVisible();
+ await expect(
+ page.getByRole('button', { name: 'Add to group' }),
+ ).toBeVisible();
await expect(page.getByRole('button', { name: 'Cancel' })).toBeVisible();
});
@@ -124,7 +126,7 @@ test.describe('Members Create', () => {
response.url().includes('/accesses/') && response.status() === 201,
);
- await page.getByRole('button', { name: 'Validate' }).click();
+ await page.getByRole('button', { name: 'Add to group' }).click();
// Check invitation sent
await expect(page.getByText(`Invitation sent to ${email}`)).toBeVisible();
@@ -169,7 +171,7 @@ test.describe('Members Create', () => {
response.url().includes('/accesses/') && response.status() === 201,
);
- await page.getByRole('button', { name: 'Validate' }).click();
+ await page.getByRole('button', { name: 'Add to group' }).click();
await expect(
page.getByText(`Member ${users[0].name} added to the team`),
@@ -207,7 +209,7 @@ test.describe('Members Create', () => {
response.url().includes('/invitations/') && response.status() === 201,
);
- await page.getByRole('button', { name: 'Validate' }).click();
+ await page.getByRole('button', { name: 'Add to group' }).click();
// Check invitation sent
await expect(page.getByText(`Invitation sent to ${email}`)).toBeVisible();
diff --git a/src/frontend/apps/e2e/__tests__/app-desk/member-delete.spec.ts b/src/frontend/apps/e2e/__tests__/app-desk/member-delete.spec.ts
index 2529f6207..1529aacfe 100644
--- a/src/frontend/apps/e2e/__tests__/app-desk/member-delete.spec.ts
+++ b/src/frontend/apps/e2e/__tests__/app-desk/member-delete.spec.ts
@@ -28,7 +28,9 @@ test.describe('Members Delete', () => {
'You are the last owner, you cannot be removed from your team.',
),
).toBeVisible();
- await expect(page.getByRole('button', { name: 'Validate' })).toBeDisabled();
+ await expect(
+ page.getByRole('button', { name: 'Remove from the group' }),
+ ).toBeDisabled();
});
test('it deletes himself when it is not the last owner', async ({
@@ -49,7 +51,7 @@ test.describe('Members Delete', () => {
await cells.nth(4).getByLabel('Member options').click();
await page.getByLabel('Open the modal to delete this member').click();
- await page.getByRole('button', { name: 'Validate' }).click();
+ await page.getByRole('button', { name: 'Remove from the group' }).click();
await expect(
page.getByText(`The member has been removed from the team`),
).toBeVisible();
@@ -76,7 +78,9 @@ test.describe('Members Delete', () => {
await expect(
page.getByText(`You cannot remove other owner.`),
).toBeVisible();
- await expect(page.getByRole('button', { name: 'Validate' })).toBeDisabled();
+ await expect(
+ page.getByRole('button', { name: 'Remove from the group' }),
+ ).toBeDisabled();
});
test('it deletes admin member', async ({ page, browserName }) => {
@@ -94,7 +98,7 @@ test.describe('Members Delete', () => {
await cells.nth(4).getByLabel('Member options').click();
await page.getByLabel('Open the modal to delete this member').click();
- await page.getByRole('button', { name: 'Validate' }).click();
+ await page.getByRole('button', { name: 'Remove from the group' }).click();
await expect(
page.getByText(`The member has been removed from the team`),
).toBeVisible();
@@ -161,7 +165,7 @@ test.describe('Members Delete', () => {
await cells.nth(4).getByLabel('Member options').click();
await page.getByLabel('Open the modal to delete this member').click();
- await page.getByRole('button', { name: 'Validate' }).click();
+ await page.getByRole('button', { name: 'Remove from the group' }).click();
await expect(
page.getByText(`The member has been removed from the team`),
).toBeVisible();
diff --git a/src/frontend/apps/e2e/__tests__/app-desk/team.spec.ts b/src/frontend/apps/e2e/__tests__/app-desk/team.spec.ts
index 78340dc85..da848f8c5 100644
--- a/src/frontend/apps/e2e/__tests__/app-desk/team.spec.ts
+++ b/src/frontend/apps/e2e/__tests__/app-desk/team.spec.ts
@@ -16,7 +16,6 @@ test.describe('Team', () => {
await createTeam(page, 'team-top-box', browserName, 1)
).shift();
- await expect(page.getByLabel('icon group')).toBeVisible();
await expect(
page.getByRole('heading', {
name: teamName,
diff --git a/src/frontend/apps/e2e/__tests__/app-desk/teams-create.spec.ts b/src/frontend/apps/e2e/__tests__/app-desk/teams-create.spec.ts
index e58493ac2..59f465328 100644
--- a/src/frontend/apps/e2e/__tests__/app-desk/teams-create.spec.ts
+++ b/src/frontend/apps/e2e/__tests__/app-desk/teams-create.spec.ts
@@ -19,8 +19,6 @@ test.describe('Teams Create', () => {
await expect(card.getByLabel('Team name')).toBeVisible();
- await expect(card.getByLabel('icon group')).toBeVisible();
-
await expect(
card.getByRole('heading', {
name: 'Create a new group',