Skip to content

[Actions UI] Changed PagerDuty action form UI to fill payload fields according to the API docs for Resolve and Acknowledge events. #96363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
YulNaumenko merged 7 commits into from
Apr 9, 2021
Merged

[Actions UI] Changed PagerDuty action form UI to fill payload fields according to the API docs for Resolve and Acknowledge events. #96363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d734677
[Actions UI] Changed PagerDuty action form UI to fill payload fields …
YulNaumenko Apr 6, 2021
4191635
fixed test
YulNaumenko Apr 7, 2021
7aead73
fixed test
YulNaumenko Apr 7, 2021
0e5721f
Merge remote-tracking branch upstream/master
YulNaumenko Apr 8, 2021
2794697
Merge branch 'master' into actions-pagerduty-events-params-fix
kibanamachine Apr 8, 2021
ab350cb
Merge branch 'master' into actions-pagerduty-events-params-fix
kibanamachine Apr 8, 2021
5b7f805
Merge branch 'master' into actions-pagerduty-events-params-fix
kibanamachine Apr 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ...ers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
PagerDutyConfig,
PagerDutySecrets,
PagerDutyActionParams,
EventActionOptions,
} from '.././types';
import pagerDutySvg from './pagerduty.svg';
import { hasMustacheTokens } from '../../../lib/has_mustache_tokens';
Expand Down Expand Up @@ -88,7 +89,10 @@ export function getActionType(): ActionTypeModel<
)
);
}
if (!actionParams.summary?.length) {
if (
actionParams.eventAction === EventActionOptions.TRIGGER &&
!actionParams.summary?.length
) {
errors.summary.push(
i18n.translate(
'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.error.requiredSummaryText',
Expand Down
50 changes: 48 additions & 2 deletions ...ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,29 @@ describe('PagerDutyParamsFields renders', () => {
expect(wrapper.find('[data-test-subj="dedupKeyAddVariableButton"]').length > 0).toBeTruthy();
});

test('params select fields dont auto set values ', () => {
test('params select fields do not auto set values eventActionSelect', () => {
const actionParams = {};

const wrapper = mountWithIntl(
<PagerDutyParamsFields
actionParams={actionParams}
errors={{ summary: [], timestamp: [], dedupKey: [] }}
editAction={() => {}}
index={0}
/>
);
expect(wrapper.find('[data-test-subj="eventActionSelect"]').length > 0).toBeTruthy();
expect(
wrapper.find('[data-test-subj="eventActionSelect"]').first().prop('value')
).toStrictEqual(undefined);
});

test('params select fields do not auto set values severitySelect', () => {
const actionParams = {
eventAction: EventActionOptions.TRIGGER,
dedupKey: 'test',
};

const wrapper = mountWithIntl(
<PagerDutyParamsFields
actionParams={actionParams}
Expand All @@ -72,9 +92,35 @@ describe('PagerDutyParamsFields renders', () => {
expect(wrapper.find('[data-test-subj="severitySelect"]').first().prop('value')).toStrictEqual(
undefined
);
});

test('only eventActionSelect is available as a payload params for PagerDuty Resolve event', () => {
const actionParams = {
eventAction: EventActionOptions.RESOLVE,
dedupKey: 'test',
};

const wrapper = mountWithIntl(
<PagerDutyParamsFields
actionParams={actionParams}
errors={{ summary: [], timestamp: [], dedupKey: [] }}
editAction={() => {}}
index={0}
/>
);
expect(wrapper.find('[data-test-subj="dedupKeyInput"]').length > 0).toBeTruthy();
expect(wrapper.find('[data-test-subj="dedupKeyInput"]').first().prop('value')).toStrictEqual(
'test'
);
expect(wrapper.find('[data-test-subj="eventActionSelect"]').length > 0).toBeTruthy();
expect(
wrapper.find('[data-test-subj="eventActionSelect"]').first().prop('value')
).toStrictEqual(undefined);
).toStrictEqual('resolve');
expect(wrapper.find('[data-test-subj="dedupKeyInput"]').length > 0).toBeTruthy();
expect(wrapper.find('[data-test-subj="timestampInput"]').length > 0).toBeFalsy();
expect(wrapper.find('[data-test-subj="componentInput"]').length > 0).toBeFalsy();
expect(wrapper.find('[data-test-subj="groupInput"]').length > 0).toBeFalsy();
expect(wrapper.find('[data-test-subj="sourceInput"]').length > 0).toBeFalsy();
expect(wrapper.find('[data-test-subj="summaryInput"]').length > 0).toBeFalsy();
});
});
257 changes: 132 additions & 125 deletions ...ions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,32 +99,11 @@ const PagerDutyParamsFields: React.FunctionComponent<ActionParamsProps<PagerDuty
];

const isDedupeKeyRequired = eventAction !== 'trigger';
const isTriggerPagerDutyEvent = eventAction === 'trigger';

return (
<Fragment>
<EuiFlexGroup>
<EuiFlexItem>
<EuiFormRow
fullWidth
label={i18n.translate(
'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.severitySelectFieldLabel',
{
defaultMessage: 'Severity (optional)',
}
)}
>
<EuiSelect
fullWidth
data-test-subj="severitySelect"
options={severityOptions}
hasNoInitialSelection={isUndefined(severity)}
value={severity}
onChange={(e) => {
editAction('severity', e.target.value, index);
}}
/>
</EuiFormRow>
</EuiFlexItem>
<EuiFlexItem>
<EuiFormRow
fullWidth
Expand All @@ -148,29 +127,6 @@ const PagerDutyParamsFields: React.FunctionComponent<ActionParamsProps<PagerDuty
</EuiFormRow>
</EuiFlexItem>
</EuiFlexGroup>
<EuiSpacer size="m" />
<EuiFormRow
id="pagerDutySummary"
fullWidth
error={errors.summary}
isInvalid={errors.summary.length > 0 && summary !== undefined}
label={i18n.translate(
'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.summaryFieldLabel',
{
defaultMessage: 'Summary',
}
)}
>
<TextFieldWithMessageVariables
index={index}
editAction={editAction}
messageVariables={messageVariables}
paramsProperty={'summary'}
inputTargetValue={summary}
errors={errors.summary as string[]}
/>
</EuiFormRow>
<EuiSpacer size="m" />
<EuiFlexGroup>
<EuiFlexItem>
<EuiFormRow
Expand Down Expand Up @@ -202,99 +158,150 @@ const PagerDutyParamsFields: React.FunctionComponent<ActionParamsProps<PagerDuty
/>
</EuiFormRow>
</EuiFlexItem>
<EuiFlexItem>
</EuiFlexGroup>
{isTriggerPagerDutyEvent ? (
<>
<EuiSpacer size="m" />
<EuiFormRow
id="pagerDutySummary"
fullWidth
error={errors.timestamp}
isInvalid={errors.timestamp.length > 0 && timestamp !== undefined}
error={errors.summary}
isInvalid={errors.summary.length > 0 && summary !== undefined}
label={i18n.translate(
'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.timestampTextFieldLabel',
'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.summaryFieldLabel',
{
defaultMessage: 'Timestamp (optional)',
defaultMessage: 'Summary',
}
)}
>
<TextFieldWithMessageVariables
index={index}
editAction={editAction}
messageVariables={messageVariables}
paramsProperty={'timestamp'}
inputTargetValue={timestamp}
errors={errors.timestamp as string[]}
paramsProperty={'summary'}
inputTargetValue={summary}
errors={errors.summary as string[]}
/>
</EuiFormRow>
</EuiFlexItem>
</EuiFlexGroup>
<EuiSpacer size="m" />
<EuiFormRow
fullWidth
label={i18n.translate(
'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.componentTextFieldLabel',
{
defaultMessage: 'Component (optional)',
}
)}
>
<TextFieldWithMessageVariables
index={index}
editAction={editAction}
messageVariables={messageVariables}
paramsProperty={'component'}
inputTargetValue={component}
/>
</EuiFormRow>
<EuiFormRow
fullWidth
label={i18n.translate(
'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.groupTextFieldLabel',
{
defaultMessage: 'Group (optional)',
}
)}
>
<TextFieldWithMessageVariables
index={index}
editAction={editAction}
messageVariables={messageVariables}
paramsProperty={'group'}
inputTargetValue={group}
/>
</EuiFormRow>
<EuiFormRow
fullWidth
label={i18n.translate(
'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.sourceTextFieldLabel',
{
defaultMessage: 'Source (optional)',
}
)}
>
<TextFieldWithMessageVariables
index={index}
editAction={editAction}
messageVariables={messageVariables}
paramsProperty={'source'}
inputTargetValue={source}
/>
</EuiFormRow>
<EuiFormRow
id="pagerDutyClass"
fullWidth
label={i18n.translate(
'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.classFieldLabel',
{
defaultMessage: 'Class (optional)',
}
)}
>
<TextFieldWithMessageVariables
index={index}
editAction={editAction}
messageVariables={messageVariables}
paramsProperty={'class'}
inputTargetValue={actionParams.class}
/>
</EuiFormRow>
<EuiSpacer size="m" />
<EuiFlexGroup>
<EuiFlexItem>
<EuiFormRow
fullWidth
label={i18n.translate(
'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.severitySelectFieldLabel',
{
defaultMessage: 'Severity (optional)',
}
)}
>
<EuiSelect
fullWidth
data-test-subj="severitySelect"
options={severityOptions}
hasNoInitialSelection={isUndefined(severity)}
value={severity}
onChange={(e) => {
editAction('severity', e.target.value, index);
}}
/>
</EuiFormRow>
</EuiFlexItem>
<EuiFlexItem>
<EuiFormRow
fullWidth
error={errors.timestamp}
isInvalid={errors.timestamp.length > 0 && timestamp !== undefined}
label={i18n.translate(
'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.timestampTextFieldLabel',
{
defaultMessage: 'Timestamp (optional)',
}
)}
>
<TextFieldWithMessageVariables
index={index}
editAction={editAction}
messageVariables={messageVariables}
paramsProperty={'timestamp'}
inputTargetValue={timestamp}
errors={errors.timestamp as string[]}
/>
</EuiFormRow>
</EuiFlexItem>
</EuiFlexGroup>
<EuiSpacer size="m" />
<EuiFormRow
fullWidth
label={i18n.translate(
'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.componentTextFieldLabel',
{
defaultMessage: 'Component (optional)',
}
)}
>
<TextFieldWithMessageVariables
index={index}
editAction={editAction}
messageVariables={messageVariables}
paramsProperty={'component'}
inputTargetValue={component}
/>
</EuiFormRow>
<EuiFormRow
fullWidth
label={i18n.translate(
'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.groupTextFieldLabel',
{
defaultMessage: 'Group (optional)',
}
)}
>
<TextFieldWithMessageVariables
index={index}
editAction={editAction}
messageVariables={messageVariables}
paramsProperty={'group'}
inputTargetValue={group}
/>
</EuiFormRow>
<EuiFormRow
fullWidth
label={i18n.translate(
'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.sourceTextFieldLabel',
{
defaultMessage: 'Source (optional)',
}
)}
>
<TextFieldWithMessageVariables
index={index}
editAction={editAction}
messageVariables={messageVariables}
paramsProperty={'source'}
inputTargetValue={source}
/>
</EuiFormRow>
<EuiFormRow
id="pagerDutyClass"
fullWidth
label={i18n.translate(
'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.classFieldLabel',
{
defaultMessage: 'Class (optional)',
}
)}
>
<TextFieldWithMessageVariables
index={index}
editAction={editAction}
messageVariables={messageVariables}
paramsProperty={'class'}
inputTargetValue={actionParams.class}
/>
</EuiFormRow>
</>
) : null}
</Fragment>
);
};
Expand Down
Loading