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 C4E148A472 for ; Thu, 20 Oct 2022 09:18:25 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9FD543B8C for ; Thu, 20 Oct 2022 09:17:55 +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 for ; Thu, 20 Oct 2022 09:17:54 +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 1E7C244A97 for ; Thu, 20 Oct 2022 09:17:54 +0200 (CEST) From: Stefan Sterz To: pve-devel@lists.proxmox.com Date: Thu, 20 Oct 2022 09:17:04 +0200 Message-Id: <20221020071704.46578-2-s.sterz@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221020071704.46578-1-s.sterz@proxmox.com> References: <20221020071704.46578-1-s.sterz@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.114 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 manager v3 2/2] ui: only allow rbd pools to be added as rbd storage 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: Thu, 20 Oct 2022 07:18:25 -0000 previously the ui would allow adding all pools (even the default ceph-mon pools) as storage. this could lead to issues when users did use these pools as storage (e.g.: vms missing their disks after a migration). hence, restrict the pool selector to rbd pools. fails gracefully by reverting to the previous behavior if a pool has no application assigned to it. Signed-off-by: Stefan Sterz --- v3: changed the name of the filter function based on alwin antreich's suggestion www/manager6/form/CephPoolSelector.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/www/manager6/form/CephPoolSelector.js b/www/manager6/form/CephPoolSelector.js index 5b96398d..b98feb54 100644 --- a/www/manager6/form/CephPoolSelector.js +++ b/www/manager6/form/CephPoolSelector.js @@ -15,9 +15,17 @@ Ext.define('PVE.form.CephPoolSelector', { throw "no nodename given"; } + let onlyCephRBDPools = (item) => { + let apps = item.data?.applications; + return apps === undefined || apps?.rbd !== undefined; + }; + var store = Ext.create('Ext.data.Store', { fields: ['name'], sorters: 'name', + filters: [ + onlyCephRBDPools, + ], proxy: { type: 'proxmox', url: '/api2/json/nodes/' + me.nodename + '/ceph/pools', @@ -32,8 +40,10 @@ Ext.define('PVE.form.CephPoolSelector', { store.load({ callback: function(rec, op, success) { - if (success && rec.length > 0) { - me.select(rec[0]); + let filteredRec = rec.filter(onlyCephRBDPools); + + if (success && filteredRec.length > 0) { + me.select(filteredRec[0]); } }, }); -- 2.30.2