public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v7 20/20] ui: render 'unmount' maintenance mode correctly
Date: Fri, 19 Apr 2024 10:58:34 +0200	[thread overview]
Message-ID: <20240419085834.32850-21-h.laimer@proxmox.com> (raw)
In-Reply-To: <20240419085834.32850-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 ad2b2777..5af2baca 100644
--- a/www/Utils.js
+++ b/www/Utils.js
@@ -698,7 +698,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> ';
@@ -718,6 +718,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


  parent reply	other threads:[~2024-04-19  9:05 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-19  8:58 [pbs-devel] [PATCH proxmox-backup v7 00/20] add removable datastores Hannes Laimer
2024-04-19  8:58 ` [pbs-devel] [PATCH proxmox-backup v7 01/20] tools: add disks utility functions Hannes Laimer
2024-04-19  9:54   ` Christian Ebner
2024-04-19  8:58 ` [pbs-devel] [PATCH proxmox-backup v7 02/20] pbs-api-types: add backing-device to DataStoreConfig Hannes Laimer
2024-04-19  8:58 ` [pbs-devel] [PATCH proxmox-backup v7 03/20] disks: add UUID to partition info Hannes Laimer
2024-04-19  8:58 ` [pbs-devel] [PATCH proxmox-backup v7 04/20] datastore: add helper for checking if a removable datastore is available Hannes Laimer
2024-04-19  9:14   ` Christian Ebner
2024-04-19 15:35     ` Hannes Laimer
2024-04-22  8:23       ` Christian Ebner
2024-04-19  8:58 ` [pbs-devel] [PATCH proxmox-backup v7 05/20] api: admin: add (un)mount endpoint for removable datastores Hannes Laimer
2024-04-19 10:21   ` Christian Ebner
2024-04-19  8:58 ` [pbs-devel] [PATCH proxmox-backup v7 06/20] api: removable datastore creation Hannes Laimer
2024-04-19  8:58 ` [pbs-devel] [PATCH proxmox-backup v7 07/20] api: disks list: add exclude-used flag Hannes Laimer
2024-04-19  8:58 ` [pbs-devel] [PATCH proxmox-backup v7 08/20] pbs-api-types: add removable/is-available flag to DataStoreListItem Hannes Laimer
2024-04-19  8:58 ` [pbs-devel] [PATCH proxmox-backup v7 09/20] bin: manager: add (un)mount command Hannes Laimer
2024-04-19  8:58 ` [pbs-devel] [PATCH proxmox-backup v7 10/20] add auto-mounting for removable datastores Hannes Laimer
2024-04-19  8:58 ` [pbs-devel] [PATCH proxmox-backup v7 11/20] datastore: handle deletion of removable datastore properly Hannes Laimer
2024-04-19  8:58 ` [pbs-devel] [PATCH proxmox-backup v7 12/20] docs: add removable datastores section Hannes Laimer
2024-04-19  8:58 ` [pbs-devel] [PATCH proxmox-backup v7 13/20] ui: add partition selector form Hannes Laimer
2024-04-19  8:58 ` [pbs-devel] [PATCH proxmox-backup v7 14/20] ui: add removable datastore creation support Hannes Laimer
2024-04-19  8:58 ` [pbs-devel] [PATCH proxmox-backup v7 15/20] ui: add (un)mount button to summary Hannes Laimer
2024-04-19  8:58 ` [pbs-devel] [PATCH proxmox-backup v7 16/20] ui: tree: render unmounted datastores correctly Hannes Laimer
2024-04-19  8:58 ` [pbs-devel] [PATCH proxmox-backup v7 17/20] ui: utils: make parseMaintenanceMode more robust Hannes Laimer
2024-04-19  8:58 ` [pbs-devel] [PATCH proxmox-backup v7 18/20] ui: add datastore status mask for unmounted removable datastores Hannes Laimer
2024-04-19  8:58 ` [pbs-devel] [PATCH proxmox-backup v7 19/20] ui: maintenance: fix disable msg field if no type is selected Hannes Laimer
2024-04-19  8:58 ` Hannes Laimer [this message]
2024-04-19 10:10 ` [pbs-devel] [PATCH proxmox-backup v7 00/20] add removable datastores Dietmar Maurer

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=20240419085834.32850-21-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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal