From d7396d268f8d754678d80c93576900a998c9359f Mon Sep 17 00:00:00 2001
From: Tina Yip <tiyip@redhat.com>
Date: Wed, 17 Jul 2024 18:03:54 -0400
Subject: [PATCH] updates with latest changes

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

diff --git a/cypress/e2e/awx/access/users.cy.ts b/cypress/e2e/awx/access/users.cy.ts
index b72ec09964..f1ade450b1 100644
--- a/cypress/e2e/awx/access/users.cy.ts
+++ b/cypress/e2e/awx/access/users.cy.ts
@@ -67,18 +67,18 @@ describe('Users List Actions', () => {
   it('edits a user from the details page', () => {
     cy.navigateTo('awx', 'users');
     cy.clickTableRowLink('username', user.username);
-    cy.verifyPageTitle(user.username);
+    cy.verifyPageTitle(`Edit ${user.username}`);
     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`);
+    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');
+    cy.verifyPageTitle(`Edit ${user.username}`);
   });
 });
 
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>