From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 EAEEA96804 for ; Wed, 25 Jan 2023 12:29:56 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CE362E0A3 for ; Wed, 25 Jan 2023 12:29:56 +0100 (CET) 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 ; Wed, 25 Jan 2023 12:29:56 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id CEFB64610A for ; Wed, 25 Jan 2023 12:29:55 +0100 (CET) From: Matthias Heiserer To: pve-devel@lists.proxmox.com Date: Wed, 25 Jan 2023 12:29:29 +0100 Message-Id: <20230125112932.127145-5-m.heiserer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230125112932.127145-1-m.heiserer@proxmox.com> References: <20230125112932.127145-1-m.heiserer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 2.322 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_HI -5 Sender listed at https://www.dnswl.org/, high trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [mem.free, arcuse.style] Subject: [pve-devel] [RFC widget-toolkit] ui: add InfoMultiWidget, to be used for RAM X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jan 2023 11:29:57 -0000 Signed-off-by: Matthias Heiserer --- src/Makefile | 1 + src/panel/NodeMemoryWidget.js | 28 ++++++++++++++++++++++++++++ src/panel/StatusView.js | 2 +- 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 src/panel/NodeMemoryWidget.js diff --git a/src/Makefile b/src/Makefile index 95da5aa..5a0213a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -54,6 +54,7 @@ JSSRC= \ panel/EOLNotice.js \ panel/InputPanel.js \ panel/InfoWidget.js \ + panel/NodeMemoryWidget.js \ panel/LogView.js \ panel/NodeInfoRepoStatus.js \ panel/JournalView.js \ diff --git a/src/panel/NodeMemoryWidget.js b/src/panel/NodeMemoryWidget.js new file mode 100644 index 0000000..e54899e --- /dev/null +++ b/src/panel/NodeMemoryWidget.js @@ -0,0 +1,28 @@ +Ext.define('Proxmox.widget.NodeMemory', { + extend: 'Proxmox.widget.Info', + alias: 'widget.pmxNodeMemoryWidget', + + updateValue: function(text, usage, mem) { + let me = this; + + let arcUse = me.el?.getById("arcsize")?.dom; + if (arcUse) { + usage = (mem.used - mem.arcsize) / mem.total; + arcUse.style["margin-right"] = `${(mem.free / mem.total) * 100}%`; + } + me.callParent([text, usage]); + }, + + initComponent: function() { + let me = this; + me.callParent(); + + me.down("#progress").on('boxready', (self) => { + self.bar.dom.insertAdjacentHTML("beforebegin", + `
+
`); + }); + }, +}); diff --git a/src/panel/StatusView.js b/src/panel/StatusView.js index e2e81e2..7258f36 100644 --- a/src/panel/StatusView.js +++ b/src/panel/StatusView.js @@ -72,7 +72,7 @@ Ext.define('Proxmox.panel.StatusView', { if (Ext.isFunction(field.calculate)) { calculate = field.calculate; } - field.updateValue(renderer.call(field, used, max), calculate(used, max)); + field.updateValue(renderer.call(field, used, max), calculate(used, max), used); } }, -- 2.30.2