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 A810C767D0 for ; Fri, 23 Apr 2021 12:15:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C74EE27753 for ; Fri, 23 Apr 2021 12:15:19 +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 8871627659 for ; Fri, 23 Apr 2021 12:15:15 +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 C151146439 for ; Fri, 23 Apr 2021 12:15:05 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 23 Apr 2021 12:14:57 +0200 Message-Id: <20210423101501.27300-8-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210423101501.27300-1-f.ebner@proxmox.com> References: <20210423101501.27300-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 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 Subject: [pve-devel] [PATCH widget-toolkit 07/11] disk list: factor out renderers for type and usage X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 10:15:50 -0000 to be re-used later. Signed-off-by: Fabian Ebner --- src/panel/DiskList.js | 64 +++++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 27 deletions(-) diff --git a/src/panel/DiskList.js b/src/panel/DiskList.js index ad965c8..10cf840 100644 --- a/src/panel/DiskList.js +++ b/src/panel/DiskList.js @@ -173,6 +173,39 @@ Ext.define('Proxmox.DiskList', { }, }, + renderDiskType: function(v) { + if (v === undefined) return Proxmox.Utils.unknownText; + switch (v) { + case 'ssd': return 'SSD'; + case 'hdd': return 'Hard Disk'; + case 'usb': return 'USB'; + default: return v; + } + }, + + renderDiskUsage: function(v, metaData, rec) { + let extendedInfo = ''; + if (rec) { + let types = []; + if (rec.data.osdid !== undefined && rec.data.osdid >= 0) { + types.push(`OSD.${rec.data.osdid.toString()}`); + } + if (rec.data.journals > 0) { + types.push('Journal'); + } + if (rec.data.db > 0) { + types.push('DB'); + } + if (rec.data.wal > 0) { + types.push('WAL'); + } + if (types.length > 0) { + extendedInfo = `, Ceph (${types.join(', ')})`; + } + } + return v ? `${v}${extendedInfo}` : Proxmox.Utils.noText; + }, + tbar: [ { text: gettext('Reload'), @@ -223,13 +256,8 @@ Ext.define('Proxmox.DiskList', { sortable: true, dataIndex: 'disk-type', renderer: function(v) { - if (v === undefined) return Proxmox.Utils.unknownText; - switch (v) { - case 'ssd': return 'SSD'; - case 'hdd': return 'Hard Disk'; - case 'usb': return 'USB'; - default: return v; - } + let me = this; + return me.renderDiskType(v); }, }, { @@ -237,26 +265,8 @@ Ext.define('Proxmox.DiskList', { width: 150, sortable: false, renderer: function(v, metaData, rec) { - let extendedInfo = ''; - if (rec) { - let types = []; - if (rec.data.osdid !== undefined && rec.data.osdid >= 0) { - types.push(`OSD.${rec.data.osdid.toString()}`); - } - if (rec.data.journals > 0) { - types.push('Journal'); - } - if (rec.data.db > 0) { - types.push('DB'); - } - if (rec.data.wal > 0) { - types.push('WAL'); - } - if (types.length > 0) { - extendedInfo = `, Ceph (${types.join(', ')})`; - } - } - return v ? `${v}${extendedInfo}` : Proxmox.Utils.noText; + let me = this; + return me.renderDiskUsage(v, metaData, rec); }, dataIndex: 'used', }, -- 2.20.1