X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=www%2Fmanager6%2Fha%2FGroupEdit.js;h=2c42de6bd8780cec2254881d996913bf3819c34b;hb=refs%2Fheads%2Fmaster;hp=a618f0c704b75f1c9411f271f1d699ce8283bbfe;hpb=78fa628075bc325f14fb939afb542e75f2bda0c8;p=pve-manager.git

diff --git a/www/manager6/ha/GroupEdit.js b/www/manager6/ha/GroupEdit.js
index a618f0c7..6db7bd05 100644
--- a/www/manager6/ha/GroupEdit.js
+++ b/www/manager6/ha/GroupEdit.js
@@ -1,53 +1,163 @@
 Ext.define('PVE.ha.GroupInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
+    onlineHelp: 'ha_manager_groups',
 
     groupId: undefined,
-    
+
     onGetValues: function(values) {
 	var me = this;
 
-	if (me.create) {
+	if (me.isCreate) {
 	    values.type = 'group';
 	}
 
 	return values;
     },
 
-    initComponent : function() {
+    initComponent: function() {
 	var me = this;
 
+	let update_nodefield, update_node_selection;
+
+	let sm = Ext.create('Ext.selection.CheckboxModel', {
+	    mode: 'SIMPLE',
+	    listeners: {
+		selectionchange: function(model, selected) {
+		    update_nodefield(selected);
+		},
+	    },
+	});
+
+	let store = Ext.create('Ext.data.Store', {
+	    fields: ['node', 'mem', 'cpu', 'priority'],
+	    data: PVE.data.ResourceStore.getNodes(), // use already cached data to avoid an API call
+	    proxy: {
+		type: 'memory',
+		reader: { type: 'json' },
+	    },
+	    sorters: [
+		{
+		    property: 'node',
+		    direction: 'ASC',
+		},
+	    ],
+	});
+
+	var nodegrid = Ext.createWidget('grid', {
+	    store: store,
+	    border: true,
+	    height: 300,
+	    selModel: sm,
+	    columns: [
+		{
+		    header: gettext('Node'),
+		    flex: 1,
+		    dataIndex: 'node',
+		},
+		{
+		    header: gettext('Memory usage') + " %",
+		    renderer: PVE.Utils.render_mem_usage_percent,
+		    sortable: true,
+		    width: 150,
+		    dataIndex: 'mem',
+		},
+		{
+		    header: gettext('CPU usage'),
+		    renderer: Proxmox.Utils.render_cpu,
+		    sortable: true,
+		    width: 150,
+		    dataIndex: 'cpu',
+		},
+		{
+		    header: gettext('Priority'),
+		    xtype: 'widgetcolumn',
+		    dataIndex: 'priority',
+		    sortable: true,
+		    stopSelection: true,
+		    widget: {
+			xtype: 'proxmoxintegerfield',
+			minValue: 0,
+			maxValue: 1000,
+			isFormField: false,
+			listeners: {
+			    change: function(numberfield, value, old_value) {
+				let record = numberfield.getWidgetRecord();
+				record.set('priority', value);
+				update_nodefield(sm.getSelection());
+				record.commit();
+			    },
+			},
+		    },
+		},
+	    ],
+	});
+
+	let nodefield = Ext.create('Ext.form.field.Hidden', {
+	    name: 'nodes',
+	    value: '',
+	    listeners: {
+		change: function(field, value) {
+		    update_node_selection(value);
+		},
+	    },
+	    isValid: function() {
+		let value = this.getValue();
+		return value && value.length !== 0;
+	    },
+	});
+
+	update_node_selection = function(string) {
+	    sm.deselectAll(true);
+
+	    string.split(',').forEach(function(e, idx, array) {
+		let [node, priority] = e.split(':');
+		store.each(function(record) {
+		    if (record.get('node') === node) {
+			sm.select(record, true);
+			record.set('priority', priority);
+			record.commit();
+		    }
+		});
+	    });
+	    nodegrid.reconfigure(store);
+	};
+
+	update_nodefield = function(selected) {
+	    let nodes = selected
+		.map(({ data }) => data.node + (data.priority ? `:${data.priority}` : ''))
+		.join(',');
+
+	    // nodefield change listener calls us again, which results in a
+	    // endless recursion, suspend the event temporary to avoid this
+	    nodefield.suspendEvent('change');
+	    nodefield.setValue(nodes);
+	    nodefield.resumeEvent('change');
+	};
+
 	me.column1 = [
 	    {
-		xtype: me.create ? 'textfield' : 'displayfield',
+		xtype: me.isCreate ? 'textfield' : 'displayfield',
 		name: 'group',
-		height: 22, // hack: set same height as text fields
 		value: me.groupId || '',
 		fieldLabel: 'ID',
 		vtype: 'StorageId',
-		allowBlank: false
-	    },
-	    {
-		xtype: 'PVE.form.NodeSelector',
-		name: 'nodes',
-		fieldLabel: gettext('Nodes'),
 		allowBlank: false,
-		multiSelect: true,
-		autoSelect: false
-	    }
+	    },
+	    nodefield,
 	];
 
 	me.column2 = [
 	    {
-		xtype: 'pvecheckbox',
+		xtype: 'proxmoxcheckbox',
 		name: 'restricted',
 		uncheckedValue: 0,
-		fieldLabel: gettext('restricted')
+		fieldLabel: 'restricted',
 	    },
 	    {
-		xtype: 'pvecheckbox',
+		xtype: 'proxmoxcheckbox',
 		name: 'nofailback',
 		uncheckedValue: 0,
-		fieldLabel: gettext('nofailback')
+		fieldLabel: 'nofailback',
 	    },
 	];
 
@@ -55,25 +165,26 @@ Ext.define('PVE.ha.GroupInputPanel', {
 	    {
 		xtype: 'textfield',
 		name: 'comment',
-		fieldLabel: gettext('Comment')
-	    }
+		fieldLabel: gettext('Comment'),
+	    },
+	    nodegrid,
 	];
-	
+
 	me.callParent();
-    }
+    },
 });
 
 Ext.define('PVE.ha.GroupEdit', {
-    extend: 'PVE.window.Edit',
+    extend: 'Proxmox.window.Edit',
 
     groupId: undefined,
 
-    initComponent : function() {
+    initComponent: function() {
 	var me = this;
- 
-	me.create = !me.groupId;
 
-	if (me.create) {
+	me.isCreate = !me.groupId;
+
+	if (me.isCreate) {
             me.url = '/api2/extjs/cluster/ha/groups';
             me.method = 'POST';
         } else {
@@ -82,29 +193,25 @@ Ext.define('PVE.ha.GroupEdit', {
         }
 
 	var ipanel = Ext.create('PVE.ha.GroupInputPanel', {
-	    create: me.create,
-	    groupId: me.groupId
+	    isCreate: me.isCreate,
+	    groupId: me.groupId,
 	});
 
 	Ext.apply(me, {
             subject: gettext('HA Group'),
-	    items: [ ipanel ]
+	    items: [ipanel],
 	});
-	
+
 	me.callParent();
 
-	if (!me.create) {
+	if (!me.isCreate) {
 	    me.load({
-		success:  function(response, options) {
+		success: function(response, options) {
 		    var values = response.result.data;
 
-		    if (values.nodes) {
-			values.nodes = values.nodes.split(',');
-		    }
-
 		    ipanel.setValues(values);
-		}
+		},
 	    });
 	}
-    }
+    },
 });