fix(RHINENG-15120): Fix rule patching in policies (#2356)

RedHatInsights · Jan 28, 2025 · 64c6bbb · 64c6bbb
1 parent e463e04
commit 64c6bbb
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 5 deletions.
diff --git a/src/PresentationalComponents/RulesTable/RulesTableRest.js b/src/PresentationalComponents/RulesTable/RulesTableRest.js
@@ -35,6 +35,7 @@ const RulesTable = ({
   onSelect,
   defaultTableView = 'tree',
   reportTestResult,
+  valueOverrides,
   ...rulesTableProps
 }) => {
   const internalSelectedState = useState([]);
@@ -77,6 +78,7 @@ const RulesTable = ({
         ...rule,
         itemId,
         valueDefinitions: ruleValueDefinitions,
+        valueOverrides,
         profile: { id: policyId, name: policyName },
         ruleValues: ruleRuleValues,
       };
@@ -98,23 +100,53 @@ const RulesTable = ({
 
     return Row;
   }, [
-    policyId,
-    policyName,
-    onRuleValueReset,
     rules,
     ruleValues,
+    policyId,
+    policyName,
     onValueOverrideSave,
+    onRuleValueReset,
+    valueOverrides,
   ]);
 
   const itemsWithValueDefinitions = useMemo(
-    () => rules?.map((rule) => ({ ...rule, valueDefinitions })),
-    [rules, valueDefinitions]
+    () =>
+      rules?.map((rule) => {
+        const updatedRule = { ...rule };
+
+        const updatedValueDefinitions = valueDefinitions?.data?.map(
+          (definition) => {
+            const matchingRule = rule.value_checks.find(
+              (checkId) => checkId === definition.id
+            );
+
+            if (matchingRule && valueOverrides) {
+              const override = Object.values(valueOverrides).find(
+                (overrideObj) => overrideObj[matchingRule]
+              );
+              if (override) {
+                definition.value = override[matchingRule];
+              }
+            }
+            return definition;
+          }
+        );
+        updatedRule.rowProps = {
+          valueDefinitions: {
+            data: updatedValueDefinitions,
+          },
+        };
+
+        return updatedRule;
+      }),
+    [rules, valueOverrides, valueDefinitions]
   );
 
   return (
     <ComplianceTable
       aria-label="Rules Table"
       items={itemsWithValueDefinitions}
+      valueOverrides={valueOverrides}
       columns={columns}
       isStickyHeader
       filters={{
@@ -189,6 +221,7 @@ RulesTable.propTypes = {
   total: propTypes.number,
   defaultTableView: propTypes.string,
   reportTestResult: propTypes.object,
+  valueOverrides: propTypes.object,
 };
 
 export default RulesTable;
diff --git a/src/PresentationalComponents/RulesTable/components/RuleValueEdit.js b/src/PresentationalComponents/RulesTable/components/RuleValueEdit.js
@@ -71,6 +71,7 @@ const RuleValueEdit = ({ rule, onValueChange, onRuleValueReset }) => {
             key={`rule-value-${idx}`}
             isOpen={isOpen}
             value={
+              valueDefinition.value ||
               ruleValues?.[valueDefinition?.id] ||
               ruleValues?.[valueDefinition?.refId]
             }

diff --git a/src/PresentationalComponents/Tailorings/Tailorings.js b/src/PresentationalComponents/Tailorings/Tailorings.js
@@ -33,6 +33,7 @@ import NoTailorings from './NoTailorings';
  *  @param                        [props.rulesPageLink]
  *
  *  @param   {object}             props.selectedVersionCounts            An object containing minor version as a key and count as a value. Helps to render the system count badge in tab headers.
+ *  @param                        props.valueOverrides
  *  @returns {React.ReactElement}
  *
  *  @category Compliance
@@ -147,6 +148,7 @@ import NoTailorings from './NoTailorings';
   preselected,
   enableSecurityGuideRulesToggle,
   selectedVersionCounts,
+  valueOverrides,
   ...rulesTableProps
 }) => {
   const {
@@ -240,6 +242,7 @@ import NoTailorings from './NoTailorings';
                       preselected?.[tab.id] ||
                       preselected?.[tab.os_minor_version],
                     rulesPageLink: rulesPageLink,
+                    valueOverrides,
                   }}
                 />
               </Tab>
@@ -273,6 +276,7 @@ Tailorings.propTypes = {
   preselected: propTypes.object,
   enableSecurityGuideRulesToggle: propTypes.bool,
   selectedVersionCounts: propTypes.object,
+  valueOverrides: propTypes.object,
 };
 
 export default Tailorings;
diff --git a/src/PresentationalComponents/Tailorings/components/TailoringTab.js b/src/PresentationalComponents/Tailorings/components/TailoringTab.js
@@ -28,6 +28,7 @@ const TailoringTab = ({
   onSelect,
   preselected,
   enableSecurityGuideRulesToggle,
+  valueOverrides,
 }) => {
   const tableState = useFullTableState();
   const openRuleGroups = tableState?.tableState?.['open-items'];
@@ -150,6 +151,7 @@ const TailoringTab = ({
             shouldSkip.securityGuide.valueDefinitions === false &&
             valueDefinitions === undefined,
         }}
+        valueOverrides={valueOverrides}
         onRuleValueReset={onRuleValueReset}
         onValueOverrideSave={onValueSave}
         onSelect={onSelect ? onSelectRule : undefined}
@@ -189,6 +191,7 @@ TailoringTab.propTypes = {
   onValueOverrideSave: propTypes.func,
   preselected: propTypes.object,
   enableSecurityGuideRulesToggle: propTypes.bool,
+  valueOverrides: propTypes.object,
 };
 
 const TailoringTabProvider = (props) => (

diff --git a/src/SmartComponents/CreatePolicy/EditPolicyProfilesRules/EditPolicyProfilesRulesRest.js b/src/SmartComponents/CreatePolicy/EditPolicyProfilesRules/EditPolicyProfilesRulesRest.js
@@ -187,6 +187,7 @@ export const EditPolicyProfilesRulesRest = ({
             preselected={preselected}
             enableSecurityGuideRulesToggle
             rulesPageLink={true}
+            valueOverrides={valueOverrides}
             onValueOverrideSave={onValueOverrideSave}
             selectedVersionCounts={osMinorVersionCounts.reduce(
               (prev, cur) => ({