From 2ec3f33d5b0b06df872d7319cfa2417f448ae10a Mon Sep 17 00:00:00 2001
From: agagancarczyk <4890675+agagancarczyk@users.noreply.github.com>
Date: Wed, 20 Sep 2023 08:28:28 +0100
Subject: [PATCH] fixed help texts for identity providers (#23367)

Co-authored-by: Agnieszka Gancarczyk <agancarc@redhat.com>
---
 .../public/locales/en/translation.json        |  2 +-
 .../identity-providers/add/AddMapperForm.tsx  |  5 +---
 .../add/AdvancedSettings.tsx                  |  2 +-
 .../add/DescriptorSettings.tsx                | 23 +++++++++----------
 .../add/ExtendedNonDiscoverySettings.tsx      |  2 +-
 .../add/OIDCGeneralSettings.tsx               |  2 +-
 .../add/SamlGeneralSettings.tsx               |  4 ++--
 7 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/js/apps/admin-ui/public/locales/en/translation.json b/js/apps/admin-ui/public/locales/en/translation.json
index 3f04da10f1..02f507f24e 100644
--- a/js/apps/admin-ui/public/locales/en/translation.json
+++ b/js/apps/admin-ui/public/locales/en/translation.json
@@ -3000,7 +3000,7 @@
   "comparisonHelp": "Specifies the comparison method used to evaluate the requested context classes or statements. The default is \"Exact\".",
   "authnContextClassRefsHelp": "Ordered list of requested AuthnContext ClassRefs.",
   "authnContextDeclRefsHelp": "Ordered list of requested AuthnContext DeclRefs.",
-  "addIdpMapperName": "Name of the mapper.",
+  "addIdpMapperNameHelp": "Name of the mapper.",
   "syncModeOverrideHelp": "Overrides the default sync mode of the IDP for this mapper. Values are: 'legacy' to keep the behaviour before this option was introduced, 'import' to only import the user once during first login of the user with this identity provider, 'force' to always update the user during every login with this identity provider and 'inherit' to use the sync mode defined in the identity provider for this mapper.",
   "advancedAttributeToRole": "If the set of attributes exists and can be matched, grant the user the specified realm or client role.",
   "usernameTemplateImporter": "Format the username to import.",
diff --git a/js/apps/admin-ui/src/identity-providers/add/AddMapperForm.tsx b/js/apps/admin-ui/src/identity-providers/add/AddMapperForm.tsx
index 1f2b1f53d7..ecbe3b71d3 100644
--- a/js/apps/admin-ui/src/identity-providers/add/AddMapperForm.tsx
+++ b/js/apps/admin-ui/src/identity-providers/add/AddMapperForm.tsx
@@ -50,10 +50,7 @@ export const AddMapperForm = ({
       <FormGroup
         label={t("name")}
         labelIcon={
-          <HelpItem
-            helpText={t("identity-providers-help:addIdpMapperName")}
-            fieldLabelId="name"
-          />
+          <HelpItem helpText={t("addIdpMapperName")} fieldLabelId="name" />
         }
         fieldId="kc-name"
         isRequired
diff --git a/js/apps/admin-ui/src/identity-providers/add/AdvancedSettings.tsx b/js/apps/admin-ui/src/identity-providers/add/AdvancedSettings.tsx
index bd547ba6f9..c1039e9e2a 100644
--- a/js/apps/admin-ui/src/identity-providers/add/AdvancedSettings.tsx
+++ b/js/apps/admin-ui/src/identity-providers/add/AdvancedSettings.tsx
@@ -44,7 +44,7 @@ const LoginFlow = ({
       label={t(label)}
       labelIcon={
         <HelpItem
-          helpText={t(`identity-providers-help:${label}`)}
+          helpText={t(`${label}Help`)}
           fieldLabelId={`identity-providers:${label}`}
         />
       }
diff --git a/js/apps/admin-ui/src/identity-providers/add/DescriptorSettings.tsx b/js/apps/admin-ui/src/identity-providers/add/DescriptorSettings.tsx
index f60e575f22..37c156a75c 100644
--- a/js/apps/admin-ui/src/identity-providers/add/DescriptorSettings.tsx
+++ b/js/apps/admin-ui/src/identity-providers/add/DescriptorSettings.tsx
@@ -26,7 +26,6 @@ type DescriptorSettingsProps = {
 
 const Fields = ({ readOnly }: DescriptorSettingsProps) => {
   const { t } = useTranslation();
-  const { t: th } = useTranslation();
 
   const {
     register,
@@ -98,7 +97,7 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
         label={t("ssoServiceUrl")}
         labelIcon={
           <HelpItem
-            helpText={th("ssoServiceUrl")}
+            helpText={t("ssoServiceUrlHelp")}
             fieldLabelId="identity-providers:ssoServiceUrl"
           />
         }
@@ -128,7 +127,7 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
         label={t("singleLogoutServiceUrl")}
         labelIcon={
           <HelpItem
-            helpText={th("singleLogoutServiceUrl")}
+            helpText={t("singleLogoutServiceUrlHelp")}
             fieldLabelId="identity-providers:singleLogoutServiceUrl"
           />
         }
@@ -158,7 +157,7 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
         label={t("nameIdPolicyFormat")}
         labelIcon={
           <HelpItem
-            helpText={th("nameIdPolicyFormat")}
+            helpText={t("nameIdPolicyFormatHelp")}
             fieldLabelId="identity-providers:nameIdPolicyFormat"
           />
         }
@@ -237,7 +236,7 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
         label={t("principalType")}
         labelIcon={
           <HelpItem
-            helpText={th("principalType")}
+            helpText={t("principalTypeHelp")}
             fieldLabelId="identity-providers:principalType"
           />
         }
@@ -292,7 +291,7 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
           label={t("principalAttribute")}
           labelIcon={
             <HelpItem
-              helpText={th("principalAttribute")}
+              helpText={t("principalAttributeHelp")}
               fieldLabelId="identity-providers:principalAttribute"
             />
           }
@@ -342,7 +341,7 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
             label={t("signatureAlgorithm")}
             labelIcon={
               <HelpItem
-                helpText={th("signatureAlgorithm")}
+                helpText={t("signatureAlgorithmHelp")}
                 fieldLabelId="identity-providers:signatureAlgorithm"
               />
             }
@@ -381,7 +380,7 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
             label={t("encryptionAlgorithm")}
             labelIcon={
               <HelpItem
-                helpText={th("encryptionAlgorithm")}
+                helpText={t("encryptionAlgorithmHelp")}
                 fieldLabelId="identity-provider:encryptionAlgorithm"
               />
             }
@@ -416,7 +415,7 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
             label={t("samlSignatureKeyName")}
             labelIcon={
               <HelpItem
-                helpText={th("samlSignatureKeyName")}
+                helpText={t("samlSignatureKeyNameHelp")}
                 fieldLabelId="identity-providers:samlSignatureKeyName"
               />
             }
@@ -500,7 +499,7 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
         label={t("allowedClockSkew")}
         labelIcon={
           <HelpItem
-            helpText={th("allowedClockSkew")}
+            helpText={t("allowedClockSkewHelp")}
             fieldLabelId="identity-providers:allowedClockSkew"
           />
         }
@@ -539,7 +538,7 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
         label={t("attributeConsumingServiceIndex")}
         labelIcon={
           <HelpItem
-            helpText={th("attributeConsumingServiceIndex")}
+            helpText={t("attributeConsumingServiceIndexHelp")}
             fieldLabelId="identity-providers:attributeConsumingServiceIndex"
           />
         }
@@ -578,7 +577,7 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
         label={t("attributeConsumingServiceName")}
         labelIcon={
           <HelpItem
-            helpText={th("attributeConsumingServiceName")}
+            helpText={t("attributeConsumingServiceNameHelp")}
             fieldLabelId="identity-providers:attributeConsumingServiceName"
           />
         }
diff --git a/js/apps/admin-ui/src/identity-providers/add/ExtendedNonDiscoverySettings.tsx b/js/apps/admin-ui/src/identity-providers/add/ExtendedNonDiscoverySettings.tsx
index ac48427147..ff6b995fe6 100644
--- a/js/apps/admin-ui/src/identity-providers/add/ExtendedNonDiscoverySettings.tsx
+++ b/js/apps/admin-ui/src/identity-providers/add/ExtendedNonDiscoverySettings.tsx
@@ -88,7 +88,7 @@ export const ExtendedNonDiscoverySettings = () => {
           label={t("allowedClockSkew")}
           labelIcon={
             <HelpItem
-              helpText={"identity-providers-help:allowedClockSkew"}
+              helpText={t("allowedClockSkewHelp")}
               fieldLabelId="identity-providers:allowedClockSkew"
             />
           }
diff --git a/js/apps/admin-ui/src/identity-providers/add/OIDCGeneralSettings.tsx b/js/apps/admin-ui/src/identity-providers/add/OIDCGeneralSettings.tsx
index 6ef6d48d1e..9a69adbe65 100644
--- a/js/apps/admin-ui/src/identity-providers/add/OIDCGeneralSettings.tsx
+++ b/js/apps/admin-ui/src/identity-providers/add/OIDCGeneralSettings.tsx
@@ -30,7 +30,7 @@ export const OIDCGeneralSettings = () => {
         label={t("alias")}
         labelIcon={
           <HelpItem
-            helpText={t("identity-providers-help:alias")}
+            helpText={t("aliasHelp")}
             fieldLabelId="identity-providers:alias"
           />
         }
diff --git a/js/apps/admin-ui/src/identity-providers/add/SamlGeneralSettings.tsx b/js/apps/admin-ui/src/identity-providers/add/SamlGeneralSettings.tsx
index e29abaa297..d6309e453c 100644
--- a/js/apps/admin-ui/src/identity-providers/add/SamlGeneralSettings.tsx
+++ b/js/apps/admin-ui/src/identity-providers/add/SamlGeneralSettings.tsx
@@ -39,7 +39,7 @@ export const SamlGeneralSettings = ({
         label={t("alias")}
         labelIcon={
           <HelpItem
-            helpText={t("identity-providers-help:alias")}
+            helpText={t("aliasHelp")}
             fieldLabelId="identity-providers:alias"
           />
         }
@@ -74,7 +74,7 @@ export const SamlGeneralSettings = ({
           fieldId="endpoints"
           labelIcon={
             <HelpItem
-              helpText={t("identity-providers-help:alias")}
+              helpText={t("aliasHelp")}
               fieldLabelId="identity-providers:alias"
             />
           }