users buttons and updates to failing tests

ansible · Aug 26, 2024 · 4558037 · 4558037
1 parent 9d7bbbe
commit 4558037
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/frontend/awx/access/users/UserPage/UserOrganizations.tsx b/frontend/awx/access/users/UserPage/UserOrganizations.tsx
@@ -55,15 +55,15 @@ 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 },
       {
         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
@@ -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
@@ -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
@@ -81,37 +81,37 @@ 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 },
       {
         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 },
       {
         type: PageActionType.Button,
         selection: PageActionSelection.Multiple,
         icon: TrashIcon,
-        label: t('Delete selected users'),
+        label: t('Delete users'),
         onClick: deleteUsers,
         isDanger: true,
       },