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 64BD197023 for ; Tue, 16 Apr 2024 17:24:59 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3E5471EBE7 for ; Tue, 16 Apr 2024 17:24:33 +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 ; Tue, 16 Apr 2024 17:24: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 0E5A545A3B for ; Tue, 16 Apr 2024 17:24:30 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Tue, 16 Apr 2024 17:24:13 +0200 Message-Id: <20240416152416.96561-20-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240416152416.96561-1-h.laimer@proxmox.com> References: <20240416152416.96561-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.008 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: [pbs-devel] [PATCH proxmox-backup v4 19/22] ui: utils: render unplugged datastores correctly 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: Tue, 16 Apr 2024 15:24:59 -0000 Signed-off-by: Hannes Laimer --- www/NavigationTree.js | 13 +++++++++---- www/Utils.js | 2 ++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/www/NavigationTree.js b/www/NavigationTree.js index 9ce93799..dc4a3dc7 100644 --- a/www/NavigationTree.js +++ b/www/NavigationTree.js @@ -264,13 +264,18 @@ Ext.define('PBS.view.main.NavigationTree', { let mainIcon = `fa fa-${records[i].data.removable ? 'plug' : 'database'}`; let [qtip, iconCls] = ['', mainIcon]; const maintenance = records[i].data.maintenance; + const removable_not_available = records[i].data.removable && !records[i].data.available; + if (removable_not_available) { + iconCls = `${mainIcon} pmx-tree-icon-custom unplugged`; + qtip = gettext('Removable datastore not mounted'); + } if (maintenance) { const [type, message] = PBS.Utils.parseMaintenanceMode(maintenance); qtip = `${type}${message ? ': ' + message : ''}`; - const maintenanceTypeCls = { - 'delete': 'destroying', - 'unplugged': 'unplugged', - }[type] ?? 'maintenance'; + let maintenanceTypeCls = 'maintenance'; + if (type === 'delete') { + maintenanceTypeCls = 'destroying'; + } iconCls = `${mainIcon} pmx-tree-icon-custom ${maintenanceTypeCls}`; } diff --git a/www/Utils.js b/www/Utils.js index 5357949b..0ee6609c 100644 --- a/www/Utils.js +++ b/www/Utils.js @@ -703,6 +703,8 @@ Ext.define('PBS.Utils', { break; case 'offline': modeText = gettext("Offline"); break; + case 'unplugged': modeText = gettext("Unplugged"); + break; } return `${modeText} ${extra}`; }, -- 2.39.2