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 v4 20/22] ui: utils: make parseMaintenanceMode more robust
Date: Tue, 16 Apr 2024 17:24:14 +0200	[thread overview]
Message-ID: <20240416152416.96561-21-h.laimer@proxmox.com> (raw)
In-Reply-To: <20240416152416.96561-1-h.laimer@proxmox.com>

Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
 www/Utils.js | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/www/Utils.js b/www/Utils.js
index 0ee6609c..1df46318 100644
--- a/www/Utils.js
+++ b/www/Utils.js
@@ -663,14 +663,29 @@ Ext.define('PBS.Utils', {
 	return `${icon} ${value}`;
     },
 
-    // FIXME: this "parser" is brittle and relies on the order the arguments will appear in
+    /**
+     * Parses maintenance mode property string.
+     * Examples:
+     *   "offline,message=foo" -> ["offline", "foo"]
+     *   "offline" -> ["offline", null]
+     *   "message=foo,offline" -> ["offline", "foo"]
+     *   null/undefined -> [null, null]
+     *
+     * @param {string|null} mode - Maintenance mode string to parse.
+     * @return {Array<string|null>} - Parsed maintenance mode values.
+     */
     parseMaintenanceMode: function(mode) {
-	let [type, message] = mode.split(/,(.+)/);
-	type = type.split("=").pop();
-	message = message ? message.split("=")[1]
-	    .replace(/^"(.*)"$/, '$1')
-	    .replaceAll('\\"', '"') : null;
-	return [type, message];
+	if (!mode) {
+	    return [null, null];
+	}
+	return mode.split(',').reduce(([m, msg], pair) => {
+	    const [key, value] = pair.split('=');
+	    if (key === 'message') {
+		return [m, value.replace(/^"(.*)"$/, '$1').replace(/\\"/g, '"')];
+	    } else {
+		return [value ?? key, msg];
+	    }
+	}, [null, null]);
     },
 
     renderMaintenance: function(mode, activeTasks) {
-- 
2.39.2





  parent reply	other threads:[~2024-04-16 15:34 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-16 15:23 [pbs-devel] [PATCH proxmox-backup v4 00/22] add removable datastores Hannes Laimer
2024-04-16 15:23 ` [pbs-devel] [PATCH proxmox-backup v4 01/22] tools: add disks utility functions Hannes Laimer
2024-04-16 15:23 ` [pbs-devel] [PATCH proxmox-backup v4 02/22] datastore: make dropping from cache more efficient Hannes Laimer
2024-04-17  7:48   ` Christian Ebner
2024-04-17  9:37   ` Dietmar Maurer
2024-04-16 15:23 ` [pbs-devel] [PATCH proxmox-backup v4 03/22] pbs-api-types: add backing-device to DataStoreConfig Hannes Laimer
2024-04-16 15:23 ` [pbs-devel] [PATCH proxmox-backup v4 04/22] disks: add UUID to partition info Hannes Laimer
2024-04-16 15:23 ` [pbs-devel] [PATCH proxmox-backup v4 05/22] add helper for checking if a removable datastore is available Hannes Laimer
2024-04-17  7:56   ` Christian Ebner
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 06/22] api2: admin: add (un)mount endpoint for removable datastores Hannes Laimer
2024-04-17  8:08   ` Christian Ebner
2024-04-17  9:19     ` Hannes Laimer
2024-04-17  9:26       ` Christian Ebner
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 07/22] api2: removable datastore creation Hannes Laimer
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 08/22] api2: disks list: add exclude-used flag Hannes Laimer
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 09/22] pbs-api-types: datastore: use new proxmox_schema::de for deserialization Hannes Laimer
2024-04-17  8:13   ` Christian Ebner
2024-04-17  9:08     ` Hannes Laimer
2024-04-17  9:38       ` Christian Ebner
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 10/22] pbs-api-types: add removable/is-available flag to DataStoreListItem Hannes Laimer
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 11/22] pb-manager: add (un)mount command Hannes Laimer
2024-04-17  8:21   ` Christian Ebner
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 12/22] add auto-mounting for removable datastores Hannes Laimer
2024-04-17  8:29   ` Christian Ebner
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 13/22] datastore: handle deletion of removable datastore properly Hannes Laimer
2024-04-17  8:34   ` Christian Ebner
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 14/22] docs: mention maintenance mode reset when removable datastore is unplugged Hannes Laimer
2024-04-17  8:46   ` Hannes Laimer
2024-04-17  8:52     ` Christian Ebner
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 15/22] ui: add partition selector form Hannes Laimer
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 16/22] ui: add removable datastore creation support Hannes Laimer
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 17/22] ui: add (un)mount button to summary Hannes Laimer
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 18/22] ui: display removable datastores in list Hannes Laimer
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 19/22] ui: utils: render unplugged datastores correctly Hannes Laimer
2024-04-16 15:24 ` Hannes Laimer [this message]
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 21/22] ui: add datastore status mask for unplugged removable datastores Hannes Laimer
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 22/22] ui: maintenance: fix disable msg field if no type is selected Hannes Laimer
2024-04-17  9:16 ` [pbs-devel] [PATCH proxmox-backup v4 00/22] add removable datastores Christian Ebner

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=20240416152416.96561-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