From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v6 19/23] ui: tree: render unmounted datastores correctly
Date: Thu, 18 Apr 2024 16:29:27 +0200 [thread overview]
Message-ID: <20240418142931.122618-20-h.laimer@proxmox.com> (raw)
In-Reply-To: <20240418142931.122618-1-h.laimer@proxmox.com>
Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
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
next prev parent reply other threads:[~2024-04-18 14:30 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-18 14:29 [pbs-devel] [PATCH proxmox-backup v6 00/23] add removable datastores Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 01/23] pbs-api-types: new MaintenanceType::Unmount, implement and use set_maintenance_mode Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 02/23] pbs-api-types: use SchemaDeserializer for maintenance mode Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 03/23] datastore: rename and simplify update-datastore-cache socket command Hannes Laimer
2024-04-19 6:53 ` Dietmar Maurer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 04/23] tools: add disks utility functions Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 05/23] pbs-api-types: add backing-device to DataStoreConfig Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 06/23] disks: add UUID to partition info Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 07/23] add helper for checking if a removable datastore is available Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 08/23] api2: admin: add (un)mount endpoint for removable datastores Hannes Laimer
2024-04-19 7:27 ` Dietmar Maurer
2024-04-19 7:34 ` Dietmar Maurer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 09/23] api2: removable datastore creation Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 10/23] api2: disks list: add only-unused flag Hannes Laimer
2024-04-18 14:50 ` Christian Ebner
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 11/23] pbs-api-types: add removable/is-available flag to DataStoreListItem Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 12/23] bin: manager: add (un)mount command Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 13/23] add auto-mounting for removable datastores Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 14/23] datastore: handle deletion of removable datastore properly Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 15/23] docs: add removable datastores section Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 16/23] ui: add partition selector form Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 17/23] ui: add removable datastore creation support Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 18/23] ui: add (un)mount button to summary Hannes Laimer
2024-04-18 14:29 ` Hannes Laimer [this message]
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 20/23] ui: utils: make parseMaintenanceMode more robust Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 21/23] ui: add datastore status mask for unmounted removable datastores Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 22/23] ui: maintenance: fix disable msg field if no type is selected Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 23/23] ui: render 'unmount' maintenance mode correctly Hannes Laimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240418142931.122618-20-h.laimer@proxmox.com \
--to=h.laimer@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox