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 5D00B6B41F for ; Thu, 18 Feb 2021 15:41:05 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B0747F6D7 for ; Thu, 18 Feb 2021 15:40:34 +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 0D102F651 for ; Thu, 18 Feb 2021 15:40:32 +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 CC60846272 for ; Thu, 18 Feb 2021 15:40:31 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Thu, 18 Feb 2021 15:40:30 +0100 Message-Id: <20210218144030.16778-11-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210218144030.16778-1-d.csapak@proxmox.com> References: <20210218144030.16778-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.215 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 Subject: [pbs-devel] [PATCH proxmox-backup 11/11] ui: tape/ChangerStatus: show the state of the drive 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: Thu, 18 Feb 2021 14:41:05 -0000 an optimize the columns for smaller layouts (1280 width) we show either: * Idle * spinner + status (if no upid) * spinner + rendered UPID (clickable, opens task viewer) Signed-off-by: Dominik Csapak --- we probably want to have an updatestore for only the drive state of the changer (such an api call would not cost much, since it only checks a lock + read from tmpfs) to have an up-to-date view of the drive state. If we have that, we can enable/disable buttons/options for busy drives. www/tape/ChangerStatus.js | 47 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/www/tape/ChangerStatus.js b/www/tape/ChangerStatus.js index 436bae72..5a1c6073 100644 --- a/www/tape/ChangerStatus.js +++ b/www/tape/ChangerStatus.js @@ -498,6 +498,42 @@ Ext.define('PBS.TapeManagement.ChangerStatus', { } return status; }, + + renderState: function(value, md, record) { + if (!value) { + return gettext('Idle'); + } + + let icon = ''; + + if (value.startsWith("UPID")) { + let upid = Proxmox.Utils.parse_task_upid(value); + md.tdCls = "pointer"; + return `${icon} ${upid.desc}`; + } + + return `${icon} ${value}`; + }, + + control: { + 'grid[reference=drives]': { + cellclick: function(table, td, ci, rec, tr, ri, e) { + if (!e.position.column.dataIndex === 'state') { + return; + } + + let upid = rec.data.state; + if (!upid || !upid.startsWith("UPID")) { + return; + } + + Ext.create('Proxmox.window.TaskViewer', { + autoShow: true, + upid, + }); + }, + }, + }, }, listeners: { @@ -641,7 +677,7 @@ Ext.define('PBS.TapeManagement.ChangerStatus', { text: gettext('Inventory'), dataIndex: 'is-labeled', renderer: 'renderIsLabeled', - flex: 1, + flex: 1.5, }, { text: gettext("Name"), @@ -650,10 +686,17 @@ Ext.define('PBS.TapeManagement.ChangerStatus', { flex: 1, renderer: Ext.htmlEncode, }, + { + text: gettext('State'), + dataIndex: 'state', + flex: 3, + renderer: 'renderState', + }, { text: gettext("Vendor"), sortable: true, dataIndex: 'vendor', + hidden: true, flex: 1, renderer: Ext.htmlEncode, }, @@ -661,6 +704,7 @@ Ext.define('PBS.TapeManagement.ChangerStatus', { text: gettext("Model"), sortable: true, dataIndex: 'model', + hidden: true, flex: 1, renderer: Ext.htmlEncode, }, @@ -668,6 +712,7 @@ Ext.define('PBS.TapeManagement.ChangerStatus', { text: gettext("Serial"), sortable: true, dataIndex: 'serial', + hidden: true, flex: 1, renderer: Ext.htmlEncode, }, -- 2.20.1