Skip to content

Commit

Permalink
[7.8] Hide action types in action form that don't have actionParamsFi…
Browse files Browse the repository at this point in the history
…elds set (#68171) (#68313)

* Hide action types in action form that don't have actionParamsFields set (#68171)

* Hide action types in alert flyout that don't have actionParamsFields set

* Fix jest tests

* Fix tests to be compatible with 7.8

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
  • Loading branch information
mikecote and elasticmachine committed Jun 8, 2020
1 parent 3e76914 commit 4a773f1
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ jest.mock('../../lib/action_connector_api', () => ({
const actionTypeRegistry = actionTypeRegistryMock.create();
describe('action_form', () => {
let deps: any;

const mockedActionParamsFields = () => <Fragment />;

const alertType = {
id: 'my-alert-type',
iconClass: 'test',
Expand All @@ -41,7 +44,7 @@ describe('action_form', () => {
return validationResult;
},
actionConnectorFields: null,
actionParamsFields: null,
actionParamsFields: mockedActionParamsFields,
};

const disabledByConfigActionType = {
Expand All @@ -56,7 +59,7 @@ describe('action_form', () => {
return validationResult;
},
actionConnectorFields: null,
actionParamsFields: null,
actionParamsFields: mockedActionParamsFields,
};

const disabledByLicenseActionType = {
Expand All @@ -71,7 +74,7 @@ describe('action_form', () => {
return validationResult;
},
actionConnectorFields: null,
actionParamsFields: null,
actionParamsFields: mockedActionParamsFields,
};

const preconfiguredOnly = {
Expand All @@ -86,6 +89,21 @@ describe('action_form', () => {
return validationResult;
},
actionConnectorFields: null,
actionParamsFields: mockedActionParamsFields,
};

const actionTypeWithoutParams = {
id: 'my-action-type-without-params',
iconClass: 'test',
selectMessage: 'test',
validateConnector: (): ValidationResult => {
return { errors: {} };
},
validateParams: (): ValidationResult => {
const validationResult = { errors: {} };
return validationResult;
},
actionConnectorFields: null,
actionParamsFields: null,
};

Expand Down Expand Up @@ -153,6 +171,7 @@ describe('action_form', () => {
disabledByConfigActionType,
disabledByLicenseActionType,
preconfiguredOnly,
actionTypeWithoutParams,
]);
actionTypeRegistry.has.mockReturnValue(true);
actionTypeRegistry.get.mockReturnValue(actionType);
Expand Down Expand Up @@ -237,6 +256,14 @@ describe('action_form', () => {
enabledInLicense: false,
minimumLicenseRequired: 'gold',
},
{
id: actionTypeWithoutParams.id,
name: 'Action type without params',
enabled: true,
enabledInConfig: true,
enabledInLicense: true,
minimumLicenseRequired: 'basic',
},
]}
toastNotifications={deps!.toastNotifications}
docLinks={deps.docLinks}
Expand Down Expand Up @@ -340,5 +367,13 @@ describe('action_form', () => {
.exists()
).toBeTruthy();
});

it(`shouldn't render action types without params component`, async () => {
await setup();
const actionOption = wrapper.find(
`[data-test-subj="${actionTypeWithoutParams.id}-ActionTypeSelectOption"]`
);
expect(actionOption.exists()).toBeFalsy();
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,7 @@ export const ActionForm = ({
actionTypeNodes = actionTypeRegistry
.list()
.filter((item) => actionTypesIndex[item.id])
.filter((item) => !!item.actionParamsFields)
.sort((a, b) =>
actionTypeCompare(actionTypesIndex[a.id], actionTypesIndex[b.id], preconfiguredConnectors)
)
Expand Down

0 comments on commit 4a773f1

Please sign in to comment.