Improve rendering of long/multiline strings in dataview changes preview

edgedb · Feb 26, 2024 · a3c2c1b · a3c2c1b
1 parent 7ac063a
commit a3c2c1b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/shared/inspector/buildScalar.tsx b/shared/inspector/buildScalar.tsx
@@ -70,7 +70,7 @@ export function renderValue(
   showTypeTag: boolean = true,
   overrideStyles: {[key: string]: string} = {},
   implicitLength?: number,
-  noMultiline: boolean = false
+  singleLineLimit?: boolean | number
 ): {body: JSX.Element; height?: number} {
   if (value == null) {
     return {body: <span className={styles.scalar_empty}>{"{}"}</span>};
@@ -155,17 +155,22 @@ export function renderValue(
 
     // @ts-ignore - Intentional fallthrough
     case "std::json":
-      value = noMultiline ? value : prettyPrintJSON(value);
+      value = singleLineLimit ? value : prettyPrintJSON(value);
     case "std::str": {
-      const str = noMultiline ? toSingleLineStr(value) : strToString(value);
+      const str = singleLineLimit
+        ? toSingleLineStr(
+            value,
+            singleLineLimit === true ? undefined : singleLineLimit
+          )
+        : strToString(value);
       return {
         body: (
           <span className={styles.scalar_string}>
             {str}
             {implicitLength && value.length === implicitLength ? "…" : ""}
           </span>
         ),
-        height: noMultiline ? 1 : (str as string).split("\n").length,
+        height: singleLineLimit ? 1 : (str as string).split("\n").length,
       };
     }
   }

diff --git a/shared/studio/tabs/dataview/reviewEditsModal.tsx b/shared/studio/tabs/dataview/reviewEditsModal.tsx
@@ -191,7 +191,10 @@ function renderParam({
       type.schemaType === "Range" || type.schemaType === "Multirange"
         ? type.elementType.name
         : undefined,
-      false
+      false,
+      undefined,
+      undefined,
+      50
     ).body;
   }
 }