rebase branch

ansible · Aug 16, 2024 · 42b4fb6 · 42b4fb6
1 parent de66851
commit 42b4fb6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/cypress/e2e/awx/administration/applications/applications.cy.ts b/cypress/e2e/awx/administration/applications/applications.cy.ts
@@ -56,7 +56,7 @@ describe('AWX OAuth Applications CRUD actions List page', () => {
         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`);
         cy.getByDataCy('Submit').click();
         cy.verifyPageTitle(oauthApplicationName);

diff --git 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
@@ -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>