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 47C8271120 for ; Wed, 8 Jun 2022 10:52:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3F15E5D25 for ; Wed, 8 Jun 2022 10:52:44 +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 DA71E5CF8 for ; Wed, 8 Jun 2022 10:52:42 +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 EB22843A8A for ; Wed, 8 Jun 2022 10:52:41 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Wed, 8 Jun 2022 08:51:54 +0000 Message-Id: <20220608085154.11271-5-h.laimer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220608085154.11271-1-h.laimer@proxmox.com> References: <20220608085154.11271-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.045 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox-widget-toolkit v2 1/1] ui: DiskLisk: handle partition data from PBS backend 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: Wed, 08 Jun 2022 08:52:44 -0000 Signed-off-by: Hannes Laimer --- src/panel/DiskList.js | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/panel/DiskList.js b/src/panel/DiskList.js index 76d92cd..c5a0050 100644 --- a/src/panel/DiskList.js +++ b/src/panel/DiskList.js @@ -167,10 +167,19 @@ Ext.define('Proxmox.DiskList', { for (const item of records) { let data = item.data; - data.leaf = true; data.expanded = true; - data.children = []; + data.children = data.partitions ?? []; + for (let p of data.children) { + p['disk-type'] = 'partition'; + p.iconCls = 'fa fa-fw fa-hdd-o x-fa-tree'; + p.used = p.used === 'filesystem' ? p.filesystem : p.used; + p.parent = data.devpath; + p.children = []; + p.leaf = true; + } data.iconCls = 'fa fa-fw fa-hdd-o x-fa-tree'; + data.leaf = data.children.length === 0; + if (!data.parent) { disks[data.devpath] = data; } @@ -227,6 +236,15 @@ Ext.define('Proxmox.DiskList', { extendedInfo = `, Ceph (${types.join(', ')})`; } } + const formatMap = { + 'bios': 'BIOS boot', + 'zfsreserved': 'ZFS reserved', + 'efi': 'EFI', + 'lvm': 'LVM', + 'zfs': 'ZFS', + }; + + v = formatMap[v] || v; return v ? `${v}${extendedInfo}` : Proxmox.Utils.noText; }, -- 2.30.2