fix pr comments

Author: egor-zalenski

redisinsight/ui/src/pages/browser/modules/key-details/components/rejson-details/components/edit-entire-item-action/EditEntireItemAction.tsx

@@ -13,7 +13,8 @@ import cx from 'classnames'
 
 import FieldMessage from 'uiSrc/components/field-message/FieldMessage'
 import { Nullable } from 'uiSrc/utils'
-import { validateRejsonValue } from '../../utils'
+import { isValidJSON } from '../../utils'
+import { JSONErrors } from '../../constants'
 
 import styles from '../../styles.module.scss'
 
@@ -42,9 +43,8 @@ const EditEntireItemAction = (props: Props) => {
   const handleFormSubmit = (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault()
 
-    const error = validateRejsonValue(value)
-    if (error) {
-      setError(error)
+    if (!isValidJSON(value)) {
+      setError(JSONErrors.valueJSONFormat)
       return
     }
 

redisinsight/ui/src/pages/browser/modules/key-details/components/rejson-details/rejson-scalar/RejsonScalar.tsx

@@ -9,8 +9,9 @@ import PopoverDelete from 'uiSrc/pages/browser/components/popover-delete/Popover
 import { bufferToString, createDeleteFieldHeader, createDeleteFieldMessage, Nullable } from 'uiSrc/utils'
 import FieldMessage from 'uiSrc/components/field-message/FieldMessage'
 
-import { JSONScalarValue, JSONScalarProps } from '../interfaces'
-import { generatePath, getClassNameByValue, validateRejsonValue } from '../utils'
+import { JSONScalarProps } from '../interfaces'
+import { generatePath, getClassNameByValue, isValidJSON } from '../utils'
+import { JSONErrors } from '../constants'
 
 import styles from '../styles.module.scss'
 import '../styles.scss'
@@ -43,10 +44,9 @@ const RejsonScalar = (props: JSONScalarProps) => {
     setError(null)
   }
 
-  const onApplyValue = (value: JSONScalarValue) => {
-    const error = validateRejsonValue(value)
-    if (error) {
-      setError(error)
+  const onApplyValue = (value: string) => {
+    if (!isValidJSON(value)) {
+      setError(JSONErrors.valueJSONFormat)
       return
     }
 

redisinsight/ui/src/pages/browser/modules/key-details/components/rejson-details/utils/utils.ts

@@ -1,5 +1,4 @@
 import { isArray } from 'lodash'
-import { JSONErrors } from '../constants'
 import { JSONScalarValue, ObjectTypes } from '../interfaces'
 import styles from '../styles.module.scss'
 
@@ -38,15 +37,6 @@ export const wrapPath = (key: string, path: string = '') => {
   }
 }
 
-export const validateRejsonValue = (value: any) => {
-  try {
-    JSON.parse(value as string)
-    return null
-  } catch (e) {
-    return JSONErrors.valueJSONFormat
-  }
-}
-
 export const getClassNameByValue = (value: any) => {
   const type = typeof value
   // @ts-ignore

redisinsight/ui/src/telemetry/telemetryUtils.ts

@@ -68,10 +68,8 @@ const getJsonPathLevel = (path: string): string => {
     const levelsLength = jsonpath.parse(
       `$${path.startsWith('.') ? '' : '..'}${path}`,
     ).length
-    if (levelsLength === 1) {
-      return 'root'
-    }
-    return `${levelsLength - 2}`
+
+    return levelsLength === 1 ? 'root' : `${levelsLength - 2}`
   } catch (e) {
     return 'root'
   }