From 7629122dd1a1edb06c72e9bb05491261efb7d1af Mon Sep 17 00:00:00 2001
From: Tina Yip <98424339+tiyiprh@users.noreply.github.com>
Date: Thu, 22 Aug 2024 17:19:55 -0400
Subject: [PATCH] [UXD][AAP-25027] AWX - updates to OAuth application section
 breadcrumbs & headers (#2730)

Co-authored-by: Maeve Hoffer <dhoffer@redhat.com>
---
 .../applications/applications.cy.ts           |  2 +-
 .../applications/ApplicationForm.cy.tsx       |  2 +-
 .../applications/ApplicationForm.tsx          | 20 +++++++++++++------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/cypress/e2e/awx/administration/applications/applications.cy.ts b/cypress/e2e/awx/administration/applications/applications.cy.ts
index 6d43568dbe..b736c388ca 100644
--- a/cypress/e2e/awx/administration/applications/applications.cy.ts
+++ b/cypress/e2e/awx/administration/applications/applications.cy.ts
@@ -58,7 +58,7 @@ cyLabel(['upstream'], () => {
           cy.verifyPageTitle('OAuth Applications');
           cy.filterTableByMultiSelect('name', [oauthApplicationName]);
           cy.clickTableRowPinnedAction(oauthApplicationName, 'edit-application', false);
-          cy.verifyPageTitle('Edit Application');
+          cy.verifyPageTitle(`Edit ${oauthApplicationName}`);
           cy.getByDataCy('description')
             .clear()
             .type(`${authGrantType} with ${appClientType} edited`);
diff --git a/frontend/awx/administration/applications/ApplicationForm.cy.tsx b/frontend/awx/administration/applications/ApplicationForm.cy.tsx
index b1a139b3c2..be9bc9d92f 100644
--- a/frontend/awx/administration/applications/ApplicationForm.cy.tsx
+++ b/frontend/awx/administration/applications/ApplicationForm.cy.tsx
@@ -115,7 +115,7 @@ describe('Create Edit Application Form', () => {
 
     it('should preload the form with current values', () => {
       cy.mount(<EditApplication />);
-      cy.verifyPageTitle('Edit Application');
+      cy.verifyPageTitle('Edit test');
       cy.get('[data-cy="name"]').should('have.value', 'test');
       cy.get('[data-cy="description"]').should('have.value', 'hello');
       cy.get('[data-cy="organization"]').should('contain', 'Default');
diff --git a/frontend/awx/administration/applications/ApplicationForm.tsx b/frontend/awx/administration/applications/ApplicationForm.tsx
index bf36f2ca53..4d547d1168 100644
--- a/frontend/awx/administration/applications/ApplicationForm.tsx
+++ b/frontend/awx/administration/applications/ApplicationForm.tsx
@@ -47,10 +47,10 @@ export function CreateApplication(props: { onSuccessfulCreate: (app: Application
   return (
     <PageLayout>
       <PageHeader
-        title={t('Create Application')}
+        title={t('Create OAuth application')}
         breadcrumbs={[
-          { label: t('Applications'), to: getPageUrl(AwxRoute.Applications) },
-          { label: t('Create Application') },
+          { label: t('OAuth Applications'), to: getPageUrl(AwxRoute.Applications) },
+          { label: t('Create OAuth application') },
         ]}
       />
       <AwxPageForm
@@ -118,10 +118,18 @@ export function EditApplication() {
   return (
     <PageLayout>
       <PageHeader
-        title={t('Edit Application')}
+        title={
+          application?.name
+            ? t('Edit {{applicationName}}', { applicationName: application?.name })
+            : t('OAuth Application')
+        }
         breadcrumbs={[
-          { label: t('Applications'), to: getPageUrl(AwxRoute.Applications) },
-          { label: t('Edit Application') },
+          { label: t('OAuth Applications'), to: getPageUrl(AwxRoute.Applications) },
+          {
+            label: application?.name
+              ? t('Edit {{applicationName}}', { applicationName: application?.name })
+              : t('OAuth Application'),
+          },
         ]}
       />
       <AwxPageForm<Application>