refactor js/MailProxyTLSDomains.js

make TLS policy selection a widget of its own, and improve splitting
between logic and presentation

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

js/MailProxyTLSDomains.js

@@ -2,23 +2,10 @@
 Ext.define('pmg-tls-policy', {
     extend: 'Ext.data.Model',
     fields: [ 'domain', 'policy' ],
-    idProperty: 'domain'
+    idProperty: 'domain',
-});
-
-Ext.define('PMG.MailProxyTLSDomains', {
-    extend: 'Ext.grid.GridPanel',
-    alias: ['widget.pmgMailProxyTLSDomains'],
-
-    initComponent : function() {
-	var me = this;
-
-	var baseurl = '/config/tlspolicy';
-	var rstore = Ext.create('Proxmox.data.UpdateStore', {
-	    model: 'pmg-tls-policy',
-	    storeid: 'pmg-mailproxy-tls-store-' + (++Ext.idSeed),
     proxy: {
 	type: 'proxmox',
-		url: '/api2/json' + baseurl
+	url: '/api2/json/config/tlspolicy'
     },
     sorters: {
 	property: 'domain',
@@ -26,25 +13,30 @@ Ext.define('PMG.MailProxyTLSDomains', {
     }
 });
 
-	var store = Ext.create('Proxmox.data.DiffStore', { rstore: rstore});
+Ext.define('PMG.TLSDomainEdit', {
+    extend: 'Proxmox.window.Edit',
+    xtype: 'pmgTLSDomainEdit',
 
-        var reload = function() {
+    subject: gettext('TLS Policy'),
-            rstore.load();
+    initComponent : function() {
-        };
+	var me = this;
 
-	me.selModel = Ext.create('Ext.selection.RowModel', {});
+	var isCreate = ! Ext.isDefined(me.domain);
 
-	var remove_btn = Ext.createWidget('proxmoxStdRemoveButton', {
+	var url = '/api2/extjs/config/tlspolicy' + (isCreate ? '' : '/' + me.domain);
-	    selModel: me.selModel,
+	var method = isCreate ? 'POST' : 'PUT';
-	    baseurl: baseurl,
+	var text = isCreate ? 'Create' : 'Edit';
-	    callback: reload,
-	    waitMsgTarget: me
-	});
 
-	var policy_selector_properties = {
+	var items = [
+	    {
+		xtype: isCreate ? 'proxmoxtextfield' : 'displayfield',
+		name: 'domain',
+		fieldLabel: gettext('Domain')
+	    },
+	    {
 		xtype: 'proxmoxKVComboBox',
 		name: 'policy',
-	    fieldLabel: 'Policy',
+		fieldLabel: gettext('Policy'),
 		deleteEmpty: false,
 		comboItems: [
 		    [ 'none', 'none' ],
@@ -58,75 +50,24 @@ Ext.define('PMG.MailProxyTLSDomains', {
 		],
 		allowBlank: true,
 		value: 'encrypt'
-	};
-
-	var run_editor = function() {
-	    var rec = me.selModel.getSelection()[0];
-	    if (!rec) {
-		return;
 	    }
-
-	    var config = {
-		url: '/api2/extjs' + baseurl + '/' + rec.data.domain,
-		method: 'PUT',
-		subject: gettext('TLS Policy'),
-		items: [
-		    {
-			xtype: 'displayfield',
-			name: 'domain',
-			fieldLabel: gettext('Domain')
-		    },
-		    policy_selector_properties
-		]
-	    };
-
-	    var win = Ext.createWidget('proxmoxWindowEdit', config);
-
-	    win.load();
-	    win.on('destroy', reload);
-	    win.show();
-	};
-
-	var tbar = [
-            {
-		xtype: 'proxmoxButton',
-		text: gettext('Edit'),
-		disabled: true,
-		selModel: me.selModel,
-		handler: run_editor
-            },
-	    {
-		text: gettext('Create'),
-		handler: function() {
-		    var config = {
-			url: '/api2/extjs' + baseurl,
-			method: 'POST',
-			subject: gettext('TLS Policy'),
-			isCreate: true,
-			items: [
-			    {
-				xtype: 'proxmoxtextfield',
-				name: 'domain',
-				fieldLabel: gettext('Domain')
-			    }, policy_selector_properties
-			]
-		    };
-
-		    var win = Ext.createWidget('proxmoxWindowEdit', config);
-
-		    win.on('destroy', reload);
-		    win.show();
-		}
-            },
-	    remove_btn
 	];
 
-	Proxmox.Utils.monStoreErrors(me, store, true);
-
 	Ext.apply(me, {
-	    store: store,
+	    url: url,
-	    tbar: tbar,
+	    method: method,
-	    run_editor: run_editor,
+	    items: items,
+	    text: text
+	});
+
+	me.callParent();
+    }
+});
+
+Ext.define('PMG.MailProxyTLSDomains', {
+    extend: 'Ext.grid.GridPanel',
+    alias: ['widget.pmgMailProxyTLSDomains'],
+
     viewConfig: {
 	trackOver: false
     },
@@ -144,6 +85,69 @@ Ext.define('PMG.MailProxyTLSDomains', {
 	    flex: 1
 	}
     ],
+
+    initComponent : function() {
+	var me = this;
+
+	var rstore = Ext.create('Proxmox.data.UpdateStore', {
+	    model: 'pmg-tls-policy',
+	    storeid: 'pmg-mailproxy-tls-store-' + (++Ext.idSeed)
+	});
+
+	var store = Ext.create('Proxmox.data.DiffStore', { rstore: rstore});
+
+        var reload = function() {
+            rstore.load();
+        };
+
+	me.selModel = Ext.create('Ext.selection.RowModel', {});
+
+	var run_editor = function() {
+	    var rec = me.selModel.getSelection()[0];
+	    if (!rec) {
+		return;
+	    }
+
+	    var win = Ext.createWidget('pmgTLSDomainEdit', {
+		domain: rec.data.domain
+	    });
+
+	    win.load();
+	    win.on('destroy', reload);
+	    win.show();
+	};
+
+	var tbar = [
+            {
+		xtype: 'proxmoxButton',
+		disabled: true,
+		text: gettext('Edit'),
+		handler: run_editor
+            },
+	    {
+		text: gettext('Create'),
+		handler: function() {
+		    var win = Ext.createWidget('pmgTLSDomainEdit');
+
+		    win.load();
+		    win.on('destroy', reload);
+		    win.show();
+		}
+            },
+	    {
+		xtype: 'proxmoxStdRemoveButton',
+		baseurl: '/config/tlspolicy',
+		callback: reload,
+		waitMsgTarget: me
+	    }
+        ];
+
+	Proxmox.Utils.monStoreErrors(me, store, true);
+
+	Ext.apply(me, {
+	    store: store,
+	    tbar: tbar,
+	    run_editor: run_editor,
 	    listeners: {
 		itemdblclick: run_editor,
 		activate: reload