[pve-devel] [PATCH widget-toolkit] fix #3971: Download and copy button in the TaskViewer

* [pve-devel] [PATCH widget-toolkit] fix #3971: Download and copy button in the TaskViewer
@ 2022-04-01 14:07 Daniel Tschlatscher
  2022-04-01 14:07 ` [pve-devel] [PATCH manager] Replaced system-report file download Daniel Tschlatscher
  2022-04-01 15:18 ` [pve-devel] [PATCH widget-toolkit] fix #3971: Download and copy button in the TaskViewer Thomas Lamprecht
  0 siblings, 2 replies; 6+ messages in thread
From: Daniel Tschlatscher @ 2022-04-01 14:07 UTC (permalink / raw)
  To: pve-devel

The taskviewer now has 2 more buttons which implement
functionality for downloading the current tasklog as a file
or copying it to the clipboard. The code for saving the log
to a file was taken from the pve System Report class and
moved to its own function in the Utils file.

Tested on Firefox 91.7.0esr and Chromium Version 99

Signed-off-by: Daniel Tschlatscher <d.tschlatscher@proxmox.com>
---
 src/Utils.js             | 17 +++++++++++
 src/window/TaskViewer.js | 65 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/src/Utils.js b/src/Utils.js
index 6a03057..3fff3da 100644
--- a/src/Utils.js
+++ b/src/Utils.js
@@ -1272,6 +1272,23 @@ utilities: {
 	    .map(val => val.charCodeAt(0)),
 	);
     },
+
+    // Convert the given string to a file and "download" it locally
+    textToFile: function(fileName, fileContent) {
+	// Internet Explorer
+	if (window.navigator.msSaveOrOpenBlob) {
+	    navigator.msSaveOrOpenBlob(new Blob([fileContent]), fileName);
+	} else {
+	    var element = document.createElement('a');
+	    element.setAttribute('href', 'data:text/plain;charset=utf-8,' +
+		encodeURIComponent(fileContent));
+	    element.setAttribute('download', fileName);
+	    element.style.display = 'none';
+	    document.body.appendChild(element);
+	    element.click();
+	    document.body.removeChild(element);
+	}
+    },
 },
 
     singleton: true,
diff --git a/src/window/TaskViewer.js b/src/window/TaskViewer.js
index 996a41b..bf4533d 100644
--- a/src/window/TaskViewer.js
+++ b/src/window/TaskViewer.js
@@ -229,13 +229,75 @@ Ext.define('Proxmox.window.TaskViewer', {
 	    border: false,
 	});
 
+	let downloadBtn = new Ext.Button({
+		text: gettext('Download'),
+	});
+
+	let copyBtn = new Ext.Button({
+		text: gettext('Copy'),
+		iconCls: 'fa fa-clipboard',
+	});
+
 	let logView = Ext.create('Proxmox.panel.LogView', {
 	    title: gettext('Output'),
-	    tbar: [stop_btn2],
+	    tbar: [stop_btn2, '->', downloadBtn, copyBtn],
 	    border: false,
 	    url: "/api2/extjs/nodes/" + task.node + "/tasks/" + encodeURIComponent(me.upid) + "/log",
 	});
 
+	const downloadLogFull = function(callback) {
+	    Proxmox.Utils.API2Request({
+		url: "/nodes/" + task.node + "/tasks/"
+		    + encodeURIComponent(me.upid) + '/log',
+		waitMsgTarget: me,
+		method: 'GET',
+		params: {
+		    'limit': logView.viewModel.data.data.total,
+		},
+		failure: function(response, opts) {
+		    callback(response.htmlStatus, null);
+		},
+		success: function(response) {
+		    let fileContent = "";
+
+		    response.result.data.forEach((line) => {
+			fileContent += `${line.t}\n`;
+		    });
+
+		    callback(null, fileContent);
+		},
+	    });
+	};
+
+	downloadBtn.handler = function() {
+	    downloadLogFull((errStatus, fileContent) => {
+		if (errStatus) {
+		    Ext.Msg.alert(gettext('Error'), errStatus);
+		} else {
+		    let record = statstore.getRecord().data;
+		    let fileName = record.user + "@" + record.node + "_" +
+			record.type + "_" + record.pid + "_" +
+			Proxmox.Utils.render_timestamp(record.starttime) +
+			"_" + record.exitstatus + ".log";
+
+		    Proxmox.Utils.textToFile(fileName, fileContent);
+		}
+	    });
+	};
+
+	copyBtn.handler = function() {
+	    downloadLogFull((errStatus, response) => {
+		if (errStatus) {
+		    Ext.Msg.alert(gettext('Error'), errStatus);
+		} else {
+		    navigator.clipboard.writeText(response)
+		    .catch((err) => {
+			Ext.Msg.alert(gettext('Error'), err);
+		    });
+		}
+	    });
+	};
+
 	me.mon(statstore, 'load', function() {
 	    let status = statgrid.getObjectValue('status');
 
@@ -248,6 +310,7 @@ Ext.define('Proxmox.window.TaskViewer', {
 
 	    stop_btn1.setDisabled(status !== 'running');
 	    stop_btn2.setDisabled(status !== 'running');
+	    downloadBtn.setDisabled(status === 'running');
 	});
 
 	statstore.startUpdate();
-- 
2.30.2





^ permalink raw reply	[flat|nested] 6+ messages in thread