Skip to content

Commit f3a4541

Browse files
committed
Do not color message row
1 parent 3ade7ef commit f3a4541

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*
2727
* <pre class='javascript'>
2828
* let tableModel = this.__logModel = new osparc.widget.logger.LoggerTable();
29-
* tableModel.setColumns(["Timestamp", "Origin", "Message"], ["time", "who", "whatRich"]);
29+
* tableModel.setColumns(["Level", "Time", "Origin", "Message"], ["level", "time", "who", "whatRich"]);
3030
* let custom = {
3131
* tableColumnModel : function(obj) {
3232
* return new qx.ui.table.columnmodel.Resize(obj);
@@ -49,10 +49,12 @@ qx.Class.define("osparc.widget.logger.LoggerModel", {
4949
this.base(arguments);
5050

5151
this.setColumns([
52+
"",
5253
"Time",
5354
"Origin",
5455
"Message"
5556
], [
57+
"level",
5658
"time",
5759
"who",
5860
"msgRich"
@@ -112,7 +114,7 @@ qx.Class.define("osparc.widget.logger.LoggerModel", {
112114

113115
addRows: function(newRows) {
114116
newRows.forEach(newRow => {
115-
const levelColor = this.self().getLevelColor(newRow.logLevel);
117+
newRow["level"] = this.self().getLevelIcon(newRow.logLevel);
116118
newRow["time"] = osparc.utils.Utils.formatTime(newRow.timeStamp, true);
117119
newRow["who"] = newRow.label;
118120
newRow["msgRich"] = this.self().addColorTag(newRow.msg, levelColor);

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,14 +275,16 @@ qx.Class.define("osparc.widget.logger.LoggerView", {
275275
// alwaysUpdateCells
276276
osparc.utils.Utils.setIdToWidget(table, "logsViewer");
277277
const colModel = table.getTableColumnModel();
278-
colModel.setDataCellRenderer(this.self().POS.TIMESTAMP, new osparc.ui.table.cellrenderer.Html().set({
278+
colModel.setDataCellRenderer(this.self().POS.LOG_LEVEL, new qx.ui.table.cellrenderer.Image());
279+
// colModel.setDataCellRenderer(this.self().POS.LOG_LEVEL, new qx.ui.table.cellrenderer.String());
279280
defaultCellStyle: "user-select: text"
280281
}));
281282
colModel.setDataCellRenderer(this.self().POS.ORIGIN, new qx.ui.table.cellrenderer.Html());
282283
colModel.setDataCellRenderer(this.self().POS.MESSAGE, new osparc.ui.table.cellrenderer.Html().set({
283284
defaultCellStyle: "user-select: text; text-wrap: wrap"
284285
}));
285-
let resizeBehavior = colModel.getBehavior();
286+
const resizeBehavior = colModel.getBehavior();
287+
resizeBehavior.setWidth(this.self().POS.LOG_LEVEL, 20);
286288
resizeBehavior.setWidth(this.self().POS.TIMESTAMP, 80);
287289
resizeBehavior.setWidth(this.self().POS.ORIGIN, 100);
288290

0 commit comments

Comments
 (0)