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 192526D789 for ; Tue, 28 Sep 2021 13:40:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9BD80DF14 for ; Tue, 28 Sep 2021 13:40:14 +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 8E7B2DCBE for ; Tue, 28 Sep 2021 13:40:06 +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 5FECC44A56 for ; Tue, 28 Sep 2021 13:40:06 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Tue, 28 Sep 2021 13:39:51 +0200 Message-Id: <20210928114001.164081-12-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210928114001.164081-1-f.ebner@proxmox.com> References: <20210928114001.164081-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.306 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 Subject: [pve-devel] [PATCH widget-toolkit 1/2] (multi) disk selector: allow requesting partitions too 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: Tue, 28 Sep 2021 11:40:50 -0000 No functional change for existing users is intended. Signed-off-by: Fabian Ebner --- src/form/DiskSelector.js | 7 +++++++ src/form/MultiDiskSelector.js | 22 +++++++++++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/form/DiskSelector.js b/src/form/DiskSelector.js index 4552beb..3292661 100644 --- a/src/form/DiskSelector.js +++ b/src/form/DiskSelector.js @@ -8,6 +8,9 @@ Ext.define('Proxmox.form.DiskSelector', { // journal_disk: all disks with gpt diskType: undefined, + // use include-partitions=1 as a parameter + includePartitions: false, + // the property the backend wnats for the type ('type' by default) typeProperty: 'type', @@ -53,6 +56,10 @@ Ext.define('Proxmox.form.DiskSelector', { extraParams[me.typeProperty] = me.diskType; } + if (me.includePartitions) { + extraParams['include-partitions'] = 1; + } + var store = Ext.create('Ext.data.Store', { filterOnLoad: true, model: 'pmx-disk-list', diff --git a/src/form/MultiDiskSelector.js b/src/form/MultiDiskSelector.js index 9e989a4..88cdc80 100644 --- a/src/form/MultiDiskSelector.js +++ b/src/form/MultiDiskSelector.js @@ -24,6 +24,9 @@ Ext.define('Proxmox.form.MultiDiskSelector', { // the type of disks to show diskType: 'unused', + // add include-partitions=1 as a request parameter + includePartitions: false, + disks: [], allowBlank: false, @@ -141,22 +144,31 @@ Ext.define('Proxmox.form.MultiDiskSelector', { initComponent: function() { let me = this; + let extraParams = {}; + if (!me.url) { if (!me.nodename) { throw "no url or nodename given"; } - let node = me.nodename; - let param = me.typeParameter; - let type = me.diskType; - me.url = `/api2/json/nodes/${node}/disks/list?${param}=${type}`; + me.url = `/api2/json/nodes/${me.nodename}/disks/list`; + + extraParams[me.typeParameter] = me.diskType; + + if (me.includePartitions) { + extraParams['include-partitions'] = 1; + } } me.disks = []; me.callParent(); let store = me.getStore(); - store.getProxy().setUrl(me.url); + store.setProxy({ + type: 'proxmox', + url: me.url, + extraParams, + }); store.load(); store.sort({ property: me.valueField }); }, -- 2.30.2