feat: fixing the json does not render properly

querymx · Oct 21, 2023 · f5b54a1 · f5b54a1
1 parent 770197a
commit f5b54a1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/renderer/datatype/JsonType.ts b/src/renderer/datatype/JsonType.ts
@@ -1,16 +1,16 @@
 import BaseType from './BaseType';
 import deepEqual from 'deep-equal';
 
-export default class JsonType implements BaseType<object> {
-  protected value?: object | null;
+export default class JsonType implements BaseType<object | string> {
+  protected value?: object | string | null;
 
   constructor(value?: object | string | null) {
     if (typeof value === 'object') this.value = value;
     else if (typeof value === 'string') {
       try {
         this.value = JSON.parse(value);
       } catch {
-        this.value = undefined;
+        this.value = value;
       }
     } else {
       this.value = value;
@@ -69,7 +69,7 @@ export default class JsonType implements BaseType<object> {
     return stringValue.includes(search);
   }
 
-  getValue(): object | null | undefined {
+  getValue(): object| string | null | undefined {
     return this.value;
   }
 }
diff --git a/src/renderer/screens/DatabaseScreen/QueryResultViewer/TableCell/TableCellJson.tsx b/src/renderer/screens/DatabaseScreen/QueryResultViewer/TableCell/TableCellJson.tsx
@@ -66,13 +66,12 @@ function TableCellJsonEditor({
   );
 }
 
-function TableCellJsonContent({ value }: TableEditableContentProps) {
+function TableCellJsonContent({ value }: TableEditableContentProps<JsonType>) {
   return (
     <TableCellContent
-      value={value}
+      value={value.toNullableString()}
       badge="json"
       mono
-      displayString={value ? JSON.stringify(value) : undefined}
     />
   );
 }
@@ -88,7 +87,7 @@ const TableCellJson = createTableCellType({
     return new JsonType(null);
   },
   onCopy: (value: JsonType) => {
-    return JSON.stringify(value);
+    return value.toString();
   },
   onPaste: (value: string) => {
     return { accept: true, value: new JsonType(value) };