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 v2 16/25] ui: utils: make parseMaintenanceMode more robust
Date: Thu, 21 Sep 2023 14:51:58 +0200	[thread overview]
Message-ID: <20230921125207.1301656-17-h.laimer@proxmox.com> (raw)
In-Reply-To: <20230921125207.1301656-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 56b1de30..c3b327d8 100644
--- a/www/Utils.js
+++ b/www/Utils.js
@@ -662,14 +662,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:[~2023-09-21 12:52 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-21 12:51 [pbs-devel] [PATCH proxmox-backup v2 00/25] add removable datastores Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 01/25] tools: add disks utility functions Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 02/25] pbs-api-types: add backing-device to DataStoreConfig Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 03/25] maintenance: add 'Unpplugged' maintenance type Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 04/25] disks: add UUID to partition info Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 05/25] api2: admin: add (un)mount endpoint for removable datastores Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 06/25] add helper for checking if a removable datastore is available Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 07/25] api2: removable datastore creation Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 08/25] ui: add partition selector form Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 09/25] api2: disks list: add only-unused flag Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 10/25] ui: add removable datastore creation support Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 11/25] ui: add (un)mount button to summary Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 12/25] pbs-api-types: datastore: use new proxmox_scheme::de for deserialization Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 13/25] pbs-api-types: add removable/is-available flag to DataStoreListItem Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 14/25] ui: display removable datastores in list Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 15/25] ui: utils: render unplugged maintenance mode correctly Hannes Laimer
2023-09-21 12:51 ` Hannes Laimer [this message]
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 17/25] ui: add datastore status mask for unplugged removable datastores Hannes Laimer
2023-09-21 12:52 ` [pbs-devel] [PATCH proxmox-backup v2 18/25] ui: maintenance: fix disable msg field if no type is selected Hannes Laimer
2023-09-21 12:52 ` [pbs-devel] [PATCH proxmox-backup v2 19/25] ui: maintenance: disable edit if unplugged Hannes Laimer
2023-09-21 12:52 ` [pbs-devel] [PATCH proxmox-backup v2 20/25] pb-manager: add (un)mount command Hannes Laimer
2023-12-11 13:00   ` Gabriel Goller
2023-09-21 12:52 ` [pbs-devel] [PATCH proxmox-backup v2 21/25] add auto-mounting for removable datastores Hannes Laimer
2023-09-21 12:52 ` [pbs-devel] [PATCH proxmox-backup v2 22/25] api: mark removable datastores as unplugged after restart Hannes Laimer
2023-09-21 12:52 ` [pbs-devel] [PATCH proxmox-backup v2 23/25] datastore: handle deletion of removable datastore properly Hannes Laimer
2023-09-21 12:52 ` [pbs-devel] [PATCH proxmox-backup v2 24/25] docs: mention maintenance mode reset when removable datastore is unplugged Hannes Laimer
2023-09-21 12:52 ` [pbs-devel] [PATCH proxmox-backup v2 25/25] bump proxmox-schema dependency to 2.0.1 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=20230921125207.1301656-17-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