[UXD][AAP-25027] AWX - updates to Users section breadcrumbs & headers (…

…#2733)
ansible · Aug 21, 2024 · 5708ce3 · 5708ce3
1 parent 9168e30
commit 5708ce3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/cypress/e2e/awx/access/users/users.cy.ts b/cypress/e2e/awx/access/users/users.cy.ts
@@ -61,15 +61,15 @@ 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', () => {
       cy.clickTableRowLink('username', user.username);
       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
@@ -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>