Skip to content

Commit c5eb774

Browse files
committed
openLogger
1 parent bb6a234 commit c5eb774

File tree

4 files changed

+17
-14
lines changed

4 files changed

+17
-14
lines changed

services/static-webserver/client/source/class/osparc/desktop/MainPage.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ qx.Class.define("osparc.desktop.MainPage", {
5050
const navBar = this.__navBar = new osparc.navigation.NavigationBar();
5151
navBar.populateLayout();
5252
navBar.addListener("backToDashboardPressed", () => this.__backToDashboardPressed(), this);
53-
navBar.addListener("downloadStudyLogs", () => this.__downloadStudyLogs(), this);
53+
navBar.addListener("openLogger", () => this.__openLogger(), this);
5454
this._add(navBar);
5555

5656
// Some resources request before building the main stack
@@ -171,9 +171,9 @@ qx.Class.define("osparc.desktop.MainPage", {
171171
}
172172
},
173173

174-
__downloadStudyLogs: function() {
174+
__openLogger: function() {
175175
if (this.__studyEditor) {
176-
this.__studyEditor.getStudyLogger().downloadLogs();
176+
osparc.ui.window.Window.popUpInWindow(this.__studyEditor.getStudyLogger(), this.tr("Platform logger"), 950, 650);
177177
}
178178
},
179179

services/static-webserver/client/source/class/osparc/navigation/NavigationBar.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ qx.Class.define("osparc.navigation.NavigationBar", {
5757

5858
events: {
5959
"backToDashboardPressed": "qx.event.type.Event",
60-
"downloadStudyLogs": "qx.event.type.Event"
60+
"openLogger": "qx.event.type.Event"
6161
},
6262

6363
properties: {
@@ -200,7 +200,7 @@ qx.Class.define("osparc.navigation.NavigationBar", {
200200
break;
201201
case "study-title-options":
202202
control = new osparc.navigation.StudyTitleWOptions();
203-
control.addListener("downloadStudyLogs", () => this.fireEvent("downloadStudyLogs"));
203+
control.addListener("openLogger", () => this.fireEvent("openLogger"));
204204
this.getChildControl("left-items").add(control);
205205
break;
206206
case "read-only-info": {

services/static-webserver/client/source/class/osparc/navigation/StudyTitleWOptions.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ qx.Class.define("osparc.navigation.StudyTitleWOptions", {
3131
},
3232

3333
events: {
34-
"downloadStudyLogs": "qx.event.type.Event"
34+
"openLogger": "qx.event.type.Event"
3535
},
3636

3737
properties: {
@@ -93,12 +93,12 @@ qx.Class.define("osparc.navigation.StudyTitleWOptions", {
9393
this.getStudy().getUi().setMode("standalone");
9494
});
9595
break;
96-
case "study-menu-download-logs":
96+
case "study-menu-open-logger":
9797
control = new qx.ui.menu.Button().set({
98-
label: this.tr("Download logs"),
98+
label: this.tr("Platform Logs..."),
9999
icon: "@FontAwesome5Solid/download/14"
100100
});
101-
control.addListener("execute", () => this.fireEvent("downloadStudyLogs"));
101+
control.addListener("execute", () => this.fireEvent("openLogger"));
102102
break;
103103
case "study-menu-button": {
104104
const optionsMenu = new qx.ui.menu.Menu();
@@ -107,7 +107,7 @@ qx.Class.define("osparc.navigation.StudyTitleWOptions", {
107107
optionsMenu.add(this.getChildControl("study-menu-reload"));
108108
optionsMenu.add(this.getChildControl("study-menu-convert-to-pipeline"));
109109
optionsMenu.add(this.getChildControl("study-menu-convert-to-standalone"));
110-
optionsMenu.add(this.getChildControl("study-menu-download-logs"));
110+
optionsMenu.add(this.getChildControl("study-menu-open-logger"));
111111
control = new qx.ui.form.MenuButton().set({
112112
appearance: "fab-button",
113113
menu: optionsMenu,

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ qx.Class.define("osparc.widget.logger.LoggerView", {
126126
switch (id) {
127127
case "toolbar":
128128
control = new qx.ui.toolbar.ToolBar();
129+
control.setBackgroundColor("transparent");
129130
this._add(control);
130131
break;
131132
case "pin-node": {
@@ -143,7 +144,9 @@ qx.Class.define("osparc.widget.logger.LoggerView", {
143144
control = new qx.ui.form.TextField().set({
144145
appearance: "toolbar-textfield",
145146
liveUpdate: true,
146-
placeholder: this.tr("Filter")
147+
placeholder: this.tr("Filter"),
148+
marginLeft: 5,
149+
marginRight: 5,
147150
});
148151
osparc.utils.Utils.setIdToWidget(control, "logsFilterField");
149152
toolbar.add(control, {
@@ -221,7 +224,7 @@ qx.Class.define("osparc.widget.logger.LoggerView", {
221224
toolTipText: this.tr("Download logs"),
222225
appearance: "toolbar-button"
223226
});
224-
osparc.utils.Utils.setIdToWidget(control, "downloadLogsButton");
227+
osparc.utils.Utils.setIdToWidget(control, "__downloadLogsButton");
225228
toolbar.add(control);
226229
break;
227230
}
@@ -256,7 +259,7 @@ qx.Class.define("osparc.widget.logger.LoggerView", {
256259
toolbar.add(copySelectedToClipboardButton);
257260

258261
const downloadButton = this.getChildControl("download-logs-button");
259-
downloadButton.addListener("execute", () => this.downloadLogs(), this);
262+
downloadButton.addListener("execute", () => this.__downloadLogs(), this);
260263
toolbar.add(downloadButton);
261264

262265
return toolbar;
@@ -345,7 +348,7 @@ qx.Class.define("osparc.widget.logger.LoggerView", {
345348
}
346349
},
347350

348-
downloadLogs: function() {
351+
__downloadLogs: function() {
349352
const logs = this.__getLogsString();
350353
const blob = new Blob([logs], {type: "text/plain"});
351354
osparc.utils.Utils.downloadBlobContent(blob, "logs.log");

0 commit comments

Comments
 (0)