From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id 558531FF183
for <inbox@lore.proxmox.com>; Mon, 11 Nov 2024 11:37:30 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 5FF893FA28;
Mon, 11 Nov 2024 11:37:29 +0100 (CET)
From: Timothy Nicholson <t.nicholson@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Mon, 11 Nov 2024 11:37:05 +0100
Message-Id: <20241111103705.76679-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 v2] 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 <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
Signed-off-by: Timothy Nicholson <t.nicholson@proxmox.com>
---
changes since v1 [0]:
- pass literal strings to gettext
- changed switch-case to include common systemd states
[0]: https://lore.proxmox.com/pve-devel/20241108125254.147646-1-t.nicholson@proxmox.com/
src/Utils.js | 25 +++++++++++++++++++++++++
src/node/ServiceView.js | 14 ++++++--------
2 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/src/Utils.js b/src/Utils.js
index 7dd034a..c189f98 100644
--- a/src/Utils.js
+++ b/src/Utils.js
@@ -305,6 +305,31 @@ utilities: {
return Ext.htmlEncode(username);
},
+ renderSystemdState: function(state) {
+ switch (state) {
+ case 'enabled':
+ return gettext('enabled');
+ case 'disabled':
+ return gettext('disabled');
+ case 'running':
+ return gettext('running');
+ case 'dead':
+ return gettext('dead');
+ case 'not-found':
+ return gettext('not installed');
+ case 'static':
+ return gettext('static');
+ case 'reload':
+ return gettext('reload');
+ case 'start':
+ return gettext('start');
+ case 'stop':
+ return gettext('stop');
+ default:
+ return state;
+ }
+ },
+
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..c519da1 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.renderSystemdState(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.renderSystemdState(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