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 ED20FE898 for ; Wed, 19 Jul 2023 13:20:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CE7D1622A for ; Wed, 19 Jul 2023 13:20:38 +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 ; Wed, 19 Jul 2023 13:20:38 +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 C7F4A40FB2 for ; Wed, 19 Jul 2023 13:20:37 +0200 (CEST) Date: Wed, 19 Jul 2023 13:20:31 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20230617124305.346338-1-aderumier@odiso.com> In-Reply-To: <20230617124305.346338-1-aderumier@odiso.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1689765622.oktkruwfvx.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL -0.330 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_ASCII_DIVIDERS 0.8 Email that uses ascii formatting dividers and possible spam tricks 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [me.zone, proxmox.com] Subject: [pve-devel] applied: [PATCH pve-manager] ui: sdn: zonedit: fix display && refactor 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: Wed, 19 Jul 2023 11:20:39 -0000 thanks! On June 17, 2023 2:43 pm, Alexandre Derumier wrote: > move ipam selector to main items as it's non optional, and it's breaking > display if present in advanced. >=20 > move common id,mtu,nodes fields from modules to base >=20 > Signed-off-by: Alexandre Derumier > --- > www/manager6/sdn/zones/Base.js | 34 ++++++++++++++++++++++++++-- > www/manager6/sdn/zones/EvpnEdit.js | 27 ---------------------- > www/manager6/sdn/zones/QinQEdit.js | 26 --------------------- > www/manager6/sdn/zones/SimpleEdit.js | 30 +----------------------- > www/manager6/sdn/zones/VlanEdit.js | 27 ---------------------- > www/manager6/sdn/zones/VxlanEdit.js | 26 --------------------- > 6 files changed, 33 insertions(+), 137 deletions(-) >=20 > diff --git a/www/manager6/sdn/zones/Base.js b/www/manager6/sdn/zones/Base= .js > index 347889c0..655352a8 100644 > --- a/www/manager6/sdn/zones/Base.js > +++ b/www/manager6/sdn/zones/Base.js > @@ -18,14 +18,44 @@ Ext.define('PVE.panel.SDNZoneBase', { > initComponent: function() { > var me =3D this; > =20 > - me.advancedItems =3D [ > + me.items.unshift({ > + xtype: me.isCreate ? 'textfield' : 'displayfield', > + name: 'zone', > + maxLength: 8, > + value: me.zone || '', > + fieldLabel: 'ID', > + allowBlank: false, > + }); > + > + me.items.push( > + { > + xtype: 'proxmoxintegerfield', > + name: 'mtu', > + minValue: 100, > + maxValue: 65000, > + fieldLabel: 'MTU', > + skipEmptyText: true, > + allowBlank: true, > + emptyText: 'auto', > + }, > + { > + xtype: 'pveNodeSelector', > + name: 'nodes', > + fieldLabel: gettext('Nodes'), > + emptyText: gettext('All') + ' (' + gettext('No restricti= ons') +')', > + multiSelect: true, > + autoSelect: false, > + }, > { > xtype: 'pveSDNIpamSelector', > fieldLabel: gettext('Ipam'), > name: 'ipam', > - value: 'pve', > + value: me.ipam || 'pve', > allowBlank: false, > }, > + ); > + > + me.advancedItems =3D [ > { > xtype: 'pveSDNDnsSelector', > fieldLabel: gettext('Dns server'), > diff --git a/www/manager6/sdn/zones/EvpnEdit.js b/www/manager6/sdn/zones/= EvpnEdit.js > index f1314ad5..1d13976c 100644 > --- a/www/manager6/sdn/zones/EvpnEdit.js > +++ b/www/manager6/sdn/zones/EvpnEdit.js > @@ -39,14 +39,6 @@ Ext.define('PVE.sdn.zones.EvpnInputPanel', { > var me =3D this; > =20 > me.items =3D [ > - { > - xtype: me.isCreate ? 'textfield' : 'displayfield', > - name: 'zone', > - maxLength: 8, > - value: me.zone || '', > - fieldLabel: 'ID', > - allowBlank: false, > - }, > { > xtype: 'pveSDNControllerSelector', > fieldLabel: gettext('Controller'), > @@ -111,25 +103,6 @@ Ext.define('PVE.sdn.zones.EvpnInputPanel', { > fieldLabel: gettext('Route-target import'), > allowBlank: true, > }, > - { > - xtype: 'proxmoxintegerfield', > - name: 'mtu', > - minValue: 100, > - maxValue: 65000, > - fieldLabel: 'MTU', > - skipEmptyText: true, > - allowBlank: true, > - emptyText: 'auto', > - }, > - { > - xtype: 'pveNodeSelector', > - name: 'nodes', > - fieldLabel: gettext('Nodes'), > - emptyText: gettext('All') + ' (' + gettext('No restrictions') +')', > - multiSelect: true, > - autoSelect: false, > - }, > - > ]; > =20 > me.callParent(); > diff --git a/www/manager6/sdn/zones/QinQEdit.js b/www/manager6/sdn/zones/= QinQEdit.js > index d9e117d9..c059a7a2 100644 > --- a/www/manager6/sdn/zones/QinQEdit.js > +++ b/www/manager6/sdn/zones/QinQEdit.js > @@ -19,14 +19,6 @@ Ext.define('PVE.sdn.zones.QinQInputPanel', { > let me =3D this; > =20 > me.items =3D [ > - { > - xtype: me.isCreate ? 'textfield' : 'displayfield', > - name: 'zone', > - maxLength: 8, > - value: me.zone || '', > - fieldLabel: 'ID', > - allowBlank: false, > - }, > { > xtype: 'textfield', > name: 'bridge', > @@ -52,24 +44,6 @@ Ext.define('PVE.sdn.zones.QinQInputPanel', { > ['802.1ad', '802.1ad'], > ], > }, > - { > - xtype: 'proxmoxintegerfield', > - name: 'mtu', > - minValue: 100, > - maxValue: 65000, > - fieldLabel: 'MTU', > - skipEmptyText: true, > - allowBlank: true, > - emptyText: 'auto', > - }, > - { > - xtype: 'pveNodeSelector', > - name: 'nodes', > - fieldLabel: gettext('Nodes'), > - emptyText: gettext('All') + ' (' + gettext('No restrictions') +')', > - multiSelect: true, > - autoSelect: false, > - }, > ]; > =20 > me.callParent(); > diff --git a/www/manager6/sdn/zones/SimpleEdit.js b/www/manager6/sdn/zone= s/SimpleEdit.js > index 56df7952..cb7c3403 100644 > --- a/www/manager6/sdn/zones/SimpleEdit.js > +++ b/www/manager6/sdn/zones/SimpleEdit.js > @@ -18,35 +18,7 @@ Ext.define('PVE.sdn.zones.SimpleInputPanel', { > initComponent: function() { > var me =3D this; > =20 > - me.items =3D [ > - { > - xtype: me.isCreate ? 'textfield' : 'displayfield', > - name: 'zone', > - maxLength: 10, > - value: me.zone || '', > - fieldLabel: 'ID', > - allowBlank: false, > - }, > - { > - xtype: 'proxmoxintegerfield', > - name: 'mtu', > - minValue: 100, > - maxValue: 65000, > - fieldLabel: 'MTU', > - skipEmptyText: true, > - allowBlank: true, > - emptyText: 'auto', > - }, > - { > - xtype: 'pveNodeSelector', > - name: 'nodes', > - fieldLabel: gettext('Nodes'), > - emptyText: gettext('All') + ' (' + gettext('No restrictions'= ) +')', > - multiSelect: true, > - autoSelect: false, > - }, > - > - ]; > + me.items =3D []; > =20 > me.callParent(); > }, > diff --git a/www/manager6/sdn/zones/VlanEdit.js b/www/manager6/sdn/zones/= VlanEdit.js > index 93d2bede..23530bfc 100644 > --- a/www/manager6/sdn/zones/VlanEdit.js > +++ b/www/manager6/sdn/zones/VlanEdit.js > @@ -19,39 +19,12 @@ Ext.define('PVE.sdn.zones.VlanInputPanel', { > var me =3D this; > =20 > me.items =3D [ > - { > - xtype: me.isCreate ? 'textfield' : 'displayfield', > - name: 'zone', > - maxLength: 10, > - value: me.zone || '', > - fieldLabel: 'ID', > - allowBlank: false, > - }, > { > xtype: 'textfield', > name: 'bridge', > fieldLabel: 'Bridge', > allowBlank: false, > }, > - { > - xtype: 'proxmoxintegerfield', > - name: 'mtu', > - minValue: 100, > - maxValue: 65000, > - fieldLabel: 'MTU', > - skipEmptyText: true, > - allowBlank: true, > - emptyText: 'auto', > - }, > - { > - xtype: 'pveNodeSelector', > - name: 'nodes', > - fieldLabel: gettext('Nodes'), > - emptyText: gettext('All') + ' (' + gettext('No restrictions'= ) +')', > - multiSelect: true, > - autoSelect: false, > - }, > - > ]; > =20 > me.callParent(); > diff --git a/www/manager6/sdn/zones/VxlanEdit.js b/www/manager6/sdn/zones= /VxlanEdit.js > index 41cc7e68..b556790d 100644 > --- a/www/manager6/sdn/zones/VxlanEdit.js > +++ b/www/manager6/sdn/zones/VxlanEdit.js > @@ -21,38 +21,12 @@ Ext.define('PVE.sdn.zones.VxlanInputPanel', { > var me =3D this; > =20 > me.items =3D [ > - { > - xtype: me.isCreate ? 'textfield' : 'displayfield', > - maxLength: 8, > - name: 'zone', > - value: me.zone || '', > - fieldLabel: 'ID', > - allowBlank: false, > - }, > { > xtype: 'textfield', > name: 'peers', > fieldLabel: gettext('Peer Address List'), > allowBlank: false, > }, > - { > - xtype: 'proxmoxintegerfield', > - name: 'mtu', > - minValue: 100, > - maxValue: 65000, > - fieldLabel: 'MTU', > - skipEmptyText: true, > - allowBlank: true, > - emptyText: 'auto', > - }, > - { > - xtype: 'pveNodeSelector', > - name: 'nodes', > - fieldLabel: gettext('Nodes'), > - emptyText: gettext('All') + ' (' + gettext('No restrictions') +')', > - multiSelect: true, > - autoSelect: false, > - }, > ]; > =20 > me.callParent(); > --=20 > 2.39.2 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20