diff --git a/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.test.jsx b/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.test.jsx
index 707e0f5401..c320aac30b 100644
--- a/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.test.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.test.jsx
@@ -112,10 +112,10 @@ describe('LaunchPrompt', () => {
expect(steps).toHaveLength(5);
expect(steps[0].name.props.children).toEqual('Inventory');
- expect(steps[1].name).toEqual('Credentials');
- expect(steps[2].name).toEqual('Other Prompts');
+ expect(steps[1].name.props.children).toEqual('Credentials');
+ expect(steps[2].name.props.children).toEqual('Other prompts');
expect(steps[3].name.props.children).toEqual('Survey');
- expect(steps[4].name).toEqual('Preview');
+ expect(steps[4].name.props.children).toEqual('Preview');
});
test('should add inventory step', async () => {
@@ -161,7 +161,7 @@ describe('LaunchPrompt', () => {
const steps = wizard.prop('steps');
expect(steps).toHaveLength(2);
- expect(steps[0].name).toEqual('Credentials');
+ expect(steps[0].name.props.children).toEqual('Credentials');
expect(isElementOfType(steps[0].component, CredentialsStep)).toEqual(true);
expect(isElementOfType(steps[1].component, PreviewStep)).toEqual(true);
});
@@ -185,7 +185,7 @@ describe('LaunchPrompt', () => {
const steps = wizard.prop('steps');
expect(steps).toHaveLength(2);
- expect(steps[0].name).toEqual('Other Prompts');
+ expect(steps[0].name.props.children).toEqual('Other prompts');
expect(isElementOfType(steps[0].component, OtherPromptsStep)).toEqual(true);
expect(isElementOfType(steps[1].component, PreviewStep)).toEqual(true);
});
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/StepName.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/StepName.jsx
index 28bf5f0414..d7d37989cd 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/StepName.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/StepName.jsx
@@ -14,13 +14,13 @@ const ExclamationCircleIcon = styled(PFExclamationCircleIcon)`
margin-left: 10px;
`;
-function StepName({ hasErrors, children, i18n }) {
+function StepName({ hasErrors, children, i18n, id }) {
if (!hasErrors) {
- return children;
+ return
{children}
;
}
return (
<>
-
+
{children}
+ {i18n._(t`Credentials`)}
+
+ ),
component: ,
enableNext: true,
};
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/useInventoryStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/useInventoryStep.jsx
index dfdf645275..0d00a3b747 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/useInventoryStep.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/useInventoryStep.jsx
@@ -35,7 +35,11 @@ function getStep(launchConfig, i18n, formError) {
}
return {
id: STEP_ID,
- name: {i18n._(t`Inventory`)},
+ name: (
+
+ {i18n._(t`Inventory`)}
+
+ ),
component: ,
enableNext: true,
};
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/useOtherPromptsStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/useOtherPromptsStep.jsx
index 9af74046fd..1f63397c17 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/useOtherPromptsStep.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/useOtherPromptsStep.jsx
@@ -2,6 +2,7 @@ import React from 'react';
import { t } from '@lingui/macro';
import { jsonToYaml, parseVariableField } from '../../../util/yaml';
import OtherPromptsStep from './OtherPromptsStep';
+import StepName from './StepName';
const STEP_ID = 'other';
@@ -43,7 +44,11 @@ function getStep(launchConfig, i18n) {
return {
id: STEP_ID,
key: 5,
- name: i18n._(t`Other Prompts`),
+ name: (
+
+ {i18n._(t`Other prompts`)}
+
+ ),
component: ,
enableNext: true,
};
diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/usePreviewStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/usePreviewStep.jsx
index fae5fd91f3..77570fab0b 100644
--- a/awx/ui_next/src/components/LaunchPrompt/steps/usePreviewStep.jsx
+++ b/awx/ui_next/src/components/LaunchPrompt/steps/usePreviewStep.jsx
@@ -1,6 +1,7 @@
import React from 'react';
import { t } from '@lingui/macro';
import PreviewStep from './PreviewStep';
+import StepName from './StepName';
const STEP_ID = 'preview';
@@ -16,7 +17,11 @@ export default function usePreviewStep(
step: showStep
? {
id: STEP_ID,
- name: i18n._(t`Preview`),
+ name: (
+
+ {i18n._(t`Preview`)}
+
+ ),
component: (
{i18n._(t`Survey`)}
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeModal.test.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeModal.test.jsx
index 55ed1b6fc8..1c227ef90d 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeModal.test.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeModal.test.jsx
@@ -274,10 +274,7 @@ describe('NodeModal', () => {
wrapper.update();
expect(wrapper.find('NodeNextButton').prop('buttonText')).toBe('Next');
act(() => {
- wrapper
- .find('WizardNavItem[content="Preview"]')
- .find('button')
- .prop('onClick')();
+ wrapper.find('StepName#preview-step').simulate('click');
});
wrapper.update();
await act(async () => {
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/useNodeTypeStep.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/useNodeTypeStep.jsx
index 73c4e10fcf..2b0dcd888d 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/useNodeTypeStep.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/useNodeTypeStep.jsx
@@ -2,6 +2,7 @@ import React from 'react';
import { t } from '@lingui/macro';
import { useField } from 'formik';
import NodeTypeStep from './NodeTypeStep';
+import StepName from '../../../../../../components/LaunchPrompt/steps/StepName';
const STEP_ID = 'nodeType';
@@ -38,7 +39,11 @@ function getStep(i18n, nodeTypeField, approvalNameField, nodeResourceField) {
};
return {
id: STEP_ID,
- name: i18n._(t`Node Type`),
+ name: (
+
+ {i18n._(t`Node type`)}
+
+ ),
component: ,
enableNext: isEnabled(),
};
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/useRunTypeStep.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/useRunTypeStep.jsx
index 6417ee2826..2e117da77e 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/useRunTypeStep.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/useRunTypeStep.jsx
@@ -1,8 +1,8 @@
import React from 'react';
import { t } from '@lingui/macro';
import { useField } from 'formik';
-
import RunStep from './RunStep';
+import StepName from '../../../../../components/LaunchPrompt/steps/StepName';
const STEP_ID = 'runType';
@@ -28,7 +28,11 @@ function getStep(askLinkType, meta, i18n) {
}
return {
id: STEP_ID,
- name: i18n._(t`Run Type`),
+ name: (
+
+ {i18n._(t`Run type`)}
+
+ ),
component: ,
enableNext: meta.value !== '',
};