[pve-devel] [PATCH pve-manager 2/2] ui: fix: change units of memory/swap for containers

[Noel Ullreich]

This patch adds a dropdown-menu (in the web interface) of units, MiB, GiB,
and TiB, (although PiB could easily be added in the future) for ram
and swapsize of containers.

Signed-off-by: Noel Ullreich <n.ullreich at proxmox.com>
---
 www/manager6/lxc/ResourceEdit.js | 59 +++++++++++++++++++++-----------
 1 file changed, 39 insertions(+), 20 deletions(-)

diff --git a/www/manager6/lxc/ResourceEdit.js b/www/manager6/lxc/ResourceEdit.js
index 9f4f7e08..8c1f57c3 100644
--- a/www/manager6/lxc/ResourceEdit.js
+++ b/www/manager6/lxc/ResourceEdit.js
@@ -1,10 +1,10 @@
-var labelWidth = 120;
+let labelWidth = 100;
 
 Ext.define('PVE.lxc.MemoryEdit', {
     extend: 'Proxmox.window.Edit',
 
     initComponent: function() {
-	var me = this;
+	let me = this;
 
 	Ext.apply(me, {
 	    subject: gettext('Memory'),
@@ -69,7 +69,7 @@ Ext.define('PVE.lxc.CPUInputPanel', {
 	return values;
     },
 
-    advancedColumn1: [
+   advancedColumn1: [
 	{
 	    xtype: 'numberfield',
 	    name: 'cpulimit',
@@ -102,7 +102,7 @@ Ext.define('PVE.lxc.CPUInputPanel', {
     ],
 
     initComponent: function() {
-	var me = this;
+	let me = this;
 
 	me.column1 = [
 	    {
@@ -130,29 +130,48 @@ Ext.define('PVE.lxc.MemoryInputPanel', {
 
     insideWizard: false,
 
+    onGetValues: function(values) {
+	let ret = {};
+
+	ret.memory = values.memory;
+	ret.swap = values.swap;
+
+	return ret;
+    },
+
+/*
+    onSetValues: function(values) {
+	// TODO: I would have thought that manually setting the combobox here
+	// might make it possible to set `ok` on the selector when changing the
+	// unit in the combobox
+	values.memunit = 'GiB';
+	values.swapunit = 'TiB';
+
+	return values;
+    },
+*/
+
     initComponent: function() {
-	var me = this;
+	let me = this;
 
-	var items = [
+	let items = [
 	    {
-		xtype: 'proxmoxintegerfield',
+		xtype: 'pmxSizeField',
+		fieldLabel: gettext('Memory'),
 		name: 'memory',
-		minValue: 16,
-		value: '512',
-		step: 32,
-		fieldLabel: gettext('Memory') + ' (MiB)',
-		labelWidth: labelWidth,
-		allowBlank: false,
+		unitname: 'memunit',
+		steparray: [32, 1, 1],
+		minarray: [16, 1, 1],
+		datastore: Object.keys(Proxmox.Utils.SizeUnits).slice(2, 5),
+		backendUnit: 'MiB',
 	    },
 	    {
-		xtype: 'proxmoxintegerfield',
+		xtype: 'pmxSizeField',
+		fieldLabel: gettext('Swap'),
 		name: 'swap',
-		minValue: 0,
-		value: '512',
-		step: 32,
-		fieldLabel: gettext('Swap') + ' (MiB)',
-		labelWidth: labelWidth,
-		allowBlank: false,
+		unitname: 'swapunit',
+		datastore: Object.keys(Proxmox.Utils.SizeUnits).slice(2, 5),
+		backendUnit: 'MiB',
 	    },
 	];
 
-- 
2.39.2