From e3ed5b0092c18e569cbe78c8bce0a0b107af5d33 Mon Sep 17 00:00:00 2001
From: afsuyadi <afsuyadi@gmail.com>
Date: Sun, 14 Jun 2026 11:54:59 +0700
Subject: [PATCH 1/2] fix(Utils): add guard against null rule value in
 validateRule

---
 frontend/common/utils/utils.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/frontend/common/utils/utils.tsx b/frontend/common/utils/utils.tsx
index ff6e7a48b17f..01757909efe7 100644
--- a/frontend/common/utils/utils.tsx
+++ b/frontend/common/utils/utils.tsx
@@ -816,6 +816,9 @@ const Utils = Object.assign({}, BaseUtils, {
     }
 
     if (operatorObj?.value?.toLowerCase?.().includes('semver')) {
+      if (rule.value == null) {
+        return false
+      }
       return !!semver.valid(`${rule.value.split(':')[0]}`)
     }
 
@@ -826,7 +829,7 @@ const Utils = Object.assign({}, BaseUtils, {
       }
       case 'REGEX': {
         try {
-          if (!rule.value) {
+          if (rule.value == null) {
             throw new Error('')
           }
           new RegExp(`${rule.value}`)
@@ -836,6 +839,9 @@ const Utils = Object.assign({}, BaseUtils, {
         }
       }
       case 'MODULO': {
+        if (rule.value == null) {
+          return false
+        }
         const valueSplit = rule.value.split('|')
         if (valueSplit.length === 2) {
           const [divisor, remainder] = [

From 91d510e8a255c3ccf2cc8fb838005ed314f95f78 Mon Sep 17 00:00:00 2001
From: afsuyadi <afsuyadi@gmail.com>
Date: Wed, 24 Jun 2026 09:50:46 +0700
Subject: [PATCH 2/2] fix(Utils): avoid loose comparisons based on code review

---
 frontend/common/utils/utils.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/common/utils/utils.tsx b/frontend/common/utils/utils.tsx
index 01757909efe7..c78237157830 100644
--- a/frontend/common/utils/utils.tsx
+++ b/frontend/common/utils/utils.tsx
@@ -816,7 +816,7 @@ const Utils = Object.assign({}, BaseUtils, {
     }
 
     if (operatorObj?.value?.toLowerCase?.().includes('semver')) {
-      if (rule.value == null) {
+      if (!rule.value) {
         return false
       }
       return !!semver.valid(`${rule.value.split(':')[0]}`)
@@ -829,7 +829,7 @@ const Utils = Object.assign({}, BaseUtils, {
       }
       case 'REGEX': {
         try {
-          if (rule.value == null) {
+          if (!rule.value) {
             throw new Error('')
           }
           new RegExp(`${rule.value}`)
@@ -839,7 +839,7 @@ const Utils = Object.assign({}, BaseUtils, {
         }
       }
       case 'MODULO': {
-        if (rule.value == null) {
+        if (!rule.value) {
           return false
         }
         const valueSplit = rule.value.split('|')