diff --git a/cypress/e2e/awx/access/teams.cy.ts b/cypress/e2e/awx/access/teams.cy.ts index 7adef0dceb..60c7db8c90 100644 --- a/cypress/e2e/awx/access/teams.cy.ts +++ b/cypress/e2e/awx/access/teams.cy.ts @@ -292,7 +292,7 @@ describe('Teams: Bulk delete', () => { cy.filterTableByMultiSelect('name', arrayOfElementText); cy.get('tbody tr').should('have.length', 5); cy.getByDataCy('select-all').click(); - cy.clickToolbarKebabAction('delete-selected-teams'); + cy.clickToolbarKebabAction('delete-teams'); cy.get('#confirm').click(); cy.intercept('DELETE', awxAPI`/teams/*/`).as('deleted'); diff --git a/frontend/awx/access/teams/Teams.cy.tsx b/frontend/awx/access/teams/Teams.cy.tsx index 5868e54107..f7058cbb32 100644 --- a/frontend/awx/access/teams/Teams.cy.tsx +++ b/frontend/awx/access/teams/Teams.cy.tsx @@ -58,7 +58,7 @@ describe('Teams.cy.ts', () => { cy.intercept({ method: 'GET', url: '/api/v2/teams/*' }, { fixture: 'teams.json' }); cy.mount(); cy.get('[type="checkbox"][id="select-all"]').check(); - cy.clickToolbarKebabAction('delete-selected-teams'); + cy.clickToolbarKebabAction('delete-teams'); cy.contains( '1 of the selected teams cannot be deleted due to insufficient permissions.' ).should('be.visible'); diff --git a/frontend/awx/access/teams/hooks/useTeamActions.tsx b/frontend/awx/access/teams/hooks/useTeamActions.tsx index 397d464996..664d66b573 100644 --- a/frontend/awx/access/teams/hooks/useTeamActions.tsx +++ b/frontend/awx/access/teams/hooks/useTeamActions.tsx @@ -65,7 +65,7 @@ export function useTeamActions(options: { type: PageActionType.Button, selection: PageActionSelection.Single, icon: PlusCircleIcon, - label: t('Add users'), + label: t('Add users to teams'), isDisabled: (team: Team) => cannotAddUsers(team), onClick: (team) => selectUsersAddTeams([team]), }, @@ -73,7 +73,7 @@ export function useTeamActions(options: { type: PageActionType.Button, selection: PageActionSelection.Single, icon: MinusCircleIcon, - label: t('Remove users'), + label: t('Remove users from teams'), isDisabled: (team: Team) => cannotRemoveUsers(team), onClick: (team) => selectAndRemoveUsersFromTeam(team), }, diff --git a/frontend/awx/access/teams/hooks/useTeamToolbarActions.tsx b/frontend/awx/access/teams/hooks/useTeamToolbarActions.tsx index be5f6dad6e..4f1b6ff242 100644 --- a/frontend/awx/access/teams/hooks/useTeamToolbarActions.tsx +++ b/frontend/awx/access/teams/hooks/useTeamToolbarActions.tsx @@ -47,7 +47,7 @@ export function useTeamToolbarActions(view: IAwxView) { type: PageActionType.Button, selection: PageActionSelection.Multiple, icon: PlusCircleIcon, - label: t('Add users to selected teams'), + label: t('Add users to teams'), onClick: () => selectUsersAddTeams(view.selectedItems), }, { @@ -62,7 +62,7 @@ export function useTeamToolbarActions(view: IAwxView) { type: PageActionType.Button, selection: PageActionSelection.Multiple, icon: TrashIcon, - label: t('Delete selected teams'), + label: t('Delete teams'), onClick: deleteTeams, isDanger: true, },