[8.x] [Security Solution] Display Modified badge for customized field…

…s in Rule Upgrade flyout (elastic#203968) (elastic#204195) # Backport This will backport the following commits from `main` to `8.x`: - [[Security Solution] Display Modified badge for customized fields in Rule Upgrade flyout (elastic#203968)](elastic#203968)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Maxim Palenov <maxim.palenov@elastic.co>
gsoldevila · Dec 13, 2024 · 84267a2 · 84267a2
1 parent 85bb51e
commit 84267a2
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 13 deletions.
diff --git a/...ine/rule_management/components/rule_details/three_way_diff/rule_upgrade/field_upgrade.tsx b/...ine/rule_management/components/rule_details/three_way_diff/rule_upgrade/field_upgrade.tsx
@@ -16,12 +16,18 @@ import { useFieldUpgradeContext } from './field_upgrade_context';
 
 export function FieldUpgrade(): JSX.Element {
   const { euiTheme } = useEuiTheme();
-  const { fieldName, fieldUpgradeState, hasConflict } = useFieldUpgradeContext();
+  const { fieldName, fieldUpgradeState, hasConflict, isCustomized } = useFieldUpgradeContext();
 
   return (
     <>
       <SplitAccordion
-        header={<FieldUpgradeHeader fieldName={fieldName} fieldUpgradeState={fieldUpgradeState} />}
+        header={
+          <FieldUpgradeHeader
+            fieldName={fieldName}
+            fieldUpgradeState={fieldUpgradeState}
+            isCustomized={isCustomized}
+          />
+        }
         initialIsOpen={hasConflict}
         data-test-subj="ruleUpgradePerFieldDiff"
       >

diff --git a/..._management/components/rule_details/three_way_diff/rule_upgrade/field_upgrade_context.tsx b/..._management/components/rule_details/three_way_diff/rule_upgrade/field_upgrade_context.tsx
@@ -7,10 +7,12 @@
 
 import React, { createContext, useContext, useMemo } from 'react';
 import { useBoolean } from '@kbn/react-hooks';
-import type {
-  DiffableRule,
-  FieldsDiff,
-  ThreeWayDiff,
+import { assertUnreachable } from '../../../../../../../common/utility_types';
+import {
+  ThreeWayDiffOutcome,
+  type DiffableRule,
+  type FieldsDiff,
+  type ThreeWayDiff,
 } from '../../../../../../../common/api/detection_engine';
 import { invariant } from '../../../../../../../common/utils/invariant';
 import { convertRuleToDiffable } from '../../../../../../../common/detection_engine/prebuilt_rules/diff/convert_rule_to_diffable';
@@ -34,9 +36,13 @@ interface FieldUpgradeContextType {
    */
   fieldUpgradeState: FieldUpgradeStateEnum;
   /**
-   * Whether rule has an unresolved conflict. This state is derived from `fieldUpgradeState`.
+   * Whether the field has an unresolved conflict. This state is derived from `fieldUpgradeState`.
    */
   hasConflict: boolean;
+  /**
+   * Whether the field was changed after prebuilt rule installation, i.e. customized
+   */
+  isCustomized: boolean;
   /**
    * Field's three way diff
    */
@@ -98,6 +104,7 @@ export function FieldUpgradeContextProvider({
       hasConflict:
         fieldUpgradeState === FieldUpgradeStateEnum.SolvableConflict ||
         fieldUpgradeState === FieldUpgradeStateEnum.NonSolvableConflict,
+      isCustomized: calcIsCustomized(fieldDiff),
       fieldDiff,
       finalDiffableRule: calcFinalDiffableRule(ruleUpgradeState),
       rightSideMode: editing ? FieldFinalSideMode.Edit : FieldFinalSideMode.Readonly,
@@ -133,6 +140,24 @@ export function useFieldUpgradeContext() {
   return context;
 }
 
+function calcIsCustomized(fieldDiff: ThreeWayDiff<unknown>): boolean {
+  switch (fieldDiff.diff_outcome) {
+    case ThreeWayDiffOutcome.StockValueNoUpdate:
+    case ThreeWayDiffOutcome.StockValueCanUpdate:
+    case ThreeWayDiffOutcome.MissingBaseCanUpdate:
+    case ThreeWayDiffOutcome.MissingBaseNoUpdate:
+      return false;
+
+    case ThreeWayDiffOutcome.CustomizedValueCanUpdate:
+    case ThreeWayDiffOutcome.CustomizedValueSameUpdate:
+    case ThreeWayDiffOutcome.CustomizedValueNoUpdate:
+      return true;
+
+    default:
+      return assertUnreachable(fieldDiff.diff_outcome);
+  }
+}
+
 function calcFinalDiffableRule(ruleUpgradeState: RuleUpgradeState): DiffableRule {
   const fieldsResolvedValues = Object.entries(ruleUpgradeState.fieldsUpgradeState).reduce<
     Record<string, unknown>

diff --git a/...e_management/components/rule_details/three_way_diff/rule_upgrade/field_upgrade_header.tsx b/...e_management/components/rule_details/three_way_diff/rule_upgrade/field_upgrade_header.tsx
@@ -11,25 +11,29 @@ import { EuiFlexGroup, EuiTitle } from '@elastic/eui';
 import { fieldToDisplayNameMap } from '../../diff_components/translations';
 import type { FieldUpgradeStateEnum } from '../../../../model/prebuilt_rule_upgrade';
 import { FieldUpgradeStateInfo } from './field_upgrade_state_info';
+import { ModifiedBadge } from '../badges/modified_badge';
+import { FIELD_MODIFIED_BADGE_DESCRIPTION } from './translations';
 
 interface FieldUpgradeHeaderProps {
   fieldName: string;
   fieldUpgradeState: FieldUpgradeStateEnum;
+  isCustomized: boolean;
 }
 
 export function FieldUpgradeHeader({
   fieldName,
   fieldUpgradeState,
+  isCustomized,
 }: FieldUpgradeHeaderProps): JSX.Element {
   return (
-    <EuiFlexGroup alignItems="center">
+    <EuiFlexGroup alignItems="center" gutterSize="m">
       <EuiTitle data-test-subj="ruleUpgradeFieldDiffLabel" size="xs">
         <h5>{fieldToDisplayNameMap[fieldName] ?? startCase(camelCase(fieldName))}</h5>
       </EuiTitle>
 
-      <EuiFlexGroup alignItems="center" gutterSize="s">
-        <FieldUpgradeStateInfo state={fieldUpgradeState} />
-      </EuiFlexGroup>
+      {isCustomized && <ModifiedBadge tooltip={FIELD_MODIFIED_BADGE_DESCRIPTION} />}
+
+      <FieldUpgradeStateInfo state={fieldUpgradeState} />
     </EuiFlexGroup>
   );
 }
diff --git a/...gine/rule_management/components/rule_details/three_way_diff/rule_upgrade/translations.tsx b/...gine/rule_management/components/rule_details/three_way_diff/rule_upgrade/translations.tsx
@@ -110,6 +110,7 @@ export const RULE_IS_READY_FOR_UPGRADE_DESCRIPTION = i18n.translate(
 export const FIELD_MODIFIED_BADGE_DESCRIPTION = i18n.translate(
   'xpack.securitySolution.detectionEngine.upgradeFlyout.fieldModifiedBadgeDescription',
   {
-    defaultMessage: 'The field value was edited and differs from the stock value',
+    defaultMessage:
+      "The field value was edited after rule's installation and differs from the value upon installation",
   }
 );
diff --git a/...e/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/translations.tsx b/...e/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/translations.tsx
@@ -136,6 +136,7 @@ export const FIELD_UPDATES = i18n.translate(
 export const RULE_MODIFIED_BADGE_DESCRIPTION = i18n.translate(
   'xpack.securitySolution.detectionEngine.upgradeFlyout.ruleModifiedBadgeDescription',
   {
-    defaultMessage: 'The rule was edited and field values differs from the stock values',
+    defaultMessage:
+      'The rule was edited after installation and field values differs from the values upon installation',
   }
 );