From b1b64892330e2d9ceb204c596871711ab537a995 Mon Sep 17 00:00:00 2001 From: Hannes Laimer Date: Mon, 25 Nov 2024 17:22:04 +0100 Subject: [PATCH] ui: utils: make parseMaintenanceMode more robust Signed-off-by: Hannes Laimer --- www/Utils.js | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/www/Utils.js b/www/Utils.js index 4853be36..7756e9b5 100644 --- a/www/Utils.js +++ b/www/Utils.js @@ -740,14 +740,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} - 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) {