From 37e0f8f92b9fcaed943df10233f49c3fe07baa09 Mon Sep 17 00:00:00 2001
From: agagancarczyk <4890675+agagancarczyk@users.noreply.github.com>
Date: Mon, 22 Jan 2024 14:47:18 +0000
Subject: [PATCH] Fixed resource and permission names and tooltip message
 (#26385)

* fixed typo

Signed-off-by: Agnieszka Gancarczyk <agancarc@redhat.com>

* renamed key

Signed-off-by: Agnieszka Gancarczyk <agancarc@redhat.com>

---------

Signed-off-by: Agnieszka Gancarczyk <agancarc@redhat.com>
Co-authored-by: Agnieszka Gancarczyk <agancarc@redhat.com>
---
 .../theme/keycloak.v2/admin/messages/messages_en.properties | 5 +++--
 .../src/clients/authorization/PermissionDetails.tsx         | 1 +
 .../admin-ui/src/clients/authorization/ResourceDetails.tsx  | 6 +++++-
 .../src/identity-providers/add/DiscoverySettings.tsx        | 1 +
 .../src/user-federation/ldap/LdapSettingsSearching.tsx      | 2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

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 767af37aff3d..85f85ee7350b 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
@@ -3033,7 +3033,7 @@ selectEvictionMinute=Select eviction minute
 selectEditMode=Select edit mode
 emptySelection=Empty selection
 readOnlySelection=Read only selection
-writtableSelection=Writable selection
+writableSelection=Writable selection
 unsyncedSelection=Unsynced selection
 selectMapperType=Select mapper type
 editBtn=Edit button
@@ -3041,4 +3041,5 @@ acceptBtn=Accept editing button
 cancelBtn=Cancel editing button
 chooseBindingType=Choose binding type
 selectFlowType=Select flow type
-selectClientAssertionSigningAlg=Select client assertion signing algorithm
\ No newline at end of file
+selectClientAssertionSigningAlg=Select client assertion signing algorithm
+resourceDetailsTypeHelp=The type of this resource. It can be used to group different resource instances with the same type.
diff --git a/js/apps/admin-ui/src/clients/authorization/PermissionDetails.tsx b/js/apps/admin-ui/src/clients/authorization/PermissionDetails.tsx
index 59bf28bce3e6..26a55030664c 100644
--- a/js/apps/admin-ui/src/clients/authorization/PermissionDetails.tsx
+++ b/js/apps/admin-ui/src/clients/authorization/PermissionDetails.tsx
@@ -129,6 +129,7 @@ export default function PermissionDetails() {
           { id, type: permissionType },
           permission,
         );
+        setPermission(result);
         navigate(
           toPermissionDetails({
             realm,
diff --git a/js/apps/admin-ui/src/clients/authorization/ResourceDetails.tsx b/js/apps/admin-ui/src/clients/authorization/ResourceDetails.tsx
index d59660dabe90..10c95aa43e1c 100644
--- a/js/apps/admin-ui/src/clients/authorization/ResourceDetails.tsx
+++ b/js/apps/admin-ui/src/clients/authorization/ResourceDetails.tsx
@@ -114,6 +114,7 @@ export default function ResourceDetails() {
           { id },
           resource,
         );
+        setResource(resource);
         navigate(toResourceDetails({ realm, id, resourceId: result._id! }));
       }
       addAlert(
@@ -250,7 +251,10 @@ export default function ResourceDetails() {
               label={t("type")}
               fieldId="type"
               labelIcon={
-                <HelpItem helpText={t("clientTypeHelp")} fieldLabelId="type" />
+                <HelpItem
+                  helpText={t("resourceDetailsTypeHelp")}
+                  fieldLabelId="type"
+                />
               }
             >
               <KeycloakTextInput id="type" {...register("type")} />
diff --git a/js/apps/admin-ui/src/identity-providers/add/DiscoverySettings.tsx b/js/apps/admin-ui/src/identity-providers/add/DiscoverySettings.tsx
index 92b8f9e4bc1b..659da332aab3 100644
--- a/js/apps/admin-ui/src/identity-providers/add/DiscoverySettings.tsx
+++ b/js/apps/admin-ui/src/identity-providers/add/DiscoverySettings.tsx
@@ -134,6 +134,7 @@ const Fields = ({ readOnly }: DiscoverySettingsProps) => {
               <FormGroupField label="validatingPublicKey">
                 <KeycloakTextArea
                   data-testid="validatingPublicKey"
+                  aria-label={t("validatingPublicKey")}
                   {...register("config.publicKeySignatureVerifier")}
                 />
               </FormGroupField>
diff --git a/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsSearching.tsx b/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsSearching.tsx
index 2159827b3b48..39a3bc40cbf1 100644
--- a/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsSearching.tsx
+++ b/js/apps/admin-ui/src/user-federation/ldap/LdapSettingsSearching.tsx
@@ -100,7 +100,7 @@ export const LdapSettingsSearching = ({
                   value="READ_ONLY"
                 />
                 <SelectOption
-                  aria-label={t("writtableSelection")}
+                  aria-label={t("writableSelection")}
                   value="WRITABLE"
                 />
                 <SelectOption