proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-07-27 13:21:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ui: sdn: zonedit: fix display && refactor

Browse Source 
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>
This commit is contained in:
Alexandre Derumier 2023-06-17 14:43:05 +02:00 committed by Fabian Grünbichler
parent a083d41041
commit a8e18f8560
6 changed files with 33 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
www/manager6/sdn/zones/Base.js
View File

@ -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'),

27
www/manager6/sdn/zones/EvpnEdit.js
View File

@ -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();

26
www/manager6/sdn/zones/QinQEdit.js
View File

@ -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();

30
www/manager6/sdn/zones/SimpleEdit.js
View File

@ -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();
},

27
www/manager6/sdn/zones/VlanEdit.js
View File

@ -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();

26
www/manager6/sdn/zones/VxlanEdit.js
View File

@ -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();