From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <d.tschlatscher@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 7870698C7
for <pve-devel@lists.proxmox.com>; Tue, 26 Apr 2022 14:36:26 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 515A51BD5B
for <pve-devel@lists.proxmox.com>; Tue, 26 Apr 2022 14:35:56 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id 170C61BBB0
for <pve-devel@lists.proxmox.com>; Tue, 26 Apr 2022 14:35:51 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E592742A84
for <pve-devel@lists.proxmox.com>; Tue, 26 Apr 2022 14:35:50 +0200 (CEST)
From: Daniel Tschlatscher <d.tschlatscher@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 26 Apr 2022 14:35:41 +0200
Message-Id: <20220426123542.154739-7-d.tschlatscher@proxmox.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20220426123542.154739-1-d.tschlatscher@proxmox.com>
References: <20220426123542.154739-1-d.tschlatscher@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.061 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [atag.download, hiddenelement.download, hiddenelement.target,
chromium.org]
Subject: [pve-devel] [PATCH widget-toolkit 1/1] fix #3971: Download button
in the TaskViewer
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 26 Apr 2022 12:36:26 -0000
The taskviewer now has a button which implements functionality for
downloading the current tasklog as a file. The code for saving the log
to a file was taken from the pve System Report class, adapted and
moved to its own function in the Utils file.
Also simplified the PVE-Subscription report file download to use the
newly created function in the Utils file. I simplified the "download
as file" calls for invokations in the FileBrowser UI as well.
Tested on Firefox 91.7.0esr and Chromium Version 99 in the PMG, PBS
and the PVE webinterfaces.
Signed-off-by: Daniel Tschlatscher <d.tschlatscher@proxmox.com>
---
src/Utils.js | 18 ++++++++++++++++++
src/window/FileBrowser.js | 12 +++---------
src/window/TaskViewer.js | 16 ++++++++++++++--
3 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/src/Utils.js b/src/Utils.js
index 6a03057..8d4d1cc 100644
--- a/src/Utils.js
+++ b/src/Utils.js
@@ -1272,6 +1272,24 @@ utilities: {
.map(val => val.charCodeAt(0)),
);
},
+
+ // Setting filename here when downloading from a remote url sometimes fails in chromium browsers
+ // because of a bug when using attribute download in conjunction with a self signed certificate.
+ // For more info see https://bugs.chromium.org/p/chromium/issues/detail?id=993362
+ downloadAsFile: function(source, fileName) {
+ let hiddenElement = document.createElement('a');
+ hiddenElement.href = source;
+ hiddenElement.target = '_blank';
+ if (fileName) {
+ hiddenElement.download = fileName;
+ }
+ hiddenElement.click();
+ },
+
+ downloadStringAsFile: function(fileContent, fileName) {
+ let source = `data:attachment/text;charset=utf-8,${encodeURIComponent(fileContent)}`;
+ this.downloadAsFile(source, fileName);
+ },
},
singleton: true,
diff --git a/src/window/FileBrowser.js b/src/window/FileBrowser.js
index 99a7a85..2dac7c9 100644
--- a/src/window/FileBrowser.js
+++ b/src/window/FileBrowser.js
@@ -98,17 +98,11 @@ Ext.define("Proxmox.window.FileBrowser", {
let data = selection[0].data;
- let atag = document.createElement('a');
-
- atag.download = data.text;
let params = { ...view.extraParams };
params.filepath = data.filepath;
- atag.download = data.text;
- if (data.type === 'd') {
- atag.download += ".zip";
- }
- atag.href = me.buildUrl(view.downloadURL, params);
- atag.click();
+ let filename = data.type === 'd' ? `${data.text}.zip` : data.text;
+
+ Proxmox.Utils.downloadAsFile(me.buildUrl(view.downloadURL, params), filename);
},
fileChanged: function() {
diff --git a/src/window/TaskViewer.js b/src/window/TaskViewer.js
index 996a41b..e47a4d8 100644
--- a/src/window/TaskViewer.js
+++ b/src/window/TaskViewer.js
@@ -229,11 +229,22 @@ Ext.define('Proxmox.window.TaskViewer', {
border: false,
});
+ let downloadBtn = new Ext.Button({
+ text: gettext('Download'),
+ iconCls: 'fa fa-download',
+ handler: function() {
+ let url = '/api2/extjs/nodes/' +
+ `${task.node}/tasks/${encodeURIComponent(me.upid)}/log?limit=0`;
+
+ Proxmox.Utils.downloadAsFile(url);
+ },
+ });
+
let logView = Ext.create('Proxmox.panel.LogView', {
title: gettext('Output'),
- tbar: [stop_btn2],
+ tbar: [stop_btn2, '->', downloadBtn],
border: false,
- url: "/api2/extjs/nodes/" + task.node + "/tasks/" + encodeURIComponent(me.upid) + "/log",
+ url: `/api2/extjs/nodes/${task.node}/tasks/${encodeURIComponent(me.upid)}/log`,
});
me.mon(statstore, 'load', function() {
@@ -248,6 +259,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