From 394ea13f531ddb75276fd4ed6468629bd6261cad Mon Sep 17 00:00:00 2001 From: agagancarczyk <4890675+agagancarczyk@users.noreply.github.com> Date: Tue, 25 Jun 2024 12:31:10 +0100 Subject: [PATCH] backport to fix username display in the users dropdown on create/edit user policy (#30737) Signed-off-by: Agnieszka Gancarczyk Co-authored-by: Agnieszka Gancarczyk --- js/apps/admin-ui/src/clients/authorization/policy/User.tsx | 1 + js/apps/admin-ui/src/components/users/UserSelect.tsx | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/js/apps/admin-ui/src/clients/authorization/policy/User.tsx b/js/apps/admin-ui/src/clients/authorization/policy/User.tsx index 1a64d523a0b..db654e064ab 100644 --- a/js/apps/admin-ui/src/clients/authorization/policy/User.tsx +++ b/js/apps/admin-ui/src/clients/authorization/policy/User.tsx @@ -9,6 +9,7 @@ export const User = () => { label="users" helpText={t("policyUsers")} defaultValue={[]} + variant="typeaheadMulti" isRequired /> ); diff --git a/js/apps/admin-ui/src/components/users/UserSelect.tsx b/js/apps/admin-ui/src/components/users/UserSelect.tsx index db1cde18688..962fe459f10 100644 --- a/js/apps/admin-ui/src/components/users/UserSelect.tsx +++ b/js/apps/admin-ui/src/components/users/UserSelect.tsx @@ -154,7 +154,10 @@ export const UserSelect = ({ ); }} > - {selection} + { + users.find((u) => u?.id === selection) + ?.username + } ), )}