From aa2ae61f22802b85121fbe47bd40084c1e8cc73b Mon Sep 17 00:00:00 2001 From: Erik Jan de Wit Date: Tue, 16 Apr 2024 13:03:54 +0200 Subject: [PATCH] added show inherited roles to empty state (#28793) fixes: #28640 Signed-off-by: Erik Jan de Wit --- .../keycloak.v2/admin/messages/messages_en.properties | 2 ++ .../admin-ui/src/components/role-mapping/RoleMapping.tsx | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties b/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties index 9f202522c2..835fba8c62 100644 --- a/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties +++ b/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties @@ -660,6 +660,7 @@ addAssociatedRolesText=Add associated roles enabledFeatures=Enabled features groupsClaimHelp=If defined, the policy will fetch user's groups from the given claim within an access token or ID token representing the identity asking permissions. If not defined, user's groups are obtained from your realm configuration. createGroup=Create group +validatingPublicKey= Validating public key validatingPublicKeyId=Validating public key id clientAuthentications.client_secret_jwt=JWT signed with client secret created=Created @@ -1118,6 +1119,7 @@ addPostLogoutRedirectUri=Add valid post logout redirect URIs SSOSessionMaxRememberMe=SSO Session Max Remember Me pkceMethod=PKCE Method noRoles-users=No roles for this user +showInheritedRoles=Show inherited roles moveGroupEmptyInstructions=There are no sub groups, select 'Move here' to move the selected group as a subgroup of this group hmacGenerated=hmac-generated unlockSuccess=User successfully unlocked diff --git a/js/apps/admin-ui/src/components/role-mapping/RoleMapping.tsx b/js/apps/admin-ui/src/components/role-mapping/RoleMapping.tsx index b9fd1b6b7c..3df678e218 100644 --- a/js/apps/admin-ui/src/components/role-mapping/RoleMapping.tsx +++ b/js/apps/admin-ui/src/components/role-mapping/RoleMapping.tsx @@ -258,6 +258,15 @@ export const RoleMapping = ({ instructions={t(`noRolesInstructions-${type}`)} primaryActionText={t("assignRole")} onPrimaryAction={() => setShowAssign(true)} + secondaryActions={[ + { + text: t("showInheritedRoles"), + onClick: () => { + setHide(false); + refresh(); + }, + }, + ]} /> } />