Skip to content
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

[MGMTEX] Fix action data override when adding a second action #181604

Merged
merged 2 commits into from
Apr 25, 2024
Merged

[MGMTEX] Fix action data override when adding a second action #181604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e5ddc6
first commit
jcger Apr 24, 2024
6d333be
Update x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/al…
jcger Apr 25, 2024
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
4 changes: 3 additions & 1 deletion ...ins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,9 @@ export const ActionForm = ({
// TODO: fix in https://github.com/elastic/kibana/issues/155993
// actionTypes with subtypes need to be updated in case they switched to a
// subtype that is not the default one
actions[0].actionTypeId = savedAction.actionTypeId;
activeActionItem.indices.forEach((index: number) => {
actions[index].actionTypeId = savedAction.actionTypeId;
});
connectors.push(savedAction);
const indicesToUpdate = activeActionItem.indices || [];
indicesToUpdate.forEach((index: number) => setActionIdByIndex(savedAction.id, index));
Expand Down
48 changes: 48 additions & 0 deletions x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alert_create_flyout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,5 +340,53 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {

await discardNewRuleCreation();
});

it('should not do a type override when adding a second action', async () => {
// create a new rule
const ruleName = generateUniqueKey();
await rules.common.defineIndexThresholdAlert(ruleName);

// add server log action
await testSubjects.click('.server-log-alerting-ActionTypeSelectOption');
expect(
await find.existsByCssSelector(
'[data-test-subj="comboBoxSearchInput"][value="Serverlog#xyz"]'
)
).to.eql(true);
expect(
await find.existsByCssSelector(
'[data-test-subj="comboBoxSearchInput"][value="webhook-test"]'
)
).to.eql(false);

// click on add new action
await testSubjects.click('addAlertActionButton');
await find.existsByCssSelector('[data-test-subj="Serverlog#xyz"]');

// create webhook connector
await testSubjects.click('.webhook-alerting-ActionTypeSelectOption');
await testSubjects.click('createActionConnectorButton-1');
await testSubjects.setValue('nameInput', 'webhook-test');
await testSubjects.setValue('webhookUrlText', 'https://test.test');
await testSubjects.setValue('webhookUserInput', 'fakeuser');
await testSubjects.setValue('webhookPasswordInput', 'fakepassword');
await testSubjects.click('saveActionButtonModal');

// checking the new one first to avoid flakiness. If the value is checked before the new one is added
// it might return a false positive
expect(
await find.existsByCssSelector(
'[data-test-subj="comboBoxSearchInput"][value="webhook-test"]'
)
).to.eql(true);
// If it was overridden, the value would change to be empty
expect(
await find.existsByCssSelector(
'[data-test-subj="comboBoxSearchInput"][value="Serverlog#xyz"]'
)
).to.eql(true);

await deleteConnectorByName('webhook-test');
});
});
};