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 729DD9459A for ; Wed, 10 Apr 2024 15:13:33 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1A0AE105BE for ; Wed, 10 Apr 2024 15:13:32 +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 ; Wed, 10 Apr 2024 15:13:31 +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 586A043B1D for ; Wed, 10 Apr 2024 15:13:31 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Wed, 10 Apr 2024 15:13:10 +0200 Message-Id: <20240410131316.1208679-14-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240410131316.1208679-1-f.gruenbichler@proxmox.com> References: <20240410131316.1208679-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.057 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 Subject: [pve-devel] [PATCH manager 4/4] ui: add pool limits and usage 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, 10 Apr 2024 13:13:33 -0000 Signed-off-by: Fabian Grünbichler --- Notes: this is very "bare", obviously we'd want - a nicer grid/.. display of usage - a way to edit the limits I am not yet sure how to integrate this nicely, and wanted to get feedback on the rest first. www/manager6/pool/StatusView.js | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/www/manager6/pool/StatusView.js b/www/manager6/pool/StatusView.js index 3d46b3b1a..fdbbb5672 100644 --- a/www/manager6/pool/StatusView.js +++ b/www/manager6/pool/StatusView.js @@ -21,6 +21,39 @@ Ext.define('PVE.pool.StatusView', { renderer: Ext.String.htmlEncode, required: true, }, + usage: { + header: gettext('Usage'), + required: false, + renderer: value => { + if (value === null) { + return '-'; + } else { + let rendered = ''; + let over = false; + for (const [first, second] of Object.entries(value)) { + if (first === 'over') { + over = second == 1 ? true : false; + } else { + for (const [kind, usage] of Object.entries(second)) { + if (rendered === '') { + rendered = `${first}-${kind}=${usage}`; + } else { + rendered = rendered + `, ${first}-${kind}=${usage}`; + } + } + } + } + if (over) { + rendered = rendered + "\nover limit"; + } + return rendered; + } + }, + }, + limits: { + header: gettext('Resource Limits'), + required: false, + }, }; Ext.apply(me, { -- 2.39.2