From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 0D9311FF173 for ; Mon, 11 Nov 2024 14:17:19 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BEDF4B672; Mon, 11 Nov 2024 14:17:18 +0100 (CET) From: Timothy Nicholson To: pve-devel@lists.proxmox.com Date: Mon, 11 Nov 2024 14:17:15 +0100 Message-Id: <20241111131715.173179-1-t.nicholson@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.005 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pve-devel] [PATCH widget-toolkit v3] fix #5836: ui: translate systemd states in ServiceView X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Signed-off-by: Timothy Nicholson --- changes since v2 [0]: - use object instead of switch-case statement for systemd states - use different terms (starting/stopping) for start/stop states [0]: https://lore.proxmox.com/pve-devel/20241111103705.76679-1-t.nicholson@proxmox.com/ src/Utils.js | 12 ++++++++++++ src/node/ServiceView.js | 14 ++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/Utils.js b/src/Utils.js index 7dd034a..5634a06 100644 --- a/src/Utils.js +++ b/src/Utils.js @@ -305,6 +305,18 @@ utilities: { return Ext.htmlEncode(username); }, + systemdStates: { + 'enabled': gettext('enabled'), + 'disabled': gettext('disabled'), + 'running': gettext('running'), + 'dead': gettext('dead'), + 'not-found': gettext('not installed'), + 'static': gettext('static'), + 'reload': gettext('reload'), + 'start': gettext('starting'), + 'stop': gettext('stopping'), + }, + getStoredAuth: function() { let storedAuth = JSON.parse(window.localStorage.getItem('ProxmoxUser')); return storedAuth || {}; diff --git a/src/node/ServiceView.js b/src/node/ServiceView.js index 19cfc18..1f03ccc 100644 --- a/src/node/ServiceView.js +++ b/src/node/ServiceView.js @@ -180,14 +180,8 @@ Ext.define('Proxmox.node.ServiceView', { sortable: true, dataIndex: 'state', renderer: (value, meta, rec) => { - const unitState = rec.get('unit-state'); - if (unitState === 'masked') { - return gettext('disabled'); - } else if (unitState === 'not-found') { - return gettext('not installed'); - } else { - return value; - } + const state = rec.get('state'); + return Proxmox.Utils.systemdStates[state] ?? state; }, }, { @@ -203,6 +197,10 @@ Ext.define('Proxmox.node.ServiceView', { sortable: true, hidden: !Ext.Array.contains(['PVEAuthCookie', 'PBSAuthCookie'], Proxmox?.Setup?.auth_cookie_name), dataIndex: 'unit-state', + renderer: (value, meta, rec) => { + const unitState = rec.get('unit-state'); + return Proxmox.Utils.systemdStates[unitState] ?? unitState; + }, }, { header: gettext('Description'), -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel