fixed due to comments

elastic · Dec 17, 2020 · 98adabb · 98adabb
1 parent 643575a
commit 98adabb
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 18 deletions.
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -20147,7 +20147,6 @@
     "xpack.uptime.alerts.monitorStatus.timerangeValueField.ariaLabel": "アラートの範囲のための時間単位の数を入力してください",
     "xpack.uptime.alerts.monitorStatus.timerangeValueField.expression": "within",
     "xpack.uptime.alerts.monitorStatus.timerangeValueField.value": "最終{value}",
-    "xpack.uptime.alerts.monitorStatus.title.label": "稼働状況の監視ステータス",
     "xpack.uptime.alerts.settings.createConnector": "コネクターを作成",
     "xpack.uptime.alerts.timerangeUnitSelectable.daysOption.ariaLabel": "「日」の時間範囲選択項目",
     "xpack.uptime.alerts.timerangeUnitSelectable.hoursOption.ariaLabel": "「時間」の時間範囲選択項目",

diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
@@ -20166,7 +20166,6 @@
     "xpack.uptime.alerts.monitorStatus.timerangeValueField.ariaLabel": "输入告警范围的时间单位数目",
     "xpack.uptime.alerts.monitorStatus.timerangeValueField.expression": "之内",
     "xpack.uptime.alerts.monitorStatus.timerangeValueField.value": "上一 {value}",
-    "xpack.uptime.alerts.monitorStatus.title.label": "运行时间监测状态",
     "xpack.uptime.alerts.settings.createConnector": "创建连接器",
     "xpack.uptime.alerts.timerangeUnitSelectable.daysOption.ariaLabel": "“天”时间范围选择项",
     "xpack.uptime.alerts.timerangeUnitSelectable.hoursOption.ariaLabel": "“小时”时间范围选择项",

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.tsx
@@ -375,10 +375,7 @@ export const AlertForm = ({
           hasDisabledByLicenseAlertTypes = true;
         }
         (result[producer] = result[producer] || []).push({
-          name:
-            alertTypeValue.alertTypeModel.name === undefined
-              ? alertTypeValue.alertType.name
-              : alertTypeValue.alertTypeModel.name.props.defaultMessage,
+          name: alertTypeValue.alertType.name,
           id: alertTypeValue.alertTypeModel.id,
           checkEnabledResult,
           alertTypeItem: alertTypeValue.alertTypeModel,

diff --git a/x-pack/plugins/triggers_actions_ui/public/types.ts b/x-pack/plugins/triggers_actions_ui/public/types.ts
@@ -196,7 +196,6 @@ export interface AlertTypeModel<AlertParamsType = any> {
     | React.LazyExoticComponent<ComponentType<AlertTypeParamsExpressionProps<AlertParamsType>>>;
   requiresAppContext: boolean;
   defaultActionMessage?: string;
-  name?: JSX.Element;
 }
 
 export interface IErrorObject {

diff --git a/x-pack/plugins/uptime/public/lib/alert_types/__tests__/monitor_status.test.ts b/x-pack/plugins/uptime/public/lib/alert_types/__tests__/monitor_status.test.ts
@@ -207,11 +207,7 @@ describe('monitor status alert type', () => {
         "documentationUrl": [Function],
         "iconClass": "uptimeApp",
         "id": "xpack.uptime.alerts.monitorStatus",
-        "name": <FormattedMessage
-          defaultMessage="Uptime monitor status"
-          id="xpack.uptime.alerts.monitorStatus.title.label"
-          values={Object {}}
-        />,
+        "name": "Uptime monitor status",
         "requiresAppContext": false,
         "validate": [Function],
       }

diff --git a/x-pack/plugins/uptime/public/lib/alert_types/monitor_status.tsx b/x-pack/plugins/uptime/public/lib/alert_types/monitor_status.tsx
@@ -23,12 +23,6 @@ export const initMonitorStatusAlertType: AlertTypeInitializer = ({
   plugins,
 }): AlertTypeModel => ({
   id: CLIENT_ALERT_TYPES.MONITOR_STATUS,
-  name: (
-    <FormattedMessage
-      id="xpack.uptime.alerts.monitorStatus.title.label"
-      defaultMessage="Uptime monitor status"
-    />
-  ),
   description,
   iconClass: 'uptimeApp',
   documentationUrl(docLinks) {