Merge pull request #673 from devtron-labs/uat/approval-policy-exceptions

fix: CM/CS - incorrect validations for required field for yaml fix

Author: RohitRaj011

src/Shared/Components/CMCS/validations.ts

@@ -32,9 +32,12 @@ import { getESOSecretDataFromYAML } from './utils'
  */
 const validateYaml = (yaml: string): UseFormValidation['custom'] => {
     try {
-        // Check if the YAML string is empty or undefined, if so, throw a no-data error.
+        // Check if the YAML string is empty or undefined, if so, return required field error.
         if (!yaml) {
-            throw new Error('This is a required field')
+            return {
+                isValid: () => false,
+                message: 'This is a required field',
+            }
         }
 
         // Parse the YAML string into a JSON object.
@@ -47,11 +50,13 @@ const validateYaml = (yaml: string): UseFormValidation['custom'] => {
             const errorKeys = [] // To store keys that do not match the key pattern.
             const errorValues = [] // To store values that are boolean or numeric, which should be quoted.
 
+            let updatedError = ''
+
             // Iterate through the object keys and validate each key-value pair.
             Object.keys(json).forEach((k) => {
-                // If a key or its corresponding value is empty, throw a no-data error.
+                // If a key or its corresponding value is empty, set required field error.
                 if (!k && !json[k]) {
-                    throw new Error('This is a required field')
+                    updatedError = 'This is a required field'
                 }
 
                 // Convert the value to a string for easier validation, handle nested objects using YAMLStringify.
@@ -68,7 +73,12 @@ const validateYaml = (yaml: string): UseFormValidation['custom'] => {
                 }
             })
 
-            let updatedError = ''
+            if (updatedError) {
+                return {
+                    isValid: () => false,
+                    message: updatedError,
+                }
+            }
 
             // If there are invalid keys, append a message listing the problematic keys.
             if (errorKeys.length > 0) {
@@ -116,9 +126,14 @@ const validateYaml = (yaml: string): UseFormValidation['custom'] => {
  */
 const validateEsoSecretYaml = (esoSecretYaml: string): UseFormValidation => {
     try {
-        // Check if the provided YAML string is empty or undefined, and throw a no-data error.
+        // Check if the provided YAML string is empty or undefined, and return required field error.
         if (!esoSecretYaml) {
-            throw new Error('This is a required field')
+            return {
+                custom: {
+                    isValid: () => false,
+                    message: 'This is a required field',
+                },
+            }
         }
 
         // Parse the YAML string into a JSON object.