Skip to content

Commit 8160031

Browse files
odeimaizmrnicegyu11
authored andcommitted
🐛 [Frontend] Fix: Download logs with newlines (Firefox) (ITISFoundation#6583)
1 parent 8097004 commit 8160031

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

services/static-webserver/client/source/class/osparc/utils/Utils.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -804,11 +804,10 @@ qx.Class.define("osparc.utils.Utils", {
804804
loadedCb();
805805
}
806806
const blob = new Blob([xhr.response]);
807-
const urlBlob = window.URL.createObjectURL(blob);
808807
if (!fileName) {
809808
fileName = this.self().filenameFromContentDisposition(xhr);
810809
}
811-
this.self().downloadContent(urlBlob, fileName);
810+
this.self().downloadBlobContent(blob, fileName);
812811
resolve();
813812
} else {
814813
reject(xhr);
@@ -820,9 +819,9 @@ qx.Class.define("osparc.utils.Utils", {
820819
});
821820
},
822821

823-
downloadContent: function(content, filename = "file") {
822+
downloadBlobContent: function(blob, filename = "file") {
824823
let downloadAnchorNode = document.createElement("a");
825-
downloadAnchorNode.setAttribute("href", content);
824+
downloadAnchorNode.setAttribute("href", window.URL.createObjectURL(blob));
826825
downloadAnchorNode.setAttribute("download", filename);
827826
downloadAnchorNode.click();
828827
downloadAnchorNode.remove();

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
@@ -317,9 +317,10 @@ qx.Class.define("osparc.widget.logger.LoggerView", {
317317
},
318318

319319
__getLogsString: function() {
320+
const newLine = "\n";
320321
let logs = "";
321322
this.__loggerModel.getFilteredRows().forEach(rowData => {
322-
logs += this.self().printRow(rowData) + "\n";
323+
logs += this.self().printRow(rowData) + newLine;
323324
});
324325
return logs;
325326
},
@@ -338,7 +339,8 @@ qx.Class.define("osparc.widget.logger.LoggerView", {
338339

339340
downloadLogs: function() {
340341
const logs = this.__getLogsString();
341-
osparc.utils.Utils.downloadContent("data:text/plain;charset=utf-8," + logs, "logs.log");
342+
const blob = new Blob([logs], {type: "text/plain"});
343+
osparc.utils.Utils.downloadBlobContent(blob, "logs.log");
342344
},
343345

344346
debug: function(nodeId, msg = "") {

0 commit comments

Comments
 (0)