Skip to content

Commit e9ff7c7

Browse files
committed
expandable
1 parent 56e2188 commit e9ff7c7

File tree

3 files changed

+20
-11
lines changed

3 files changed

+20
-11
lines changed

services/static-webserver/client/source/class/osparc/ui/table/rowrenderer/ExpandSelection.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,20 @@
1818
qx.Class.define("osparc.ui.table.rowrenderer.ExpandSelection", {
1919
extend: qx.ui.table.rowrenderer.Default,
2020

21+
construct: function(_, expandableColPos = 2) {
22+
this.base(arguments);
23+
24+
this.__expandableColPos = expandableColPos;
25+
},
26+
2127
members: {
28+
__expandableColPos: null,
29+
2230
// overridden
2331
updateDataRowElement : function(rowInfo, rowElem) {
2432
this.base(arguments, rowInfo, rowElem);
2533

26-
const messageCellPos = 2;
34+
const messageCellPos = this.__expandableColPos;
2735
// extend collapse row
2836
const style = rowElem.style;
2937
if (rowInfo.selected) {

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,21 +80,22 @@ qx.Class.define("osparc.widget.logger.LoggerModel", {
8080
statics: {
8181
getLevelIcon: function(logLevel) {
8282
const logLevels = osparc.widget.logger.LoggerView.LOG_LEVELS;
83-
let iconSource = "";
83+
let iconSource = "@FontAwesome5Solid/home/12";
8484
switch (logLevel) {
8585
case logLevels.DEBUG:
86-
iconSource = "@FontAwesome5Solid/info/12";
86+
iconSource = "@FontAwesome5Solid/home/12";
8787
break;
8888
case logLevels.INFO:
89-
iconSource = "@FontAwesome5Solid/info/12";
89+
iconSource = "@FontAwesome5Solid/home/12";
9090
break;
9191
case logLevels.WARNING:
92-
iconSource = "@FontAwesome5Solid/exclamation-triangle/12";
92+
iconSource = "@FontAwesome5Solid/home/12";
9393
break;
9494
case logLevels.ERROR:
95-
iconSource = "@FontAwesome5Solid/exclamation-circle/12";
95+
iconSource = "@FontAwesome5Solid/home/12";
9696
break;
9797
}
98+
return "";
9899
return iconSource;
99100
}
100101
},

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -276,21 +276,21 @@ qx.Class.define("osparc.widget.logger.LoggerView", {
276276
// alwaysUpdateCells
277277
osparc.utils.Utils.setIdToWidget(table, "logsViewer");
278278
const colModel = table.getTableColumnModel();
279-
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.Image(12, 12));
280280
// colModel.setDataCellRenderer(this.self().POS.LOG_LEVEL, new qx.ui.table.cellrenderer.String());
281-
colModel.setDataCellRenderer(this.self().POS.TIMESTAMP, new osparc.ui.table.cellrenderer.String().set({
281+
colModel.setDataCellRenderer(this.self().POS.TIMESTAMP, new osparc.ui.table.cellrenderer.Html().set({
282282
defaultCellStyle: "user-select: text"
283283
}));
284284
colModel.setDataCellRenderer(this.self().POS.ORIGIN, new qx.ui.table.cellrenderer.String());
285-
colModel.setDataCellRenderer(this.self().POS.MESSAGE, new osparc.ui.table.cellrenderer.String().set({
285+
colModel.setDataCellRenderer(this.self().POS.MESSAGE, new osparc.ui.table.cellrenderer.Html().set({
286286
defaultCellStyle: "user-select: text; text-wrap: wrap"
287287
}));
288288
const resizeBehavior = colModel.getBehavior();
289-
resizeBehavior.setWidth(this.self().POS.LOG_LEVEL, 20);
289+
resizeBehavior.setWidth(this.self().POS.LOG_LEVEL, 35);
290290
resizeBehavior.setWidth(this.self().POS.TIMESTAMP, 80);
291291
resizeBehavior.setWidth(this.self().POS.ORIGIN, 100);
292292

293-
table.setDataRowRenderer(new osparc.ui.table.rowrenderer.ExpandSelection(table));
293+
table.setDataRowRenderer(new osparc.ui.table.rowrenderer.ExpandSelection(table, this.self().POS.MESSAGE));
294294

295295
this.__applyFilters();
296296

0 commit comments

Comments
 (0)