diff --git a/frontend/awx/access/users/UserPage/UserOrganizations.tsx b/frontend/awx/access/users/UserPage/UserOrganizations.tsx index 6a6c01ad5b..d30119586d 100644 --- a/frontend/awx/access/users/UserPage/UserOrganizations.tsx +++ b/frontend/awx/access/users/UserPage/UserOrganizations.tsx @@ -55,7 +55,7 @@ function UserOrganizationsInternal(props: { user: AwxUser }) { variant: ButtonVariant.primary, isPinned: true, icon: PlusCircleIcon, - label: t('Add user to organizations'), + label: t('Add users to organizations'), onClick: () => selectOrganizationsAddUsers([user]), }, { type: PageActionType.Seperator }, @@ -63,7 +63,7 @@ function UserOrganizationsInternal(props: { user: AwxUser }) { type: PageActionType.Button, selection: PageActionSelection.Multiple, icon: MinusCircleIcon, - label: t('Remove user from selected organizations'), + label: t('Remove users from organizations'), onClick: () => removeOrganizationsFromUsers([user], view.selectedItems, view.unselectItemsAndRefresh), isDanger: true, diff --git a/frontend/awx/access/users/UserPage/UserTeams.tsx b/frontend/awx/access/users/UserPage/UserTeams.tsx index 8cc4f40261..7707ac824f 100644 --- a/frontend/awx/access/users/UserPage/UserTeams.tsx +++ b/frontend/awx/access/users/UserPage/UserTeams.tsx @@ -56,7 +56,7 @@ function UserTeamsInternal(props: { user: AwxUser }) { variant: ButtonVariant.primary, isPinned: true, icon: PlusCircleIcon, - label: t('Add user to teams'), + label: t('Add users to teams'), isDisabled: canAddUserToTeam ? undefined : t( @@ -69,7 +69,7 @@ function UserTeamsInternal(props: { user: AwxUser }) { type: PageActionType.Button, selection: PageActionSelection.Multiple, icon: MinusCircleIcon, - label: t('Remove user from selected teams'), + label: t('Remove users from teams'), onClick: () => removeTeamsFromUsers([user], view.selectedItems), isDanger: true, }, diff --git a/frontend/awx/access/users/Users.cy.tsx b/frontend/awx/access/users/Users.cy.tsx index e9f90be9bd..9a65388b99 100644 --- a/frontend/awx/access/users/Users.cy.tsx +++ b/frontend/awx/access/users/Users.cy.tsx @@ -66,7 +66,7 @@ describe('Users.cy.ts', () => { .then((results: AwxUser[]) => { const user = results[0]; cy.selectTableRow(user.username, false); - cy.clickToolbarKebabAction('delete-selected-users'); + cy.clickToolbarKebabAction('delete-users'); cy.contains('Permanently delete users').should('be.visible'); }); }); diff --git a/frontend/awx/access/users/Users.tsx b/frontend/awx/access/users/Users.tsx index 9e19638e2a..a6b2e8f3dc 100644 --- a/frontend/awx/access/users/Users.tsx +++ b/frontend/awx/access/users/Users.tsx @@ -81,14 +81,14 @@ export function Users() { type: PageActionType.Button, selection: PageActionSelection.Multiple, icon: PlusCircleIcon, - label: t('Add selected users to teams'), + label: t('Add users to teams'), onClick: () => selectTeamsAddUsers(view.selectedItems), }, { type: PageActionType.Button, selection: PageActionSelection.Multiple, icon: MinusCircleIcon, - label: t('Remove selected users from teams'), + label: t('Remove users from teams'), onClick: () => selectTeamsRemoveUsers(view.selectedItems), }, { type: PageActionType.Seperator }, @@ -96,14 +96,14 @@ export function Users() { type: PageActionType.Button, selection: PageActionSelection.Multiple, icon: PlusCircleIcon, - label: t('Add selected users to organizations'), + label: t('Add users to organizations'), onClick: () => selectOrganizationsAddUsers(view.selectedItems), }, { type: PageActionType.Button, selection: PageActionSelection.Multiple, icon: MinusCircleIcon, - label: t('Remove selected users from organizations'), + label: t('Remove users from organizations'), onClick: () => selectOrganizationsRemoveUsers(view.selectedItems), }, { type: PageActionType.Seperator }, @@ -111,7 +111,7 @@ export function Users() { type: PageActionType.Button, selection: PageActionSelection.Multiple, icon: TrashIcon, - label: t('Delete selected users'), + label: t('Delete users'), onClick: deleteUsers, isDanger: true, },