External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Remove enableWebhooks conditional in WebhookSubForm

Browse Source 
Signed-off-by: Vadiem Janssens <info@vadiemjanssens.nl>
This commit is contained in:
Vadiem Janssens
2020-06-22 12:09:12 +02:00
committed by John Mitchell
parent be33627755
commit f9039703ee
4 changed files with 109 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
View File

@@ -583,16 +583,15 @@ function JobTemplateForm({
</> </>
)} )}
{allowCallbacks && enableWebhooks && (<br />)} {allowCallbacks && enableWebhooks && <br />}
{enableWebhooks && ( {enableWebhooks && (
<> <>
<Title size="md" headingLevel="h4">{i18n._(t`Webhook details`)}</Title> <Title size="md" headingLevel="h4">
{i18n._(t`Webhook details`)}
</Title>
<FormColumnLayout> <FormColumnLayout>
<WebhookSubForm <WebhookSubForm templateType={template.type} />
enableWebhooks={enableWebhooks}
templateType={template.type}
/>
</FormColumnLayout> </FormColumnLayout>
</> </>
)} )}

210
awx/ui_next/src/screens/Template/shared/WebhookSubForm.jsx
View File

@@ -23,7 +23,7 @@ import {
CredentialTypesAPI, CredentialTypesAPI,
} from '../../../api'; } from '../../../api';
function WebhookSubForm({ i18n, enableWebhooks, templateType }) { function WebhookSubForm({ i18n, templateType }) {
const { id } = useParams(); const { id } = useParams();
const { pathname } = useLocation(); const { pathname } = useLocation();
@@ -36,6 +36,7 @@ function WebhookSubForm({ i18n, enableWebhooks, templateType }) {
webhookServiceHelpers, webhookServiceHelpers,
] = useField('webhook_service'); ] = useField('webhook_service');
// eslint-disable-next-line no-unused-vars
const [webhookUrlField, webhookUrlMeta, webhookUrlHelpers] = useField( const [webhookUrlField, webhookUrlMeta, webhookUrlHelpers] = useField(
'webhook_url' 'webhook_url'
); );
@@ -71,21 +72,6 @@ function WebhookSubForm({ i18n, enableWebhooks, templateType }) {
loadCredentialType(); loadCredentialType();
}, [loadCredentialType]); }, [loadCredentialType]);
useEffect(() => {
if (enableWebhooks) {
webhookServiceHelpers.setValue(webhookServiceMeta.initialValue);
webhookUrlHelpers.setValue(webhookUrlMeta.initialValue);
webhookKeyHelpers.setValue(webhookKeyMeta.initialValue);
webhookCredentialHelpers.setValue(webhookCredentialMeta.initialValue);
} else {
webhookServiceHelpers.setValue('');
webhookUrlHelpers.setValue('');
webhookKeyHelpers.setValue('');
webhookCredentialHelpers.setValue(null);
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [enableWebhooks]);
const { request: fetchWebhookKey, error: webhookKeyError } = useRequest( const { request: fetchWebhookKey, error: webhookKeyError } = useRequest(
useCallback(async () => { useCallback(async () => {
const updateWebhookKey = const updateWebhookKey =
@@ -134,108 +120,106 @@ function WebhookSubForm({ i18n, enableWebhooks, templateType }) {
return <ContentLoading />; return <ContentLoading />;
} }
return ( return (
enableWebhooks && ( <FormColumnLayout>
<FormColumnLayout> <FormGroup
<FormGroup name="webhook_service"
name="webhook_service" fieldId="webhook_service"
fieldId="webhook_service" helperTextInvalid={webhookServiceMeta.error}
helperTextInvalid={webhookServiceMeta.error} label={i18n._(t`Webhook Service`)}
label={i18n._(t`Webhook Service`)} >
> <FieldTooltip content={i18n._(t`Select a webhook service.`)} />
<FieldTooltip content={i18n._(t`Select a webhook service.`)} /> <AnsibleSelect
<AnsibleSelect {...webhookServiceField}
{...webhookServiceField} id="webhook_service"
id="webhook_service" data={webhookServiceOptions}
data={webhookServiceOptions} onChange={(event, val) => {
onChange={(event, val) => { webhookServiceHelpers.setValue(val);
webhookServiceHelpers.setValue(val); webhookUrlHelpers.setValue(
webhookUrlHelpers.setValue( pathname.endsWith('/add')
pathname.endsWith('/add') ? i18n
? i18n ._(t`a new webhook url will be generated on save.`)
._(t`a new webhook url will be generated on save.`)
.toUpperCase()
: `${origin}/api/v2/${templateType}s/${id}/${val}/`
);
if (val === webhookServiceMeta.initialValue || val === '') {
webhookKeyHelpers.setValue(webhookKeyMeta.initialValue);
webhookCredentialHelpers.setValue(
webhookCredentialMeta.initialValue
);
} else {
webhookKeyHelpers.setValue(
i18n
._(t`a new webhook key will be generated on save.`)
.toUpperCase() .toUpperCase()
); : `${origin}/api/v2/${templateType}s/${id}/${val}/`
webhookCredentialHelpers.setValue(null); );
} if (val === webhookServiceMeta.initialValue || val === '') {
}} webhookKeyHelpers.setValue(webhookKeyMeta.initialValue);
webhookCredentialHelpers.setValue(
webhookCredentialMeta.initialValue
);
} else {
webhookKeyHelpers.setValue(
i18n
._(t`a new webhook key will be generated on save.`)
.toUpperCase()
);
webhookCredentialHelpers.setValue(null);
}
}}
/>
</FormGroup>
<>
<FormGroup
type="text"
fieldId="jt-webhookURL"
label={i18n._(t`Webhook URL`)}
name="webhook_url"
>
<FieldTooltip
content={i18n._(
t`Webhook services can launch jobs with this workflow job template by making a POST request to this URL.`
)}
/>
<TextInput
id="t-webhookURL"
aria-label={i18n._(t`Webhook URL`)}
value={webhookUrlField.value}
isReadOnly
/> />
</FormGroup> </FormGroup>
<> <FormGroup
<FormGroup label={i18n._(t`Webhook Key`)}
type="text" fieldId="template-webhook_key"
fieldId="jt-webhookURL" >
label={i18n._(t`Webhook URL`)} <FieldTooltip
name="webhook_url" content={i18n._(
> t`Webhook services can use this as a shared secret.`
<FieldTooltip
content={i18n._(
t`Webhook services can launch jobs with this workflow job template by making a POST request to this URL.`
)}
/>
<TextInput
id="t-webhookURL"
aria-label={i18n._(t`Webhook URL`)}
value={webhookUrlField.value}
isReadOnly
/>
</FormGroup>
<FormGroup
label={i18n._(t`Webhook Key`)}
fieldId="template-webhook_key"
>
<FieldTooltip
content={i18n._(
t`Webhook services can use this as a shared secret.`
)}
/>
<InputGroup>
<TextInput
id="template-webhook_key"
isReadOnly
aria-label="wfjt-webhook-key"
value={webhookKeyField.value}
/>
<Button
isDisabled={isUpdateKeyDisabled}
variant="tertiary"
aria-label={i18n._(t`Update webhook key`)}
onClick={changeWebhookKey}
>
<SyncAltIcon />
</Button>
</InputGroup>
</FormGroup>
</>
{credTypeId && (
<CredentialLookup
label={i18n._(t`Webhook Credential`)}
tooltip={i18n._(
t`Optionally select the credential to use to send status updates back to the webhook service.`
)} )}
credentialTypeId={credTypeId}
onChange={value => {
webhookCredentialHelpers.setValue(value || null);
}}
isValid={!webhookCredentialMeta.error}
helperTextInvalid={webhookCredentialMeta.error}
value={webhookCredentialField.value}
/> />
)} <InputGroup>
</FormColumnLayout> <TextInput
) id="template-webhook_key"
isReadOnly
aria-label="wfjt-webhook-key"
value={webhookKeyField.value}
/>
<Button
isDisabled={isUpdateKeyDisabled}
variant="tertiary"
aria-label={i18n._(t`Update webhook key`)}
onClick={changeWebhookKey}
>
<SyncAltIcon />
</Button>
</InputGroup>
</FormGroup>
</>
{credTypeId && (
<CredentialLookup
label={i18n._(t`Webhook Credential`)}
tooltip={i18n._(
t`Optionally select the credential to use to send status updates back to the webhook service.`
)}
credentialTypeId={credTypeId}
onChange={value => {
webhookCredentialHelpers.setValue(value || null);
}}
isValid={!webhookCredentialMeta.error}
helperTextInvalid={webhookCredentialMeta.error}
value={webhookCredentialField.value}
/>
)}
</FormColumnLayout>
); );
} }
export default withI18n()(WebhookSubForm); export default withI18n()(WebhookSubForm);

9
awx/ui_next/src/screens/Template/shared/WebhookSubForm.test.jsx
View File

@@ -34,7 +34,7 @@ describe('<WebhookSubForm />', () => {
wrapper = mountWithContexts( wrapper = mountWithContexts(
<Route path="templates/:templateType/:id/edit"> <Route path="templates/:templateType/:id/edit">
<Formik initialValues={initialValues}> <Formik initialValues={initialValues}>
<WebhookSubForm enableWebhooks templateType="job_template" /> <WebhookSubForm templateType="job_template" />
</Formik> </Formik>
</Route>, </Route>,
{ {
@@ -103,7 +103,7 @@ describe('<WebhookSubForm />', () => {
webhook_key: 'A NEW WEBHOOK KEY WILL BE GENERATED ON SAVE.', webhook_key: 'A NEW WEBHOOK KEY WILL BE GENERATED ON SAVE.',
}} }}
> >
<WebhookSubForm enableWebhooks templateType="job_template" /> <WebhookSubForm templateType="job_template" />
</Formik> </Formik>
</Route>, </Route>,
{ {
@@ -133,10 +133,7 @@ describe('<WebhookSubForm />', () => {
newWrapper = mountWithContexts( newWrapper = mountWithContexts(
<Route path="templates/:templateType/:id/edit"> <Route path="templates/:templateType/:id/edit">
<Formik initialValues={{ ...initialValues, webhook_url }}> <Formik initialValues={{ ...initialValues, webhook_url }}>
<WebhookSubForm <WebhookSubForm templateType="workflow_job_template" />
enableWebhooks
templateType="workflow_job_template"
/>
</Formik> </Formik>
</Route>, </Route>,
{ {

9
awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.jsx
View File

@@ -216,11 +216,10 @@ function WorkflowJobTemplateForm({
{enableWebhooks && ( {enableWebhooks && (
<SubFormLayout> <SubFormLayout>
<Title size="md" headingLevel="h4">{i18n._(t`Webhook details`)}</Title> <Title size="md" headingLevel="h4">
<WebhookSubForm {i18n._(t`Webhook details`)}
enableWebhooks={enableWebhooks} </Title>
templateType={template.type} <WebhookSubForm templateType={template.type} />
/>
</SubFormLayout> </SubFormLayout>
)} )}