ui: sdn: zonedit: fix display && refactor

move ipam selector to main items as it's non optional, and it's breaking
display if present in advanced.

move common id,mtu,nodes fields from modules to base

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>

www/manager6/sdn/zones/Base.js

@@ -18,14 +18,44 @@ Ext.define('PVE.panel.SDNZoneBase', {
     initComponent: function() {
 	var me = this;
 
-	me.advancedItems = [
+	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 restrictions') +')',
+                multiSelect: true,
+                autoSelect: false,
+            },
 	    {
 		xtype: 'pveSDNIpamSelector',
 		fieldLabel: gettext('Ipam'),
 		name: 'ipam',
-		value: 'pve',
+		value: me.ipam || 'pve',
 		allowBlank: false,
 	    },
+	);
+
+	me.advancedItems = [
 	    {
 		xtype: 'pveSDNDnsSelector',
 		fieldLabel: gettext('Dns server'),

www/manager6/sdn/zones/EvpnEdit.js

@@ -39,14 +39,6 @@ Ext.define('PVE.sdn.zones.EvpnInputPanel', {
 	var me = this;
 
 	me.items = [
-	    {
-		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,
-	    },
-
 	];
 
 	me.callParent();

www/manager6/sdn/zones/QinQEdit.js

@@ -19,14 +19,6 @@ Ext.define('PVE.sdn.zones.QinQInputPanel', {
 	let me = this;
 
 	me.items = [
-	    {
-		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,
-	    },
 	];
 
 	me.callParent();

www/manager6/sdn/zones/SimpleEdit.js

@@ -18,35 +18,7 @@ Ext.define('PVE.sdn.zones.SimpleInputPanel', {
     initComponent: function() {
 	var me = this;
 
-        me.items = [
+        me.items = [];
-           {
-            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.callParent();
     },

www/manager6/sdn/zones/VlanEdit.js

@@ -19,39 +19,12 @@ Ext.define('PVE.sdn.zones.VlanInputPanel', {
 	var me = this;
 
         me.items = [
-           {
-            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,
-          },
-
 	];
 
 	me.callParent();

www/manager6/sdn/zones/VxlanEdit.js

@@ -21,38 +21,12 @@ Ext.define('PVE.sdn.zones.VxlanInputPanel', {
 	var me = this;
 
 	me.items = [
-	    {
-		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,
-	    },
 	];
 
 	me.callParent();