fix quotes around non-json strings; test coverage

jaegertracing · May 27, 2020 · 801a528 · 801a528
1 parent 6c76e93
commit 801a528
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/.../jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetail/KeyValuesTable.test.js b/.../jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetail/KeyValuesTable.test.js
@@ -47,8 +47,8 @@ describe('<KeyValuesTable>', () => {
 
   const data = [
     { key: 'span.kind', value: 'client' },
-    { key: 'omg', value: 'mos-def' },
-    { key: 'numericString', value: '12345678901234567890' },
+    { key: 'omg', value: '{not-a-json' },
+    { key: 'numeric', value: 123456789 },
     { key: 'jsonkey', value: JSON.stringify({ hello: 'world' }) },
   ];
 
@@ -138,7 +138,7 @@ describe('<KeyValuesTable>', () => {
     expect(el.length).toBe(data.length);
     el.forEach((valueDiv, i) => {
       if (data[i].key !== 'jsonkey') {
-        expect(valueDiv.text()).toBe(data[i].value);
+        expect(valueDiv.html()).toMatch(data[i].value.toString());
       }
     });
   });

diff --git a/...ages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetail/KeyValuesTable.tsx b/...ages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetail/KeyValuesTable.tsx
@@ -26,8 +26,12 @@ import './KeyValuesTable.css';
 const jsonObjectOrArrayStartRegex = /^(\[|\{)/;
 
 function tryParseJson(value: string) {
+  // if the value is a string representing actual json object or array, then use json-markup
+  // otherwise just return as is
   try {
-    return JSON.parse(value);
+    return jsonObjectOrArrayStartRegex.test(value)
+      ? JSON.parse(value)
+      : value
   } catch (_) {
     return value;
   }
@@ -51,12 +55,11 @@ function _jsonMarkup(value: any) {
 function formatValue(value: any) {
   let content;
 
-  // if the value is a string representing actual json object or array, then use json-markup
   if (typeof value === 'string') {
-    // otherwise just return as is
-    content = jsonObjectOrArrayStartRegex.test(value)
-      ? _jsonMarkup(tryParseJson(value))
-      : stringMarkup(value);
+    let parsed = tryParseJson(value);
+    content = (typeof parsed === 'string')
+      ? stringMarkup(parsed)
+      : _jsonMarkup(parsed);
   } else {
     content = _jsonMarkup(value);
   }