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 55802B95D4 for ; Mon, 11 Dec 2023 09:59:37 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 356BD1341A for ; Mon, 11 Dec 2023 09:59:07 +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 ; Mon, 11 Dec 2023 09:59:06 +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 E8A5F44EF1 for ; Mon, 11 Dec 2023 09:59:05 +0100 (CET) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Mon, 11 Dec 2023 09:59:01 +0100 Message-Id: <20231211085902.20747-2-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231211085902.20747-1-g.goller@proxmox.com> References: <20231211085902.20747-1-g.goller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.148 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: [pbs-devel] [PATCH v2 proxmox-backup 1/2] ui: datastore summary handle non-existent values X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Dec 2023 08:59:37 -0000 Correctly display missing 'avail' and 'used' attributes in the datatstore summary. This simply sets it to 0, so that we don't get any errors in the console. Signed-off-by: Gabriel Goller --- www/datastore/DataStoreListSummary.js | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/www/datastore/DataStoreListSummary.js b/www/datastore/DataStoreListSummary.js index 968239b0..b908034d 100644 --- a/www/datastore/DataStoreListSummary.js +++ b/www/datastore/DataStoreListSummary.js @@ -52,12 +52,20 @@ Ext.define('PBS.datastore.DataStoreListSummary', { vm.set('maintenance', ''); } - let total = statusData.avail + statusData.used; - let usage = statusData.used / total; - let usagetext = Ext.String.format(gettext('{0} of {1}'), - Proxmox.Utils.format_size(statusData.used, true), - Proxmox.Utils.format_size(total, true), - ); + let usagetext; + let usage; + + if (Object.hasOwn(statusData, 'avail') && Object.hasOwn(statusData, 'used')) { + let total = statusData.avail + statusData.used; + usage = statusData.used / total; + usagetext = Ext.String.format(gettext('{0} of {1}'), + Proxmox.Utils.format_size(statusData.used, true), + Proxmox.Utils.format_size(total, true), + ); + } else { + usagetext = Ext.String.format(gettext('{0} of {1}'), 0, 0); + usage = 0; + } let usagePanel = me.lookup('usage'); usagePanel.updateValue(usage, usagetext); -- 2.39.2