From a2b9715d7bfeaeb36301afdbdff79766328640f0 Mon Sep 17 00:00:00 2001
From: Egor Shamardin <33912805+LightOfHeaven1994@users.noreply.github.com>
Date: Wed, 29 Jan 2025 13:53:24 +0100
Subject: [PATCH] fix(RHINENG-15635): Set system minVer correctly on
 search&select (#2364)

---
 src/SmartComponents/EditPolicy/EditPolicyFormRest.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/SmartComponents/EditPolicy/EditPolicyFormRest.js b/src/SmartComponents/EditPolicy/EditPolicyFormRest.js
index 50f716b91..6b49d450e 100644
--- a/src/SmartComponents/EditPolicy/EditPolicyFormRest.js
+++ b/src/SmartComponents/EditPolicy/EditPolicyFormRest.js
@@ -42,7 +42,11 @@ const EditPolicyForm = ({
   const handleSystemSelect = useCallback(
     (newSelectedSystems) => {
       const newOsMinorVersions = [
-        ...new Set(newSelectedSystems.map((system) => system.osMinorVersion)), // get unique values
+        ...new Set(
+          newSelectedSystems.map(
+            (system) => system.os_minor_version ?? system.osMinorVersion
+          )
+        ), // get unique values
       ];
 
       const hasNewOsMinorVersions =
@@ -57,7 +61,11 @@ const EditPolicyForm = ({
       setNewRulesAlert(hasNewOsMinorVersions);
       setSelectedOsMinorVersions(newOsMinorVersions);
       setSelectedVersionCounts(
-        getCounts(newSelectedSystems.map((system) => system.osMinorVersion))
+        getCounts(
+          newSelectedSystems.map(
+            (system) => system.osMinorVersion ?? system.os_minor_version
+          )
+        )
       );
       setSelectedSystems(newSelectedSystems.map((system) => system.id));
     },