Revert Saved query and saved_id removing

This reverts commit
3f9d3f0
2fb24e9.
2ad42e7
04cceaa

Author: nkhristinin

x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.test.tsx

@@ -176,7 +176,7 @@ describe('helpers', () => {
       );
     });
 
-    test('returns empty array of ListItems when "savedId" exists', () => {
+    test('returns expected array of ListItems when "savedId" exists', () => {
       const mockQueryBarWithSavedId = {
         ...mockQueryBar,
         query: '',
@@ -189,7 +189,8 @@ describe('helpers', () => {
         query: mockQueryBarWithSavedId.query,
         savedId: mockQueryBarWithSavedId.saved_id,
       });
-      expect(result.length).toEqual(0);
+      expect(result[0].title).toEqual(<>{i18n.SAVED_ID_LABEL} </>);
+      expect(result[0].description).toEqual(<>{mockQueryBarWithSavedId.saved_id} </>);
     });
   });
 

x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.tsx

@@ -65,6 +65,7 @@ export const buildQueryBarDescription = ({
   filters,
   filterManager,
   query,
+  savedId,
   indexPatterns,
   queryLabel,
 }: BuildQueryBarDescription): ListItems[] => {
@@ -105,7 +106,15 @@ export const buildQueryBarDescription = ({
       },
     ];
   }
-
+  if (!isEmpty(savedId)) {
+    items = [
+      ...items,
+      {
+        title: <>{i18n.SAVED_ID_LABEL} </>,
+        description: <>{savedId} </>,
+      },
+    ];
+  }
   return items;
 };
 

x-pack/plugins/security_solution/public/detections/components/rules/description_step/translations.tsx

@@ -28,6 +28,13 @@ export const THREAT_QUERY_LABEL = i18n.translate(
   }
 );
 
+export const SAVED_ID_LABEL = i18n.translate(
+  'xpack.securitySolution.detectionEngine.createRule.savedIdLabel',
+  {
+    defaultMessage: 'Saved query name',
+  }
+);
+
 export const ML_TYPE_DESCRIPTION = i18n.translate(
   'xpack.securitySolution.detectionEngine.createRule.mlRuleTypeDescription',
   {

x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/helpers.test.ts

@@ -120,7 +120,7 @@ describe('helpers', () => {
         query: 'test query',
         saved_id: 'test123',
         index: ['filebeat-'],
-        type: 'query',
+        type: 'saved_query',
         timeline_id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2',
         timeline_title: 'Titled timeline',
       };
@@ -166,7 +166,7 @@ describe('helpers', () => {
         query: 'test query',
         index: ['filebeat-'],
         saved_id: 'test123',
-        type: 'query',
+        type: 'saved_query',
       };
 
       expect(result).toEqual(expected);
@@ -188,7 +188,7 @@ describe('helpers', () => {
         query: 'test query',
         index: ['filebeat-'],
         saved_id: 'test123',
-        type: 'query',
+        type: 'saved_query',
         timeline_id: '',
         timeline_title: 'Titled timeline',
       };
@@ -214,7 +214,7 @@ describe('helpers', () => {
         query: 'test query',
         index: ['filebeat-'],
         saved_id: 'test123',
-        type: 'query',
+        type: 'saved_query',
       };
 
       expect(result).toEqual(expected);
@@ -236,7 +236,7 @@ describe('helpers', () => {
         query: 'test query',
         index: ['filebeat-'],
         saved_id: 'test123',
-        type: 'query',
+        type: 'saved_query',
         timeline_id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2',
         timeline_title: '',
       };
@@ -828,10 +828,10 @@ describe('helpers', () => {
       mockActions = mockActionsStepRule();
     });
 
-    test('returns rule with type of query when saved_id exists', () => {
+    test('returns rule with type of saved_query when saved_id exists', () => {
       const result = formatRule<Rule>(mockDefine, mockAbout, mockSchedule, mockActions);
 
-      expect(result.type).toEqual('query');
+      expect(result.type).toEqual('saved_query');
     });
 
     test('returns rule with type of query when saved_id does not exist', () => {

x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/helpers.ts

@@ -256,6 +256,8 @@ export const formatDefineStepData = (defineStepData: DefineStepRule): DefineStep
         language: ruleFields.queryBar?.query?.language,
         query: ruleFields.queryBar?.query?.query as string,
         saved_id: ruleFields.queryBar?.saved_id,
+        ...(ruleType === 'query' &&
+          ruleFields.queryBar?.saved_id && { type: 'saved_query' as Type }),
       };
 
   return {

x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.ts

@@ -6,7 +6,7 @@
  */
 
 import { BadRequestError } from '@kbn/securitysolution-es-utils';
-import { Type, LanguageOrUndefined } from '@kbn/securitysolution-io-ts-alerting-types';
+import { Type, LanguageOrUndefined, Language } from '@kbn/securitysolution-io-ts-alerting-types';
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { assertUnreachable } from '../../../../common/utility_types';
 import { getQueryFilter } from '../../../../common/detection_engine/get_query_filter';

x-pack/plugins/translations/translations/ja-JP.json

@@ -20123,6 +20123,7 @@
     "xpack.securitySolution.detectionEngine.createRule.QueryLabel": "カスタムクエリ",
     "xpack.securitySolution.detectionEngine.createRule.queryRuleTypeDescription": "クエリ",
     "xpack.securitySolution.detectionEngine.createRule.ruleActionsField.ruleActionsFormErrorsTitle": "次の一覧の問題を解決してください",
+    "xpack.securitySolution.detectionEngine.createRule.savedIdLabel": "保存されたクエリ名",
     "xpack.securitySolution.detectionEngine.createRule.stepAboutRule.descriptionFieldRequiredError": "説明が必要です。",
     "xpack.securitySolution.detectionEngine.createRule.stepAboutRule.fiedIndexPatternsLabel": "インデックスパターン",
     "xpack.securitySolution.detectionEngine.createRule.stepAboutRule.fieldAssociatedToEndpointListLabel": "既存のエンドポイント例外をルールに追加",

x-pack/plugins/translations/translations/zh-CN.json

@@ -20589,6 +20589,7 @@
     "xpack.securitySolution.detectionEngine.createRule.QueryLabel": "定制查询",
     "xpack.securitySolution.detectionEngine.createRule.queryRuleTypeDescription": "查询",
     "xpack.securitySolution.detectionEngine.createRule.ruleActionsField.ruleActionsFormErrorsTitle": "请修复下面所列的问题",
+    "xpack.securitySolution.detectionEngine.createRule.savedIdLabel": "已保存查询名称",
     "xpack.securitySolution.detectionEngine.createRule.stepAboutRule.descriptionFieldRequiredError": "描述必填。",
     "xpack.securitySolution.detectionEngine.createRule.stepAboutRule.fiedIndexPatternsLabel": "索引模式",
     "xpack.securitySolution.detectionEngine.createRule.stepAboutRule.fieldAssociatedToEndpointListLabel": "将现有的终端例外添加到规则",