From 5708ce313151868f02dfce85fffd6c6cb262259b Mon Sep 17 00:00:00 2001
From: Tina Yip <98424339+tiyiprh@users.noreply.github.com>
Date: Wed, 21 Aug 2024 16:06:54 -0400
Subject: [PATCH] [UXD][AAP-25027] AWX - updates to Users section breadcrumbs &
 headers (#2733)

---
 cypress/e2e/awx/access/users/users.cy.ts |  4 ++--
 frontend/awx/access/users/UserForm.tsx   | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cypress/e2e/awx/access/users/users.cy.ts b/cypress/e2e/awx/access/users/users.cy.ts
index 1ffbb3ca12..d7a2331581 100644
--- a/cypress/e2e/awx/access/users/users.cy.ts
+++ b/cypress/e2e/awx/access/users/users.cy.ts
@@ -61,7 +61,7 @@ describe('Users Tests', () => {
 
     it('navigates to the edit form from the users list row item', () => {
       cy.clickTableRowPinnedAction(user.username, 'edit-user');
-      cy.verifyPageTitle('Edit User');
+      cy.verifyPageTitle(`Edit ${user.username}`);
     });
 
     it('edits a user from the details page', () => {
@@ -69,7 +69,7 @@ describe('Users Tests', () => {
       cy.verifyPageTitle(user.username);
       cy.url().should('contain', '/details');
       cy.clickButton(/^Edit user$/);
-      cy.verifyPageTitle('Edit User');
+      cy.verifyPageTitle(`Edit ${user.username}`);
       cy.get('[data-cy="username"]').type(user.username + 'a');
       cy.clickButton(/^Save user$/);
       cy.verifyPageTitle(`${user.username}a`);
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>