#RI-5749 - cover 422 error

AmirAllayarovSofteq · AmirAllayarovSofteq · commit 7cf0c36c3010 · 2024-06-18T18:45:34.000+04:00
diff --git a/redisinsight/api/src/constants/custom-error-codes.ts b/redisinsight/api/src/constants/custom-error-codes.ts
@@ -57,5 +57,5 @@ export enum CustomErrorCodes {
   RdiDeployPipelineFailure = 11_401,
   RdiUnauthorized = 11_402,
   RdiInternalServerError = 11_403,
-
+  RdiValidationError = 11_404,
 }
diff --git a/redisinsight/api/src/constants/error-messages.ts b/redisinsight/api/src/constants/error-messages.ts
@@ -110,4 +110,5 @@ export default {
 
   RDI_DEPLOY_PIPELINE_FAILURE: 'Failed to deploy pipeline',
   RDI_TIMEOUT_ERROR: 'Encountered a timeout error while attempting to retrieve data',
+  RDI_VALIDATION_ERROR: 'Validation error',
 };
diff --git a/redisinsight/api/src/modules/rdi/exceptions/index.ts b/redisinsight/api/src/modules/rdi/exceptions/index.ts
@@ -3,3 +3,4 @@ export * from './rdi-pipiline.error.handler';
 export * from './rdi-pipeline.internal-server-error.exception';
 export * from './rdi-pipeline.not-found.exception';
 export * from './rdi-pipeline.unauthorized.exception';
+export * from './rdi-pipeline.validation.exception';
diff --git a/redisinsight/api/src/modules/rdi/exceptions/rdi-pipeline.validation.exception.ts b/redisinsight/api/src/modules/rdi/exceptions/rdi-pipeline.validation.exception.ts
@@ -0,0 +1,20 @@
+import { HttpException, HttpExceptionOptions, HttpStatus } from '@nestjs/common';
+import { CustomErrorCodes } from 'src/constants';
+import ERROR_MESSAGES from 'src/constants/error-messages';
+
+export class RdiPipelineValidationException extends HttpException {
+  constructor(
+    message = ERROR_MESSAGES.RDI_VALIDATION_ERROR,
+    options?: HttpExceptionOptions & { details?: unknown },
+  ) {
+    const response = {
+      message,
+      statusCode: HttpStatus.UNPROCESSABLE_ENTITY,
+      error: 'RdiValidationError',
+      errorCode: CustomErrorCodes.RdiValidationError,
+      details: options,
+    };
+
+    super(response, response.statusCode, options);
+  }
+}
diff --git a/redisinsight/api/src/modules/rdi/exceptions/rdi-pipiline.error.handler.ts b/redisinsight/api/src/modules/rdi/exceptions/rdi-pipiline.error.handler.ts
@@ -2,7 +2,7 @@ import { AxiosError } from 'axios';
 import { HttpException } from '@nestjs/common';
 import {
   RdiPipelineInternalServerErrorException,
-  RdiPipelineUnauthorizedException, RdiPipelineNotFoundException,
+  RdiPipelineUnauthorizedException, RdiPipelineNotFoundException, RdiPipelineValidationException,
 } from 'src/modules/rdi/exceptions';
 
 export const wrapRdiPipelineError = (error: AxiosError<any>, message?: string): HttpException => {
@@ -11,11 +11,14 @@ export const wrapRdiPipelineError = (error: AxiosError<any>, message?: string):
   }
 
   const { response } = error;
+
   if (response) {
     const errorOptions = response?.data?.detail;
     switch (response?.status) {
       case 401:
         return new RdiPipelineUnauthorizedException(message, errorOptions);
+      case 422:
+        return new RdiPipelineValidationException(message, errorOptions);
       default:
         return new RdiPipelineNotFoundException(message, errorOptions);
     }
diff --git a/redisinsight/ui/src/components/monaco-editor/components/monaco-yaml/MonacoYaml.tsx b/redisinsight/ui/src/components/monaco-editor/components/monaco-yaml/MonacoYaml.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useEffect } from 'react'
 import { isNull } from 'lodash'
 
 import { CommonProps } from 'uiSrc/components/monaco-editor/MonacoEditor'
@@ -23,15 +23,22 @@ const MonacoYaml = (props: Props) => {
     ...rest
   } = props
 
