Fix Delete modal text.

remove checkAAD from test
elastic · May 11, 2022 · 29168a7 · 29168a7
1 parent 92d4dce
commit 29168a7
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 17 deletions.
diff --git a/x-pack/plugins/alerting/server/rules_client/rules_client.ts b/x-pack/plugins/alerting/server/rules_client/rules_client.ts
@@ -1617,8 +1617,6 @@ export class RulesClient {
         id,
         this.updateMeta({
           ...attributes,
-          ...(!attributes.apiKeyOwner && { apiKeyOwner: null }),
-          ...(!attributes.apiKey && { apiKey: null }),
           enabled: false,
           scheduledTaskId: null,
           updatedBy: await this.getUserName(),

diff --git a/x-pack/plugins/alerting/server/rules_client/tests/disable.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/disable.test.ts
@@ -399,12 +399,7 @@ describe('disable()', () => {
         schedule: { interval: '10s' },
         alertTypeId: 'myType',
         enabled: false,
-        meta: {
-          versionApiKeyLastmodified: 'v7.10.0',
-        },
         scheduledTaskId: null,
-        apiKey: null,
-        apiKeyOwner: null,
         updatedAt: '2019-02-12T21:01:22.479Z',
         updatedBy: 'elastic',
         actions: [

diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -31172,6 +31172,7 @@
     "xpack.watcher.watchActions.webhook.portIsRequiredValidationMessage": "Webフックポートが必要です。",
     "xpack.watcher.watchActions.webhook.usernameIsRequiredIfPasswordValidationMessage": "ユーザー名が必要です。",
     "xpack.watcher.watchEdit.thresholdWatchExpression.aggType.fieldIsRequiredValidationMessage": "フィールドを選択してください。",
+    "xpack.watcher.watcherDescription": "アラートの作成、管理、監視によりデータへの変更を検知します。",
     "unifiedSearch.search.searchBar.savedQueryDescriptionText": "再度使用するクエリテキストとフィルターを保存します。",
     "unifiedSearch.search.searchBar.savedQueryForm.titleConflictText": "タイトルがすでに保存されているクエリに使用されています",
     "unifiedSearch.search.searchBar.savedQueryFormSaveButtonText": "保存",
@@ -31263,7 +31264,6 @@
     "unifiedSearch.filter.options.invertNegatedFiltersButtonLabel": "含める・除外を反転",
     "unifiedSearch.filter.options.pinAllFiltersButtonLabel": "すべてピン付け",
     "unifiedSearch.filter.options.unpinAllFiltersButtonLabel": "すべてのピンを外す",
-    "xpack.watcher.watcherDescription": "アラートの作成、管理、監視によりデータへの変更を検知します。",
     "unifiedSearch.kueryAutocomplete.andOperatorDescription": "{bothArguments} が true であることを条件とする",
     "unifiedSearch.kueryAutocomplete.andOperatorDescription.bothArgumentsText": "両方の引数",
     "unifiedSearch.kueryAutocomplete.equalOperatorDescription": "一部の値に{equals}",

diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
@@ -31208,6 +31208,7 @@
     "xpack.watcher.watchActions.webhook.portIsRequiredValidationMessage": "Webhook 端口必填。",
     "xpack.watcher.watchActions.webhook.usernameIsRequiredIfPasswordValidationMessage": "“用户名”必填。",
     "xpack.watcher.watchEdit.thresholdWatchExpression.aggType.fieldIsRequiredValidationMessage": "此字段必填。",
+    "xpack.watcher.watcherDescription": "通过创建、管理和监测警报来检测数据中的更改。",
     "unifiedSearch.search.searchBar.savedQueryDescriptionText": "保存想要再次使用的查询文本和筛选。",
     "unifiedSearch.search.searchBar.savedQueryForm.titleConflictText": "标题与现有已保存查询有冲突",
     "unifiedSearch.search.searchBar.savedQueryFormSaveButtonText": "保存",
@@ -31299,7 +31300,6 @@
     "unifiedSearch.filter.options.invertNegatedFiltersButtonLabel": "反向包括",
     "unifiedSearch.filter.options.pinAllFiltersButtonLabel": "全部固定",
     "unifiedSearch.filter.options.unpinAllFiltersButtonLabel": "全部取消固定",
-    "xpack.watcher.watcherDescription": "通过创建、管理和监测警报来检测数据中的更改。",
     "unifiedSearch.kueryAutocomplete.andOperatorDescription": "需要{bothArguments}为 true",
     "unifiedSearch.kueryAutocomplete.andOperatorDescription.bothArgumentsText": "两个参数都",
     "unifiedSearch.kueryAutocomplete.equalOperatorDescription": "{equals}某一值",

diff --git a/...k/plugins/triggers_actions_ui/public/application/components/delete_modal_confirmation.tsx b/...k/plugins/triggers_actions_ui/public/application/components/delete_modal_confirmation.tsx
@@ -54,7 +54,7 @@ export const DeleteModalConfirmation = ({
     'xpack.triggersActionsUI.deleteSelectedIdsConfirmModal.descriptionText',
     {
       defaultMessage:
-        "You can't recover {numIdsToDelete, plural, one {a deleted {singleTitle}} other {deleted {multipleTitle}}}.",
+        "You won't be able to recover {numIdsToDelete, plural, one {a deleted {singleTitle}} other {deleted {multipleTitle}}}.",
       values: { numIdsToDelete, singleTitle, multipleTitle },
     }
   );

diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group1/tests/alerting/disable.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group1/tests/alerting/disable.ts
@@ -334,13 +334,6 @@ export default function createDisableAlertTests({ getService }: FtrProviderConte
               } catch (e) {
                 expect(e.meta.statusCode).to.eql(404);
               }
-              // Ensure AAD isn't broken
-              await checkAAD({
-                supertest,
-                spaceId: space.id,
-                type: 'alert',
-                id: createdAlert.id,
-              });
               break;
             default:
               throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);