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>

diff --git a/www/manager6/sdn/zones/Base.js b/www/manager6/sdn/zones/Base.js
index 347889c045068867e98e34d5c3b7056458913ed8..655352a86d84c1f14bb1d5a24a547ae987c1adfd 100644 (file)
--- 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 = 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'),

diff --git a/www/manager6/sdn/zones/EvpnEdit.js b/www/manager6/sdn/zones/EvpnEdit.js
index f1314ad5748310cfcf3bec236d3771d80e8a92d9..1d13976c94d175e29398b01ccac751ed5d476557 100644 (file)
--- 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 = 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();

diff --git a/www/manager6/sdn/zones/QinQEdit.js b/www/manager6/sdn/zones/QinQEdit.js
index d9e117d9800e698f108bf2170c15526d05f643ea..c059a7a23c17082727d686fee05ac6f8417549b4 100644 (file)
--- 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 = 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();

diff --git a/www/manager6/sdn/zones/SimpleEdit.js b/www/manager6/sdn/zones/SimpleEdit.js
index 56df7952a864043e70a948b3b0523274e020362b..cb7c34035b399614b222f308c50df4a58ef137fd 100644 (file)
--- 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 = this;
 
-        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.items = [];
 
        me.callParent();
     },

diff --git a/www/manager6/sdn/zones/VlanEdit.js b/www/manager6/sdn/zones/VlanEdit.js
index 93d2bedecad81263a6e8a9134d4525f3dd6f3c73..23530bfcfc046e74ec9f2e1110dd80e2263c8cf8 100644 (file)
--- 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 = 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();

diff --git a/www/manager6/sdn/zones/VxlanEdit.js b/www/manager6/sdn/zones/VxlanEdit.js
index 41cc7e68df404ab3f340baa2bb69dbeb74c38805..b556790df3ff1e12936e8e210e3e2723c4ebd4ff 100644 (file)
--- 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 = 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();