do not color message

Author: odeimaiz

services/static-webserver/client/source/class/osparc/ui/table/cellrenderer/String.js

@@ -0,0 +1,34 @@
+/* ************************************************************************
+
+   osparc - the simcore frontend
+
+   https://osparc.io
+
+   Copyright:
+     2024 IT'IS Foundation, https://itis.swiss
+
+   License:
+     MIT: https://opensource.org/licenses/MIT
+
+   Authors:
+     * Ignacio Pascual (ignapas)
+
+************************************************************************ */
+
+/**
+ * String cell renderer that does not override the cell styles.
+ */
+qx.Class.define("osparc.ui.table.cellrenderer.String", {
+  extend: qx.ui.table.cellrenderer.String,
+  construct: function() {
+    this.base(arguments);
+  },
+  members: {
+    // Override
+    _getCellStyle: function(cellInfo) {
+      const baseStyle = this.base(arguments, cellInfo) || "";
+      const cellStyle = cellInfo.style || "";
+      return baseStyle + cellStyle;
+    }
+  }
+});

services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js

@@ -61,9 +61,6 @@ qx.Class.define("osparc.widget.logger.LoggerModel", {
     ]);
 
     this.__rawData = [];
-
-    const themeManager = qx.theme.manager.Meta.getInstance();
-    themeManager.addListener("changeTheme", () => this.__themeChanged());
   },
 
   properties: {
@@ -81,22 +78,24 @@ qx.Class.define("osparc.widget.logger.LoggerModel", {
   },
 
   statics: {
-    addColorTag: function(msg, color) {
-      return ("<font color=" + color +">" + msg + "</font>");
-    },
-
-    getLevelColor: function(logLevel) {
-      const colorManager = qx.theme.manager.Color.getInstance();
-      let logColor = null;
+    getLevelIcon: function(logLevel) {
       const logLevels = osparc.widget.logger.LoggerView.LOG_LEVELS;
-      Object.keys(logLevels).forEach(logLevelKey => {
-        const logString = logLevelKey.toLowerCase();
-        const logNumber = logLevels[logLevelKey];
-        if (logNumber === logLevel) {
-          logColor = colorManager.resolve("logger-"+logString+"-message");
-        }
-      });
-      return logColor ? logColor : colorManager.resolve("logger-info-message");
+      let iconSource = "";
+      switch (logLevel) {
+        case logLevels.DEBUG:
+          iconSource = "@FontAwesome5Solid/info/12";
+          break;
+        case logLevels.INFO:
+          iconSource = "@FontAwesome5Solid/info/12";
+          break;
+        case logLevels.WARNING:
+          iconSource = "@FontAwesome5Solid/exclamation-triangle/12";
+          break;
+        case logLevels.ERROR:
+          iconSource = "@FontAwesome5Solid/exclamation-circle/12";
+          break;
+      }
+      return iconSource;
     }
   },
 
@@ -117,7 +116,7 @@ qx.Class.define("osparc.widget.logger.LoggerModel", {
         newRow["level"] = this.self().getLevelIcon(newRow.logLevel);
         newRow["time"] = osparc.utils.Utils.formatTime(newRow.timeStamp, true);
         newRow["who"] = newRow.label;
-        newRow["msgRich"] = this.self().addColorTag(newRow.msg, levelColor);
+        newRow["msgRich"] = newRow.msg;
         this.__rawData.push(newRow);
       });
     },
@@ -131,15 +130,6 @@ qx.Class.define("osparc.widget.logger.LoggerModel", {
       });
     },
 
-    __themeChanged: function() {
-      this.__rawData.forEach(row => {
-        const levelColor = this.self().getLevelColor(row.logLevel);
-        row["time"] = osparc.utils.Utils.formatTime(row.timeStamp, true);
-        row["who"] = row.label;
-        row["msgRich"] = this.self().addColorTag(row.msg, levelColor);
-      });
-    },
-
     clearTable: function() {
       const rawLength = this.__rawData.length;
       this.__rawData = [];

services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js

@@ -82,9 +82,10 @@ qx.Class.define("osparc.widget.logger.LoggerView", {
 
   statics: {
     POS: {
-      TIMESTAMP: 0,
-      ORIGIN: 1,
-      MESSAGE: 2
+      LOG_LEVEL: 0,
+      TIMESTAMP: 1,
+      ORIGIN: 2,
+      MESSAGE: 3,
     },
 
     LOG_LEVELS: {
@@ -277,10 +278,11 @@ qx.Class.define("osparc.widget.logger.LoggerView", {
       const colModel = table.getTableColumnModel();
       colModel.setDataCellRenderer(this.self().POS.LOG_LEVEL, new qx.ui.table.cellrenderer.Image());
       // colModel.setDataCellRenderer(this.self().POS.LOG_LEVEL, new qx.ui.table.cellrenderer.String());
+      colModel.setDataCellRenderer(this.self().POS.TIMESTAMP, new osparc.ui.table.cellrenderer.String().set({
         defaultCellStyle: "user-select: text"
       }));
-      colModel.setDataCellRenderer(this.self().POS.ORIGIN, new qx.ui.table.cellrenderer.Html());
-      colModel.setDataCellRenderer(this.self().POS.MESSAGE, new osparc.ui.table.cellrenderer.Html().set({
+      colModel.setDataCellRenderer(this.self().POS.ORIGIN, new qx.ui.table.cellrenderer.String());
+      colModel.setDataCellRenderer(this.self().POS.MESSAGE, new osparc.ui.table.cellrenderer.String().set({
         defaultCellStyle: "user-select: text; text-wrap: wrap"
       }));
       const resizeBehavior = colModel.getBehavior();