From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager 5/6] ui: Utils: refactor userid parsing to Utils
Date: Thu, 1 Jul 2021 14:25:05 +0200 [thread overview]
Message-ID: <20210701122506.503289-7-d.csapak@proxmox.com> (raw)
In-Reply-To: <20210701122506.503289-1-d.csapak@proxmox.com>
we'll need that again
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
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
next prev parent reply other threads:[~2021-07-01 12:42 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-01 12:24 [pve-devel] [PATCH access-control/manager] add openid gui handling Dominik Csapak
2021-07-01 12:25 ` [pve-devel] [PATCH access-control 1/1] api: user: add realmtype to user list Dominik Csapak
2021-07-02 11:48 ` [pve-devel] applied: " Thomas Lamprecht
2021-07-01 12:25 ` [pve-devel] [PATCH manager 1/6] ui: dc/AuthEditBase: only add tfa field on auth modes that support that Dominik Csapak
2021-07-01 12:25 ` [pve-devel] [PATCH manager 2/6] ui: dc: add AuthEditOpenId panel Dominik Csapak
2021-07-01 12:25 ` [pve-devel] [PATCH manager 3/6] ui: dc/UserView: disable TFA button based on realm type Dominik Csapak
2021-07-01 12:25 ` [pve-devel] [PATCH manager 4/6] ui: dc/UserView: disable Password " Dominik Csapak
2021-07-01 12:25 ` Dominik Csapak [this message]
2021-07-01 12:25 ` [pve-devel] [PATCH manager 6/6] ui: Workspace: use domains info to hide password/tfa items Dominik Csapak
2021-07-02 13:28 ` [pve-devel] applied: " Thomas Lamprecht
2021-07-02 13:28 ` [pve-devel] applied-series: [PATCH access-control/manager] add openid gui handling Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210701122506.503289-7-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal