Merge branch 'bug_23087/inventory_variable_that_are_json_types_are_li…

…sted_as_plain_string_types_in_the_ui_pr' into branches/rudder/7.2
Normation · Aug 3, 2023 · abfe57e · abfe57e
2 parents 70f586f + 193ee23
commit abfe57e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 10 deletions.
diff --git a/...rces/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala b/...rces/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala
@@ -66,6 +66,8 @@ import net.liftweb.http.js.JE.JsRaw
 import net.liftweb.http.js.JE.JsVar
 import net.liftweb.http.js.JE.Str
 import net.liftweb.http.js.JsCmds._
+import net.liftweb.json.JsonAST._
+import net.liftweb.json.JsonDSL._
 import net.liftweb.util._
 import net.liftweb.util.Helpers._
 import org.joda.time.DateTime
@@ -885,27 +887,38 @@ object DisplayNode extends Loggable {
         if (value.strip().isEmpty) {
           <td></td>
         } else {
-          <td>{value}<button class="btn btn-xs btn-default btn-clipboard" data-clipboard-text={
-            value
-          }><i class="ion ion-clipboard"></i></button></td>
+          <td>
+            <pre class="json-inventory-vars">{value}</pre>
+            <button class="btn btn-xs btn-default btn-clipboard" data-clipboard-text={value}>
+              <i class="ion ion-clipboard"></i>
+            </button>
+          </td>
         }
       }
      </tr>
     }
 
+    val os = (
+      ("fullName"          -> escape(sm.node.main.osDetails.fullName))
+        ~ ("name"          -> escape(S.?("os.name." + sm.node.main.osDetails.os.name)))
+        ~ ("version"       -> escape(sm.node.main.osDetails.version.value))
+        ~ ("servicePack"   -> escape(sm.node.main.osDetails.servicePack.getOrElse("None")))
+        ~ ("kernelVersion" -> escape(sm.node.main.osDetails.kernelVersion.value))
+    )
+
+    val machine = (
+      ("manufacturer"    -> escape(sm.machine.flatMap(x => x.manufacturer).map(x => x.name).getOrElse("")))
+        ~ ("machineType" -> displayMachineType(sm.machine).text.toString)
+    )
+
     val values = Seq[(String, String)](
       ("localAdministratorAccountName", escape(sm.node.main.rootUser)),
       ("hostname", escape(sm.node.main.hostname)),
       ("policyServerId", escape(sm.node.main.policyServerId.value)),
-      ("os.fullName", escape(sm.node.main.osDetails.fullName)),
-      ("os.name", escape(S.?("os.name." + sm.node.main.osDetails.os.name))),
-      ("os.version", escape(sm.node.main.osDetails.version.value)),
-      ("os.servicePack", escape(sm.node.main.osDetails.servicePack.getOrElse("None"))),
+      ("os", net.liftweb.json.prettyRender(os)),
       ("archDescription", escape(sm.node.archDescription.getOrElse("None"))),
-      ("os.kernelVersion", escape(sm.node.main.osDetails.kernelVersion.value)),
       ("ram", escape(sm.node.ram.map(_.size.toString).getOrElse(""))),
-      ("machine.manufacturer", escape(sm.machine.flatMap(x => x.manufacturer).map(x => x.name).getOrElse(""))),
-      ("machine.machineType", displayMachineType(sm.machine).text.toString),
+      ("machine", net.liftweb.json.prettyRender(machine)),
       (
         "timezone",
         escape(

diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/style/rudder/rudder-menu.css b/webapp/sources/rudder/rudder-web/src/main/webapp/style/rudder/rudder-menu.css
@@ -119,6 +119,10 @@ header.main-header .logo-lg img{
   overflow : hidden;
 }
 /* - JSON - */
+.json-inventory-vars {
+  border: none;
+  background-color: transparent;
+}
 pre.json-beautify, .content-wrapper pre.json-beautify{
   border: none;
   background-color: transparent;