-  // insert schema work only before monaco will be rendered
-  if (isNull(schema)) {
-    return null
-  }
+  useEffect(() => {
+    if (!isNull(schema)) {
+      monacoYamlModel?.update({
+        schemas: [{
+          schema,
+          uri,
+          fileMatch: [fileMatch],
+        }],
+      })
+    }
+  }, [schema, uri, fileMatch])
 
   const editorWillMount = () => {
     monacoYamlModel?.update({
       schemas: [{
-        schema,
+        schema: schema || {},
         uri,
         fileMatch: [fileMatch],
       }],
diff --git a/redisinsight/ui/src/constants/customErrorCodes.ts b/redisinsight/ui/src/constants/customErrorCodes.ts
@@ -54,6 +54,7 @@ export enum CustomErrorCodes {
 
   GeneralAiUnexpectedError = 11_391,
 
-  // RDI errors [11300, 11499]
-  RdiDeployPipelineFailure = 11_301,
+  // RDI errors [11400, 11499]
+  RdiDeployPipelineFailure = 11_401,
+  RdiValidationError = 11_404,
 }
diff --git a/redisinsight/ui/src/slices/interfaces/app.ts b/redisinsight/ui/src/slices/interfaces/app.ts
@@ -6,6 +6,7 @@ import { GetServerInfoResponse } from 'apiSrc/modules/server/dto/server.dto'
 import { RedisString as RedisStringAPI } from 'apiSrc/common/constants/redis-string'
 
 export interface CustomError {
+  details?: any;
   error: string
   message: string
   statusCode: number
diff --git a/redisinsight/ui/src/slices/rdi/dryRun.ts b/redisinsight/ui/src/slices/rdi/dryRun.ts
@@ -2,8 +2,8 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit'
 import { AxiosError } from 'axios'
 import { apiService, } from 'uiSrc/services'
 import { addErrorNotification } from 'uiSrc/slices/app/notifications'
-import { getApiErrorMessage, isStatusSuccessful } from 'uiSrc/utils'
-import { IDryRunJobResults, IStateRdiDryRunJob } from 'uiSrc/slices/interfaces'
+import { getApiErrorMessage, getAxiosError, isStatusSuccessful } from 'uiSrc/utils'
+import { EnhancedAxiosError, IDryRunJobResults, IStateRdiDryRunJob } from 'uiSrc/slices/interfaces'
 
 import { AppDispatch, RootState } from '../store'
 
@@ -73,8 +73,10 @@ export function rdiDryRunJob(
       }
     } catch (_err) {
       const error = _err as AxiosError
+      const parsedError = getAxiosError(error as EnhancedAxiosError)
       const errorMessage = getApiErrorMessage(error)
-      dispatch(addErrorNotification(error))
+
+      dispatch(addErrorNotification(parsedError))
       dispatch(dryRunJobFailure(errorMessage))
       onFailAction?.()
     }
diff --git a/redisinsight/ui/src/slices/rdi/testConnections.ts b/redisinsight/ui/src/slices/rdi/testConnections.ts
@@ -4,13 +4,15 @@ import { apiService, } from 'uiSrc/services'
 import { addErrorNotification } from 'uiSrc/slices/app/notifications'
 import {
   getApiErrorMessage,
+  getAxiosError,
   getRdiUrl,
   isStatusSuccessful,
   Maybe,
   Nullable,
   transformConnectionResults
 } from 'uiSrc/utils'
 import {
+  EnhancedAxiosError,
   IStateRdiTestConnections,
   TestConnectionsResponse,
   TransformResult
@@ -94,8 +96,10 @@ export function testConnectionsAction(
     } catch (_err) {
       if (!axios.isCancel(_err)) {
         const error = _err as AxiosError
+        const parsedError = getAxiosError(error as EnhancedAxiosError)
         const errorMessage = getApiErrorMessage(error)
-        dispatch(addErrorNotification(error))
+
+        dispatch(addErrorNotification(parsedError))
         dispatch(testConnectionsFailure(errorMessage))
         onFailAction?.()
       } else {
diff --git a/redisinsight/ui/src/slices/tests/rdi/dryRun.spec.tsx b/redisinsight/ui/src/slices/tests/rdi/dryRun.spec.tsx
@@ -1,5 +1,6 @@
 import { cloneDeep } from 'lodash'
 import { AxiosError } from 'axios'
+import { AnyAction } from '@reduxjs/toolkit'
 import { cleanup, initialStateDefault, mockedStore } from 'uiSrc/utils/test-utils'
 import reducer, {
   initialState,
@@ -27,7 +28,7 @@ describe('rdi dry run slice', () => {
       const nextState = initialState
 
       // Act
-      const result = reducer(undefined, {})
+      const result = reducer(undefined, {} as AnyAction)
 
       // Assert
       expect(result).toEqual(nextState)
@@ -59,7 +60,11 @@ describe('rdi dry run slice', () => {
   describe('dryRunJobSuccess', () => {
     it('should properly set state', () => {
       // Arrange
-      const mockData = { commands: ['HSET 1 1'], transformations: { name: 'John' } }
+      const mockData = {
+        output: [{ connection: 'name', commands: ['HSET 1 1'] }],
+        transformation: { name: 'John' }
+      }
+
       const state = {
         ...initialState,
         results: mockData,
diff --git a/redisinsight/ui/src/utils/errors.tsx b/redisinsight/ui/src/utils/errors.tsx
@@ -1,12 +1,29 @@
 import { AxiosError } from 'axios'
-import { isEmpty, isString, set } from 'lodash'
+import { capitalize, clone, isEmpty, isString, isArray, set } from 'lodash'
 import React from 'react'
 import { EuiSpacer } from '@elastic/eui'
 import { CustomErrorCodes } from 'uiSrc/constants'
 import { DEFAULT_ERROR_MESSAGE } from 'uiSrc/utils'
 import { CustomError } from 'uiSrc/slices/interfaces'
 import { EXTERNAL_LINKS } from 'uiSrc/constants/links'
 
+export const getRdiValidationMessage = (message: string = '', loc?: string[]): string => {
+  // first item is always "body"
+  if (!loc || !isArray(loc) || loc.length < 2) {
+    return message
+  }
+  const locArr = clone(loc)
+  locArr.shift()
+
+  const field = locArr.pop()
+  const path = locArr?.join('/')
+  const words = message.split(' ')
+
+  words[0] = path ? `${field} in ${path}` : field || ''
+
+  return capitalize(words.join(' '))
+}
+
 export const parseCustomError = (err: CustomError | string = DEFAULT_ERROR_MESSAGE): AxiosError => {
   const error = {
     response: {
@@ -156,6 +173,13 @@ export const parseCustomError = (err: CustomError | string = DEFAULT_ERROR_MESSA
       additionalInfo.errorCode = err.errorCode
       break
 
+    case CustomErrorCodes.RdiValidationError:
+      const details = err?.details[0] || {}
+      title = 'Validation error'
+      message = getRdiValidationMessage(details.msg, err?.details[0]?.loc)
+
+      break
+
     default:
       title = 'Error'
       message = err?.message || DEFAULT_ERROR_MESSAGE
diff --git a/redisinsight/ui/src/utils/tests/errors.spec.tsx b/redisinsight/ui/src/utils/tests/errors.spec.tsx
@@ -2,7 +2,7 @@ import { set, cloneDeep } from 'lodash'
 import React from 'react'
 import { EuiSpacer } from '@elastic/eui'
 import { AxiosError } from 'axios'
-import { parseCustomError } from 'uiSrc/utils'
+import { parseCustomError, getRdiValidationMessage, Maybe } from 'uiSrc/utils'
 import { CustomError } from 'uiSrc/slices/interfaces'
 import { EXTERNAL_LINKS } from 'uiSrc/constants/links'
 
@@ -102,12 +102,12 @@ const parseCustomErrorTests = [
         resourceId: undefined
       }
     })],
-  [{ errorCode: 11_301 },
+  [{ errorCode: 11_401 },
     set(cloneDeep(responseData), 'response.data', {
       title: 'Pipeline not deployed',
       message: 'Unfortunately we’ve found some errors in your pipeline.',
       additionalInfo: {
-        errorCode: 11301,
+        errorCode: 11_401,
       }
     })],
 ]
@@ -121,3 +121,22 @@ describe('parseCustomError', () => {
     }
   )
 })
+
+const getRdiValidationMessageTests: Array<[[Maybe<string>, string[]], string]> = [
+  [[undefined, []], ''],
+  [['Custom message', []], 'Custom message'],
+  [['Custom message', ['field']], 'Custom message'],
+  [['Custom message', ['field', 'field2']], 'Field2 message'],
+  [['Custom message', ['field', 'field2', 'field3']], 'Field3 in field2 message'],
+  [['Custom message', ['field', 'field2', 'field3', 'field4']], 'Field4 in field2/field3 message'],
+]
+
+describe('getRdiValidationMessage', () => {
+  test.each(getRdiValidationMessageTests)(
+    '%j',
+    (input, expected) => {
+      const result = getRdiValidationMessage(...input)
+      expect(result).toEqual(expected)
+    }
+  )
+})

Original file line number	Diff line number	Diff line change
`@@ -57,5 +57,5 @@ export enum CustomErrorCodes {`
`57`	`57`	`RdiDeployPipelineFailure = 11_401,`
`58`	`58`	`RdiUnauthorized = 11_402,`
`59`	`59`	`RdiInternalServerError = 11_403,`
`60`		`-`
	`60`	`+ RdiValidationError = 11_404,`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ export enum CustomErrorCodes {`
`54`	`54`
`55`	`55`	`GeneralAiUnexpectedError = 11_391,`
`56`	`56`
`57`		`- // RDI errors [11300, 11499]`
`58`		`- RdiDeployPipelineFailure = 11_301,`
	`57`	`+ // RDI errors [11400, 11499]`
	`58`	`+ RdiDeployPipelineFailure = 11_401,`
	`59`	`+ RdiValidationError = 11_404,`
`59`	`60`	`}`