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 6008E63F9B for ; Mon, 5 Oct 2020 17:10:31 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 160021D04D for ; Mon, 5 Oct 2020 17:09:56 +0200 (CEST) Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id D13951CB55 for ; Mon, 5 Oct 2020 17:09:31 +0200 (CEST) Received: by kvmformation1.odiso.net (Postfix, from userid 0) id BC121E89A7; Mon, 5 Oct 2020 17:09:30 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 5 Oct 2020 17:09:27 +0200 Message-Id: <20201005150929.463334-12-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201005150929.463334-1-aderumier@odiso.com> References: <20201005150929.463334-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.386 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.248 From and EnvelopeFrom 2nd level mail domains are different 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 KHOP_HELO_FCRDNS 0.398 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records 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 Subject: [pve-devel] [PATCH v6 pve-manager 11/13] sdn: add options panel + move controller/ipam/dns view 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: Mon, 05 Oct 2020 15:10:31 -0000 Signed-off-by: Alexandre Derumier --- www/manager6/Makefile | 1 + www/manager6/dc/Config.js | 24 +++-------------- www/manager6/sdn/ControllerView.js | 1 + www/manager6/sdn/DnsView.js | 1 + www/manager6/sdn/IpamView.js | 2 ++ www/manager6/sdn/OptionsPanel.js | 41 ++++++++++++++++++++++++++++++ 6 files changed, 50 insertions(+), 20 deletions(-) create mode 100644 www/manager6/sdn/OptionsPanel.js diff --git a/www/manager6/Makefile b/www/manager6/Makefile index 50624c3d..17a5ba2d 100644 --- a/www/manager6/Makefile +++ b/www/manager6/Makefile @@ -215,6 +215,7 @@ JSSRC= \ sdn/SubnetView.js \ sdn/ZoneContentView.js \ sdn/ZoneView.js \ + sdn/OptionsPanel.js \ sdn/controllers/Base.js \ sdn/controllers/EvpnEdit.js \ sdn/IpamView.js \ diff --git a/www/manager6/dc/Config.js b/www/manager6/dc/Config.js index 97b37e6d..e2e84c9c 100644 --- a/www/manager6/dc/Config.js +++ b/www/manager6/dc/Config.js @@ -153,14 +153,6 @@ Ext.define('PVE.dc.Config', { itemId: 'sdn', expandedOnInit: true }, - { - xtype: 'pveSDNControllerView', - groups: ['sdn'], - title: gettext('Controllers'), - hidden: true, - iconCls: 'fa fa-crosshairs', - itemId: 'sdncontroller' - }, { xtype: 'pveSDNZoneView', groups: ['sdn'], @@ -178,20 +170,12 @@ Ext.define('PVE.dc.Config', { itemId: 'sdnvnet' }, { - xtype: 'pveSDNIpamView', - groups: ['sdn'], - title: gettext('Ipams'), - hidden: true, - iconCls: 'fa fa-network-wired', - itemId: 'sdnipam' - }, - { - xtype: 'pveSDNDnsView', + xtype: 'pveSDNOptions', groups: ['sdn'], - title: gettext('Dns'), + title: gettext('Options'), hidden: true, - iconCls: 'fa fa-network-wired', - itemId: 'sdndns' + iconCls: 'fa fa-gear', + itemId: 'sdnoptions' }); } diff --git a/www/manager6/sdn/ControllerView.js b/www/manager6/sdn/ControllerView.js index 0d991af3..4fdcdecd 100644 --- a/www/manager6/sdn/ControllerView.js +++ b/www/manager6/sdn/ControllerView.js @@ -125,6 +125,7 @@ Ext.define('PVE.sdn.ControllerView', { } }); + store.load(); me.callParent(); } }); diff --git a/www/manager6/sdn/DnsView.js b/www/manager6/sdn/DnsView.js index 6d47e38f..2459327e 100644 --- a/www/manager6/sdn/DnsView.js +++ b/www/manager6/sdn/DnsView.js @@ -126,6 +126,7 @@ Ext.define('PVE.sdn.DnsView', { } }); + store.load(); me.callParent(); } }); diff --git a/www/manager6/sdn/IpamView.js b/www/manager6/sdn/IpamView.js index 605f44c7..4635b2ab 100644 --- a/www/manager6/sdn/IpamView.js +++ b/www/manager6/sdn/IpamView.js @@ -126,6 +126,8 @@ Ext.define('PVE.sdn.IpamView', { } }); + store.load(); me.callParent(); + } }); diff --git a/www/manager6/sdn/OptionsPanel.js b/www/manager6/sdn/OptionsPanel.js new file mode 100644 index 00000000..d9145299 --- /dev/null +++ b/www/manager6/sdn/OptionsPanel.js @@ -0,0 +1,41 @@ +Ext.define('PVE.sdn.Options', { + extend: 'Ext.panel.Panel', + alias: 'widget.pveSDNOptions', + + title: 'Options', + + layout: { + type: 'vbox', + align: 'stretch' + }, + +// onlineHelp: 'pvesdn_config_vnet', + + initComponent: function() { + var me = this; + + me.items = [ + { + xtype: 'pveSDNControllerView', + title: gettext('Controllers'), + border: 0, + collapsible: true, + padding: '0 0 20 0' + }, + { + xtype: 'pveSDNIpamView', + title: gettext('Ipams'), + border: 0, + collapsible: true, + padding: '0 0 20 0' + },{ + xtype: 'pveSDNDnsView', + flex: 1, + collapsible: true, + title: gettext('Dns'), + border: 0, + }]; + + me.callParent(); + } +}); -- 2.20.1