From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v11 22/26] ui: render 'unmount' maintenance mode correctly
Date: Tue, 20 Aug 2024 17:43:56 +0200 [thread overview]
Message-ID: <20240820154400.149863-23-h.laimer@proxmox.com> (raw)
In-Reply-To: <20240820154400.149863-1-h.laimer@proxmox.com>
Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
www/Utils.js | 4 +++-
www/window/MaintenanceOptions.js | 10 ++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/www/Utils.js b/www/Utils.js
index 7756e9b5..6bae9b70 100644
--- a/www/Utils.js
+++ b/www/Utils.js
@@ -775,7 +775,7 @@ Ext.define('PBS.Utils', {
let extra = '';
if (activeTasks !== undefined) {
- const conflictingTasks = activeTasks.write + (type === 'offline' ? activeTasks.read : 0);
+ const conflictingTasks = activeTasks.write + (type === 'offline' || type === 'unmount' ? activeTasks.read : 0);
if (conflictingTasks > 0) {
extra += '| <i class="fa fa-spinner fa-pulse fa-fw"></i> ';
@@ -795,6 +795,8 @@ Ext.define('PBS.Utils', {
break;
case 'offline': modeText = gettext("Offline");
break;
+ case 'unmount': modeText = gettext("Unmounting");
+ break;
}
return `${modeText} ${extra}`;
},
diff --git a/www/window/MaintenanceOptions.js b/www/window/MaintenanceOptions.js
index 527c3698..d7348cb4 100644
--- a/www/window/MaintenanceOptions.js
+++ b/www/window/MaintenanceOptions.js
@@ -52,6 +52,7 @@ Ext.define('PBS.window.MaintenanceOptions', {
items: [
{
xtype: 'pbsMaintenanceType',
+ id: 'type-field',
name: 'maintenance-type',
fieldLabel: gettext('Maintenance Type'),
value: '__default__',
@@ -85,6 +86,15 @@ Ext.define('PBS.window.MaintenanceOptions', {
};
}
+ let unmounting = options['maintenance-type'] === 'unmount';
+ let defaultType = options['maintenance-type'] === '__default__';
+ if (unmounting) {
+ options['maintenance-type'] = '';
+ }
+
me.callParent([options]);
+
+ Ext.ComponentManager.get('type-field').setDisabled(unmounting);
+ Ext.ComponentManager.get('message-field').setDisabled(unmounting || defaultType);
},
});
--
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-08-20 15:44 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-20 15:43 [pbs-devel] [PATCH proxmox-backup v11 00/26] add removable datastores Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 01/26] tools: add disks utility functions Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 02/26] config: factor out method to get the absolute datastore path Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 03/26] pbs-api-types: add backing-device to DataStoreConfig Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 04/26] maintenance: add 'Unmount' maintenance type Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 05/26] disks: add UUID to partition info Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 06/26] datastore: add helper for checking if a removable datastore is available Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 07/26] api: admin: add (un)mount endpoint for removable datastores Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 08/26] api: removable datastore creation Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 09/26] api: disks list: add exclude-used flag Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 10/26] pbs-api-types: add removable/is-available flag to DataStoreListItem Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 11/26] bin: manager: add (un)mount command Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 12/26] add auto-mounting for removable datastores Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 13/26] datastore: handle deletion of removable datastore properly Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 14/26] docs: add removable datastores section Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 15/26] ui: add partition selector form Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 16/26] ui: add removable datastore creation support Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 17/26] ui: add (un)mount button to summary Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 18/26] ui: tree: render unmounted datastores correctly Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 19/26] ui: utils: make parseMaintenanceMode more robust Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 20/26] ui: add datastore status mask for unmounted removable datastores Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 21/26] ui: maintenance: fix disable msg field if no type is selected Hannes Laimer
2024-08-20 15:43 ` Hannes Laimer [this message]
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 23/26] api: node: allow creation of removable datastore through directory endpoint Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 24/26] api: node: include removable datastores in directory list Hannes Laimer
2024-08-20 15:43 ` [pbs-devel] [PATCH proxmox-backup v11 25/26] node: disks: replace BASE_MOUNT_DIR with DATASTORE_MOUNT_DIR Hannes Laimer
2024-08-20 15:44 ` [pbs-devel] [PATCH proxmox-backup v11 26/26] ui: support create removable datastore through directory creation 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=20240820154400.149863-23-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