From: Benjamin Braatz <benjamin.braatz@graph-it.com>
Date: Wed, 10 Mar 2021 10:13:10 +0000 (+0100)
Subject: Show recursive structures in message values
X-Git-Tag: v0.3.0~32
X-Git-Url: http://git.graph-it.com/?a=commitdiff_plain;h=56468810c2ba07e65629cbbadae7df5c30dd1099;p=graphit%2Fcontrolpi-wsserver.git

Show recursive structures in message values
---

diff --git a/web/controlpi-debug.css b/web/controlpi-debug.css
index 1fca3c6..82ca93b 100644
--- a/web/controlpi-debug.css
+++ b/web/controlpi-debug.css
@@ -6,7 +6,7 @@
 .client {
     display: inline-block;
     vertical-align: top;
-    width: 300px;
+    width: 600px;
     margin-top: 5px;
     margin-left: 5px;
     border: 2px solid black;
@@ -46,7 +46,7 @@
 .templatecontainer {
     display: inline-block;
     vertical-align: top;
-    width: 280px;
+    width: 580px;
     white-space: normal;
 }
 
@@ -97,6 +97,44 @@
     border-spacing: 2px;
 }
 
+.message .array {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+}
+
+.message .array > * {
+    vertical-align: baseline;
+}
+
+.message .object {
+    display: flex;
+    flex-direction: column;
+    border: 1px solid black;
+    padding-top: 2px;
+    padding-left: 2px;
+    margin-bottom: 2px;
+}
+
+.message .object > .property {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+}
+
+.message .object > .property > .key {
+    margin-right: 2px;
+    margin-bottom: 2px;
+}
+
+.message .object > .property > .value {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    margin-right: 2px;
+    margin-bottom: 2px;
+}
+
 .message input {
     background-color: #35bfd3;
 }
diff --git a/web/controlpi-debug.js b/web/controlpi-debug.js
index 9c4dd77..3cfe956 100644
--- a/web/controlpi-debug.js
+++ b/web/controlpi-debug.js
@@ -274,6 +274,44 @@ function processBusMessage(message) {
     }
 }
 
+// Recursively create div structure for arrays, objects and primitive
+// values:
+function createForMessageValue(value) {
+    var result = ''
+    if (typeof(value) == 'object') {
+        if (Array.isArray(value)) {
+            result = document.createElement('div')
+            result.setAttribute('class', 'array')
+            var counter = value.length
+            for (const child of value) {
+                result.appendChild(createForMessageValue(child))
+                if (--counter) {
+                    result.appendChild(document.createTextNode(', '))
+                }
+            }
+        } else {
+            result = document.createElement('div')
+            result.setAttribute('class', 'object')
+            for (const key in value) {
+                const property = document.createElement('div')
+                property.setAttribute('class', 'property')
+                const keyDiv = document.createElement('div')
+                keyDiv.setAttribute('class', 'key')
+                keyDiv.appendChild(document.createTextNode(key + ':'))
+                property.appendChild(keyDiv)
+                const valueDiv = document.createElement('div')
+                valueDiv.setAttribute('class', 'value')
+                valueDiv.appendChild(createForMessageValue(value[key]))
+                property.appendChild(valueDiv)
+                result.appendChild(property)
+            }
+        }
+    } else {
+        result = document.createTextNode(JSON.stringify(value))
+    }
+    return result
+}
+
 // Create div and table for message:
 function createForMessage(message) {
     const div = document.createElement('div')
@@ -305,9 +343,7 @@ function createForMessage(message) {
         keyTd.appendChild(keyTdContent)
         tr.appendChild(keyTd)
         const valueTd = document.createElement('td')
-        value = JSON.stringify(message[key])
-        const valueTdContent = document.createTextNode(value)
-        valueTd.appendChild(valueTdContent)
+        valueTd.appendChild(createForMessageValue(message[key]))
         tr.appendChild(valueTd)
         table.appendChild(tr)
     }