From dc64da6f72734830e4cd061b3cf9e3f2afdeac32 Mon Sep 17 00:00:00 2001 From: mabashian Date: Tue, 25 May 2021 11:48:09 -0400 Subject: [PATCH] Adds resource name and description to launch and schedule prompt wizards --- awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.jsx | 4 ++-- .../src/components/LaunchPrompt/LaunchPrompt.test.jsx | 6 ++++++ .../components/Schedule/shared/SchedulePromptableFields.jsx | 5 ++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.jsx b/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.jsx index ddb0a1e7cd..6d83fcbb28 100644 --- a/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.jsx +++ b/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.jsx @@ -1,6 +1,5 @@ import React from 'react'; import { Wizard } from '@patternfly/react-core'; - import { t } from '@lingui/macro'; import { Formik, useFormikContext } from 'formik'; import ContentError from '../ContentError'; @@ -102,7 +101,8 @@ function PromptModalForm({ validateStep(nextStep.id); } }} - title={t`Prompts`} + title={t`Launch | ${resource.name}`} + description={resource.description} steps={ isReady ? steps diff --git a/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.test.jsx b/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.test.jsx index 338ea17256..4e5547242c 100644 --- a/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.test.jsx +++ b/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.test.jsx @@ -24,6 +24,8 @@ jest.mock('../../api/models/JobTemplates'); let config; const resource = { id: 1, + description: 'Foo Description', + name: 'Foobar', type: 'job_template', }; const noop = () => {}; @@ -147,6 +149,10 @@ describe('LaunchPrompt', () => { expect(steps[3].name.props.children).toEqual('Other prompts'); expect(steps[4].name.props.children).toEqual('Survey'); expect(steps[5].name.props.children).toEqual('Preview'); + expect(wizard.find('WizardHeader').prop('title')).toBe('Launch | Foobar'); + expect(wizard.find('WizardHeader').prop('description')).toBe( + 'Foo Description' + ); }); test('should add inventory step', async () => { diff --git a/awx/ui_next/src/components/Schedule/shared/SchedulePromptableFields.jsx b/awx/ui_next/src/components/Schedule/shared/SchedulePromptableFields.jsx index 72cac061e8..1eff706902 100644 --- a/awx/ui_next/src/components/Schedule/shared/SchedulePromptableFields.jsx +++ b/awx/ui_next/src/components/Schedule/shared/SchedulePromptableFields.jsx @@ -1,6 +1,5 @@ import React from 'react'; import { Wizard } from '@patternfly/react-core'; - import { t } from '@lingui/macro'; import { useFormikContext } from 'formik'; import AlertModal from '../../AlertModal'; @@ -37,7 +36,6 @@ function SchedulePromptableFields({ launchConfig, schedule, resource, - credentials, resourceDefaultCredentials ); @@ -107,7 +105,8 @@ function SchedulePromptableFields({ validateStep(nextStep.id); } }} - title={t`Prompts`} + title={t`Prompt | ${resource.name}`} + description={resource.description} steps={ isReady ? steps