remove commented out code

x-pack/plugins/security_solution/cypress/tasks/create_new_rule.ts

@@ -255,16 +255,6 @@ export const fillDefineCustomRuleWithImportedQueryAndContinue = (
   cy.get(IMPORT_QUERY_FROM_SAVED_TIMELINE_LINK).click();
   cy.get(TIMELINE(rule.timeline.id)).click();
   cy.get(CUSTOM_QUERY_INPUT).should('have.value', rule.customQuery);
-  // cy.get('[data-test-subj="stepDefineRuleDataViewSelectedRadioGroup"]').click({ force: true });
-  // cy.get(
-  //   '[data-test-subj="detectionsDataViewSelectorDropdown"] [data-test-subj="comboBoxInput"]'
-  // ).click({ force: true });
-  // cy.get('[id="logs-*"]').click();
-
-  // cy.get('[id="indexPatterns"]').click({ force: true });
-  // cy.get('[data-test-subj="detectionEngineStepDefineRuleIndexPatternsAccordion"]').click({
-  //   force: true,
-  // });
 
   cy.get(DEFINE_CONTINUE_BUTTON).should('exist').click({ force: true });
 
@@ -307,10 +297,6 @@ export const fillDefineThresholdRuleAndContinue = (rule: ThresholdRule) => {
   const typeThresholdField = ($el: Cypress.ObjectLike) =>
     cy.wrap($el).type(rule.thresholdField, { delay: 35 });
 
-  // cy.get('[id="indexPatterns"]').click({ force: true });
-  // cy.get('[data-test-subj="detectionEngineStepDefineRuleIndexPatternsAccordion"]').click({
-  //   force: true,
-  // });
   cy.get(IMPORT_QUERY_FROM_SAVED_TIMELINE_LINK).click();
   cy.get(TIMELINE(rule.timeline.id)).click();
   cy.get(CUSTOM_QUERY_INPUT).should('have.value', rule.customQuery);
@@ -331,10 +317,7 @@ export const fillDefineEqlRuleAndContinue = (rule: CustomRule) => {
   if (rule.customQuery == null) {
     throw new TypeError('The rule custom query should never be undefined or null ');
   }
-  // cy.get('[id="indexPatterns"]').click({ force: true });
-  // cy.get('[data-test-subj="detectionEngineStepDefineRuleIndexPatternsAccordion"]').click({
-  //   force: true,
-  // });
+
   cy.get(RULES_CREATION_FORM).find(EQL_QUERY_INPUT).should('exist');
   cy.get(RULES_CREATION_FORM).find(EQL_QUERY_INPUT).should('be.visible');
   cy.get(RULES_CREATION_FORM).find(EQL_QUERY_INPUT).type(rule.customQuery);
@@ -463,10 +446,6 @@ export const getDefineContinueButton = () => cy.get(DEFINE_CONTINUE_BUTTON);
 
 /** Returns the indicator index pattern */
 export const getIndicatorIndex = () => {
-  // cy.get('[id="indexPatterns"]').click({ force: true });
-  // cy.get('[data-test-subj="detectionEngineStepDefineRuleIndexPatternsAccordion"]').click({
-  //   force: true,
-  // });
   return cy.get(THREAT_MATCH_INDICATOR_INDEX).eq(0);
 };
 

x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.tsx

@@ -238,11 +238,9 @@ const StepDefineRuleComponent: FC<StepDefineRuleProps> = ({
   const anomalyThreshold = formAnomalyThreshold ?? initialState.anomalyThreshold;
   const ruleType = formRuleType || initialState.ruleType;
 
-  // TODO: update the logic for browserField stuff.
   // if 'index' is selected, use these browser fields
   // otherwise use the dataview browserfields
   const previousRuleType = usePrevious(ruleType);
-  // const fields: Readonly<BrowserFields> = aggregatableFields(browserFields);
   const [optionsSelected, setOptionsSelected] = useState<EqlOptionsSelected>(
     defaultValues?.eqlOptions || {}
   );
@@ -260,21 +258,6 @@ const StepDefineRuleComponent: FC<StepDefineRuleProps> = ({
     }
   }, [initIndexPattern, dataSourceRadioIdSelected]);
 
-  // useEffect(() => {
-  //   // adding the && !isUpdateView to ensure we
-  //   // are not resetting the query bar if editing a rule
-  //   // I should figure how to make this work so that
-  //   // it only resets if the radioSelected changes state.
-  //   if (!isReadOnlyView && !isUpdateView) {
-  //     const { queryBar } = getFields();
-  //     const { queryBar: defaultQueryBar } = stepDefineDefaultValue;
-  //     queryBar.reset({
-  //       defaultValue: defaultQueryBar,
-  //     });
-  //   }
-  //   // eslint-disable-next-line react-hooks/exhaustive-deps
-  // }, [dataSourceRadioIdSelected]);
-
   // Callback for when user toggles between Data Views and Index Patterns
   const onChangeDataSource = (optionId: string) => {
     setDataSourceRadioIdSelected(optionId);

x-pack/plugins/security_solution/server/lib/detection_engine/rules/bulk_action_edit.ts

@@ -13,7 +13,7 @@ import {
 } from '../../../../common/detection_engine/schemas/common/schemas';
 
 import { invariant } from '../../../../common/utils/invariant';
-import { isEqlParams, isQueryParams, isThresholdParams, isThreatParams } from '../signals/utils';
+import { isMachineLearningParams } from '../signals/utils';
 
 export const addItemsToArray = <T>(arr: T[], items: T[]): T[] =>
   Array.from(new Set([...arr, ...items]));
@@ -23,7 +23,6 @@ export const deleteItemsFromArray = <T>(arr: T[], items: T[]): T[] => {
   return arr.filter((item) => !itemsSet.has(item));
 };
 
-// eslint-disable-next-line complexity
 export const applyBulkActionEditToRule = (
   existingRule: RuleAlertType,
   action: BulkActionEditPayload
@@ -52,13 +51,7 @@ export const applyBulkActionEditToRule = (
         "Index patterns can't be added. Machine learning rule doesn't have index patterns property"
       );
 
-      if (
-        (isEqlParams(rule.params) ||
-          isQueryParams(rule.params) ||
-          isThresholdParams(rule.params) ||
-          isThreatParams(rule.params)) &&
-        action.overwriteDataViews
-      ) {
+      if (!isMachineLearningParams(rule.params) && action.overwriteDataViews) {
         rule.params.dataViewId = undefined;
       }
       rule.params.index = addItemsToArray(rule.params.index ?? [], action.value);
@@ -71,13 +64,7 @@ export const applyBulkActionEditToRule = (
         "Index patterns can't be deleted. Machine learning rule doesn't have index patterns property"
       );
 
-      if (
-        (isEqlParams(rule.params) ||
-          isQueryParams(rule.params) ||
-          isThresholdParams(rule.params) ||
-          isThreatParams(rule.params)) &&
-        action.overwriteDataViews
-      ) {
+      if (!isMachineLearningParams(rule.params) && action.overwriteDataViews) {
         rule.params.dataViewId = undefined;
       }
       rule.params.index = deleteItemsFromArray(rule.params.index ?? [], action.value);
@@ -96,13 +83,7 @@ export const applyBulkActionEditToRule = (
       );
       invariant(action.value.length !== 0, "Index patterns can't be overwritten with empty list");
 
-      if (
-        (isEqlParams(rule.params) ||
-          isQueryParams(rule.params) ||
-          isThresholdParams(rule.params) ||
-          isThreatParams(rule.params)) &&
-        action.overwriteDataViews
-      ) {
+      if (!isMachineLearningParams(rule.params) && action.overwriteDataViews) {
         rule.params.dataViewId = undefined;
       }
       rule.params.index = action.value;

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

@@ -132,7 +132,6 @@ export const buildEventsSearchQuery = ({
     },
   });
 
-  // TODO: ensure null / undefined runtimeMappings doesn't blow anything up
   const searchQuery = {
     allow_no_indices: true,
     runtime_mappings: runtimeMappings,