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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id D01D8BC2E2 for ; Fri, 22 Dec 2023 11:43:18 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B56534299 for ; Fri, 22 Dec 2023 11:43:18 +0100 (CET) Received: from lana.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Fri, 22 Dec 2023 11:43:17 +0100 (CET) Received: by lana.proxmox.com (Postfix, from userid 10043) id 9B9652C2F2C; Fri, 22 Dec 2023 11:43:17 +0100 (CET) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Fri, 22 Dec 2023 11:43:16 +0100 Message-Id: <20231222104316.107600-1-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.413 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-manager] sdn: vnets: Hide irrelevant fields depending on zone type 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, 22 Dec 2023 10:43:18 -0000 Not all fields in the VnetEdit dialog are necessary for every zone type. This lead to confusion for some users. Hide fields in the VNetEdit dialog depending on which kind of zone is selected in order to prevent potential confusion. Signed-off-by: Stefan Hanreich --- www/manager6/form/SDNZoneSelector.js | 2 +- www/manager6/sdn/VnetEdit.js | 40 ++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/www/manager6/form/SDNZoneSelector.js b/www/manager6/form/SDNZoneSelector.js index 28c3457d2..0d0327529 100644 --- a/www/manager6/form/SDNZoneSelector.js +++ b/www/manager6/form/SDNZoneSelector.js @@ -40,7 +40,7 @@ Ext.define('PVE.form.SDNZoneSelector', { }, function() { Ext.define('pve-sdn-zone', { extend: 'Ext.data.Model', - fields: ['zone'], + fields: ['zone', 'type'], proxy: { type: 'proxmox', url: "/api2/json/cluster/sdn/zones", diff --git a/www/manager6/sdn/VnetEdit.js b/www/manager6/sdn/VnetEdit.js index cdd83ed40..9fb6cd6c7 100644 --- a/www/manager6/sdn/VnetEdit.js +++ b/www/manager6/sdn/VnetEdit.js @@ -12,6 +12,13 @@ Ext.define('PVE.sdn.VnetInputPanel', { return values; }, + initComponent: function() { + let me = this; + + me.callParent(); + me.setZoneType(undefined); + }, + items: [ { xtype: 'pmxDisplayEditField', @@ -40,9 +47,21 @@ Ext.define('PVE.sdn.VnetInputPanel', { name: 'zone', value: '', allowBlank: false, + listeners: { + change: function() { + let me = this; + + let record = me.findRecordByValue(me.value); + let zoneType = record?.data?.type; + + let panel = me.up('panel'); + panel.setZoneType(zoneType); + }, + }, }, { xtype: 'proxmoxintegerfield', + itemId: 'sdnVnetTagField', name: 'tag', minValue: 1, maxValue: 16777216, @@ -54,6 +73,7 @@ Ext.define('PVE.sdn.VnetInputPanel', { }, { xtype: 'proxmoxcheckbox', + itemId: 'sdnVnetVlanAwareField', name: 'vlanaware', uncheckedValue: null, checked: false, @@ -63,6 +83,26 @@ Ext.define('PVE.sdn.VnetInputPanel', { }, }, ], + + setZoneType: function(zoneType) { + let me = this; + + let tagField = me.down('#sdnVnetTagField'); + if (!zoneType || zoneType === 'simple') { + tagField.setVisible(false); + tagField.setValue(''); + } else { + tagField.setVisible(true); + } + + let vlanField = me.down('#sdnVnetVlanAwareField'); + if (!zoneType || zoneType === 'evpn') { + vlanField.setVisible(false); + vlanField.setValue(''); + } else { + vlanField.setVisible(true); + } + }, }); Ext.define('PVE.sdn.VnetEdit', { -- 2.39.2