From 7da998440da6bcc3eebe135ea306992157b20b98 Mon Sep 17 00:00:00 2001
From: Tina Yip <tiyip@redhat.com>
Date: Thu, 18 Jul 2024 10:47:50 -0400
Subject: [PATCH] reset branch

---
 cypress/e2e/awx/access/users.cy.ts     | 133 +++++++++++++++++++++++++
 frontend/awx/access/users/UserForm.tsx |  12 ++-
 2 files changed, 141 insertions(+), 4 deletions(-)
 create mode 100644 cypress/e2e/awx/access/users.cy.ts

diff --git a/cypress/e2e/awx/access/users.cy.ts b/cypress/e2e/awx/access/users.cy.ts
new file mode 100644
index 0000000000..f1ade450b1
--- /dev/null
+++ b/cypress/e2e/awx/access/users.cy.ts
@@ -0,0 +1,133 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+/// <reference types="cypress" />
+
+import { randomString } from '../../../../framework/utils/random-string';
+import { Organization } from '../../../../frontend/awx/interfaces/Organization';
+import { AwxUser } from '../../../../frontend/awx/interfaces/User';
+
+describe('Users List Actions', () => {
+  let organization: Organization;
+  let user: AwxUser;
+
+  beforeEach(() => {
+    cy.createAwxOrganization().then((org) => {
+      organization = org;
+      cy.createAwxUser({ organization: organization.id }).then((testUser) => {
+        user = testUser;
+      });
+    });
+  });
+
+  afterEach(() => {
+    cy.deleteAwxUser(user, { failOnStatusCode: false });
+    cy.deleteAwxOrganization(organization, { failOnStatusCode: false });
+  });
+
+  it('renders the users list page', () => {
+    cy.navigateTo('awx', 'users');
+    cy.verifyPageTitle('Users');
+  });
+
+  it('filters users by id', () => {
+    cy.navigateTo('awx', 'users');
+    cy.filterTableByMultiSelect('id', [user.id.toString()]);
+    cy.get('tr').should('have.length.greaterThan', 0);
+    if (user.id) {
+      cy.contains(user.id).should('be.visible');
+    }
+    cy.clearAllFilters();
+  });
+
+  it('creates and then deletes a basic user', () => {
+    const userName = 'E2E_User_' + randomString(4);
+    const password = randomString(12);
+    cy.navigateTo('awx', 'users');
+    cy.clickLink(/^Create user$/);
+    cy.get('[data-cy="username"]').type(userName);
+    cy.get('[data-cy="password"]').type(password);
+    cy.get('[data-cy="confirmpassword"]').type(password);
+    cy.singleSelectBy('[data-cy="organization"]', organization.name);
+    cy.clickButton(/^Create user$/);
+    cy.verifyPageTitle(userName);
+    // Clean up this user
+    cy.clickPageAction('delete-user');
+    cy.get('#confirm').click();
+    cy.clickButton(/^Delete user/);
+    cy.verifyPageTitle('Users');
+  });
+
+  it('renders the user details page', () => {
+    cy.navigateTo('awx', 'users');
+    cy.clickTableRowLink('username', user.username);
+    cy.verifyPageTitle(user.username);
+    cy.clickLink(/^Details$/);
+    cy.contains('#username', user.username);
+  });
+
+  it('edits a user from the details page', () => {
+    cy.navigateTo('awx', 'users');
+    cy.clickTableRowLink('username', user.username);
+    cy.verifyPageTitle(`Edit ${user.username}`);
+    cy.clickButton(/^Edit user$/);
+    cy.verifyPageTitle(`Edit ${user.username}`);
+    cy.get('[data-cy="username"]').type(user.username + 'a');
+    cy.clickButton(/^Save user$/);
+    cy.verifyPageTitle(`Edit ${user.username}`);
+  });
+
+  it('navigates to the edit form from the users list row item', () => {
+    cy.navigateTo('awx', 'users');
+    cy.clickTableRowPinnedAction(user.username, 'edit-user');
+    cy.verifyPageTitle(`Edit ${user.username}`);
+  });
+});
+
+describe('Users Delete Actions', () => {
+  let organization: Organization;
+  let user: AwxUser;
+
+  beforeEach(() => {
+    cy.createAwxOrganization().then((org) => {
+      organization = org;
+      cy.createAwxUser({ organization: organization.id }).then((testUser) => {
+        user = testUser;
+      });
+    });
+  });
+
+  afterEach(() => {
+    cy.deleteAwxUser(user, { failOnStatusCode: false });
+    cy.deleteAwxOrganization(organization, { failOnStatusCode: false });
+  });
+
+  it('deletes a user from the details page', () => {
+    cy.navigateTo('awx', 'users');
+    cy.clickTableRowLink('username', user.username);
+    cy.verifyPageTitle(user.username);
+    cy.clickPageAction('delete-user');
+    cy.get('#confirm').click();
+    cy.clickButton(/^Delete user/);
+    cy.verifyPageTitle('Users');
+  });
+
+  it('deletes a user from the users list row item', () => {
+    cy.navigateTo('awx', 'users');
+    cy.clickTableRowKebabAction(user.username, 'delete-user');
+    cy.get('#confirm').click();
+    cy.clickButton(/^Delete user/);
+    cy.contains(/^Success$/);
+    cy.clickButton(/^Close$/);
+    cy.clickButton(/^Clear all filters$/);
+  });
+
+  it('deletes a user from the users list toolbar', () => {
+    cy.navigateTo('awx', 'users');
+    cy.selectTableRow(user.username);
+    cy.clickToolbarKebabAction('delete-selected-users');
+    cy.get('#confirm').click();
+    cy.clickButton(/^Delete user/);
+    cy.contains(/^Success$/);
+    cy.clickButton(/^Close$/);
+    cy.clickButton(/^Clear all filters$/);
+  });
+});
diff --git a/frontend/awx/access/users/UserForm.tsx b/frontend/awx/access/users/UserForm.tsx
index 7f8abc1288..1f5186d769 100644
--- a/frontend/awx/access/users/UserForm.tsx
+++ b/frontend/awx/access/users/UserForm.tsx
@@ -56,10 +56,10 @@ export function CreateUser() {
   return (
     <PageLayout>
       <PageHeader
-        title={t('Create User')}
+        title={t('Create user')}
         breadcrumbs={[
           { label: t('Users'), to: getPageUrl(AwxRoute.Users) },
-          { label: t('Create User') },
+          { label: t('Create user') },
         ]}
       />
       <AwxPageForm
@@ -130,10 +130,14 @@ export function EditUser() {
   return (
     <PageLayout>
       <PageHeader
-        title={t('Edit User')}
+        title={user?.username ? t('Edit {{userName}}', { userName: user?.username }) : t('User')}
         breadcrumbs={[
           { label: t('Users'), to: getPageUrl(AwxRoute.Users) },
-          { label: t('Edit User') },
+          {
+            label: user?.username
+              ? t('Edit {{userName}}', { userName: user?.username })
+              : t('User'),
+          },
         ]}
       />
       <AwxPageForm<IUserInput>