add merge values to final diffable rule

elastic · Sep 10, 2024 · 298f486 · 298f486
1 parent a8c6c23
commit 298f486
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/...i/components/rules_table/upgrade_prebuilt_rules_table/use_prebuilt_rules_upgrade_state.ts b/...i/components/rules_table/upgrade_prebuilt_rules_table/use_prebuilt_rules_upgrade_state.ts
@@ -6,6 +6,7 @@
  */
 
 import { useCallback, useMemo, useState } from 'react';
+import type { FieldsDiff } from '../../../../../../common/api/detection_engine';
 import {
   ThreeWayDiffConflict,
   type DiffableAllFields,
@@ -89,10 +90,26 @@ function calcFinalDiffableRule(
 ): DiffableRule {
   return {
     ...convertRuleToDiffable(ruleUpgradeInfo.target_rule),
+    ...convertRuleFieldsDiffToDiffable(ruleUpgradeInfo.diff.fields),
     ...ruleResolvedConflicts,
   } as DiffableRule;
 }
 
+/**
+ * Assembles a `DiffableRule` from rule fields diff `merge_value`s.
+ */
+function convertRuleFieldsDiffToDiffable(
+  ruleFieldsDiff: FieldsDiff<Record<string, unknown>>
+): Partial<DiffableRule> {
+  const mergeVersionRule: Record<string, unknown> = {};
+
+  for (const fieldName of Object.keys(ruleFieldsDiff)) {
+    mergeVersionRule[fieldName] = ruleFieldsDiff[fieldName].merged_version;
+  }
+
+  return mergeVersionRule;
+}
+
 function calcUnresolvedConflicts(
   ruleUpgradeInfo: RuleUpgradeInfoForReview,
   ruleResolvedConflicts: RuleResolvedConflicts