fix: JSON viewer bugs — NULL data loss, tree expand, undo, display issues

Author: datlechin

TablePro/Models/UI/JSONTreeNode.swift

@@ -110,11 +110,14 @@ internal enum JSONTreeParser {
         }
 
         if let str = value as? String {
+            let escaped = str.replacingOccurrences(of: "\"", with: "\\\"")
             let display: String
-            if (str as NSString).length > 80 {
-                display = "\"\(str.prefix(80))...\""
+            let nsLen = (escaped as NSString).length
+            if nsLen > 80 {
+                let truncated = (escaped as NSString).substring(to: 80)
+                display = "\"\(truncated)...\""
             } else {
-                display = "\"\(str)\""
+                display = "\"\(escaped)\""
             }
             return JSONTreeNode(
                 key: key, keyPath: keyPath, valueType: .string,

TablePro/Resources/Localizable.xcstrings

@@ -91,6 +91,9 @@
           }
         }
       }
+    },
+    ":" : {
+
     },
     ".%@" : {
       "localizations" : {
@@ -7578,6 +7581,9 @@
           }
         }
       }
+    },
+    "Collapse All" : {
+
     },
     "Collation" : {
       "localizations" : {
@@ -9285,6 +9291,12 @@
           }
         }
       }
+    },
+    "Copy Key" : {
+
+    },
+    "Copy Key Path" : {
+
     },
     "Copy Name" : {
       "localizations" : {
@@ -11364,6 +11376,9 @@
           }
         }
       }
+    },
+    "Default view:" : {
+
     },
     "Default:" : {
       "extractionState" : "stale",
@@ -14220,6 +14235,9 @@
           }
         }
       }
+    },
+    "Expand All" : {
+
     },
     "Expired" : {
       "localizations" : {
@@ -16069,6 +16087,9 @@
     },
     "Fetch All Rows" : {
 
+    },
+    "Fields" : {
+
     },
     "FIELDS" : {
       "localizations" : {
@@ -16304,6 +16325,9 @@
           }
         }
       }
+    },
+    "Filter keys or values..." : {
+
     },
     "Filter logic mode" : {
       "localizations" : {
@@ -16799,6 +16823,9 @@
           }
         }
       }
+    },
+    "Format JSON" : {
+
     },
     "Format Query" : {
 
@@ -19668,6 +19695,12 @@
           }
         }
       }
+    },
+    "JSON Too Large" : {
+
+    },
+    "JSON Viewer" : {
+
     },
     "Jump Hosts" : {
       "localizations" : {
@@ -25048,6 +25081,9 @@
     },
     "Open in Editor" : {
 
+    },
+    "Open JSON Viewer" : {
+
     },
     "Open MQL Editor" : {
       "extractionState" : "stale",
@@ -35772,6 +35808,9 @@
           }
         }
       }
+    },
+    "The text could not be parsed as JSON. Use text mode to view or edit." : {
+
     },
     "The text is not valid JSON. Save anyway?" : {
       "localizations" : {
@@ -36066,6 +36105,9 @@
           }
         }
       }
+    },
+    "This JSON document is too large for tree view. Use text mode instead." : {
+
     },
     "This keyword is already in use" : {
       "localizations" : {

TablePro/Views/Results/JSONEditorContentView.swift

@@ -29,7 +29,8 @@ struct JSONEditorContentView: View {
             isEditable: true,
             onDismiss: onDismiss,
             onCommit: { newValue in
-                if newValue != initialValue {
+                let effective = newValue.isEmpty ? nil : newValue
+                if effective != initialValue {
                     onCommit(newValue)
                 }
             }

TablePro/Views/Results/JSONSyntaxTextView.swift

@@ -60,7 +60,16 @@ internal struct JSONSyntaxTextView: NSViewRepresentable {
     func updateNSView(_ scrollView: NSScrollView, context: Context) {
         guard let textView = scrollView.documentView as? NSTextView else { return }
         if textView.string != text, !context.coordinator.isUpdating {
-            textView.string = text
+            let fullRange = NSRange(location: 0, length: (textView.string as NSString).length)
+            if isEditable,
+               textView.shouldChangeText(in: fullRange, replacementString: text) {
+                context.coordinator.isUpdating = true
+                textView.textStorage?.replaceCharacters(in: fullRange, with: text)
+                textView.didChangeText()
+                context.coordinator.isUpdating = false
+            } else {
+                textView.string = text
+            }
             Self.applyHighlighting(to: textView)
         }
     }

TablePro/Views/Results/JSONTreeView.swift

@@ -83,7 +83,8 @@ internal struct JSONTreeView: View {
 
     private func expandMatchingNodes() {
         if searchText.isEmpty {
-            expandedNodeIDs = [rootNode.id]
+            expandedNodeIDs.removeAll()
+            expandRootLevel()
             return
         }
         expandedNodeIDs.formUnion(collectMatchingContainerIDs(filteredRootNodes))
@@ -109,7 +110,9 @@ internal struct JSONTreeView: View {
     }
 
     private func expandRootLevel() {
-        expandedNodeIDs.insert(rootNode.id)
+        for child in rootNode.children where !child.children.isEmpty {
+            expandedNodeIDs.insert(child.id)
+        }
     }
 
     private func collectAllContainerIDs(_ node: JSONTreeNode) -> Set<UUID> {

TablePro/Views/Results/JSONViewerView.swift

@@ -63,7 +63,7 @@ internal struct JSONViewerView: View {
                 Text("Tree").tag(JSONViewMode.tree)
             }
             .pickerStyle(.segmented)
-            .frame(width: 140)
+            .fixedSize()
             Spacer()
             if viewMode == .text && isEditable {
                 Button {
@@ -183,7 +183,7 @@ internal struct JSONViewerView: View {
               let jsonObject = try? JSONSerialization.jsonObject(with: data),
               let compactData = try? JSONSerialization.data(
                   withJSONObject: jsonObject,
-                  options: [.withoutEscapingSlashes]
+                  options: [.sortedKeys, .withoutEscapingSlashes]
               ),
               let compactString = String(data: compactData, encoding: .utf8) else {
             return nil

TablePro/Views/RightSidebar/FieldEditors/JsonEditorView.swift

@@ -14,7 +14,7 @@ internal struct JsonEditorView: View {
             .frame(minHeight: context.isReadOnly ? 60 : 80, maxHeight: 120)
             .clipShape(RoundedRectangle(cornerRadius: 5))
             .overlay(RoundedRectangle(cornerRadius: 5).strokeBorder(Color(nsColor: .separatorColor)))
-            .overlay(alignment: .topTrailing) {
+            .overlay(alignment: .bottomTrailing) {
                 if let onExpand {
                     Button(action: onExpand) {
                         Image(systemName: "arrow.up.left.and.arrow.down.right")