From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 23D8E20EC7F for ; Tue, 23 Apr 2024 10:30:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 09D4E1D913; Tue, 23 Apr 2024 10:30:50 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Tue, 23 Apr 2024 10:29:52 +0200 Message-Id: <20240423083000.28002-19-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240423083000.28002-1-h.laimer@proxmox.com> References: <20240423083000.28002-1-h.laimer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.009 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 v9 18/26] ui: tree: render unmounted 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: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Signed-off-by: Hannes Laimer --- www/NavigationTree.js | 15 ++++++++++++--- www/css/ext6-pbs.css | 8 ++++++++ www/datastore/DataStoreListSummary.js | 1 + 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/www/NavigationTree.js b/www/NavigationTree.js index 3e0040f7..dc4a3dc7 100644 --- a/www/NavigationTree.js +++ b/www/NavigationTree.js @@ -261,13 +261,22 @@ Ext.define('PBS.view.main.NavigationTree', { j++; } - let [qtip, iconCls] = ['', 'fa fa-database']; + 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 : ''}`; - let mainenanceTypeCls = type === 'delete' ? 'destroying' : 'maintenance'; - iconCls = `fa fa-database pmx-tree-icon-custom ${mainenanceTypeCls}`; + let maintenanceTypeCls = 'maintenance'; + if (type === 'delete') { + maintenanceTypeCls = 'destroying'; + } + iconCls = `${mainIcon} pmx-tree-icon-custom ${maintenanceTypeCls}`; } if (getChildTextAt(j).localeCompare(name) !== 0) { diff --git a/www/css/ext6-pbs.css b/www/css/ext6-pbs.css index c33ce684..706e681e 100644 --- a/www/css/ext6-pbs.css +++ b/www/css/ext6-pbs.css @@ -271,6 +271,10 @@ span.snapshot-comment-column { content: "\ "; } +.x-treelist-item-icon.fa-plug, .pmx-tree-icon-custom.fa-plug { + font-size: 12px; +} + /* datastore maintenance */ .pmx-tree-icon-custom.maintenance:after { content: "\f0ad"; @@ -290,6 +294,10 @@ span.snapshot-comment-column { color: #888; } +.pmx-tree-icon-custom.unplugged:before { + color: #888; +} + /*' PBS specific icons */ .pbs-icon-tape { diff --git a/www/datastore/DataStoreListSummary.js b/www/datastore/DataStoreListSummary.js index b908034d..f7ea83e7 100644 --- a/www/datastore/DataStoreListSummary.js +++ b/www/datastore/DataStoreListSummary.js @@ -22,6 +22,7 @@ Ext.define('PBS.datastore.DataStoreListSummary', { stillbad: 0, deduplication: 1.0, error: "", + removable: false, maintenance: '', }, }, -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel