#RI-5749 - resolve comments

Author: AmirAllayarovSofteq

redisinsight/ui/src/utils/errors.tsx

@@ -1,5 +1,5 @@
 import { AxiosError } from 'axios'
-import { capitalize, clone, isEmpty, isString, isArray, set } from 'lodash'
+import { capitalize, isEmpty, isString, isArray, set } from 'lodash'
 import React from 'react'
 import { EuiSpacer } from '@elastic/eui'
 import { CustomErrorCodes } from 'uiSrc/constants'
@@ -12,14 +12,12 @@ export const getRdiValidationMessage = (message: string = '', loc?: string[]): s
   if (!loc || !isArray(loc) || loc.length < 2) {
     return message
   }
-  const locArr = clone(loc)
-  locArr.shift()
-
-  const field = locArr.pop()
-  const path = locArr?.join('/')
+  const [, ...rest] = loc
+  const field = rest.pop() as string
+  const path = rest.join('/')
   const words = message.split(' ')
 
-  words[0] = path ? `${field} in ${path}` : field || ''
+  words[0] = path ? `${field} in ${path}` : field
 
   return capitalize(words.join(' '))
 }
@@ -174,7 +172,7 @@ export const parseCustomError = (err: CustomError | string = DEFAULT_ERROR_MESSA
       break
 
     case CustomErrorCodes.RdiValidationError:
-      const details = err?.details[0] || {}
+      const details = err?.details?.[0] || {}
       title = 'Validation error'
       message = getRdiValidationMessage(details.msg, err?.details[0]?.loc)
 

redisinsight/ui/src/utils/tests/errors.spec.tsx

@@ -125,10 +125,16 @@ 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'],
+  [['Input is required', ['field']], 'Input is required'],
+  [['Input required', ['body', 'targets']], 'Targets required'],
+  [
+    ['Input should be \'postgresql\', \'mysql\', \'oracle\', \'cassandra\', \'sqlserver\' or \'redis\'', ['body', 'targets', 'type']],
+    'Type in targets should be \'postgresql\', \'mysql\', \'oracle\', \'cassandra\', \'sqlserver\' or \'redis\''
+  ],
+  [
+    ['Input should be a valid integer, unable to parse string as an integer', ['body', 'targets', 'my-redis', 'connection']],
+    'Connection in targets/my-redis should be a valid integer, unable to parse string as an integer'
+  ],
 ]
 
 describe('getRdiValidationMessage', () => {