Merge pull request #3449 from RedisInsight/fe/rejson_change_misprint

change misprint for ReJSON

Author: egor-zalenski

redisinsight/ui/src/pages/browser/components/add-key/constants/fields-config.ts

@@ -108,7 +108,7 @@ export const AddListFormConfig: IAddListFormConfig = {
     name: 'count',
     isRequire: true,
     label: 'Count',
-    placeholder: 'Enter Count'
+    placeholder: 'Enter Count*'
   }
 }
 

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

@@ -106,7 +106,7 @@ const RejsonDetailsWrapper = (props: Props) => {
                 data={data as IJSONData}
                 length={length}
                 parentPath={path}
-                expadedRows={expandedRows}
+                expandedRows={expandedRows}
                 onJsonKeyExpandAndCollapse={handleJsonKeyExpandAndCollapse}
                 isDownloaded={downloaded}
               />

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/interfaces.ts

@@ -43,14 +43,14 @@ export interface BaseProps {
   selectedKey: RedisResponseBuffer
   isDownloaded: boolean
   onJsonKeyExpandAndCollapse: (isExpanded: boolean, path: string) => void
-  expadedRows: Set<string>
+  expandedRows: Set<string>
 }
 
 export interface DynamicTypesProps {
   data: IJSONData
   parentPath?: string
   leftPadding?: number
-  expadedRows: Set<string>
+  expandedRows: Set<string>
   selectedKey: RedisResponseBuffer
   isDownloaded: boolean
   onClickRemoveKey: (path: string, keyName: string) => void
@@ -80,7 +80,7 @@ export interface JSONScalarProps extends JSONCommonProps {
 export interface JSONObjectProps extends JSONCommonProps {
   type: ObjectTypes
   isDownloaded: boolean
-  expadedRows: Set<string>
+  expandedRows: Set<string>
   onJsonKeyExpandAndCollapse: (isExpanded: boolean, path: string) => void
   onClickRemoveKey: (path: string, keyName: string) => void
   handleSubmitUpdateValue?: (body: UpdateValueBody) => void

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

@@ -25,7 +25,7 @@ const RejsonDetails = (props: BaseProps) => {
     parentPath,
     isDownloaded,
     onJsonKeyExpandAndCollapse,
-    expadedRows
+    expandedRows
   } = props
 
   const [addRootKVPair, setAddRootKVPair] = useState<boolean>(false)
@@ -80,7 +80,7 @@ const RejsonDetails = (props: BaseProps) => {
           parentPath={parentPath}
           selectedKey={selectedKey}
           isDownloaded={isDownloaded}
-          expadedRows={expadedRows}
+          expandedRows={expandedRows}
           onClickRemoveKey={onClickRemoveKey}
           onJsonKeyExpandAndCollapse={onJsonKeyExpandAndCollapse}
           handleAppendRejsonObjectItemAction={handleAppendRejsonArrayItemAction}

redisinsight/ui/src/pages/browser/modules/key-details/components/rejson-details/rejson-dynamic-types/RejsonDynamicTypes.tsx

@@ -14,7 +14,7 @@ const RejsonDynamicTypes = (props: DynamicTypesProps) => {
     selectedKey,
     parentPath = '',
     isDownloaded,
-    expadedRows,
+    expandedRows,
     leftPadding = 0,
     onClickRemoveKey,
     onJsonKeyExpandAndCollapse,
@@ -42,7 +42,7 @@ const RejsonDynamicTypes = (props: DynamicTypesProps) => {
 
   const renderJSONObject = (data: any, type: string) => (
     <RejsonObject
-      expadedRows={expadedRows}
+      expandedRows={expandedRows}
       type={type as ObjectTypes}
       isDownloaded={isDownloaded}
       leftPadding={nextLeftPadding}

redisinsight/ui/src/pages/browser/modules/key-details/components/rejson-details/rejson-object/RejsonObject.tsx

@@ -18,7 +18,7 @@ const RejsonObject = (props: JSONObjectProps) => {
     parentPath,
     keyName,
     isDownloaded,
-    expadedRows,
+    expandedRows,
     leftPadding,
     selectedKey,
     cardinality = 0,
@@ -43,14 +43,14 @@ const RejsonObject = (props: JSONObjectProps) => {
   const [isExpanded, setIsExpanded] = useState<boolean>(false)
 
   useEffect(() => {
-    if (!expadedRows?.has(path)) {
+    if (!expandedRows?.has(path)) {
       setValue(defaultValue)
       return
     }
 
     if (isDownloaded) {
       setValue(currentValue)
-      setIsExpanded(expadedRows?.has(path))
+      setIsExpanded(expandedRows?.has(path))
       return
     }
 
@@ -173,7 +173,7 @@ const RejsonObject = (props: JSONObjectProps) => {
         />
       ) : (
         <RejsonDynamicTypes
-          expadedRows={expadedRows}
+          expandedRows={expandedRows}
           leftPadding={leftPadding}
           data={value}
           parentPath={path}

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'
   }