From 0d890ec4147fe1bc1525d3196263b4a6b904d2b5 Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Thu, 18 Feb 2021 15:40:30 +0100 Subject: [PATCH] ui: tape/ChangerStatus: show the state of the drive 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 --- 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 d00d712f..2e35c55c 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, },