From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id B539C723BB for ; Thu, 1 Jul 2021 14:42:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B33B724C8A for ; Thu, 1 Jul 2021 14:42:23 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 0965324C4E for ; Thu, 1 Jul 2021 14:42:21 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 753F040352 for ; Thu, 1 Jul 2021 14:42:21 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 1 Jul 2021 14:25:05 +0200 Message-Id: <20210701122506.503289-7-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210701122506.503289-1-d.csapak@proxmox.com> References: <20210701122506.503289-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.702 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH manager 5/6] ui: Utils: refactor userid parsing to Utils 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: , X-List-Received-Date: Thu, 01 Jul 2021 12:42:23 -0000 we'll need that again Signed-off-by: Dominik Csapak --- www/manager6/Utils.js | 26 +++++++++++++++++++++++++- www/manager6/dc/UserView.js | 4 ++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index fbd2dfa8..d807a37e 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1770,7 +1770,31 @@ Ext.define('PVE.Utils', { } return undefined; }, -}, + + // returns username + realm + parse_userid: function(userid) { + if (!Ext.isString(userid)) { + return [undefined, undefined]; + } + + let match = userid.match(/^(.+)@([^@]+)$/); + if (match !== null) { + return [match[1], match[2]]; + } + + return [undefined, undefined]; + }, + + render_username: function(userid) { + let username = PVE.Utils.parse_userid(userid)[0] || ""; + return Ext.htmlEncode(username); + }, + + render_realm: function(userid) { + let username = PVE.Utils.parse_userid(userid)[1] || ""; + return Ext.htmlEncode(username); + }, + }, singleton: true, constructor: function() { diff --git a/www/manager6/dc/UserView.js b/www/manager6/dc/UserView.js index 957b7724..79f7c52c 100644 --- a/www/manager6/dc/UserView.js +++ b/www/manager6/dc/UserView.js @@ -152,14 +152,14 @@ Ext.define('PVE.dc.UserView', { header: gettext('User name'), width: 200, sortable: true, - renderer: userid => Ext.String.htmlEncode(userid.match(/^(.+)(@[^@]+)$/)[1]), + renderer: PVE.Utils.render_username, dataIndex: 'userid', }, { header: gettext('Realm'), width: 100, sortable: true, - renderer: userid => Ext.String.htmlEncode(userid.match(/@([^@]+)$/)[1]), + renderer: PVE.Utils.render_realm, dataIndex: 'userid', }, { -- 2.30.2