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

[Actions] Back Button on Add Connector Flyout #80160

Merged
merged 6 commits into from
Oct 16, 2020
Merged

[Actions] Back Button on Add Connector Flyout #80160

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
08d524b
Adding back button to add connector flyout
ymao1 Oct 8, 2020
622d4e4
Adding tests
ymao1 Oct 12, 2020
6d91b84
Merge branch 'master' of https://github.com/elastic/kibana into alert…
ymao1 Oct 12, 2020
2f345f1
Adding tests
ymao1 Oct 12, 2020
46d7e02
Merge branch 'master' into alerting/back-button-on-flyout
kibanamachine Oct 14, 2020
9176836
Merge branch 'master' into alerting/back-button-on-flyout
kibanamachine Oct 16, 2020
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
2 changes: 2 additions & 0 deletions ...ctions_ui/public/application/sections/action_connector_form/connector_add_flyout.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ describe('connector_add_flyout', () => {
);
expect(wrapper.find('ActionTypeMenu')).toHaveLength(1);
expect(wrapper.find(`[data-test-subj="${actionType.id}-card"]`).exists()).toBeTruthy();
expect(wrapper.find('[data-test-subj="cancelButton"]').exists()).toBeTruthy();
expect(wrapper.find('[data-test-subj="backButton"]').exists()).toBeFalsy();
});

it('renders banner with subscription links when gold features are disabled due to licensing ', () => {
Expand Down
33 changes: 25 additions & 8 deletions ...ers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,14 +251,31 @@ export const ConnectorAddFlyout = ({
<EuiFlyoutFooter>
<EuiFlexGroup justifyContent="spaceBetween">
<EuiFlexItem grow={false}>
<EuiButtonEmpty onClick={closeFlyout}>
{i18n.translate(
'xpack.triggersActionsUI.sections.actionConnectorAdd.cancelButtonLabel',
{
defaultMessage: 'Cancel',
}
)}
</EuiButtonEmpty>
{!actionType ? (
<EuiButtonEmpty data-test-subj="cancelButton" onClick={closeFlyout}>
{i18n.translate(
'xpack.triggersActionsUI.sections.actionConnectorAdd.cancelButtonLabel',
{
defaultMessage: 'Cancel',
}
)}
</EuiButtonEmpty>
) : (
<EuiButtonEmpty
data-test-subj="backButton"
onClick={() => {
setActionType(undefined);
setConnector(initialConnector);
}}
>
{i18n.translate(
'xpack.triggersActionsUI.sections.actionConnectorAdd.backButtonLabel',
{
defaultMessage: 'Back',
}
)}
</EuiButtonEmpty>
)}
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiFlexGroup justifyContent="spaceBetween">
Expand Down
4 changes: 4 additions & 0 deletions x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/connectors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {

await pageObjects.triggersActionsUI.clickCreateConnectorButton();

await testSubjects.click('.index-card');

await find.clickByCssSelector('[data-test-subj="backButton"]');

await testSubjects.click('.slack-card');

await testSubjects.setValue('nameInput', connectorName);
Expand Down