From f3a454196f735b25cf7217fd1b544536bb56257b Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Thu, 5 Dec 2024 11:09:29 +0100 Subject: [PATCH 01/20] Do not color message row --- .../client/source/class/osparc/widget/logger/LoggerModel.js | 6 ++++-- .../client/source/class/osparc/widget/logger/LoggerView.js | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js index ddadf44332d..d5addda30cf 100644 --- a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js +++ b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js @@ -26,7 +26,7 @@ * *
  *   let tableModel = this.__logModel = new osparc.widget.logger.LoggerTable();
- *   tableModel.setColumns(["Timestamp", "Origin", "Message"], ["time", "who", "whatRich"]);
+ *   tableModel.setColumns(["Level", "Time", "Origin", "Message"], ["level", "time", "who", "whatRich"]);
  *   let custom = {
  *     tableColumnModel : function(obj) {
  *       return new qx.ui.table.columnmodel.Resize(obj);
@@ -49,10 +49,12 @@ qx.Class.define("osparc.widget.logger.LoggerModel", {
     this.base(arguments);
 
     this.setColumns([
+      "",
       "Time",
       "Origin",
       "Message"
     ], [
+      "level",
       "time",
       "who",
       "msgRich"
@@ -112,7 +114,7 @@ qx.Class.define("osparc.widget.logger.LoggerModel", {
 
     addRows: function(newRows) {
       newRows.forEach(newRow => {
-        const levelColor = this.self().getLevelColor(newRow.logLevel);
+        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);
diff --git a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js
index 7eb6bbb4081..40463054b65 100644
--- a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js
+++ b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js
@@ -275,14 +275,16 @@ qx.Class.define("osparc.widget.logger.LoggerView", {
       // alwaysUpdateCells
       osparc.utils.Utils.setIdToWidget(table, "logsViewer");
       const colModel = table.getTableColumnModel();
-      colModel.setDataCellRenderer(this.self().POS.TIMESTAMP, new osparc.ui.table.cellrenderer.Html().set({
+      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());
         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({
         defaultCellStyle: "user-select: text; text-wrap: wrap"
       }));
-      let resizeBehavior = colModel.getBehavior();
+      const resizeBehavior = colModel.getBehavior();
+      resizeBehavior.setWidth(this.self().POS.LOG_LEVEL, 20);
       resizeBehavior.setWidth(this.self().POS.TIMESTAMP, 80);
       resizeBehavior.setWidth(this.self().POS.ORIGIN, 100);
 

From 8457f2bb119dd7ac9c8b0ff9f3fea8b13e4973a0 Mon Sep 17 00:00:00 2001
From: odeimaiz 
Date: Thu, 5 Dec 2024 11:14:07 +0100
Subject: [PATCH 02/20] do not color message

---
 .../osparc/ui/table/cellrenderer/String.js    | 34 ++++++++++++++
 .../class/osparc/widget/logger/LoggerModel.js | 46 ++++++++-----------
 .../class/osparc/widget/logger/LoggerView.js  | 12 +++--
 3 files changed, 59 insertions(+), 33 deletions(-)
 create mode 100644 services/static-webserver/client/source/class/osparc/ui/table/cellrenderer/String.js

diff --git a/services/static-webserver/client/source/class/osparc/ui/table/cellrenderer/String.js b/services/static-webserver/client/source/class/osparc/ui/table/cellrenderer/String.js
new file mode 100644
index 00000000000..67a89c22f1c
--- /dev/null
+++ b/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;
+    }
+  }
+});
diff --git a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js
index d5addda30cf..942811625f5 100644
--- a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js
+++ b/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 ("" + msg + "");
-    },
-
-    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 = [];
diff --git a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js
index 40463054b65..74e8ecf6018 100644
--- a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js
+++ b/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();

From 56e21884c667745e5b0218dbd316ebee988331f4 Mon Sep 17 00:00:00 2001
From: odeimaiz 
Date: Thu, 5 Dec 2024 11:35:59 +0100
Subject: [PATCH 03/20] less contrast for selected row

---
 .../client/source/class/osparc/theme/ColorDark.js           | 6 +++---
 .../client/source/class/osparc/theme/ColorLight.js          | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/services/static-webserver/client/source/class/osparc/theme/ColorDark.js b/services/static-webserver/client/source/class/osparc/theme/ColorDark.js
index fda2ccd25a4..82e652ff83f 100644
--- a/services/static-webserver/client/source/class/osparc/theme/ColorDark.js
+++ b/services/static-webserver/client/source/class/osparc/theme/ColorDark.js
@@ -133,11 +133,11 @@ qx.Theme.define("osparc.theme.ColorDark", {
 
     // used in table code
     "table-header-cell": "background-main",
-    "table-row-background-focused-selected": "background-main-4",
-    "table-row-background-focused": "background-main-3",
-    "table-row-background-selected": "background-main-4",
     "table-row-background-even": "background-main",
     "table-row-background-odd": "background-main",
+    "table-row-background-focused": "background-main-1",
+    "table-row-background-focused-selected": "background-main-2",
+    "table-row-background-selected": "background-main-2",
 
     // foreground
     "table-row-selected": "c12",
diff --git a/services/static-webserver/client/source/class/osparc/theme/ColorLight.js b/services/static-webserver/client/source/class/osparc/theme/ColorLight.js
index c1a6bfb5783..d7abe4267f6 100644
--- a/services/static-webserver/client/source/class/osparc/theme/ColorLight.js
+++ b/services/static-webserver/client/source/class/osparc/theme/ColorLight.js
@@ -135,11 +135,11 @@ qx.Theme.define("osparc.theme.ColorLight", {
 
     // used in table code
     "table-header-cell": "background-main",
-    "table-row-background-focused-selected": "background-main-4",
-    "table-row-background-focused": "background-main-3",
-    "table-row-background-selected": "background-main-4",
     "table-row-background-even": "background-main",
     "table-row-background-odd": "background-main",
+    "table-row-background-focused": "background-main-1",
+    "table-row-background-focused-selected": "background-main-2",
+    "table-row-background-selected": "background-main-2",
 
     // foreground
     "table-row-selected": "c12",

From e9ff7c7cf00757066b93be87a1a55ce60c0ff46c Mon Sep 17 00:00:00 2001
From: odeimaiz 
Date: Thu, 5 Dec 2024 11:45:40 +0100
Subject: [PATCH 04/20] expandable

---
 .../osparc/ui/table/rowrenderer/ExpandSelection.js    | 10 +++++++++-
 .../source/class/osparc/widget/logger/LoggerModel.js  | 11 ++++++-----
 .../source/class/osparc/widget/logger/LoggerView.js   | 10 +++++-----
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/services/static-webserver/client/source/class/osparc/ui/table/rowrenderer/ExpandSelection.js b/services/static-webserver/client/source/class/osparc/ui/table/rowrenderer/ExpandSelection.js
index 60a0469c4c8..642f8bfed90 100644
--- a/services/static-webserver/client/source/class/osparc/ui/table/rowrenderer/ExpandSelection.js
+++ b/services/static-webserver/client/source/class/osparc/ui/table/rowrenderer/ExpandSelection.js
@@ -18,12 +18,20 @@
 qx.Class.define("osparc.ui.table.rowrenderer.ExpandSelection", {
   extend: qx.ui.table.rowrenderer.Default,
 
+  construct: function(_, expandableColPos = 2) {
+    this.base(arguments);
+
+    this.__expandableColPos = expandableColPos;
+  },
+
   members: {
+    __expandableColPos: null,
+
     // overridden
     updateDataRowElement : function(rowInfo, rowElem) {
       this.base(arguments, rowInfo, rowElem);
 
-      const messageCellPos = 2;
+      const messageCellPos = this.__expandableColPos;
       // extend collapse row
       const style = rowElem.style;
       if (rowInfo.selected) {
diff --git a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js
index 942811625f5..581f723740b 100644
--- a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js
+++ b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js
@@ -80,21 +80,22 @@ qx.Class.define("osparc.widget.logger.LoggerModel", {
   statics: {
     getLevelIcon: function(logLevel) {
       const logLevels = osparc.widget.logger.LoggerView.LOG_LEVELS;
-      let iconSource = "";
+      let iconSource = "@FontAwesome5Solid/home/12";
       switch (logLevel) {
         case logLevels.DEBUG:
-          iconSource = "@FontAwesome5Solid/info/12";
+          iconSource = "@FontAwesome5Solid/home/12";
           break;
         case logLevels.INFO:
-          iconSource = "@FontAwesome5Solid/info/12";
+          iconSource = "@FontAwesome5Solid/home/12";
           break;
         case logLevels.WARNING:
-          iconSource = "@FontAwesome5Solid/exclamation-triangle/12";
+          iconSource = "@FontAwesome5Solid/home/12";
           break;
         case logLevels.ERROR:
-          iconSource = "@FontAwesome5Solid/exclamation-circle/12";
+          iconSource = "@FontAwesome5Solid/home/12";
           break;
       }
+      return "";
       return iconSource;
     }
   },
diff --git a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js
index 74e8ecf6018..be65f184271 100644
--- a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js
+++ b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js
@@ -276,21 +276,21 @@ qx.Class.define("osparc.widget.logger.LoggerView", {
       // alwaysUpdateCells
       osparc.utils.Utils.setIdToWidget(table, "logsViewer");
       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.Image(12, 12));
       // 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({
+      colModel.setDataCellRenderer(this.self().POS.TIMESTAMP, new osparc.ui.table.cellrenderer.Html().set({
         defaultCellStyle: "user-select: text"
       }));
       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({
+      colModel.setDataCellRenderer(this.self().POS.MESSAGE, new osparc.ui.table.cellrenderer.Html().set({
         defaultCellStyle: "user-select: text; text-wrap: wrap"
       }));
       const resizeBehavior = colModel.getBehavior();
-      resizeBehavior.setWidth(this.self().POS.LOG_LEVEL, 20);
+      resizeBehavior.setWidth(this.self().POS.LOG_LEVEL, 35);
       resizeBehavior.setWidth(this.self().POS.TIMESTAMP, 80);
       resizeBehavior.setWidth(this.self().POS.ORIGIN, 100);
 
-      table.setDataRowRenderer(new osparc.ui.table.rowrenderer.ExpandSelection(table));
+      table.setDataRowRenderer(new osparc.ui.table.rowrenderer.ExpandSelection(table, this.self().POS.MESSAGE));
 
       this.__applyFilters();
 

From 52228253f13b61af092921dc5319f82083a9ac28 Mon Sep 17 00:00:00 2001
From: odeimaiz 
Date: Thu, 5 Dec 2024 11:58:41 +0100
Subject: [PATCH 05/20] minor

---
 .../client/source/class/osparc/widget/logger/LoggerModel.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js
index 581f723740b..f1146806e7b 100644
--- a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js
+++ b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js
@@ -49,7 +49,7 @@ qx.Class.define("osparc.widget.logger.LoggerModel", {
     this.base(arguments);
 
     this.setColumns([
-      "",
+      "Lvl",
       "Time",
       "Origin",
       "Message"

From ff5a7238a2f2416f581916893537b295322e953b Mon Sep 17 00:00:00 2001
From: odeimaiz 
Date: Thu, 5 Dec 2024 12:12:31 +0100
Subject: [PATCH 06/20] add logs

---
 .../class/osparc/desktop/WorkbenchView.js     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js b/services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js
index d6df7d06b28..02df1dd3a00 100644
--- a/services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js
+++ b/services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js
@@ -33,6 +33,27 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
     this.__workbenchUI = this.__workbenchPanel.getMainView();
 
     this.__attachEventHandlers();
+
+    // OM removed this
+    setTimeout(() => {
+      [{
+        nodeId: null,
+        messages: ["Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum."],
+        logLevel: "DEBUG",
+      }, {
+        nodeId: null,
+        messages: ["Contrary to popular belief, Lorem Ipsum is not simply random text.\nIt has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old.\nRichard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of 'de Finibus Bonorum et Malorum' (The Extremes of Good and Evil) by Cicero, written in 45 BC.\nThis book is a treatise on the theory of ethics, very popular during the Renaissance.\nThe first line of Lorem Ipsum, 'Lorem ipsum dolor sit amet..', comes from a line in section 1.10.32."],
+        logLevel: "INFO",
+      }, {
+        nodeId: null,
+        messages: ["Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum."],
+        logLevel: "WARNING",
+      }, {
+        nodeId: null,
+        messages: ["Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum."],
+        logLevel: "ERROR",
+      }].forEach(log => this.logsToLogger(log.nodeId, log.messages, log.logLevel));
+    }, 5000);
   },
 
   statics: {

From 6efc2b1d294ad580c660f189fe4f9e798eb399f6 Mon Sep 17 00:00:00 2001
From: odeimaiz 
Date: Thu, 5 Dec 2024 12:29:08 +0100
Subject: [PATCH 07/20] improve expansion

---
 .../osparc/ui/table/rowrenderer/ExpandSelection.js   | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/services/static-webserver/client/source/class/osparc/ui/table/rowrenderer/ExpandSelection.js b/services/static-webserver/client/source/class/osparc/ui/table/rowrenderer/ExpandSelection.js
index 642f8bfed90..58ec4918302 100644
--- a/services/static-webserver/client/source/class/osparc/ui/table/rowrenderer/ExpandSelection.js
+++ b/services/static-webserver/client/source/class/osparc/ui/table/rowrenderer/ExpandSelection.js
@@ -35,14 +35,12 @@ qx.Class.define("osparc.ui.table.rowrenderer.ExpandSelection", {
       // extend collapse row
       const style = rowElem.style;
       if (rowInfo.selected) {
-        let messageDiv = rowElem.children.item(messageCellPos)
-        if (rowElem.children.item(messageCellPos).children.length) {
-          messageDiv = rowElem.children.item(messageCellPos).children.item(0);
-        }
-        const extendedHeight = messageDiv.getBoundingClientRect().height + "px";
-        style.height = extendedHeight;
-        Array.from(rowElem.children).forEach(child => child.style.height = extendedHeight);
+        const messageDiv = rowElem.children.item(messageCellPos);
+        const expandedHeight = messageDiv.scrollHeight + "px";
+        style.height = expandedHeight;
+        Array.from(rowElem.children).forEach(child => child.style.height = expandedHeight);
       } else {
+        // back to collapsed
         style.height = "19px";
       }
     }

From 58f0eccb5d1e861a6f9de45cc48423197efa03e2 Mon Sep 17 00:00:00 2001
From: odeimaiz 
Date: Thu, 5 Dec 2024 12:29:17 +0100
Subject: [PATCH 08/20] replace("\n", "
") --- .../client/source/class/osparc/widget/logger/LoggerModel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js index f1146806e7b..1ab87f65e11 100644 --- a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js +++ b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js @@ -117,7 +117,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"] = newRow.msg; + newRow["msgRich"] = newRow.msg.replace("\n", "
"); this.__rawData.push(newRow); }); }, From 712b47285dcc1b5e9244d2250e853bded8a817e2 Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Thu, 5 Dec 2024 12:29:24 +0100 Subject: [PATCH 09/20] minor --- .../client/source/class/osparc/widget/logger/LoggerView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js index be65f184271..f089e61078b 100644 --- a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js +++ b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js @@ -402,12 +402,12 @@ qx.Class.define("osparc.widget.logger.LoggerView", { const msgLogs = []; msgs.forEach(msg => { const msgLog = { + logLevel, timeStamp: new Date(), nodeId, label, msg, tooltip: msg, - logLevel }; msgLogs.push(msgLog); }); From 49938889ed4290bc05e9ef005edc672f0375f9a8 Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Thu, 5 Dec 2024 12:57:51 +0100 Subject: [PATCH 10/20] [skip ci] minors --- .../client/source/class/osparc/desktop/WorkbenchView.js | 2 +- .../client/source/class/osparc/widget/logger/LoggerModel.js | 2 +- .../client/source/class/osparc/widget/logger/LoggerView.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js b/services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js index 02df1dd3a00..bd8eee2c776 100644 --- a/services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js +++ b/services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js @@ -42,7 +42,7 @@ qx.Class.define("osparc.desktop.WorkbenchView", { logLevel: "DEBUG", }, { nodeId: null, - messages: ["Contrary to popular belief, Lorem Ipsum is not simply random text.\nIt has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old.\nRichard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of 'de Finibus Bonorum et Malorum' (The Extremes of Good and Evil) by Cicero, written in 45 BC.\nThis book is a treatise on the theory of ethics, very popular during the Renaissance.\nThe first line of Lorem Ipsum, 'Lorem ipsum dolor sit amet..', comes from a line in section 1.10.32."], + messages: ["Contrary\nto popular belief,\nLorem Ipsum is not simply random text.\nIt has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old.\nRichard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of 'de Finibus Bonorum et Malorum' (The Extremes of Good and Evil) by Cicero, written in 45 BC.\nThis book is a treatise on the theory of ethics, very popular during the Renaissance.\nThe first line of Lorem Ipsum, 'Lorem ipsum dolor sit amet..', comes from a line in section 1.10.32."], logLevel: "INFO", }, { nodeId: null, diff --git a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js index 1ab87f65e11..92a04dc5e75 100644 --- a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js +++ b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js @@ -117,7 +117,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"] = newRow.msg.replace("\n", "
"); + newRow["msgRich"] = newRow.msg.replaceAll("\n", "
"); this.__rawData.push(newRow); }); }, diff --git a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js index f089e61078b..a9a8bde8494 100644 --- a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js +++ b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js @@ -281,7 +281,7 @@ qx.Class.define("osparc.widget.logger.LoggerView", { colModel.setDataCellRenderer(this.self().POS.TIMESTAMP, new osparc.ui.table.cellrenderer.Html().set({ defaultCellStyle: "user-select: text" })); - colModel.setDataCellRenderer(this.self().POS.ORIGIN, new qx.ui.table.cellrenderer.String()); + colModel.setDataCellRenderer(this.self().POS.ORIGIN, new osparc.ui.table.cellrenderer.Html()); colModel.setDataCellRenderer(this.self().POS.MESSAGE, new osparc.ui.table.cellrenderer.Html().set({ defaultCellStyle: "user-select: text; text-wrap: wrap" })); From 1666334f6f448c5e1e6c02f29a610c88d7128011 Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Thu, 5 Dec 2024 14:28:32 +0100 Subject: [PATCH 11/20] "border-separator": "product-color" --- .../client/source/class/osparc/theme/ColorDark.js | 3 --- .../client/source/class/osparc/theme/ColorLight.js | 3 --- .../client/source/class/osparc/theme/mixin/Color.js | 3 +++ 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/services/static-webserver/client/source/class/osparc/theme/ColorDark.js b/services/static-webserver/client/source/class/osparc/theme/ColorDark.js index 82e652ff83f..64a3784c276 100644 --- a/services/static-webserver/client/source/class/osparc/theme/ColorDark.js +++ b/services/static-webserver/client/source/class/osparc/theme/ColorDark.js @@ -118,9 +118,6 @@ qx.Theme.define("osparc.theme.ColorDark", { "border-invalid": "failed-red", "border-disabled": "background-main", - // separator - "border-separator": "fab-background", - // tooltip "tooltip": "flash_message_bg", "tooltip-text": "text", diff --git a/services/static-webserver/client/source/class/osparc/theme/ColorLight.js b/services/static-webserver/client/source/class/osparc/theme/ColorLight.js index d7abe4267f6..6b798200e18 100644 --- a/services/static-webserver/client/source/class/osparc/theme/ColorLight.js +++ b/services/static-webserver/client/source/class/osparc/theme/ColorLight.js @@ -119,9 +119,6 @@ qx.Theme.define("osparc.theme.ColorLight", { "border-invalid": "failed-red", "border-disabled": "background-main", - // separator - "border-separator": "background-main-3", - // tooltip "tooltip": "flash_message_bg", "tooltip-text": "text", diff --git a/services/static-webserver/client/source/class/osparc/theme/mixin/Color.js b/services/static-webserver/client/source/class/osparc/theme/mixin/Color.js index 1254122ad44..95883e8284f 100644 --- a/services/static-webserver/client/source/class/osparc/theme/mixin/Color.js +++ b/services/static-webserver/client/source/class/osparc/theme/mixin/Color.js @@ -46,6 +46,9 @@ qx.Theme.define("osparc.theme.mixin.Color", { "status_icon": "rgba(255, 255, 255, 1)", + // separator + "border-separator": "product-color", + "visual-blue": "#007fd4", // Visual Studio blue "logger-warning-message": "warning-yellow", From 1fda302cb14a78b90a57facf3d28bfb9510870c7 Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Thu, 5 Dec 2024 16:35:51 +0100 Subject: [PATCH 12/20] wrokinish expanded --- .../ui/table/rowrenderer/ExpandSelection.js | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/services/static-webserver/client/source/class/osparc/ui/table/rowrenderer/ExpandSelection.js b/services/static-webserver/client/source/class/osparc/ui/table/rowrenderer/ExpandSelection.js index 58ec4918302..9e19c172db9 100644 --- a/services/static-webserver/client/source/class/osparc/ui/table/rowrenderer/ExpandSelection.js +++ b/services/static-webserver/client/source/class/osparc/ui/table/rowrenderer/ExpandSelection.js @@ -31,18 +31,20 @@ qx.Class.define("osparc.ui.table.rowrenderer.ExpandSelection", { updateDataRowElement : function(rowInfo, rowElem) { this.base(arguments, rowInfo, rowElem); - const messageCellPos = this.__expandableColPos; - // extend collapse row const style = rowElem.style; - if (rowInfo.selected) { - const messageDiv = rowElem.children.item(messageCellPos); - const expandedHeight = messageDiv.scrollHeight + "px"; - style.height = expandedHeight; - Array.from(rowElem.children).forEach(child => child.style.height = expandedHeight); - } else { - // back to collapsed - style.height = "19px"; + + const rowClicked = () => { + // switch it's expanded if it was already expanded + rowInfo.expanded = !rowInfo.expanded; + + const messageDiv = rowElem.children.item(this.__expandableColPos); + const expandedHeight = messageDiv.scrollHeight; + const newHeight = (rowInfo.expanded ? expandedHeight : 19) + "px"; + style.height = newHeight + Array.from(rowElem.children).forEach(child => child.style.height = newHeight); } + rowElem.removeEventListener("click", rowClicked); + rowElem.addEventListener("click", rowClicked); } } }); From 71ba7e7b5ba1821e5412c47790bb3d5115853536 Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Fri, 6 Dec 2024 13:32:32 +0100 Subject: [PATCH 13/20] not needed --- .../osparc/ui/table/cellrenderer/String.js | 34 ------------------- 1 file changed, 34 deletions(-) delete mode 100644 services/static-webserver/client/source/class/osparc/ui/table/cellrenderer/String.js diff --git a/services/static-webserver/client/source/class/osparc/ui/table/cellrenderer/String.js b/services/static-webserver/client/source/class/osparc/ui/table/cellrenderer/String.js deleted file mode 100644 index 67a89c22f1c..00000000000 --- a/services/static-webserver/client/source/class/osparc/ui/table/cellrenderer/String.js +++ /dev/null @@ -1,34 +0,0 @@ -/* ************************************************************************ - - 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; - } - } -}); From 68c7724b0155864fba94babc962ee31f821dbb68 Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Fri, 6 Dec 2024 13:33:14 +0100 Subject: [PATCH 14/20] icons --- .../class/osparc/widget/logger/LoggerModel.js | 14 +++++--------- .../class/osparc/widget/logger/LoggerView.js | 3 +-- .../resource/osparc/circle-exclamation-solid.svg | 1 + .../source/resource/osparc/circle-info-solid.svg | 1 + .../source/resource/osparc/circle-xmark-solid.svg | 1 + 5 files changed, 9 insertions(+), 11 deletions(-) create mode 100644 services/static-webserver/client/source/resource/osparc/circle-exclamation-solid.svg create mode 100644 services/static-webserver/client/source/resource/osparc/circle-info-solid.svg create mode 100644 services/static-webserver/client/source/resource/osparc/circle-xmark-solid.svg diff --git a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js index 92a04dc5e75..a6110b2714c 100644 --- a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js +++ b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerModel.js @@ -49,7 +49,7 @@ qx.Class.define("osparc.widget.logger.LoggerModel", { this.base(arguments); this.setColumns([ - "Lvl", + "", "Time", "Origin", "Message" @@ -80,22 +80,18 @@ qx.Class.define("osparc.widget.logger.LoggerModel", { statics: { getLevelIcon: function(logLevel) { const logLevels = osparc.widget.logger.LoggerView.LOG_LEVELS; - let iconSource = "@FontAwesome5Solid/home/12"; + let iconSource = ""; switch (logLevel) { - case logLevels.DEBUG: - iconSource = "@FontAwesome5Solid/home/12"; - break; case logLevels.INFO: - iconSource = "@FontAwesome5Solid/home/12"; + iconSource = "osparc/circle-info-solid.svg"; break; case logLevels.WARNING: - iconSource = "@FontAwesome5Solid/home/12"; + iconSource = "osparc/circle-exclamation-solid.svg"; break; case logLevels.ERROR: - iconSource = "@FontAwesome5Solid/home/12"; + iconSource = "osparc/circle-xmark-solid.svg"; break; } - return ""; return iconSource; } }, diff --git a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js index a9a8bde8494..b2a21846d88 100644 --- a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js +++ b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js @@ -276,8 +276,7 @@ qx.Class.define("osparc.widget.logger.LoggerView", { // alwaysUpdateCells osparc.utils.Utils.setIdToWidget(table, "logsViewer"); const colModel = table.getTableColumnModel(); - colModel.setDataCellRenderer(this.self().POS.LOG_LEVEL, new qx.ui.table.cellrenderer.Image(12, 12)); - // colModel.setDataCellRenderer(this.self().POS.LOG_LEVEL, new qx.ui.table.cellrenderer.String()); + colModel.setDataCellRenderer(this.self().POS.LOG_LEVEL, new qx.ui.table.cellrenderer.Image(14, 14)); colModel.setDataCellRenderer(this.self().POS.TIMESTAMP, new osparc.ui.table.cellrenderer.Html().set({ defaultCellStyle: "user-select: text" })); diff --git a/services/static-webserver/client/source/resource/osparc/circle-exclamation-solid.svg b/services/static-webserver/client/source/resource/osparc/circle-exclamation-solid.svg new file mode 100644 index 00000000000..6d0c4723dbe --- /dev/null +++ b/services/static-webserver/client/source/resource/osparc/circle-exclamation-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/services/static-webserver/client/source/resource/osparc/circle-info-solid.svg b/services/static-webserver/client/source/resource/osparc/circle-info-solid.svg new file mode 100644 index 00000000000..1f0971ab4e8 --- /dev/null +++ b/services/static-webserver/client/source/resource/osparc/circle-info-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/services/static-webserver/client/source/resource/osparc/circle-xmark-solid.svg b/services/static-webserver/client/source/resource/osparc/circle-xmark-solid.svg new file mode 100644 index 00000000000..6e0189b6bd0 --- /dev/null +++ b/services/static-webserver/client/source/resource/osparc/circle-xmark-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file From 1d2918610fcd99cdba281c048893f1681328e9b4 Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Fri, 6 Dec 2024 13:44:15 +0100 Subject: [PATCH 15/20] color the icons --- .../client/source/class/osparc/widget/logger/LoggerView.js | 2 +- .../client/source/resource/osparc/circle-exclamation-solid.svg | 2 +- .../client/source/resource/osparc/circle-info-solid.svg | 2 +- .../client/source/resource/osparc/circle-xmark-solid.svg | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js index b2a21846d88..e7b857f375b 100644 --- a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js +++ b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js @@ -276,7 +276,7 @@ qx.Class.define("osparc.widget.logger.LoggerView", { // alwaysUpdateCells osparc.utils.Utils.setIdToWidget(table, "logsViewer"); const colModel = table.getTableColumnModel(); - colModel.setDataCellRenderer(this.self().POS.LOG_LEVEL, new qx.ui.table.cellrenderer.Image(14, 14)); + colModel.setDataCellRenderer(this.self().POS.LOG_LEVEL, new qx.ui.table.cellrenderer.Image(16, 16)); colModel.setDataCellRenderer(this.self().POS.TIMESTAMP, new osparc.ui.table.cellrenderer.Html().set({ defaultCellStyle: "user-select: text" })); diff --git a/services/static-webserver/client/source/resource/osparc/circle-exclamation-solid.svg b/services/static-webserver/client/source/resource/osparc/circle-exclamation-solid.svg index 6d0c4723dbe..fa80fe70833 100644 --- a/services/static-webserver/client/source/resource/osparc/circle-exclamation-solid.svg +++ b/services/static-webserver/client/source/resource/osparc/circle-exclamation-solid.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/services/static-webserver/client/source/resource/osparc/circle-info-solid.svg b/services/static-webserver/client/source/resource/osparc/circle-info-solid.svg index 1f0971ab4e8..64e1e26721a 100644 --- a/services/static-webserver/client/source/resource/osparc/circle-info-solid.svg +++ b/services/static-webserver/client/source/resource/osparc/circle-info-solid.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/services/static-webserver/client/source/resource/osparc/circle-xmark-solid.svg b/services/static-webserver/client/source/resource/osparc/circle-xmark-solid.svg index 6e0189b6bd0..ce756f46a91 100644 --- a/services/static-webserver/client/source/resource/osparc/circle-xmark-solid.svg +++ b/services/static-webserver/client/source/resource/osparc/circle-xmark-solid.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From 16e789b13981b3b819f5a6448dd388c1c05111a8 Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Fri, 6 Dec 2024 13:45:09 +0100 Subject: [PATCH 16/20] smaller icon --- .../client/source/class/osparc/widget/logger/LoggerView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js index e7b857f375b..b2a21846d88 100644 --- a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js +++ b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js @@ -276,7 +276,7 @@ qx.Class.define("osparc.widget.logger.LoggerView", { // alwaysUpdateCells osparc.utils.Utils.setIdToWidget(table, "logsViewer"); const colModel = table.getTableColumnModel(); - colModel.setDataCellRenderer(this.self().POS.LOG_LEVEL, new qx.ui.table.cellrenderer.Image(16, 16)); + colModel.setDataCellRenderer(this.self().POS.LOG_LEVEL, new qx.ui.table.cellrenderer.Image(14, 14)); colModel.setDataCellRenderer(this.self().POS.TIMESTAMP, new osparc.ui.table.cellrenderer.Html().set({ defaultCellStyle: "user-select: text" })); From 22bbdeec8bbbc929e56395a33aea31e730118606 Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Fri, 6 Dec 2024 13:51:07 +0100 Subject: [PATCH 17/20] remove dummy logs --- .../class/osparc/desktop/WorkbenchView.js | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js b/services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js index bd8eee2c776..d6df7d06b28 100644 --- a/services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js +++ b/services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js @@ -33,27 +33,6 @@ qx.Class.define("osparc.desktop.WorkbenchView", { this.__workbenchUI = this.__workbenchPanel.getMainView(); this.__attachEventHandlers(); - - // OM removed this - setTimeout(() => { - [{ - nodeId: null, - messages: ["Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum."], - logLevel: "DEBUG", - }, { - nodeId: null, - messages: ["Contrary\nto popular belief,\nLorem Ipsum is not simply random text.\nIt has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old.\nRichard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of 'de Finibus Bonorum et Malorum' (The Extremes of Good and Evil) by Cicero, written in 45 BC.\nThis book is a treatise on the theory of ethics, very popular during the Renaissance.\nThe first line of Lorem Ipsum, 'Lorem ipsum dolor sit amet..', comes from a line in section 1.10.32."], - logLevel: "INFO", - }, { - nodeId: null, - messages: ["Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum."], - logLevel: "WARNING", - }, { - nodeId: null, - messages: ["Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum."], - logLevel: "ERROR", - }].forEach(log => this.logsToLogger(log.nodeId, log.messages, log.logLevel)); - }, 5000); }, statics: { From 4daaf2ef2e5e6456f35a754bf919363f5865224f Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Fri, 6 Dec 2024 13:52:34 +0100 Subject: [PATCH 18/20] exclamatino red --- .../client/source/resource/osparc/circle-exclamation-solid.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/static-webserver/client/source/resource/osparc/circle-exclamation-solid.svg b/services/static-webserver/client/source/resource/osparc/circle-exclamation-solid.svg index fa80fe70833..32f592db7e6 100644 --- a/services/static-webserver/client/source/resource/osparc/circle-exclamation-solid.svg +++ b/services/static-webserver/client/source/resource/osparc/circle-exclamation-solid.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From a99eec3b996fe7704408ba3d3fc31773e627c0ae Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Fri, 6 Dec 2024 13:53:09 +0100 Subject: [PATCH 19/20] colors --- .../client/source/resource/osparc/circle-exclamation-solid.svg | 2 +- .../client/source/resource/osparc/circle-xmark-solid.svg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/static-webserver/client/source/resource/osparc/circle-exclamation-solid.svg b/services/static-webserver/client/source/resource/osparc/circle-exclamation-solid.svg index 32f592db7e6..fa80fe70833 100644 --- a/services/static-webserver/client/source/resource/osparc/circle-exclamation-solid.svg +++ b/services/static-webserver/client/source/resource/osparc/circle-exclamation-solid.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/services/static-webserver/client/source/resource/osparc/circle-xmark-solid.svg b/services/static-webserver/client/source/resource/osparc/circle-xmark-solid.svg index ce756f46a91..e7074e6aadf 100644 --- a/services/static-webserver/client/source/resource/osparc/circle-xmark-solid.svg +++ b/services/static-webserver/client/source/resource/osparc/circle-xmark-solid.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From 8d2323707a58ea86573b52f1bc8ad9bab8368ad5 Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Fri, 6 Dec 2024 16:48:15 +0100 Subject: [PATCH 20/20] @pcrespov Min log-level --- .../client/source/class/osparc/widget/logger/LoggerView.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js index b2a21846d88..c9a1795bf4a 100644 --- a/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js +++ b/services/static-webserver/client/source/class/osparc/widget/logger/LoggerView.js @@ -153,6 +153,11 @@ qx.Class.define("osparc.widget.logger.LoggerView", { } case "log-level": { const toolbar = this.getChildControl("toolbar"); + const minLogLevelLabel = new qx.ui.basic.Label().set({ + value: this.tr("Min log-level"), + alignY: "middle", + }); + toolbar.add(minLogLevelLabel); control = new qx.ui.form.SelectBox().set({ appearance: "toolbar-selectbox", maxWidth: 80