From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 0AD3C1FF183 for ; Mon, 11 Nov 2024 13:01:33 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AF639999C; Mon, 11 Nov 2024 13:01:30 +0100 (CET) Message-ID: Date: Mon, 11 Nov 2024 13:01:27 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta To: Proxmox VE development discussion , Timothy Nicholson References: <20241111103705.76679-1-t.nicholson@proxmox.com> Content-Language: en-US From: Dominik Csapak In-Reply-To: <20241111103705.76679-1-t.nicholson@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.016 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" comments inline: On 11/11/24 11:37, Timothy Nicholson wrote: > Signed-off-by: Timothy Nicholson > --- > 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; > + } > + }, > + instead of making this a switch statement, i'd rather do what we do elsewhere and simply use an object like this: ---8<--- systemdStates: { 'enabled': gettext('enabled'), 'disabled': getttext('disabled'), ... } --->8--- when we could simply use something like let text = Proxmox.Utils.systemdStates[state] ?? state; also where do the states 'start'/'stop'/etc. come from? when is a service in state 'start' instead of e.g. 'running' ? 'start'/'stop'/etc. as state does not make much sense to me? *if* these states actually exist (e.g. when it's being started) i'd rather use better terms in the gettext like 'started'/'starting' or 'stopped'/'stopping', etc. does that make sense to you? > 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'), _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel