RI-7315: fix rdi pipeline upload from file (#5114)

Author: KrumTy

redisinsight/ui/src/components/yaml-validator/validatePipeline.ts

@@ -1,6 +1,10 @@
 import { get } from 'lodash'
 import { Nullable } from 'uiSrc/utils'
-import { validateSchema, validateYamlSchema } from './validateYamlSchema'
+import {
+  validateSchema,
+  validateYamlSchema,
+  VALID_RESULT,
+} from './validateYamlSchema'
 
 interface PipelineValidationProps {
   config: string
@@ -28,10 +32,12 @@ export const validatePipeline = ({
   }>(
     (acc, j) => {
       const validation = validateYamlSchema(j.value, monacoJobsSchema)
-      const jobNameValidation = validateSchema(j.name, jobNameSchema, {
-        errorMessagePrefix: 'Job name',
-        includePathIntoErrorMessage: false,
-      })
+      const jobNameValidation = !jobNameSchema
+        ? VALID_RESULT
+        : validateSchema(j.name, jobNameSchema, {
+            errorMessagePrefix: 'Job name',
+            includePathIntoErrorMessage: false,
+          })
 
       if (!acc.jobsErrors[j.name]) {
         acc.jobsErrors[j.name] = new Set()
@@ -41,7 +47,7 @@ export const validatePipeline = ({
         validation.errors.forEach((error) => acc.jobsErrors[j.name].add(error))
       }
 
-      if (jobNameSchema && !jobNameValidation.valid) {
+      if (!jobNameValidation.valid) {
         jobNameValidation.errors.forEach((error) =>
           acc.jobsErrors[j.name].add(error),
         )

redisinsight/ui/src/components/yaml-validator/validateYamlSchema.ts

@@ -6,11 +6,18 @@ type ValidationConfig = {
   includePathIntoErrorMessage?: boolean
 }
 
+type ValidationResult = {
+  valid: boolean
+  errors: string[]
+}
+
+export const VALID_RESULT: ValidationResult = { valid: true, errors: [] }
+
 export const validateSchema = (
   parsed: any,
   schema: any,
   config: ValidationConfig = {},
-): { valid: boolean; errors: string[] } => {
+): ValidationResult => {
   const errorMessagePrefix = config.errorMessagePrefix ?? 'Error:'
   const includePathIntoErrorMessage = config.includePathIntoErrorMessage ?? true
 
@@ -25,12 +32,12 @@ export const validateSchema = (
     const valid = validate(parsed)
 
     if (!valid) {
-      const errors = validate.errors?.map(
-        (err) => {
-          const pathMessage = includePathIntoErrorMessage ? ` (at ${err.instancePath || 'root'})` : ''
-          return `${[errorMessagePrefix]} ${err.message}${pathMessage}`
-        }
-      )
+      const errors = validate.errors?.map((err) => {
+        const pathMessage = includePathIntoErrorMessage
+          ? ` (at ${err.instancePath || 'root'})`
+          : ''
+        return `${[errorMessagePrefix]} ${err.message}${pathMessage}`
+      })
       return { valid: false, errors: errors || [] }
     }
 
@@ -43,7 +50,7 @@ export const validateSchema = (
 export const validateYamlSchema = (
   content: string,
   schema: any,
-): { valid: boolean; errors: string[] } => {
+): ValidationResult => {
   try {
     const parsed = yaml.load(content) as object
 

redisinsight/ui/src/pages/rdi/pipeline-management/components/upload-modal/UploadModal.tsx

@@ -37,6 +37,8 @@ const UploadModal = (props: Props) => {
     config: pipelineConfig,
     jobs: pipelineJobs,
     schema,
+    monacoJobsSchema,
+    jobNameSchema,
   } = useSelector(rdiPipelineSelector)
 
   const { rdiInstanceId } = useParams<{ rdiInstanceId: string }>()
@@ -111,7 +113,13 @@ const UploadModal = (props: Props) => {
 
       if (config && schema && jobs?.length) {
         const { result, configValidationErrors, jobsValidationErrors } =
-          validatePipeline({ config, schema, jobs })
+          validatePipeline({
+            config,
+            schema,
+            jobs,
+            monacoJobsSchema,
+            jobNameSchema,
+          })
 
         dispatch(setConfigValidationErrors(configValidationErrors))
         dispatch(setJobsValidationErrors(jobsValidationErrors))