[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 | 136 ++++++++++++++++++++++++++-----
 1 file changed, 117 insertions(+), 19 deletions(-)

diff --git a/www/manager6/lxc/ResourceEdit.js b/www/manager6/lxc/ResourceEdit.js
index 9f4f7e08d..a5437e292 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'),
@@ -102,7 +102,7 @@ Ext.define('PVE.lxc.CPUInputPanel', {
     ],
 
     initComponent: function() {
-	var me = this;
+	let me = this;
 
 	me.column1 = [
 	    {
@@ -122,6 +122,12 @@ Ext.define('PVE.lxc.CPUInputPanel', {
     },
 });
 
+let unitScalingFactor = [
+    { 'name': gettext('MiB'), 'factor': 1 },
+    { 'name': gettext('GiB'), 'factor': 1024 },
+    { 'name': gettext('TiB'), 'factor': 1024**2 },
+];
+
 Ext.define('PVE.lxc.MemoryInputPanel', {
     extend: 'Proxmox.panel.InputPanel',
     alias: 'widget.pveLxcMemoryInputPanel',
@@ -130,29 +136,121 @@ Ext.define('PVE.lxc.MemoryInputPanel', {
 
     insideWizard: false,
 
+    onGetValues: function(values) {
+	let me = this;
+	let ret = {};
+
+	ret.memory = values.memory*values.memorySize;
+	ret.swap = values.swap*values.swapSize;
+
+	return ret;
+    },
+
+    onSetValues: function(values) {
+	let me = this;
+	let ret = structuredClone(values);
+
+	for (let i in unitScalingFactor) {
+	    if (Object.prototype.hasOwnProperty.call(unitScalingFactor, i)) {
+		if (values.memory%unitScalingFactor[i].factor===0) {
+		    ret.memory = values.memory/unitScalingFactor[i].factor;
+		    ret.memorySize = unitScalingFactor[i];
+		}
+		if (values.swap%unitScalingFactor[i].factor===0 && values.swap) {
+		    ret.swap = values.swap/unitScalingFactor[i].factor;
+		    ret.swapSize = unitScalingFactor[i];
+		}
+	    }
+	}
+
+	return ret;
+    },
+
     initComponent: function() {
-	var me = this;
+	let me = this;
 
-	var items = [
+	let items = [
 	    {
-		xtype: 'proxmoxintegerfield',
-		name: 'memory',
-		minValue: 16,
-		value: '512',
-		step: 32,
-		fieldLabel: gettext('Memory') + ' (MiB)',
+		xtype: 'fieldcontainer',
+		layout: 'hbox',
 		labelWidth: labelWidth,
-		allowBlank: false,
+		fieldLabel: gettext('Memory'),
+		items: [
+		    {
+			xtype: 'proxmoxintegerfield',
+			name: 'memory',
+			flex: 2,
+			minValue: 16,
+			value: '512',
+			step: 32,
+			labelWidth: labelWidth,
+			allowBlank: false,
+		    },
+		    {
+			xtype: 'combobox',
+			name: 'memorySize',
+			itemId: 'memorySize',
+			value: unitScalingFactor[0], //set to MiB by default
+			flex: 1,
+			editable: false,
+			allowBlank: false,
+			store: unitScalingFactor,
+			displayField: 'name',
+			valueField: 'factor',
+			listeners: {
+			    change: function(f, value) {
+				let mf = me.down('field[name=memory]');
+				if (value===1) {
+				    mf.setMinValue(16);
+				    mf.step=32;
+				} else {
+				    mf.setMinValue(1);
+				    mf.step=1;
+				}
+				mf.validate();
+			    },
+			},
+		    },
+		],
 	    },
 	    {
-		xtype: 'proxmoxintegerfield',
-		name: 'swap',
-		minValue: 0,
-		value: '512',
-		step: 32,
-		fieldLabel: gettext('Swap') + ' (MiB)',
+		xtype: 'fieldcontainer',
+		layout: 'hbox',
 		labelWidth: labelWidth,
-		allowBlank: false,
+		fieldLabel: gettext('Swap'),
+		items: [
+		    {
+			xtype: 'proxmoxintegerfield',
+			name: 'swap',
+			flex: 2,
+			minValue: 0,
+			value: '512',
+			step: 32,
+			labelWidth: labelWidth,
+			allowBlank: false,
+		    },
+		    {
+			xtype: 'combobox',
+			name: 'swapSize',
+			itemId: 'swapSize',
+			value: unitScalingFactor[0], //set to MiB by default
+			flex: 1,
+			editable: false,
+			allowBlank: false,
+			store: unitScalingFactor,
+			displayField: 'name',
+			valueField: 'factor',
+			listeners: {
+			    change: function(f, value) {
+				let sf = me.down('field[name=swap]');
+
+				sf.step = value===1 ? 32 : 1;
+
+				sf.validate();
+			    },
+			},
+		    },
+		],
 	    },
 	];
 
-- 
2.30.2