🐛 Minor bug fixes (ITISFoundation#3163)

Author: odeimaiz

services/web/client/source/class/osparc/component/widget/logger/LoggerTable.js

@@ -26,7 +26,7 @@
  *
  * <pre class='javascript'>
  *   let tableModel = this.__logModel = new osparc.component.widget.logger.LoggerTable();
- *   tableModel.setColumns(["Origin", "Timestamp", "Message"], ["whoRich", "whatRich", "whatRich"]);
+ *   tableModel.setColumns(["Timestamp", "Origin", "Message"], ["timeRich", "whoRich", "whatRich"]);
  *   let custom = {
  *     tableColumnModel : function(obj) {
  *       return new qx.ui.table.columnmodel.Resize(obj);
@@ -49,12 +49,12 @@ qx.Class.define("osparc.component.widget.logger.LoggerTable", {
     this.base(arguments);
 
     this.setColumns([
-      "Origin",
       "Time",
+      "Origin",
       "Message"
     ], [
-      "whoRich",
       "timeRich",
+      "whoRich",
       "msgRich"
     ]);
 
@@ -137,8 +137,8 @@ qx.Class.define("osparc.component.widget.logger.LoggerTable", {
         newRow["nodeColor"] = this.__getNodesColor(newRow.nodeId);
         newRow["msgColor"] = this.self().getLevelColor(newRow.logLevel);
 
-        newRow["whoRich"] = this.self().addColorTag(newRow.label, newRow.nodeColor);
         newRow["timeRich"] = this.self().addColorTag(osparc.utils.Utils.formatTime(newRow.timeStamp, true), newRow.msgColor);
+        newRow["whoRich"] = this.self().addColorTag(newRow.label, newRow.nodeColor);
         newRow["msgRich"] = this.self().addColorTag(newRow.msg, newRow.msgColor);
 
         this.__rawData.push(newRow);
@@ -161,8 +161,8 @@ qx.Class.define("osparc.component.widget.logger.LoggerTable", {
         row["nodeColor"] = this.__getNodesColor(row.nodeId);
         row["msgColor"] = this.self().getLevelColor(row.logLevel);
 
-        row["whoRich"] = this.self().addColorTag(row.label, row.nodeColor);
         row["timeRich"] = this.self().addColorTag(osparc.utils.Utils.formatTime(row.timeStamp, true), row.msgColor);
+        row["whoRich"] = this.self().addColorTag(row.label, row.nodeColor);
         row["msgRich"] = this.self().addColorTag(row.msg, row.msgColor);
       });
     },

services/web/client/source/class/osparc/component/widget/logger/LoggerView.js

@@ -82,8 +82,8 @@ qx.Class.define("osparc.component.widget.logger.LoggerView", {
 
   statics: {
     POS: {
-      ORIGIN: 0,
-      TIMESTAMP: 1,
+      TIMESTAMP: 0,
+      ORIGIN: 1,
       MESSAGE: 2
     },
 
@@ -92,6 +92,14 @@ qx.Class.define("osparc.component.widget.logger.LoggerView", {
       info: 0,
       warning: 1,
       error: 2
+    },
+
+    logLevel2Str: function(logLevel) {
+      const pairFound = Object.entries(this.LOG_LEVELS).find(pair => pair[1] === logLevel);
+      if (pairFound && pairFound.length) {
+        return pairFound[0].toUpperCase();
+      }
+      return undefined;
     }
   },
 
@@ -243,16 +251,16 @@ qx.Class.define("osparc.component.widget.logger.LoggerView", {
       });
       osparc.utils.Utils.setIdToWidget(table, "logsViewer");
       const colModel = table.getTableColumnModel();
-      colModel.setDataCellRenderer(this.self().POS.ORIGIN, new qx.ui.table.cellrenderer.Html());
       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.Html());
       colModel.setDataCellRenderer(this.self().POS.MESSAGE, new osparc.ui.table.cellrenderer.Html().set({
         defaultCellStyle: "user-select: text"
       }));
       let resizeBehavior = colModel.getBehavior();
-      resizeBehavior.setWidth(this.self().POS.ORIGIN, 100);
       resizeBehavior.setWidth(this.self().POS.TIMESTAMP, 80);
+      resizeBehavior.setWidth(this.self().POS.ORIGIN, 100);
 
       this.__applyFilters();
 
@@ -280,7 +288,7 @@ qx.Class.define("osparc.component.widget.logger.LoggerView", {
     __getLogsString: function() {
       let logs = "";
       this.__loggerModel.getRows().forEach(row => {
-        logs += `(${row.nodeId}) - [${row.timeStamp}] ${row.label}: ${row.msg} \n`;
+        logs += `${row.timeStamp} ${this.self().logLevel2Str(row.logLevel)} ${row.nodeId} ${row.label}: ${row.msg} \n`;
       });
       return logs;
     },
@@ -291,7 +299,7 @@ qx.Class.define("osparc.component.widget.logger.LoggerView", {
 
     __downloadLogs: function() {
       const logs = this.__getLogsString();
-      osparc.utils.Utils.downloadContent("data:text/json;charset=utf-8," + logs, "logs.json");
+      osparc.utils.Utils.downloadContent("data:text/plain;charset=utf-8," + logs, "logs.log");
     },
 
     debug: function(nodeId, msg = "") {
@@ -337,9 +345,9 @@ qx.Class.define("osparc.component.widget.logger.LoggerView", {
       const msgLogs = [];
       msgs.forEach(msg => {
         const msgLog = {
+          timeStamp: new Date(),
           nodeId,
           label,
-          timeStamp: new Date(),
           msg,
           tooltip: msg,
           logLevel

services/web/client/source/class/osparc/dashboard/ListButtonItem.js

@@ -122,6 +122,17 @@ qx.Class.define("osparc.dashboard.ListButtonItem", {
             column: osparc.dashboard.ListButtonBase.POS.UI_MODE
           });
           break;
+        case "hits-service": {
+          control = new qx.ui.basic.Label().set({
+            alignY: "middle",
+            toolTipText: this.tr("Number of times it was instantiated")
+          });
+          this._add(control, {
+            row: 0,
+            column: osparc.dashboard.ListButtonBase.POS.HITS
+          });
+          break;
+        }
         case "update-study":
           control = new qx.ui.basic.Image().set({
             minWidth: 20,