From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 E1C86619B2 for ; Fri, 20 Nov 2020 17:40:24 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DFA90153F3 for ; Fri, 20 Nov 2020 17:40:24 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 67415153E9 for ; Fri, 20 Nov 2020 17:40:24 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3029743D48 for ; Fri, 20 Nov 2020 17:40:24 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Fri, 20 Nov 2020 17:38:43 +0100 Message-Id: <20201120163845.1225080-14-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201120163845.1225080-1-f.gruenbichler@proxmox.com> References: <20201120163845.1225080-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.025 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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. [parentnode.id] Subject: [pbs-devel] [PATCH proxmox-backup 13/13] gui: add snapshot/file fingerprint tooltip X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Nov 2020 16:40:24 -0000 display short key ID, like backend's Display trait. Signed-off-by: Fabian Grünbichler --- Notes: new in v2 www/Utils.js | 5 +++++ www/datastore/Content.js | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/www/Utils.js b/www/Utils.js index ab48bdcf..775c03d7 100644 --- a/www/Utils.js +++ b/www/Utils.js @@ -161,6 +161,11 @@ Ext.define('PBS.Utils', { return `Datastore ${what} ${id}`; }, + // mimics Display trait in backend + renderKeyID: function(fingerprint) { + return fingerprint.substring(0, 23); + }, + parse_datastore_worker_id: function(type, id) { let result; let res; diff --git a/www/datastore/Content.js b/www/datastore/Content.js index acd4184b..12dacb89 100644 --- a/www/datastore/Content.js +++ b/www/datastore/Content.js @@ -12,6 +12,7 @@ Ext.define('pbs-data-store-snapshots', { 'files', 'owner', 'verification', + 'fingerprint', { name: 'size', type: 'int', allowNull: true }, { name: 'crypt-mode', @@ -182,6 +183,7 @@ Ext.define('PBS.DataStoreContent', { for (const file of data.files) { file.text = file.filename; file['crypt-mode'] = PBS.Utils.cryptmap.indexOf(file['crypt-mode']); + file.fingerprint = data.fingerprint; file.leaf = true; file.matchesFilter = true; @@ -699,7 +701,16 @@ Ext.define('PBS.DataStoreContent', { if (iconCls) { iconTxt = ` `; } - return (iconTxt + PBS.Utils.cryptText[v]) || Proxmox.Utils.unknownText; + let tip; + if (v !== PBS.Utils.cryptmap.indexOf('none') && record.data.fingerprint !== undefined) { + tip = "Key: " + PBS.Utils.renderKeyID(record.data.fingerprint); + } + let txt = (iconTxt + PBS.Utils.cryptText[v]) || Proxmox.Utils.unknownText; + if (record.parentNode.id === 'root' || tip === undefined) { + return txt; + } else { + return `${txt}`; + } }, }, { -- 2.20.1