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.

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

Update alert type selection layout to rows instead of grid #73665

Merged
merged 31 commits into from
Nov 9, 2020
Merged
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
64afacd
Update layout to rows for alert types
mdefazio Jul 29, 2020
923d398
Fix gutter usage
mdefazio Jul 29, 2020
1ed453b
Merge branch 'master' of github.com:elastic/kibana into alerting-desi…
mdefazio Aug 3, 2020
9f87047
Update heading, remove icons
mdefazio Aug 3, 2020
afd6cb4
Non-working update to the combo box
mdefazio Aug 17, 2020
2340875
Merge branch 'master' of github.com:elastic/kibana into alerting-desi…
mdefazio Sep 9, 2020
9721af1
Add incorrect updates with questions to fix
mdefazio Sep 9, 2020
e4f5ee3
Merge branch 'master' of github.com:elastic/kibana into alerting-desi…
mdefazio Sep 10, 2020
5ab4a7d
Fix combo box
mdefazio Sep 17, 2020
e371b53
Cleanup changes to specific to this module
mdefazio Sep 17, 2020
8c97177
Merge remote-tracking branch 'upstream/master' into alerting-design-u…
YulNaumenko Oct 20, 2020
50d565e
fixed type checks and made combobox always visible
YulNaumenko Oct 20, 2020
0ce9e8e
Added groups by producer
YulNaumenko Oct 26, 2020
bca7924
Merge remote-tracking branch 'upstream/master' into alerting-design-u…
YulNaumenko Oct 26, 2020
11ffae0
Added get producer name from kibana features names
YulNaumenko Oct 27, 2020
d8f3ae1
Merge remote-tracking branch 'upstream/master' into alerting-design-u…
YulNaumenko Nov 2, 2020
5634fc6
Added search bar with list of alert types
YulNaumenko Nov 3, 2020
7ace8d7
Added search support functionality
YulNaumenko Nov 3, 2020
db42de7
Merge remote-tracking branch 'upstream/master' into alerting-design-u…
YulNaumenko Nov 3, 2020
e45c7de
fixed links to alert type
YulNaumenko Nov 3, 2020
239712e
added alert type title
YulNaumenko Nov 3, 2020
850a030
Fixed failing tests
YulNaumenko Nov 4, 2020
00bfb1c
Design updates to list
mdefazio Nov 4, 2020
489ee44
Remove unsed items in import list
mdefazio Nov 4, 2020
22db484
Merge remote-tracking branch 'upstream/master' into alerting-design-u…
YulNaumenko Nov 6, 2020
8ba2a3f
fixed merge issue
YulNaumenko Nov 6, 2020
9d5595d
Fixed due to comments
YulNaumenko Nov 6, 2020
ae9faba
fixed tests
YulNaumenko Nov 6, 2020
6a96a4e
Design fixes
mdefazio Nov 6, 2020
e6ced0d
Merge branch 'alerting-design-updates' of github.com:mdefazio/kibana …
mdefazio Nov 6, 2020
a197fcf
Merge remote-tracking branch 'upstream/master' into alerting-design-u…
YulNaumenko Nov 9, 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
3 changes: 0 additions & 3 deletions x-pack/plugins/translations/translations/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -20180,7 +20180,6 @@
"xpack.triggersActionsUI.home.connectorsTabTitle": "コネクター",
"xpack.triggersActionsUI.home.sectionDescription": "アラートを使用して条件を検出し、コネクターを使用してアクションを実行します。",
"xpack.triggersActionsUI.managementSection.displayName": "アラートとアクション",
"xpack.triggersActionsUI.sections.actionAdd.indexAction.indexTextFieldLabel": "タグ (任意)",
"xpack.triggersActionsUI.sections.actionConnectorAdd.cancelButtonLabel": "キャンセル",
"xpack.triggersActionsUI.sections.actionConnectorAdd.manageLicensePlanBannerLinkTitle": "ライセンスの管理",
"xpack.triggersActionsUI.sections.actionConnectorAdd.saveAndTestButtonLabel": "保存してテスト",
Expand Down Expand Up @@ -20288,7 +20287,6 @@
"xpack.triggersActionsUI.sections.alertForm.addConnectorButtonLabel": "コネクターを作成する",
"xpack.triggersActionsUI.sections.alertForm.addNewConnectorEmptyButton": "新規追加",
"xpack.triggersActionsUI.sections.alertForm.alertNameLabel": "名前",
"xpack.triggersActionsUI.sections.alertForm.changeAlertTypeAriaLabel": "削除",
"xpack.triggersActionsUI.sections.alertForm.checkFieldLabel": "確認間隔",
"xpack.triggersActionsUI.sections.alertForm.checkWithTooltip": "条件を評価する頻度を定義します。",
"xpack.triggersActionsUI.sections.alertForm.emptyConnectorsLabel": "{actionTypeName}コネクターがありません",
Expand All @@ -20305,7 +20303,6 @@
"xpack.triggersActionsUI.sections.alertForm.renotifyFieldLabel": "通知間隔",
"xpack.triggersActionsUI.sections.alertForm.renotifyWithTooltip": "アラートがアクティブな間にアクションを繰り返す頻度を定義します。",
"xpack.triggersActionsUI.sections.alertForm.selectAlertActionTypeTitle": "アクションタイプを選択してください",
"xpack.triggersActionsUI.sections.alertForm.selectAlertTypeTitle": "トリガータイプを選択してください",
"xpack.triggersActionsUI.sections.alertForm.selectedAlertTypeTitle": "{alertType}",
"xpack.triggersActionsUI.sections.alertForm.unableToAddAction": "デフォルトアクショングループの定義がないのでアクションを追加できません",
"xpack.triggersActionsUI.sections.alertForm.unableToLoadActionsMessage": "コネクターを読み込めません",
Expand Down
3 changes: 0 additions & 3 deletions x-pack/plugins/translations/translations/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -20199,7 +20199,6 @@
"xpack.triggersActionsUI.home.connectorsTabTitle": "连接器",
"xpack.triggersActionsUI.home.sectionDescription": "使用告警检测条件,并使用连接器采取操作。",
"xpack.triggersActionsUI.managementSection.displayName": "告警和操作",
"xpack.triggersActionsUI.sections.actionAdd.indexAction.indexTextFieldLabel": "标记(可选)",
"xpack.triggersActionsUI.sections.actionConnectorAdd.cancelButtonLabel": "取消",
"xpack.triggersActionsUI.sections.actionConnectorAdd.manageLicensePlanBannerLinkTitle": "管理许可证",
"xpack.triggersActionsUI.sections.actionConnectorAdd.saveAndTestButtonLabel": "保存并测试",
Expand Down Expand Up @@ -20308,7 +20307,6 @@
"xpack.triggersActionsUI.sections.alertForm.addConnectorButtonLabel": "创建连接器",
"xpack.triggersActionsUI.sections.alertForm.addNewConnectorEmptyButton": "新添",
"xpack.triggersActionsUI.sections.alertForm.alertNameLabel": "名称",
"xpack.triggersActionsUI.sections.alertForm.changeAlertTypeAriaLabel": "删除",
"xpack.triggersActionsUI.sections.alertForm.checkFieldLabel": "检查频率",
"xpack.triggersActionsUI.sections.alertForm.checkWithTooltip": "定义评估条件的频率。",
"xpack.triggersActionsUI.sections.alertForm.emptyConnectorsLabel": "无 {actionTypeName} 连接器",
Expand All @@ -20325,7 +20323,6 @@
"xpack.triggersActionsUI.sections.alertForm.renotifyFieldLabel": "通知频率",
"xpack.triggersActionsUI.sections.alertForm.renotifyWithTooltip": "定义告警处于活动状态时重复操作的频率。",
"xpack.triggersActionsUI.sections.alertForm.selectAlertActionTypeTitle": "选择操作类型",
"xpack.triggersActionsUI.sections.alertForm.selectAlertTypeTitle": "选择触发器类型",
"xpack.triggersActionsUI.sections.alertForm.selectedAlertTypeTitle": "{alertType}",
"xpack.triggersActionsUI.sections.alertForm.unableToAddAction": "无法添加操作,因为未定义默认操作组",
"xpack.triggersActionsUI.sections.alertForm.unableToLoadActionsMessage": "无法加载连接器",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import {
CoreStart,
ScopedHistory,
} from 'kibana/public';
import { Section, routeToAlertDetails } from './constants';
import { KibanaFeature } from '../../../features/common';
import { Section, routeToAlertDetails } from './constants';
import { AppContextProvider } from './app_context';
import { ActionTypeRegistryContract, AlertTypeRegistryContract } from '../types';
import { ChartsPluginStart } from '../../../../../src/plugins/charts/public';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
DataPublicPluginStartUi,
IndexPatternsContract,
} from 'src/plugins/data/public';
import { KibanaFeature } from '../../../../features/common';
import { AlertTypeRegistryContract, ActionTypeRegistryContract } from '../../types';

