From 001673f973e6658d0e4f41c079ba5323b15600c3 Mon Sep 17 00:00:00 2001 From: Anthony LC Date: Mon, 6 May 2024 12:09:17 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=AC(app-desk)=20change=20some=20texts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change some texts on the team page. --- .../members/__tests__/MemberGrid.test.tsx | 2 +- .../members/__tests__/ModalRole.test.tsx | 12 +++--- .../members/components/ChooseRole.tsx | 16 +++---- .../members/components/MemberAction.tsx | 4 +- .../members/components/MemberGrid.tsx | 2 +- .../features/members/components/ModalRole.tsx | 4 +- .../features/teams/components/TeamInfo.tsx | 10 +---- .../apps/desk/src/i18n/translations.json | 43 +++++++++++-------- .../apps/e2e/__tests__/app-desk/common.ts | 2 +- .../__tests__/app-desk/member-create.spec.ts | 8 ++-- .../__tests__/app-desk/member-delete.spec.ts | 12 +++--- .../__tests__/app-desk/member-grid.spec.ts | 6 ++- .../apps/e2e/__tests__/app-desk/team.spec.ts | 10 ++--- .../__tests__/app-desk/teams-create.spec.ts | 2 +- .../__tests__/app-desk/teams-delete.spec.ts | 10 ++--- 15 files changed, 74 insertions(+), 69 deletions(-) diff --git a/src/frontend/apps/desk/src/features/members/__tests__/MemberGrid.test.tsx b/src/frontend/apps/desk/src/features/members/__tests__/MemberGrid.test.tsx index 9c8b174..04e70d3 100644 --- a/src/frontend/apps/desk/src/features/members/__tests__/MemberGrid.test.tsx +++ b/src/frontend/apps/desk/src/features/members/__tests__/MemberGrid.test.tsx @@ -94,7 +94,7 @@ describe('MemberGrid', () => { expect(screen.getByText('user2@test.com')).toBeInTheDocument(); expect(screen.getByText('user3@test.com')).toBeInTheDocument(); expect(screen.getByText('Owner')).toBeInTheDocument(); - expect(screen.getByText('Admin')).toBeInTheDocument(); + expect(screen.getByText('Administration')).toBeInTheDocument(); expect(screen.getByText('Member')).toBeInTheDocument(); }); diff --git a/src/frontend/apps/desk/src/features/members/__tests__/ModalRole.test.tsx b/src/frontend/apps/desk/src/features/members/__tests__/ModalRole.test.tsx index 0716b66..c1d52ab 100644 --- a/src/frontend/apps/desk/src/features/members/__tests__/ModalRole.test.tsx +++ b/src/frontend/apps/desk/src/features/members/__tests__/ModalRole.test.tsx @@ -84,7 +84,7 @@ describe('ModalRole', () => { expect( screen.getByRole('radio', { - name: 'Admin', + name: 'Administration', }), ).toBeChecked(); @@ -174,12 +174,14 @@ describe('ModalRole', () => { ); expect( - screen.getByText('You are the last owner, you cannot change your role.'), + screen.getByText( + 'You are the sole owner of this group. Make another member the group owner, before you can change your own role.', + ), ).toBeInTheDocument(); expect( screen.getByRole('radio', { - name: 'Admin', + name: 'Administration', }), ).toBeDisabled(); @@ -232,7 +234,7 @@ describe('ModalRole', () => { expect( screen.getByRole('radio', { - name: 'Admin', + name: 'Administration', }), ).toBeDisabled(); @@ -274,7 +276,7 @@ describe('ModalRole', () => { expect( screen.getByRole('radio', { - name: 'Admin', + name: 'Administration', }), ).toBeEnabled(); diff --git a/src/frontend/apps/desk/src/features/members/components/ChooseRole.tsx b/src/frontend/apps/desk/src/features/members/components/ChooseRole.tsx index fdafeb5..c574cbc 100644 --- a/src/frontend/apps/desk/src/features/members/components/ChooseRole.tsx +++ b/src/frontend/apps/desk/src/features/members/components/ChooseRole.tsx @@ -20,14 +20,6 @@ export const ChooseRole = ({ return ( - setRole(evt.target.value as Role)} - defaultChecked={defaultRole === Role.ADMIN} - disabled={disabled} - /> + setRole(evt.target.value as Role)} + defaultChecked={defaultRole === Role.ADMIN} + disabled={disabled} + /> edit} > - {t('Update the role')} + {t('Update role')} diff --git a/src/frontend/apps/desk/src/features/members/components/MemberGrid.tsx b/src/frontend/apps/desk/src/features/members/components/MemberGrid.tsx index 8679cad..31a5f01 100644 --- a/src/frontend/apps/desk/src/features/members/components/MemberGrid.tsx +++ b/src/frontend/apps/desk/src/features/members/components/MemberGrid.tsx @@ -69,7 +69,7 @@ export const MemberGrid = ({ team, currentRole }: MemberGridProps) => { }); const localizedRoles = { - [Role.ADMIN]: t('Admin'), + [Role.ADMIN]: t('Administration'), [Role.MEMBER]: t('Member'), [Role.OWNER]: t('Owner'), }; diff --git a/src/frontend/apps/desk/src/features/members/components/ModalRole.tsx b/src/frontend/apps/desk/src/features/members/components/ModalRole.tsx index d25c8da..203aa9d 100644 --- a/src/frontend/apps/desk/src/features/members/components/ModalRole.tsx +++ b/src/frontend/apps/desk/src/features/members/components/ModalRole.tsx @@ -104,7 +104,9 @@ export const ModalRole = ({ > warning {isLastOwner && - t('You are the last owner, you cannot change your role.')} + t( + 'You are the sole owner of this group. Make another member the group owner, before you can change your own role.', + )} {isOtherOwner && t('You cannot update the role of other owner.')} )} diff --git a/src/frontend/apps/desk/src/features/teams/components/TeamInfo.tsx b/src/frontend/apps/desk/src/features/teams/components/TeamInfo.tsx index 877bf01..25bc6cb 100644 --- a/src/frontend/apps/desk/src/features/teams/components/TeamInfo.tsx +++ b/src/frontend/apps/desk/src/features/teams/components/TeamInfo.tsx @@ -59,15 +59,9 @@ export const TeamInfo = ({ team, currentRole }: TeamInfoProps) => { $size="1.25rem" $margin={{ top: 'none' }} > - {t('Members of “{{teamName}}“', { - teamName: team.name, - })} - - - {t('Add people to the “{{teamName}}“ group.', { - teamName: team.name, - })} + {team.name} + {t('Group details')} { const responsePromiseSearchUser = page.waitForResponse( 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 cf082b8..a8014c0 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 @@ -77,7 +77,9 @@ test.describe('Members Create', () => { await expect(page.getByText(/Choose a role/)).toBeVisible(); await expect(page.getByRole('radio', { name: 'Member' })).toBeChecked(); await expect(page.getByRole('radio', { name: 'Owner' })).toBeVisible(); - await expect(page.getByRole('radio', { name: 'Admin' })).toBeVisible(); + await expect( + page.getByRole('radio', { name: 'Administration' }), + ).toBeVisible(); }); test('it sends a new invitation and adds a new member', async ({ @@ -109,7 +111,7 @@ test.describe('Members Create', () => { await page.getByRole('option', { name: users[0].name }).click(); // Choose a role - await page.getByRole('radio', { name: 'Admin' }).click(); + await page.getByRole('radio', { name: 'Administration' }).click(); const responsePromiseCreateInvitation = page.waitForResponse( (response) => @@ -136,7 +138,7 @@ test.describe('Members Create', () => { const table = page.getByLabel('List members card').getByRole('table'); await expect(table.getByText(users[0].name)).toBeVisible(); - await expect(table.getByText('Admin')).toBeVisible(); + await expect(table.getByText('Administration')).toBeVisible(); }); test('it try to add twice the same user', async ({ page, browserName }) => { 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 e43d3be..2529f62 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 @@ -82,7 +82,7 @@ test.describe('Members Delete', () => { test('it deletes admin member', async ({ page, browserName }) => { await createTeam(page, 'member-delete-4', browserName, 1); - const username = await addNewMember(page, 0, 'Admin'); + const username = await addNewMember(page, 0, 'Administration'); const table = page.getByLabel('List members card').getByRole('table'); @@ -119,9 +119,9 @@ test.describe('Members Delete', () => { await myCells.nth(4).getByLabel('Member options').click(); // Change role to Admin - await page.getByText('Update the role').click(); + await page.getByText('Update role').click(); const radioGroup = page.getByLabel('Radio buttons to update the roles'); - await radioGroup.getByRole('radio', { name: 'Admin' }).click(); + await radioGroup.getByRole('radio', { name: 'Administration' }).click(); await page.getByRole('button', { name: 'Validate' }).click(); const cells = table @@ -137,7 +137,7 @@ test.describe('Members Delete', () => { // To not be the only owner await addNewMember(page, 0, 'Owner'); - const username = await addNewMember(page, 1, 'Admin', 'something'); + const username = await addNewMember(page, 1, 'Administration', 'something'); const table = page.getByLabel('List members card').getByRole('table'); @@ -149,9 +149,9 @@ test.describe('Members Delete', () => { await myCells.nth(4).getByLabel('Member options').click(); // Change role to Admin - await page.getByText('Update the role').click(); + await page.getByText('Update role').click(); const radioGroup = page.getByLabel('Radio buttons to update the roles'); - await radioGroup.getByRole('radio', { name: 'Admin' }).click(); + await radioGroup.getByRole('radio', { name: 'Administration' }).click(); await page.getByRole('button', { name: 'Validate' }).click(); const cells = table diff --git a/src/frontend/apps/e2e/__tests__/app-desk/member-grid.spec.ts b/src/frontend/apps/e2e/__tests__/app-desk/member-grid.spec.ts index d09e640..6a668b0 100644 --- a/src/frontend/apps/e2e/__tests__/app-desk/member-grid.spec.ts +++ b/src/frontend/apps/e2e/__tests__/app-desk/member-grid.spec.ts @@ -43,10 +43,12 @@ test.describe('Member Grid', () => { new RegExp(`E2E ${browserName}`, 'i'), ); await cells.nth(4).getByLabel('Member options').click(); - await page.getByText('Update the role').click(); + await page.getByText('Update role').click(); await expect( - page.getByText('You are the last owner, you cannot change your role.'), + page.getByText( + 'You are the sole owner of this group. Make another member the group owner, before you can change your own role.', + ), ).toBeVisible(); const radioGroup = page.getByLabel('Radio buttons to update the roles'); 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 60e4371..78340dc 100644 --- a/src/frontend/apps/e2e/__tests__/app-desk/team.spec.ts +++ b/src/frontend/apps/e2e/__tests__/app-desk/team.spec.ts @@ -19,13 +19,11 @@ test.describe('Team', () => { await expect(page.getByLabel('icon group')).toBeVisible(); await expect( page.getByRole('heading', { - name: `Members of “${teamName}“`, + name: teamName, level: 3, }), ).toBeVisible(); - await expect( - page.getByText(`Add people to the “${teamName}“ group.`), - ).toBeVisible(); + await expect(page.getByText(`Group details`)).toBeVisible(); await expect(page.getByText(`1 member`)).toBeVisible(); @@ -55,8 +53,6 @@ test.describe('Team', () => { .click(); await expect(page.getByText('The team has been updated.')).toBeVisible(); - await expect( - page.getByText(`Add people to the “${teamName}“ group.`), - ).toBeVisible(); + await expect(page.getByText(`Group details`)).toBeVisible(); }); }); 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 7365984..11a978e 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 @@ -71,7 +71,7 @@ test.describe('Teams Create', () => { await page.getByText('Team name').fill(teamName); await page.getByRole('button', { name: 'Create the team' }).click(); - const elTeam = page.getByText(`Members of “${teamName}“`); + const elTeam = page.getByRole('heading', { name: teamName }); await expect(elTeam).toBeVisible(); await panel.getByRole('button', { name: 'Add a team' }).click(); diff --git a/src/frontend/apps/e2e/__tests__/app-desk/teams-delete.spec.ts b/src/frontend/apps/e2e/__tests__/app-desk/teams-delete.spec.ts index 159a7ef..e81cfda 100644 --- a/src/frontend/apps/e2e/__tests__/app-desk/teams-delete.spec.ts +++ b/src/frontend/apps/e2e/__tests__/app-desk/teams-delete.spec.ts @@ -31,7 +31,7 @@ test.describe('Teams Delete', () => { await addNewMember(page, 0, 'Owner'); - // Change role to Admin + // Change role to Administration const table = page.getByLabel('List members card').getByRole('table'); const myCells = table .getByRole('row') @@ -39,9 +39,9 @@ test.describe('Teams Delete', () => { .getByRole('cell'); await myCells.nth(4).getByLabel('Member options').click(); - await page.getByText('Update the role').click(); + await page.getByText('Update role').click(); const radioGroup = page.getByLabel('Radio buttons to update the roles'); - await radioGroup.getByRole('radio', { name: 'Admin' }).click(); + await radioGroup.getByRole('radio', { name: 'Administration' }).click(); await page.getByRole('button', { name: 'Validate' }).click(); // Delete the team button should be hidden @@ -59,7 +59,7 @@ test.describe('Teams Delete', () => { await addNewMember(page, 0, 'Owner'); - // Change role to Admin + // Change role to Administration const table = page.getByLabel('List members card').getByRole('table'); const myCells = table .getByRole('row') @@ -67,7 +67,7 @@ test.describe('Teams Delete', () => { .getByRole('cell'); await myCells.nth(4).getByLabel('Member options').click(); - await page.getByText('Update the role').click(); + await page.getByText('Update role').click(); const radioGroup = page.getByLabel('Radio buttons to update the roles'); await radioGroup.getByRole('radio', { name: 'Member' }).click(); await page.getByRole('button', { name: 'Validate' }).click();