Merge pull request #572 from devtron-labs/fix/rjsf-form-validations

fix: use SCHEMA_07_VALIDATOR instead of SCHEMA_07_VALIDATOR_STRICT in rjsf

Author: Elessar1802

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.6.13",
+    "version": "1.6.14",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

package.json

@@ -20,13 +20,13 @@ import RJSF from '@rjsf/core'
 import { templates, widgets } from './config'
 import { FormProps } from './types'
 import { translateString } from './utils'
-import { SCHEMA_07_VALIDATOR_STRICT } from '@Shared/validations'
+import { SCHEMA_07_VALIDATOR } from '@Shared/validations'
 import './rjsfForm.scss'
 
 // Need to use this way because the default import was not working as expected
 // The default import resolves to an object intead of a function
 const Form = RJSF
-const validator = SCHEMA_07_VALIDATOR_STRICT
+const validator = SCHEMA_07_VALIDATOR
 
 export const RJSFForm = forwardRef((props: FormProps, ref: FormProps['ref']) => (
     <Form

src/Common/RJSF/Form.tsx

@@ -389,8 +389,10 @@ SCHEMA_07_VALIDATOR_STRICT.ajv.addKeyword('hidden')
 SCHEMA_07_VALIDATOR_STRICT.ajv.addFormat('memory', /^\d+(\.\d+)?(Ki|Mi|Gi|Ti|Pi|Ei|KiB|MiB|GiB|TiB|PiB|EiB)?$/)
 SCHEMA_07_VALIDATOR_STRICT.ajv.addFormat('cpu', /^(?:\d+(\.\d+)?|(\d+)(m))$/)
 
-const SCHEMA_07_VALIDATOR = customizeValidator({ ajvOptionsOverrides: { strict: false } })
+export const SCHEMA_07_VALIDATOR = customizeValidator({ ajvOptionsOverrides: { strict: false } })
 SCHEMA_07_VALIDATOR.ajv.addKeyword('hidden')
+SCHEMA_07_VALIDATOR.ajv.addFormat('memory', /^\d+(\.\d+)?(Ki|Mi|Gi|Ti|Pi|Ei|KiB|MiB|GiB|TiB|PiB|EiB)?$/)
+SCHEMA_07_VALIDATOR.ajv.addFormat('cpu', /^(?:\d+(\.\d+)?|(\d+)(m))$/)
 
 export const doesJSONConformToSchema07 = (json: string, strict = false): ValidationResponseType => {
     try {