remove ruletype param from useAlertSuppression hook since all rule ty…

…pes support suppression, with eql sequence dependent on feature flag, so that is now the only parameter necessary
elastic · Dec 4, 2024 · a38142f · a38142f
1 parent 7abac02
commit a38142f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 41 deletions.
diff --git a/...y_solution/public/detection_engine/rule_creation_ui/components/step_define_rule/index.tsx b/...y_solution/public/detection_engine/rule_creation_ui/components/step_define_rule/index.tsx
@@ -357,7 +357,6 @@ const StepDefineRuleComponent: FC<StepDefineRuleProps> = ({
   const areSuppressionFieldsSelected = isThresholdRule || Boolean(alertSuppressionFields?.length);
 
   const { isSuppressionEnabled: isAlertSuppressionEnabled } = useAlertSuppression(
-    ruleType,
     isEqlSequenceQuery(queryBar?.query?.query as string)
   );
 

diff --git a/...blic/detection_engine/rule_management/components/rule_details/rule_definition_section.tsx b/...blic/detection_engine/rule_management/components/rule_details/rule_definition_section.tsx
@@ -843,7 +843,7 @@ export const RuleDefinitionSection = ({
     ruleType: rule.type,
   });
 
-  const { isSuppressionEnabled } = useAlertSuppression(rule.type);
+  const { isSuppressionEnabled } = useAlertSuppression();
 
   const definitionSectionListItems = prepareDefinitionSectionListItems(
     rule,

diff --git a/...ity_solution/public/detection_engine/rule_management/logic/use_alert_suppression.test.tsx b/...ity_solution/public/detection_engine/rule_management/logic/use_alert_suppression.test.tsx
@@ -6,41 +6,23 @@
  */
 
 import { renderHook } from '@testing-library/react';
-import type { Type } from '@kbn/securitysolution-io-ts-alerting-types';
 import * as useIsExperimentalFeatureEnabledMock from '../../../common/hooks/use_experimental_features';
 import { useAlertSuppression } from './use_alert_suppression';
 
 describe('useAlertSuppression', () => {
   jest
     .spyOn(useIsExperimentalFeatureEnabledMock, 'useIsExperimentalFeatureEnabled')
     .mockReturnValue(false);
-  (
-    [
-      'new_terms',
-      'threat_match',
-      'saved_query',
-      'query',
-      'threshold',
-      'eql',
-      'esql',
-      'machine_learning',
-    ] as Type[]
-  ).forEach((ruleType) => {
-    it(`should return the isSuppressionEnabled true for ${ruleType} rule type that exists in SUPPRESSIBLE_ALERT_RULES`, () => {
-      const { result } = renderHook(() => useAlertSuppression(ruleType));
-
-      expect(result.current.isSuppressionEnabled).toBe(true);
-    });
-  });
-
-  it('should return false if rule type is undefined', () => {
-    const { result } = renderHook(() => useAlertSuppression(undefined));
-    expect(result.current.isSuppressionEnabled).toBe(false);
+  it(`should return the isSuppressionEnabled true if query for all rule types is not an eql sequence query`, () => {
+    const { result } = renderHook(() => useAlertSuppression());
+    expect(result.current.isSuppressionEnabled).toBe(true);
   });
 
-  it('should return false if rule type is not a suppressible rule', () => {
-    const { result } = renderHook(() => useAlertSuppression('OTHER_RULE_TYPE' as Type));
-
+  jest
+    .spyOn(useIsExperimentalFeatureEnabledMock, 'useIsExperimentalFeatureEnabled')
+    .mockReturnValue(false);
+  it('should return isSuppressionEnabled false for eql sequence query when feature flag is disabled', () => {
+    const { result } = renderHook(() => useAlertSuppression(true));
     expect(result.current.isSuppressionEnabled).toBe(false);
   });
 });
diff --git a/...security_solution/public/detection_engine/rule_management/logic/use_alert_suppression.tsx b/...security_solution/public/detection_engine/rule_management/logic/use_alert_suppression.tsx
@@ -5,33 +5,24 @@
  * 2.0.
  */
 import { useCallback } from 'react';
-import type { Type } from '@kbn/securitysolution-io-ts-alerting-types';
-import { isEqlRule, isSuppressibleAlertRule } from '../../../../common/detection_engine/utils';
 import { useIsExperimentalFeatureEnabled } from '../../../common/hooks/use_experimental_features';
 
 export interface UseAlertSuppressionReturn {
   isSuppressionEnabled: boolean;
 }
 
-export const useAlertSuppression = (
-  ruleType: Type | undefined,
-  isEqlSequenceQuery = false
-): UseAlertSuppressionReturn => {
+export const useAlertSuppression = (isEqlSequenceQuery = false): UseAlertSuppressionReturn => {
   const isAlertSuppressionForSequenceEQLRuleEnabled = useIsExperimentalFeatureEnabled(
     'alertSuppressionForSequenceEqlRuleEnabled'
   );
 
   const isSuppressionEnabledForRuleType = useCallback(() => {
-    if (!ruleType) {
-      return false;
-    }
-
-    if (isEqlRule(ruleType) && isEqlSequenceQuery) {
+    if (isEqlSequenceQuery) {
       return isAlertSuppressionForSequenceEQLRuleEnabled;
     }
 
-    return isSuppressibleAlertRule(ruleType);
-  }, [ruleType, isAlertSuppressionForSequenceEQLRuleEnabled, isEqlSequenceQuery]);
+    return true;
+  }, [isAlertSuppressionForSequenceEQLRuleEnabled, isEqlSequenceQuery]);
 
   return {
     isSuppressionEnabled: isSuppressionEnabledForRuleType(),