Pretty-print json-stringified measurement values

google · Oct 13, 2022 · ce7387c · ce7387c
1 parent c6b7f1f
commit ce7387c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/openhtf/output/web_gui/src/app/shared/trimmed-text.component.ts b/openhtf/output/web_gui/src/app/shared/trimmed-text.component.ts
@@ -22,7 +22,7 @@ import { Component, Input } from '@angular/core';
 
 const ellipsis = '…';
 const template = `
-  {{ trimmedContent }}
+  <div style="white-space: pre-wrap;">{{ trimmedContent }}</div>
   <button *ngIf="buttonLabel !== null" type="button" class="htf-link-button"
           (click)="onClick()">
     {{ buttonLabel }}

diff --git a/openhtf/output/web_gui/src/app/stations/station/station-data.ts b/openhtf/output/web_gui/src/app/stations/station/station-data.ts
@@ -205,11 +205,12 @@ function makePhase(phase: RawPhase, running: boolean) {
     measurements = Object.keys(phase.measurements).map(key => {
       const rawMeasuredValue = phase.measurements[key].measured_value;
       let measuredValue = null;
-      if (typeof rawMeasuredValue === 'object') {
-        measuredValue = JSON.stringify(rawMeasuredValue);
-      } else if (typeof rawMeasuredValue !== 'undefined') {
-        measuredValue = `${rawMeasuredValue}`;
+      if (typeof rawMeasuredValue === 'string') {
+        measuredValue = rawMeasuredValue.trim();
+      } else {
+        JSON.stringify(rawMeasuredValue, null, 2);
       }
+
       return new Measurement({
         name: phase.measurements[key].name,
         validators: phase.measurements[key].validators || null,