diff --git a/awx/ui_next/src/components/FieldWithPrompt/FieldWithPrompt.jsx b/awx/ui_next/src/components/FieldWithPrompt/FieldWithPrompt.jsx index bf3b3661c9..0bf7fbcb75 100644 --- a/awx/ui_next/src/components/FieldWithPrompt/FieldWithPrompt.jsx +++ b/awx/ui_next/src/components/FieldWithPrompt/FieldWithPrompt.jsx @@ -19,7 +19,6 @@ const StyledCheckboxField = styled(CheckboxField)` function FieldWithPrompt({ children, fieldId, - isRequired, label, promptId, diff --git a/awx/ui_next/src/components/LaunchPrompt/steps/useOtherPromptsStep.jsx b/awx/ui_next/src/components/LaunchPrompt/steps/useOtherPromptsStep.jsx index 4b0fc00742..d874d32995 100644 --- a/awx/ui_next/src/components/LaunchPrompt/steps/useOtherPromptsStep.jsx +++ b/awx/ui_next/src/components/LaunchPrompt/steps/useOtherPromptsStep.jsx @@ -118,7 +118,7 @@ function getInitialValues(launchConfig, resource) { initialValues.job_type = resource?.job_type || ''; } if (launchConfig.ask_limit_on_launch) { - initialValues.limit = resource?.limit || ''; + initialValues.limit = resource?.limit || null; } if (launchConfig.ask_verbosity_on_launch) { initialValues.verbosity = resource?.verbosity || 0; diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateAdd/WorkflowJobTemplateAdd.test.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateAdd/WorkflowJobTemplateAdd.test.jsx index 097f1b5026..ddd2b09f80 100644 --- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateAdd/WorkflowJobTemplateAdd.test.jsx +++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateAdd/WorkflowJobTemplateAdd.test.jsx @@ -126,7 +126,7 @@ describe('', () => { description: '', extra_vars: '---', inventory: undefined, - limit: '', + limit: null, organization: undefined, scm_branch: '', webhook_credential: undefined, diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx index 7f2ce66236..8b94505558 100644 --- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx +++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx @@ -45,6 +45,7 @@ function WorkflowJobTemplateDetail({ template }) { webhook_credential, webhook_key, scm_branch: scmBranch, + limit, } = template; const urlOrigin = window.location.origin; @@ -160,6 +161,7 @@ function WorkflowJobTemplateDetail({ template }) { )} /> )} + ', () => { webhook_key: 'Foo webhook key', execution_environment: 4, scm_branch: 'main', + limit: 'servers', }; beforeEach(async () => { @@ -115,6 +116,11 @@ describe('', () => { prop: 'value', value: 'main', }, + { + element: 'Detail[label="Limit"]', + prop: 'value', + value: 'servers', + }, { element: "Detail[label='Webhook Service']", prop: 'value', diff --git a/awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.jsx b/awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.jsx index 56c967fcd3..311181bae5 100644 --- a/awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.jsx +++ b/awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.jsx @@ -40,7 +40,6 @@ function WorkflowJobTemplateForm({ template, handleSubmit, handleCancel, - submitError, isOrgAdmin, }) { @@ -167,7 +166,7 @@ function WorkflowJobTemplateForm({ >