RI-6231 - addressing feedback

KIvanow · KIvanow · commit 2d08a99edf19 · 2024-11-20T15:36:24.000+02:00
diff --git a/redisinsight/ui/src/pages/browser/modules/key-details/components/rejson-details/rejson-scalar/RejsonScalar.tsx b/redisinsight/ui/src/pages/browser/modules/key-details/components/rejson-details/rejson-scalar/RejsonScalar.tsx
@@ -10,7 +10,7 @@ import { bufferToString, createDeleteFieldHeader, createDeleteFieldMessage, Null
 import FieldMessage from 'uiSrc/components/field-message/FieldMessage'
 
 import { JSONScalarProps } from '../interfaces'
-import { generatePath, getClassNameByValue, isValidJSON } from '../utils'
+import { generatePath, getClassNameByValue, isValidJSON, stringifyScalarValue } from '../utils'
 import { JSONErrors } from '../constants'
 
 import styles from '../styles.module.scss'
@@ -36,22 +36,9 @@ const RejsonScalar = (props: JSONScalarProps) => {
   const dispatch = useDispatch()
 
   useEffect(() => {
-    setChangedValue(stringify(value))
+    setChangedValue(stringifyScalarValue(value))
   }, [value])
 
-  const stringify = (value: string | number | boolean | bigint): string => {
-    if (typeof value === 'bigint') {
-      return value.toString()
-    }
-    if (isString(value)) {
-      return `"${value}"`
-    }
-    if (isNull(value)) {
-      return 'null'
-    }
-    return String(value)
-  }
-
   const onDeclineChanges = () => {
     setEditing(false)
     setError(null)
diff --git a/redisinsight/ui/src/pages/browser/modules/key-details/components/rejson-details/utils/utils.spec.ts b/redisinsight/ui/src/pages/browser/modules/key-details/components/rejson-details/utils/utils.spec.ts
@@ -1,4 +1,4 @@
-import { generatePath, getBrackets, isRealArray, isRealObject, isScalar, isValidKey, parseJsonData, parseValue, wrapPath } from './utils'
+import { generatePath, getBrackets, isRealArray, isRealObject, isScalar, isValidKey, parseJsonData, parseValue, stringifyScalarValue, wrapPath } from './utils'
 import { ObjectTypes } from '../interfaces'
 
 describe('JSONUtils', () => {
@@ -177,4 +177,31 @@ describe('JSONUtils', () => {
       })
     })
   })
+
+  describe('stringifyScalarValue', () => {
+    it('should handle bigint values', () => {
+      const bigIntValue = BigInt('9007199254740991')
+      expect(stringifyScalarValue(bigIntValue)).toBe('9007199254740991')
+    })
+  
+    it('should wrap string values in quotes', () => {
+      expect(stringifyScalarValue('hello')).toBe('"hello"')
+      expect(stringifyScalarValue('')).toBe('""')
+    })
+  
+    it('should convert null to "null" string', () => {
+      expect(stringifyScalarValue(null as any)).toBe('null')
+    })
+  
+    it('should convert numbers to string representation', () => {
+      expect(stringifyScalarValue(42)).toBe('42')
+      expect(stringifyScalarValue(-123.456)).toBe('-123.456')
+      expect(stringifyScalarValue(0)).toBe('0')
+    })
+  
+    it('should convert boolean values to string representation', () => {
+      expect(stringifyScalarValue(true)).toBe('true')
+      expect(stringifyScalarValue(false)).toBe('false')
+    })
+  })
 })
diff --git a/redisinsight/ui/src/pages/browser/modules/key-details/components/rejson-details/utils/utils.ts b/redisinsight/ui/src/pages/browser/modules/key-details/components/rejson-details/utils/utils.ts
@@ -1,4 +1,4 @@
-import { isArray } from 'lodash'
+import { isArray, isNull, isString } from 'lodash'
 import JSONBigInt from 'json-bigint'
 import { JSONScalarValue, ObjectTypes } from '../interfaces'
 import styles from '../styles.module.scss'
@@ -154,3 +154,16 @@ export const parseJsonData = (data: any) => {
     return data
   }
 }
+
+export const stringifyScalarValue = (value: string | number | boolean | bigint): string => {
+  if (typeof value === 'bigint') {
+    return value.toString()
+  }
+  if (isString(value)) {
+    return `"${value}"`
+  }
+  if (isNull(value)) {
+    return 'null'
+  }
+  return String(value)
+}