export interface AlertsContextValue<MetaData = Record<string, any>> {
Expand All @@ -34,6 +35,7 @@ export interface AlertsContextValue<MetaData = Record<string, any>> {
metadata?: MetaData;
dataUi?: DataPublicPluginStartUi;
dataIndexPatterns?: IndexPatternsContract;
kibanaFeatures?: KibanaFeature[];
}

const AlertsContext = createContext<AlertsContextValue>(null as any);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,6 @@ describe('alert_add', () => {

wrapper.find('[data-test-subj="my-alert-type-SelectOption"]').first().simulate('click');

expect(wrapper.contains('Metadata: some value. Fields: test.')).toBeTruthy();

expect(wrapper.find('input#alertName').props().value).toBe('');

expect(wrapper.find('[data-test-subj="tagsComboBox"]').first().text()).toBe('');
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.triggersActionsUI__alertTypeNodeHeading {
margin-left: $euiSizeS;
margin-right: $euiSizeS;
}
Original file line number Diff line number Diff line change
Expand Up @@ -187,15 +187,15 @@ describe('alert_form', () => {

it('renders alert type description', async () => {
await setup();
wrapper.find('[data-test-subj="my-alert-type-SelectOption"]').first().simulate('click');
wrapper.find('button[data-test-subj="my-alert-type-SelectOption"]').first().simulate('click');
const alertDescription = wrapper.find('[data-test-subj="alertDescription"]');
expect(alertDescription.exists()).toBeTruthy();
expect(alertDescription.first().text()).toContain('Alert when testing');
});

it('renders alert type documentation link', async () => {
await setup();
wrapper.find('[data-test-subj="my-alert-type-SelectOption"]').first().simulate('click');
wrapper.find('button[data-test-subj="my-alert-type-SelectOption"]').first().simulate('click');
const alertDocumentationLink = wrapper.find('[data-test-subj="alertDocumentationLink"]');
expect(alertDocumentationLink.exists()).toBeTruthy();
expect(alertDocumentationLink.first().prop('href')).toBe('https://localhost.local/docs');
Expand Down
Loading