[UXD][AAP-25027] AWX - updates to Projects section breadcrumbs & head…

…ers (#2721)
ansible · Aug 12, 2024 · 6e083a8 · 6e083a8
1 parent d2f3f2d
commit 6e083a8
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/cypress/e2e/awx/resources/projects/project-details.cy.ts b/cypress/e2e/awx/resources/projects/project-details.cy.ts
@@ -338,7 +338,7 @@ describe('Projects', () => {
         cy.get(`[data-cy="row-id-${thisProject.id}"]`).within(() => {
           cy.get('[data-cy="name-column-cell"]').click();
         });
-        cy.clickTab('Job templates', true);
+        cy.clickTab('Job Templates', true);
         cy.url().should(
           'contain',
           `/projects/${thisProject.id}/job-templates?page=1&perPage=10&sort=name`

diff --git a/cypress/e2e/awx/resources/projects/project-edit-copy-sync.cy.ts b/cypress/e2e/awx/resources/projects/project-edit-copy-sync.cy.ts
@@ -31,7 +31,7 @@ describe('Project Edit, Copy, Sync', () => {
       cy.get(`[data-cy="row-id-${project.id}"]`).within(() => {
         cy.get('[data-cy="edit-project"]').click();
       });
-      cy.verifyPageTitle('Edit Project');
+      cy.verifyPageTitle(`Edit ${project.name}`);
       cy.get('[data-cy="name"]').should('have.value', `${project.name}`);
       cy.get('[data-cy="name"]').clear().type(`${project.name} - edited`);
       cy.intercept('PATCH', awxAPI`/projects/${project.id.toString()}/`).as('edited');
@@ -52,7 +52,7 @@ describe('Project Edit, Copy, Sync', () => {
       cy.clickTableRowLink('name', project.name, { disableFilter: true });
       cy.verifyPageTitle(project.name);
       cy.clickButton(/^Edit project$/);
-      cy.verifyPageTitle('Edit Project');
+      cy.verifyPageTitle(`Edit ${project.name}`);
       cy.get('[data-cy="name"]').clear().type(`${project.name} - edited`);
       cy.intercept('PATCH', awxAPI`/projects/${project.id.toString()}/`).as('edited');
       cy.clickButton(/^Save project$/);

diff --git a/frontend/awx/resources/projects/ProjectPage/ProjectForm.cy.tsx b/frontend/awx/resources/projects/ProjectPage/ProjectForm.cy.tsx
@@ -41,7 +41,7 @@ describe('ProjectForm.cy.ts', () => {
       cy.contains('Name is required.').should('be.visible');
       cy.contains('Organization is required.').should('be.visible');
       cy.contains('Source control type is required.').should('be.visible');
-      cy.verifyPageTitle('Create Project');
+      cy.verifyPageTitle('Create project');
     });
 
     it('validates required field for source control types', () => {
@@ -140,7 +140,7 @@ describe('ProjectForm.cy.ts', () => {
     );
     cy.intercept('PATCH', 'api/v2/projects/*', { statusCode: 201 }).as('editProject');
     cy.mount(<EditProject />);
-    cy.verifyPageTitle('Edit Project');
+    cy.verifyPageTitle('Edit Demo Project @ 10:44:51');
     cy.getByDataCy('name').should('have.value', 'Demo Project @ 10:44:51');
     cy.getByDataCy('organization').should('have.text', 'Default');
     cy.getByDataCy('signature_validation_credential').should('have.text', 'Select credential');

diff --git a/frontend/awx/resources/projects/ProjectPage/ProjectForm.tsx b/frontend/awx/resources/projects/ProjectPage/ProjectForm.tsx
@@ -66,10 +66,10 @@ export function CreateProject() {
   return (
     <PageLayout>
       <PageHeader
-        title={t('Create Project')}
+        title={t('Create project')}
         breadcrumbs={[
           { label: t('Projects'), to: getPageUrl(AwxRoute.Projects) },
-          { label: t('Create Project') },
+          { label: t('Create project') },
         ]}
       />
       <AwxPageForm
@@ -128,10 +128,16 @@ export function EditProject() {
   return (
     <PageLayout>
       <PageHeader
-        title={t('Edit Project')}
+        title={
+          project?.name ? t('Edit {{projectName}}', { projectName: project?.name }) : t('Project')
+        }
         breadcrumbs={[
           { label: t('Projects'), to: getPageUrl(AwxRoute.Projects) },
-          { label: t('Edit Project') },
+          {
+            label: project?.name
+              ? t('Edit {{projectName}}', { projectName: project?.name })
+              : t('Project'),
+          },
         ]}
       />
       <AwxPageForm<Project>

diff --git a/frontend/awx/resources/projects/ProjectPage/ProjectPage.tsx b/frontend/awx/resources/projects/ProjectPage/ProjectPage.tsx
@@ -50,7 +50,7 @@ export function ProjectPage() {
     const tabs = [
       { label: t('Details'), page: AwxRoute.ProjectDetails },
       { label: t('Schedules'), page: AwxRoute.ProjectSchedules },
-      { label: t('Job templates'), page: AwxRoute.ProjectJobTemplates },
+      { label: t('Job Templates'), page: AwxRoute.ProjectJobTemplates },
       { label: t('User Access'), page: AwxRoute.ProjectUsers },
       { label: t('Team Access'), page: AwxRoute.ProjectTeams },
     ];