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 8F96076806 for ; Tue, 19 Oct 2021 11:34:02 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1413A2AFA7 for ; Tue, 19 Oct 2021 11:33:59 +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 A32742AF22 for ; Tue, 19 Oct 2021 11:33:55 +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 57717468D2 for ; Tue, 19 Oct 2021 11:33:55 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Tue, 19 Oct 2021 11:33:50 +0200 Message-Id: <20211019093353.2451987-10-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211019093353.2451987-1-d.csapak@proxmox.com> References: <20211019093353.2451987-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.289 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 08/11] ui: storage/cephfs: make ceph fs selectable 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, 19 Oct 2021 09:34:02 -0000 by adding a CephFSSelector and using it in the CephFSEdit window (similar to the poolselector/textfield) Signed-off-by: Dominik Csapak --- www/manager6/Makefile | 1 + www/manager6/form/CephFSSelector.js | 42 +++++++++++++++++++++++++++++ www/manager6/storage/CephFSEdit.js | 25 +++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 www/manager6/form/CephFSSelector.js diff --git a/www/manager6/Makefile b/www/manager6/Makefile index 3d1778c2..a759db87 100644 --- a/www/manager6/Makefile +++ b/www/manager6/Makefile @@ -26,6 +26,7 @@ JSSRC= \ form/CacheTypeSelector.js \ form/CalendarEvent.js \ form/CephPoolSelector.js \ + form/CephFSSelector.js \ form/CompressionSelector.js \ form/ContentTypeSelector.js \ form/ControllerSelector.js \ diff --git a/www/manager6/form/CephFSSelector.js b/www/manager6/form/CephFSSelector.js new file mode 100644 index 00000000..3c86e3cf --- /dev/null +++ b/www/manager6/form/CephFSSelector.js @@ -0,0 +1,42 @@ +Ext.define('PVE.form.CephFSSelector', { + extend: 'Ext.form.field.ComboBox', + alias: 'widget.pveCephFSSelector', + + allowBlank: false, + valueField: 'name', + displayField: 'name', + editable: false, + queryMode: 'local', + + initComponent: function() { + var me = this; + + if (!me.nodename) { + throw "no nodename given"; + } + + var store = Ext.create('Ext.data.Store', { + fields: ['name'], + sorters: 'name', + proxy: { + type: 'proxmox', + url: '/api2/json/nodes/' + me.nodename + '/ceph/fs', + }, + }); + + Ext.apply(me, { + store: store, + }); + + me.callParent(); + + store.load({ + callback: function(rec, op, success) { + if (success && rec.length > 0) { + me.select(rec[0]); + } + }, + }); + }, + +}); diff --git a/www/manager6/storage/CephFSEdit.js b/www/manager6/storage/CephFSEdit.js index 1f5246cd..92fdfe63 100644 --- a/www/manager6/storage/CephFSEdit.js +++ b/www/manager6/storage/CephFSEdit.js @@ -64,6 +64,31 @@ Ext.define('PVE.storage.CephFSInputPanel', { }, ); + if (me.isCreate) { + me.column1.push({ + xtype: 'pveCephFSSelector', + nodename: me.nodename, + name: 'fs-name', + bind: { + disabled: '{!pveceph}', + submitValue: '{pveceph}', + hidden: '{!pveceph}', + }, + fieldLabel: gettext('FS Name'), + allowBlank: false, + }, { + xtype: 'textfield', + nodename: me.nodename, + name: 'fs-name', + bind: { + disabled: '{pveceph}', + submitValue: '{!pveceph}', + hidden: '{pveceph}', + }, + fieldLabel: gettext('FS Name'), + }); + } + me.column2 = [ { xtype: 'pveContentTypeSelector', -- 2.30.2