From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <n.ullreich@proxmox.com>
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 1162CA1CA7
for <pve-devel@lists.proxmox.com>; Fri, 16 Jun 2023 11:54:15 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id E368F308BD
for <pve-devel@lists.proxmox.com>; Fri, 16 Jun 2023 11:54:14 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(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 firstgate.proxmox.com (Proxmox) with ESMTPS
for <pve-devel@lists.proxmox.com>; Fri, 16 Jun 2023 11:54:14 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 0E3F245BC8
for <pve-devel@lists.proxmox.com>; Fri, 16 Jun 2023 11:54:14 +0200 (CEST)
From: Noel Ullreich <n.ullreich@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Fri, 16 Jun 2023 11:54:10 +0200
Message-Id: <20230616095410.33426-3-n.ullreich@proxmox.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20230616095410.33426-1-n.ullreich@proxmox.com>
References: <20230616095410.33426-1-n.ullreich@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.054 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
T_SCC_BODY_TEXT_LINE -0.01 -
Subject: [pve-devel] [PATCH pve-manager 2/2] ui: fix: change units of
memory/swap for containers
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2023 09:54:15 -0000
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@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