libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

changed all the help items (#1683)

Browse source
This commit is contained in:
Erik Jan de Wit 2021-12-14 15:56:36 +01:00 committed by GitHub
parent d4c50f6218
commit e8f335f199
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
116 changed files with 546 additions and 1101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cypress/integration/masthead_test.spec.ts
View file

@ -39,12 +39,12 @@ describe("Masthead tests in desktop mode", () => {
listingPage.goToItemDetails("address");
cy.get("#view-header-subkey").should("exist");
cy.get(`#name-help-icon`).should("exist");
cy.findByTestId("help-label-name").should("exist");
masthead.toggleGlobalHelp();
cy.get("#view-header-subkey").should("not.exist");
cy.get(`#name-help-icon`).should("not.exist");
cy.findByTestId("help-label-name").should("not.exist");
});
logOutTest();

8
src/authentication/components/ExecutionConfigModal.tsx
View file

@ -144,8 +144,7 @@ export const ExecutionConfigModal = ({
labelIcon={
<HelpItem
helpText="authentication-help:alias"
forLabel={t("alias")}
forID="alias"
fieldLabelId="authentication:alias"
/>
}
>
@ -163,7 +162,7 @@ export const ExecutionConfigModal = ({
}
/>
</FormGroup>
{configDescription?.properties?.map((property) => (
{configDescription.properties?.map((property) => (
<FormGroup
key={property.name}
label={property.label}
@ -171,8 +170,7 @@ export const ExecutionConfigModal = ({
labelIcon={
<HelpItem
helpText={property.helpText}
forLabel={property.name!}
forID={property.name!}
fieldLabelId={property.name!}
/>
}
>

15
src/authentication/components/modals/AddSubFlowModal.tsx
View file

@ -95,11 +95,7 @@ export const AddSubFlowModal = ({
}
isRequired
labelIcon={
<HelpItem
helpText="authentication-help:name"
forLabel={t("name")}
forID="name"
/>
<HelpItem helpText="authentication-help:name" fieldLabelId="name" />
}
>
<TextInput
@ -119,8 +115,7 @@ export const AddSubFlowModal = ({
labelIcon={
<HelpItem
helpText="authentication-help:description"
forLabel={t("common:description")}
forID="description"
fieldLabelId="description"
/>
}
>
@ -137,8 +132,7 @@ export const AddSubFlowModal = ({
labelIcon={
<HelpItem
helpText="authentication-help:flowType"
forLabel={t("flowType")}
forID="flowType"
fieldLabelId="authentication:flowType"
/>
}
fieldId="flowType"
@ -180,8 +174,7 @@ export const AddSubFlowModal = ({
labelIcon={
<HelpItem
helpText="authentication-help:flowType"
forLabel={t("flowType")}
forID="flowType"
fieldLabelId="authentication:flowType"
/>
}
fieldId="flowType"

3
src/authentication/form/FlowType.tsx
View file

@ -24,8 +24,7 @@ export const FlowType = () => {
labelIcon={
<HelpItem
helpText="authentication-help:topLevelFlowType"
forLabel={t("flowType")}
forID="flowType"
fieldLabelId="authentication:flowType"
/>
}
fieldId="flowType"

9
src/authentication/form/NameDescription.tsx
View file

@ -25,11 +25,7 @@ export const NameDescription = () => {
}
isRequired
labelIcon={
<HelpItem
helpText="authentication-help:name"
forLabel={t("common:name")}
forID="kc-name"
/>
<HelpItem helpText="authentication-help:name" fieldLabelId="name" />
}
>
<TextInput
@ -49,8 +45,7 @@ export const NameDescription = () => {
labelIcon={
<HelpItem
helpText="authentication-help:description"
forLabel={t("common:description")}
forID="kc-description"
fieldLabelId="description"
/>
}
validated={

2
src/authentication/help.ts
View file

@ -13,6 +13,8 @@ export default {
alias: "Name of the configuration",
otpType:
"totp is Time-Based One Time Password. 'hotp' is a counter base one time password in which the server keeps a counter to hash against.",
webAuthnPolicyRpEntityName:
"Human-readable server name as WebAuthn Relying Party",
otpHashAlgorithm:
"What hashing algorithm should be used to generate the OTP.",
otpPolicyDigits: "How many digits should the OTP have?",

1
src/authentication/messages.ts
View file

@ -14,6 +14,7 @@ export default {
updatePasswordPolicySuccess: "Password policies successfully updated",
updatePasswordPolicyError:
"Could not update the password policies: '{{error}}'",
webAuthnPolicyRpEntityName: "Relying party entity name",
addPolicy: "Add policy",
otpType: "OTP type",
policyType: {

3
src/client-scopes/details/MappingDetails.tsx
View file

@ -213,8 +213,7 @@ export default function MappingDetails() {
labelIcon={
<HelpItem
helpText="client-scopes-help:mapperName"
forLabel={t("common:name")}
forID="name"
fieldLabelId="name"
/>
}
fieldId="name"

30
src/client-scopes/details/ScopeForm.tsx
View file

@ -63,12 +63,7 @@ export const ScopeForm = ({ clientScope, save }: ScopeFormProps) => {
<FormGroup
label={t("common:name")}
labelIcon={
<HelpItem
id="name-help-icon"
helpText="client-scopes-help:name"
forLabel={t("common:name")}
forID={t(`common:helpLabel`, { label: t("common:name") })}
/>
<HelpItem helpText="client-scopes-help:name" fieldLabelId="name" />
}
fieldId="kc-name"
isRequired
@ -92,8 +87,7 @@ export const ScopeForm = ({ clientScope, save }: ScopeFormProps) => {
labelIcon={
<HelpItem
helpText="client-scopes-help:description"
forLabel={t("common:description")}
forID={t(`common:helpLabel`, { label: t("common:description") })}
fieldLabelId="description"
/>
}
fieldId="kc-description"
@ -121,8 +115,7 @@ export const ScopeForm = ({ clientScope, save }: ScopeFormProps) => {
labelIcon={
<HelpItem
helpText="client-scopes-help:type"
forLabel={t("type")}
forID={t(`common:helpLabel`, { label: t("type") })}
fieldLabelId="client-scopes:type"
/>
}
fieldId="type"
@ -154,8 +147,7 @@ export const ScopeForm = ({ clientScope, save }: ScopeFormProps) => {
labelIcon={
<HelpItem
helpText="client-scopes-help:protocol"
forLabel="protocol"
forID={t(`common:helpLabel`, { label: t("protocol") })}
fieldLabelId="client-scopes:protocol"
/>
}
fieldId="kc-protocol"
@ -199,10 +191,7 @@ export const ScopeForm = ({ clientScope, save }: ScopeFormProps) => {
labelIcon={
<HelpItem
helpText="client-scopes-help:displayOnConsentScreen"
forLabel={t("displayOnConsentScreen")}
forID={t(`common:helpLabel`, {
label: t("displayOnConsentScreen"),
})}
fieldLabelId="client-scopes:displayOnConsentScreen"
/>
}
fieldId="kc-display.on.consent.screen"
@ -228,8 +217,7 @@ export const ScopeForm = ({ clientScope, save }: ScopeFormProps) => {
labelIcon={
<HelpItem
helpText="client-scopes-help:consentScreenText"
forLabel={t("consentScreenText")}
forID={t(`common:helpLabel`, { label: t("consentScreenText") })}
fieldLabelId="client-scopes:consentScreenText"
/>
}
fieldId="kc-consent-screen-text"
@ -248,8 +236,7 @@ export const ScopeForm = ({ clientScope, save }: ScopeFormProps) => {
labelIcon={
<HelpItem
helpText="client-scopes-help:includeInTokenScope"
forLabel={t("includeInTokenScope")}
forID={t(`common:helpLabel`, { label: t("includeInTokenScope") })}
fieldLabelId="client-scopes:includeInTokenScope"
/>
}
fieldId="includeInTokenScope"
@ -274,8 +261,7 @@ export const ScopeForm = ({ clientScope, save }: ScopeFormProps) => {
labelIcon={
<HelpItem
helpText="client-scopes-help:guiOrder"
forLabel={t("guiOrder")}
forID={t(`common:helpLabel`, { label: t("guiOrder") })}
fieldLabelId="client-scopes:guiOrder"
/>
}
fieldId="kc-gui-order"

8
src/clients/AdvancedTab.tsx
View file

@ -196,8 +196,7 @@ export const AdvancedTab = ({
labelIcon={
<HelpItem
helpText="clients-help:notBefore"
forLabel={t("notBefore")}
forID={t(`common:helpLabel`, { label: t("notBefore") })}
fieldLabelId="clients:notBefore"
/>
}
>
@ -256,10 +255,7 @@ export const AdvancedTab = ({
labelIcon={
<HelpItem
helpText="clients-help:nodeReRegistrationTimeout"
forLabel={t("nodeReRegistrationTimeout")}
forID={t(`common:helpLabel`, {
label: t("nodeReRegistrationTimeout"),
})}
fieldLabelId="clients:nodeReRegistrationTimeout"
/>
}
>

15
src/clients/ClientDescription.tsx
View file

@ -20,11 +20,7 @@ export const ClientDescription = () => {
<FormAccess role="manage-clients" unWrap>
<FormGroup
labelIcon={
<HelpItem
helpText="clients-help:clientId"
forLabel={t("common:clientId")}
forID="kc-client-id"
/>
<HelpItem helpText="clients-help:clientId" fieldLabelId="clientId" />
}
label={t("common:clientId")}
fieldId="kc-client-id"
@ -46,11 +42,7 @@ export const ClientDescription = () => {
</FormGroup>
<FormGroup
labelIcon={
<HelpItem
helpText="clients-help:clientName"
forLabel={t("common:name")}
forID="kc-name"
/>
<HelpItem helpText="clients-help:clientName" fieldLabelId="name" />
}
label={t("common:name")}
fieldId="kc-name"
@ -61,8 +53,7 @@ export const ClientDescription = () => {
labelIcon={
<HelpItem
helpText="clients-help:description"
forLabel={t("common:description")}
forID="kc-description"
fieldLabelId="description"
/>
}
label={t("common:description")}

27
src/clients/ClientSettings.tsx
View file

@ -80,8 +80,7 @@ export const ClientSettings = ({
labelIcon={
<HelpItem
helpText="clients-help:rootUrl"
forLabel={t("rootUrl")}
forID="kc-root-url"
fieldLabelId="clients:rootUrl"
/>
}
>
@ -98,8 +97,7 @@ export const ClientSettings = ({
labelIcon={
<HelpItem
helpText="clients-help:validRedirectURIs"
forLabel={t("validRedirectUri")}
forID={t(`common:helpLabel`, { label: t("validRedirectUri") })}
fieldLabelId="clients:validRedirectUri"
/>
}
>
@ -115,8 +113,7 @@ export const ClientSettings = ({
labelIcon={
<HelpItem
helpText="clients-help:homeURL"
forLabel={t("homeURL")}
forID={t(`common:helpLabel`, { label: t("homeURL") })}
fieldLabelId="clients:homeURL"
/>
}
>
@ -133,8 +130,7 @@ export const ClientSettings = ({
labelIcon={
<HelpItem
helpText="clients-help:webOrigins"
forLabel={t("webOrigins")}
forID={t(`common:helpLabel`, { label: t("webOrigins") })}
fieldLabelId="clients:webOrigins"
/>
}
>
@ -150,8 +146,7 @@ export const ClientSettings = ({
labelIcon={
<HelpItem
helpText="clients-help:adminURL"
forLabel={t("adminURL")}
forID="kc-admin-url"
fieldLabelId="clients:adminURL"
/>
}
>
@ -169,8 +164,7 @@ export const ClientSettings = ({
labelIcon={
<HelpItem
helpText="clients-help:loginTheme"
forLabel={t("loginTheme")}
forID="loginTheme"
fieldLabelId="clients:loginTheme"
/>
}
fieldId="loginTheme"
@ -215,8 +209,7 @@ export const ClientSettings = ({
labelIcon={
<HelpItem
helpText="clients-help:consentRequired"
forLabel={t("consentRequired")}
forID="kc-consent-switch"
fieldLabelId="clients:consentRequired"
/>
}
fieldId="kc-consent"
@ -242,8 +235,7 @@ export const ClientSettings = ({
labelIcon={
<HelpItem
helpText="clients-help:displayOnClient"
forLabel={t("displayOnClient")}
forID="kc-display-on-client-switch"
fieldLabelId="clients:displayOnClient"
/>
}
fieldId="kc-display-on-client"
@ -270,8 +262,7 @@ export const ClientSettings = ({
labelIcon={
<HelpItem
helpText="clients-help:consentScreenText"
forLabel={t("consentScreenText")}
forID="kc-consent-screen-text"
fieldLabelId="clients:consentScreenText"
/>
}
fieldId="kc-consent-screen-text"

34
src/clients/add/CapabilityConfig.tsx
View file

@ -48,8 +48,7 @@ export const CapabilityConfig = ({
labelIcon={
<HelpItem
helpText="clients-help:authentication"
forLabel={t("authentication")}
forID={t(`common:helpLabel`, { label: t("authentication") })}
fieldLabelId="clients:authentication"
/>
}
>
@ -83,8 +82,7 @@ export const CapabilityConfig = ({
labelIcon={
<HelpItem
helpText="clients-help:authorization"
forLabel={t("authorization")}
forID={t(`common:helpLabel`, { label: t("authorization") })}
fieldLabelId="clients:authorization"
/>
}
>
@ -134,10 +132,7 @@ export const CapabilityConfig = ({
/>
<HelpItem
helpText="clients-help:standardFlow"
forLabel={t("standardFlow")}
forID={t(`common:helpLabel`, {
label: t("standardFlow"),
})}
fieldLabelId="clients:standardFlow"
/>
</InputGroup>
)}
@ -160,10 +155,7 @@ export const CapabilityConfig = ({
/>
<HelpItem
helpText="clients-help:directAccess"
forLabel={t("directAccess")}
forID={t(`common:helpLabel`, {
label: t("directAccess"),
})}
fieldLabelId="clients:directAccess"
/>
</InputGroup>
)}
@ -186,10 +178,7 @@ export const CapabilityConfig = ({
/>
<HelpItem
helpText="clients-help:implicitFlow"
forLabel={t("implicitFlow")}
forID={t(`common:helpLabel`, {
label: t("implicitFlow"),
})}
fieldLabelId="clients:implicitFlow"
/>
</InputGroup>
)}
@ -218,10 +207,7 @@ export const CapabilityConfig = ({
/>
<HelpItem
helpText="clients-help:serviceAccount"
forLabel={t("serviceAccount")}
forID={t(`common:helpLabel`, {
label: t("serviceAccount"),
})}
fieldLabelId="clients:serviceAccount"
/>
</InputGroup>
)}
@ -237,10 +223,7 @@ export const CapabilityConfig = ({
labelIcon={
<HelpItem
helpText="clients-help:encryptAssertions"
forLabel={t("encryptAssertions")}
forID={t(`common:helpLabel`, {
label: t("encryptAssertions"),
})}
fieldLabelId="clients:encryptAssertions"
/>
}
label={t("encryptAssertions")}
@ -267,8 +250,7 @@ export const CapabilityConfig = ({
labelIcon={
<HelpItem
helpText="clients-help:clientSignature"
forLabel={t("clientSignature")}
forID={t(`common:helpLabel`, { label: t("clientSignature") })}
fieldLabelId="clients:clientSignature"
/>
}
label={t("clientSignature")}

3
src/clients/add/GeneralSettings.tsx
View file

@ -30,8 +30,7 @@ export const GeneralSettings = () => {
labelIcon={
<HelpItem
helpText="clients-help:clientType"
forLabel={t("clientType")}
forID={t(`common:helpLabel`, { label: t("clientType") })}
fieldLabelId="clients:clientType"
/>
}
>

6
src/clients/add/SamlConfig.tsx
View file

@ -25,8 +25,7 @@ export const Toggle = ({ name, label }: { name: string; label: string }) => {
labelIcon={
<HelpItem
helpText={t(`clients-help:${label}`)}
forLabel={t(label)}
forID={label}
fieldLabelId={`clients:${label}`}
/>
}
>
@ -66,8 +65,7 @@ export const SamlConfig = () => {
labelIcon={
<HelpItem
helpText="clients-help:nameIdFormat"
forLabel={t("nameIdFormat")}
forID={t("common:helpLabel", { label: t("nameIdFormat") })}
fieldLabelId="clients:nameIdFormat"
/>
}
>

15
src/clients/add/SamlSignature.tsx
View file

@ -70,10 +70,7 @@ export const SamlSignature = () => {
labelIcon={
<HelpItem
helpText="clients-help:signatureAlgorithm"
forLabel={t("signatureAlgorithm")}
forID={t("common:helpLabel", {
label: t("signatureAlgorithm"),
})}
fieldLabelId="clients:signatureAlgorithm"
/>
}
>
@ -112,10 +109,7 @@ export const SamlSignature = () => {
labelIcon={
<HelpItem
helpText="clients-help:signatureKeyName"
forLabel={t("signatureKeyName")}
forID={t("common:helpLabel", {
label: t("signatureKeyName"),
})}
fieldLabelId="clients:signatureKeyName"
/>
}
>
@ -153,10 +147,7 @@ export const SamlSignature = () => {
labelIcon={
<HelpItem
helpText="clients-help:canonicalization"
forLabel={t("canonicalization")}
forID={t("common:helpLabel", {
label: t("canonicalization"),
})}
fieldLabelId="clients:canonicalization"
/>
}
>

11
src/clients/advanced/AdvancedSettings.tsx
View file

@ -40,8 +40,7 @@ export const AdvancedSettings = ({
labelIcon={
<HelpItem
helpText="clients-help:assertionLifespan"
forLabel={t("assertionLifespan")}
forID={t(`common:helpLabel`, { label: t("assertionLifespan") })}
fieldLabelId="clients:assertionLifespan"
/>
}
>
@ -76,8 +75,7 @@ export const AdvancedSettings = ({
labelIcon={
<HelpItem
helpText="clients-help:oAuthMutual"
forLabel={t("oAuthMutual")}
forID={t(`common:helpLabel`, { label: t("oAuthMutual") })}
fieldLabelId="clients:oAuthMutual"
/>
}
>
@ -103,10 +101,7 @@ export const AdvancedSettings = ({
labelIcon={
<HelpItem
helpText="clients-help:keyForCodeExchange"
forLabel={t("keyForCodeExchange")}
forID={t(`common:helpLabel`, {
label: t("keyForCodeExchange"),
})}
fieldLabelId="clients:keyForCodeExchange"
/>
}
>

6
src/clients/advanced/AuthenticationOverrides.tsx
View file

@ -63,8 +63,7 @@ export const AuthenticationOverrides = ({
labelIcon={
<HelpItem
helpText="clients-help:browserFlow"
forLabel={t("browserFlow")}
forID={t(`common:helpLabel`, { label: t("browserFlow") })}
fieldLabelId="clients:browserFlow"
/>
}
>
@ -96,8 +95,7 @@ export const AuthenticationOverrides = ({
labelIcon={
<HelpItem
helpText="clients-help:directGrant"
forLabel={t("directGrant")}
forID={t(`common:helpLabel`, { label: t("directGrant") })}
fieldLabelId="clients:directGrant"
/>
}
>

21
src/clients/advanced/FineGrainOpenIdConnect.tsx
View file

@ -108,8 +108,7 @@ export const FineGrainOpenIdConnect = ({
labelIcon={
<HelpItem
helpText="clients-help:accessTokenSignatureAlgorithm"
forLabel={t("accessTokenSignatureAlgorithm")}
forID="accessTokenSignatureAlgorithm"
fieldLabelId="clients:accessTokenSignatureAlgorithm"
/>
}
>
@ -140,8 +139,7 @@ export const FineGrainOpenIdConnect = ({
labelIcon={
<HelpItem
helpText="clients-help:idTokenSignatureAlgorithm"
forLabel={t("idTokenSignatureAlgorithm")}
forID="idTokenSignatureAlgorithm"
fieldLabelId="clients:idTokenSignatureAlgorithm"
/>
}
>
@ -172,8 +170,7 @@ export const FineGrainOpenIdConnect = ({
labelIcon={
<HelpItem
helpText="clients-help:idTokenEncryptionKeyManagementAlgorithm"
forLabel={t("idTokenEncryptionKeyManagementAlgorithm")}
forID="idTokenEncryptionKeyManagementAlgorithm"
fieldLabelId="clients:idTokenEncryptionKeyManagementAlgorithm"
/>
}
>
@ -204,8 +201,7 @@ export const FineGrainOpenIdConnect = ({
labelIcon={
<HelpItem
helpText="clients-help:idTokenEncryptionContentEncryptionAlgorithm"
forLabel={t("idTokenEncryptionContentEncryptionAlgorithm")}
forID="idTokenEncryptionContentEncryptionAlgorithm"
fieldLabelId="clients:idTokenEncryptionContentEncryptionAlgorithm"
/>
}
>
@ -236,8 +232,7 @@ export const FineGrainOpenIdConnect = ({
labelIcon={
<HelpItem
helpText="clients-help:userInfoSignedResponseAlgorithm"
forLabel={t("userInfoSignedResponseAlgorithm")}
forID="userInfoSignedResponseAlgorithm"
fieldLabelId="clients:userInfoSignedResponseAlgorithm"
/>
}
>
@ -268,8 +263,7 @@ export const FineGrainOpenIdConnect = ({
labelIcon={
<HelpItem
helpText="clients-help:requestObjectSignatureAlgorithm"
forLabel={t("requestObjectSignatureAlgorithm")}
forID="requestObjectSignatureAlgorithm"
fieldLabelId="clients:requestObjectSignatureAlgorithm"
/>
}
>
@ -300,8 +294,7 @@ export const FineGrainOpenIdConnect = ({
labelIcon={
<HelpItem
helpText="clients-help:requestObjectRequired"
forLabel={t("requestObjectRequired")}
forID="requestObjectRequired"
fieldLabelId="clients:requestObjectRequired"
/>
}
>

21
src/clients/advanced/FineGrainSamlEndpointConfig.tsx
View file

@ -31,8 +31,7 @@ export const FineGrainSamlEndpointConfig = ({
labelIcon={
<HelpItem
helpText="clients-help:assertionConsumerServicePostBindingURL"
forLabel={t("assertionConsumerServicePostBindingURL")}
forID="assertionConsumerServicePostBindingURL"
fieldLabelId="clients:assertionConsumerServicePostBindingURL"
/>
}
>
@ -49,8 +48,7 @@ export const FineGrainSamlEndpointConfig = ({
labelIcon={
<HelpItem
helpText="clients-help:assertionConsumerServiceRedirectBindingURL"
forLabel={t("assertionConsumerServiceRedirectBindingURL")}
forID="assertionConsumerServiceRedirectBindingURL"
fieldLabelId="clients:assertionConsumerServiceRedirectBindingURL"
/>
}
>
@ -67,8 +65,7 @@ export const FineGrainSamlEndpointConfig = ({
labelIcon={
<HelpItem
helpText="clients-help:logoutServicePostBindingURL"
forLabel={t("logoutServicePostBindingURL")}
forID="logoutServicePostBindingURL"
fieldLabelId="clients:logoutServicePostBindingURL"
/>
}
>
@ -85,8 +82,7 @@ export const FineGrainSamlEndpointConfig = ({
labelIcon={
<HelpItem
helpText="clients-help:logoutServiceRedirectBindingURL"
forLabel={t("logoutServiceRedirectBindingURL")}
forID="logoutServiceRedirectBindingURL"
fieldLabelId="clients:logoutServiceRedirectBindingURL"
/>
}
>
@ -103,8 +99,7 @@ export const FineGrainSamlEndpointConfig = ({
labelIcon={
<HelpItem
helpText="clients-help:logoutServiceArtifactBindingUrl"
forLabel={t("logoutServiceArtifactBindingUrl")}
forID="logoutServiceArtifactBindingUrl"
fieldLabelId="clients:logoutServiceArtifactBindingUrl"
/>
}
>
@ -121,8 +116,7 @@ export const FineGrainSamlEndpointConfig = ({
labelIcon={
<HelpItem
helpText="clients-help:artifactBindingUrl"
forLabel={t("artifactBindingUrl")}
forID="artifactBindingUrl"
fieldLabelId="clients:artifactBindingUrl"
/>
}
>
@ -139,8 +133,7 @@ export const FineGrainSamlEndpointConfig = ({
labelIcon={
<HelpItem
helpText="clients-help:artifactResolutionService"
forLabel={t("artifactResolutionService")}
forID="artifactResolutionService"
fieldLabelId="clients:artifactResolutionService"
/>
}
>

5
src/clients/advanced/OpenIdConnectCompatibilityModes.tsx
View file

@ -26,10 +26,7 @@ export const OpenIdConnectCompatibilityModes = ({
labelIcon={
<HelpItem
helpText="clients-help:excludeSessionStateFromAuthenticationResponse"
forLabel={t("excludeSessionStateFromAuthenticationResponse")}
forID={t(`common:helpLabel`, {
label: t("excludeSessionStateFromAuthenticationResponse"),
})}
fieldLabelId="clients:excludeSessionStateFromAuthenticationResponse"
/>
}
>

5
src/clients/advanced/TokenLifespan.tsx
View file

@ -51,10 +51,7 @@ export const TokenLifespan = ({
labelIcon={
<HelpItem
helpText={`clients-help:${id}`}
forLabel={t(id)}
forID={t(`common:helpLabel`, {
label: t(id),
})}
fieldLabelId={`clients:${id}`}
/>
}
>

9
src/clients/authorization/ImportDialog.tsx
View file

@ -68,8 +68,7 @@ export const ImportDialog = ({ onConfirm, closeDialog }: ImportDialogProps) => {
labelIcon={
<HelpItem
helpText="clients-help:policyEnforcementMode"
forLabel={t("policyEnforcementMode")}
forID="policyEnforcementMode"
fieldLabelId="clients:policyEnforcementMode"
/>
}
fieldId="policyEnforcementMode"
@ -91,8 +90,7 @@ export const ImportDialog = ({ onConfirm, closeDialog }: ImportDialogProps) => {
labelIcon={
<HelpItem
helpText="clients-help:decisionStrategy"
forLabel={t("decisionStrategy")}
forID="decisionStrategy"
fieldLabelId="clients:decisionStrategy"
/>
}
fieldId="decisionStrategy"
@ -114,8 +112,7 @@ export const ImportDialog = ({ onConfirm, closeDialog }: ImportDialogProps) => {
labelIcon={
<HelpItem
helpText={t("allowRemoteResourceManagement")}
forLabel={t("allowRemoteResourceManagement")}
forID={"allowRemoteResourceManagement"}
fieldLabelId="clients:allowRemoteResourceManagement"
/>
}
>

31
src/clients/authorization/ResourceDetails.tsx
View file

@ -195,8 +195,7 @@ export default function ResourceDetails() {
labelIcon={
<HelpItem
helpText="clients-help:owner"
forLabel={t("owner")}
forID={t(`common:helpLabel`, { label: t("owner") })}
fieldLabelId="clients:owner"
/>
}
>
@ -208,8 +207,7 @@ export default function ResourceDetails() {
labelIcon={
<HelpItem
helpText="clients-help:resourceName"
forLabel={t("name")}
forID={t(`common:helpLabel`, { label: t("name") })}
fieldLabelId="name"
/>
}
helperTextInvalid={t("common:required")}
@ -235,8 +233,7 @@ export default function ResourceDetails() {
labelIcon={
<HelpItem
helpText="clients-help:displayName"
forLabel={t("name")}
forID={t(`common:helpLabel`, { label: t("name") })}
fieldLabelId="name"
/>
}
>
@ -246,11 +243,7 @@ export default function ResourceDetails() {
label={t("type")}
fieldId="type"
labelIcon={
<HelpItem
helpText="clients-help:type"
forLabel={t("type")}
forID={t(`common:helpLabel`, { label: t("type") })}
/>
<HelpItem helpText="clients-help:type" fieldLabelId="type" />
}
>
<TextInput id="type" name="type" ref={register} />
@ -261,8 +254,7 @@ export default function ResourceDetails() {
labelIcon={
<HelpItem
helpText="clients-help:uris"
forLabel={t("uris")}
forID={t(`common:helpLabel`, { label: t("uris") })}
fieldLabelId="clients:uris"
/>
}
>
@ -279,8 +271,7 @@ export default function ResourceDetails() {
labelIcon={
<HelpItem
helpText="clients-help:iconUri"
forLabel={t("iconUri")}
forID={t(`common:helpLabel`, { label: t("iconUri") })}
fieldLabelId="clients:iconUri"
/>
}
>
@ -292,10 +283,7 @@ export default function ResourceDetails() {
labelIcon={
<HelpItem
helpText="clients-help:ownerManagedAccess"
forLabel={t("ownerManagedAccess")}
forID={t(`common:helpLabel`, {
label: t("ownerManagedAccess"),
})}
fieldLabelId="clients:ownerManagedAccess"
/>
}
fieldId="ownerManagedAccess"
@ -322,10 +310,7 @@ export default function ResourceDetails() {
labelIcon={
<HelpItem
helpText="clients-help:resourceAttribute"
forLabel={t("resourceAttribute")}
forID={t(`common:helpLabel`, {
label: t("resourceAttribute"),
})}
fieldLabelId="clients:resourceAttribute"
/>
}
fieldId="resourceAttribute"

3
src/clients/authorization/ScopePicker.tsx
View file

@ -54,8 +54,7 @@ export const ScopePicker = ({ clientId }: { clientId: string }) => {
labelIcon={
<HelpItem
helpText="clients-help:scopes"
forLabel={t("scopes")}
forID={t(`common:helpLabel`, { label: t("scopes") })}
fieldLabelId="clients:scopes"
/>
}
fieldId="scopes"

14
src/clients/authorization/Settings.tsx
View file

@ -69,8 +69,7 @@ export const AuthorizationSettings = ({ clientId }: { clientId: string }) => {
labelIcon={
<HelpItem
helpText="clients-help:import"
forLabel={t("import")}
forID={t(`common:helpLabel`, { label: t("import") })}
fieldLabelId="clients:import"
/>
}
>
@ -84,8 +83,7 @@ export const AuthorizationSettings = ({ clientId }: { clientId: string }) => {
labelIcon={
<HelpItem
helpText="clients-help:policyEnforcementMode"
forLabel={t("policyEnforcementMode")}
forID="policyEnforcementMode"
fieldLabelId="clients:policyEnforcementMode"
/>
}
fieldId="policyEnforcementMode"
@ -119,8 +117,7 @@ export const AuthorizationSettings = ({ clientId }: { clientId: string }) => {
labelIcon={
<HelpItem
helpText="clients-help:decisionStrategy"
forLabel={t("decisionStrategy")}
forID="decisionStrategy"
fieldLabelId="clients:decisionStrategy"
/>
}
fieldId="decisionStrategy"
@ -155,9 +152,8 @@ export const AuthorizationSettings = ({ clientId }: { clientId: string }) => {
fieldId="allowRemoteResourceManagement"
labelIcon={
<HelpItem
helpText={t("allowRemoteResourceManagement")}
forLabel={t("allowRemoteResourceManagement")}
forID={"allowRemoteResourceManagement"}
helpText="clients-help:allowRemoteResourceManagement"
fieldLabelId="clients:allowRemoteResourceManagement"
/>
}
>

6
src/clients/credentials/Credentials.tsx
View file

@ -142,8 +142,7 @@ export const Credentials = ({ clientId, save }: CredentialsProps) => {
labelIcon={
<HelpItem
helpText="clients-help:client-authenticator-type"
forLabel={t("clientAuthenticator")}
forID="kc-client-authenticator-type"
fieldLabelId="clients:clientAuthenticator"
/>
}
>
@ -210,8 +209,7 @@ export const Credentials = ({ clientId, save }: CredentialsProps) => {
labelIcon={
<HelpItem
helpText="clients-help:registration-access-token"
forLabel={t("registrationAccessToken")}
forID="kc-access-token"
fieldLabelId="clients:registrationAccessToken"
/>
}
>

3
src/clients/credentials/SignedJWT.tsx
View file

@ -27,8 +27,7 @@ export const SignedJWT = () => {
labelIcon={
<HelpItem
helpText="clients-help:signature-algorithm"
forLabel={t("signatureAlgorithm")}
forID="kc-signature-algorithm"
fieldLabelId="clients:signatureAlgorithm"
/>
}
>

3
src/clients/credentials/X509.tsx
View file

@ -14,8 +14,7 @@ export const X509 = () => {
labelIcon={
<HelpItem
helpText="clients-help:subject"
forLabel={t("subject")}
forID="kc-subject"
fieldLabelId="clients:subject"
/>
}
helperTextInvalid={t("common:required")}

6
src/clients/initial-access/CreateInitialAccessToken.tsx
View file

@ -73,8 +73,7 @@ export default function CreateInitialAccessToken() {
labelIcon={
<HelpItem
helpText="clients-help:expiration"
forLabel={t("expiration")}
forID="expiration"
fieldLabelId="clients:expiration"
/>
}
>
@ -98,8 +97,7 @@ export default function CreateInitialAccessToken() {
labelIcon={
<HelpItem
helpText="clients-help:count"
forLabel={t("count")}
forID="count"
fieldLabelId="clients:count"
/>
}
>

3
src/clients/keys/Certificate.tsx
View file

@ -38,8 +38,7 @@ export const Certificate = ({ keyInfo, plain = false }: CertificateProps) => {
labelIcon={
<HelpItem
helpText="clients-help:certificate"
forLabel={t("certificate")}
forID={id}
fieldLabelId={`clients:${id}`}
/>
}
>

6
src/clients/keys/GenerateKeyDialog.tsx
View file

@ -48,8 +48,7 @@ export const KeyForm = ({
labelIcon={
<HelpItem
helpText="clients-help:archiveFormat"
forLabel={t("archiveFormat")}
forID="archiveFormat"
fieldLabelId="clients:archiveFormat"
/>
}
fieldId="archiveFormat"
@ -88,8 +87,7 @@ export const KeyForm = ({
labelIcon={
<HelpItem
helpText="clients-help:importFile"
forLabel={t("importFile")}
forID="importFile"
fieldLabelId="clients:importFile"
/>
}
fieldId="importFile"

3
src/clients/keys/ImportKeyDialog.tsx
View file

@ -92,8 +92,7 @@ export const ImportKeyDialog = ({
labelIcon={
<HelpItem
helpText="clients-help:archiveFormat"
forLabel={t("archiveFormat")}
forID="archiveFormat"
fieldLabelId="clients:archiveFormat"
/>
}
fieldId="archiveFormat"

6
src/clients/keys/Keys.tsx
View file

@ -131,8 +131,7 @@ export const Keys = ({ clientId, save }: KeysProps) => {
labelIcon={
<HelpItem
helpText="clients-help:useJwksUrl"
forLabel={t("useJwksUrl")}
forID={t(`common:helpLabel`, { label: t("useJwksUrl") })}
fieldLabelId="clients:useJwksUrl"
/>
}
>
@ -165,8 +164,7 @@ export const Keys = ({ clientId, save }: KeysProps) => {
labelIcon={
<HelpItem
helpText="clients-help:jwksUrl"
forLabel={t("jwksUrl")}
forID="jwksUrl"
fieldLabelId="clients:jwksUrl"
/>
}
>

3
src/clients/keys/SamlKeys.tsx
View file

@ -82,8 +82,7 @@ const KeySection = ({
labelIcon={
<HelpItem
helpText={`clients-help:${key}`}
forLabel={t(key)}
forID={t(`common:helpLabel`, { label: t(key) })}
fieldLabelId={`clients:${key}`}
/>
}
label={t(key)}

3
src/clients/keys/SamlKeysDialog.tsx
View file

@ -190,8 +190,7 @@ export const SamlKeysDialog = ({
labelIcon={
<HelpItem
helpText="clients-help:certificate"
forLabel={t("certificate")}
forID="certificate"
fieldLabelId="clients:certificate"
/>
}
>

9
src/clients/keys/StoreSettings.tsx
View file

@ -22,8 +22,7 @@ export const StoreSettings = ({
labelIcon={
<HelpItem
helpText="clients-help:keyAlias"
forLabel={t("keyAlias")}
forID="keyAlias"
fieldLabelId="clients:keyAlias"
/>
}
>
@ -42,8 +41,7 @@ export const StoreSettings = ({
labelIcon={
<HelpItem
helpText="clients-help:keyPassword"
forLabel={t("keyPassword")}
forID="keyPassword"
fieldLabelId="clients:keyPassword"
/>
}
>
@ -61,8 +59,7 @@ export const StoreSettings = ({
labelIcon={
<HelpItem
helpText="clients-help:storePassword"
forLabel={t("storePassword")}
forID="storePassword"
fieldLabelId="clients:storePassword"
/>
}
>

15
src/clients/scopes/EvaluateScopes.tsx
View file

@ -255,8 +255,7 @@ export const EvaluateScopes = ({ clientId, protocol }: EvaluateScopesProps) => {
labelIcon={
<HelpItem
helpText="clients-help:scopeParameter"
forLabel={t("scopeParameter")}
forID="scopeParameter"
fieldLabelId="clients:scopeParameter"
/>
}
>
@ -300,8 +299,7 @@ export const EvaluateScopes = ({ clientId, protocol }: EvaluateScopesProps) => {
labelIcon={
<HelpItem
helpText="clients-help:user"
forLabel={t("user")}
forID="user"
fieldLabelId="clients:user"
/>
}
>
@ -388,8 +386,7 @@ export const EvaluateScopes = ({ clientId, protocol }: EvaluateScopesProps) => {
<TabTitleText>
{t("effectiveProtocolMappers")}{" "}
<HelpItem
forID="effectiveProtocolMappers"
forLabel={t("effectiveProtocolMappers")}
fieldLabelId="clients:effectiveProtocolMappers"
helpText="clients-help:effectiveProtocolMappers"
noVerticalAlign={false}
unWrap
@ -406,8 +403,7 @@ export const EvaluateScopes = ({ clientId, protocol }: EvaluateScopesProps) => {
<TabTitleText>
{t("effectiveRoleScopeMappings")}{" "}
<HelpItem
forID="effectiveRoleScopeMappings"
forLabel={t("effectiveRoleScopeMappings")}
fieldLabelId="clients:effectiveRoleScopeMappings"
helpText="clients-help:effectiveRoleScopeMappings"
noVerticalAlign={false}
unWrap
@ -424,8 +420,7 @@ export const EvaluateScopes = ({ clientId, protocol }: EvaluateScopesProps) => {
<TabTitleText>
{t("generatedAccessToken")}{" "}
<HelpItem
forID="generatedAccessToken"
forLabel={t("generatedAccessToken")}
fieldLabelId="clients:generatedAccessToken"
helpText="clients-help:generatedAccessToken"
noVerticalAlign={false}
unWrap

2
src/common-messages.ts
View file

@ -46,7 +46,7 @@ export default {
serverInfo: "Server info",
realmInfo: "Realm info",
help: "Help",
helpLabel: "More help for {{label}}",
helpLabel: "More help for '{{label}}'",
helpEnabled: "Help on",
helpDisabled: "Help off",
documentation: "Documentation",

6
src/components/download-dialog/DownloadDialog.tsx
View file

@ -116,8 +116,7 @@ export const DownloadDialog = ({
labelIcon={
<HelpItem
helpText={t("clients-help:downloadType")}
forLabel={t("clients:formatOption")}
forID="type"
fieldLabelId="clients:formatOption"
/>
}
>
@ -155,8 +154,7 @@ export const DownloadDialog = ({
labelIcon={
<HelpItem
helpText={t("clients-help:details")}
forLabel={t("details")}
forID="details"
fieldLabelId="clients:details"
/>
}
>

2
src/components/dynamic/BooleanComponent.tsx
View file

@ -21,7 +21,7 @@ export const BooleanComponent = ({
label={t(label!)}
fieldId={name!}
labelIcon={
<HelpItem helpText={t(helpText!)} forLabel={t(label!)} forID={name!} />
<HelpItem helpText={t(helpText!)} fieldLabelId={`dynamic:${label}`} />
}
>
<Controller

2
src/components/dynamic/ClientSelectComponent.tsx
View file

@ -52,7 +52,7 @@ export const ClientSelectComponent = ({
<FormGroup
label={t(label!)}
labelIcon={
<HelpItem helpText={t(helpText!)} forLabel={t(label!)} forID={name!} />
<HelpItem helpText={t(helpText!)} fieldLabelId={`dynamic:${label}`} />
}
fieldId={name!}
>

2
src/components/dynamic/ListComponent.tsx
View file

@ -26,7 +26,7 @@ export const ListComponent = ({
<FormGroup
label={t(label!)}
labelIcon={
<HelpItem helpText={t(helpText!)} forLabel={t(label!)} forID={name!} />
<HelpItem helpText={t(helpText!)} fieldLabelId={`dynamic:${label}`} />
}
fieldId={name!}
>

2
src/components/dynamic/MultivaluedChipsComponent.tsx
View file

@ -49,7 +49,7 @@ export const MultivaluedChipsComponent = ({
<FormGroup
label={t(label!)}
labelIcon={
<HelpItem helpText={t(helpText!)} forLabel={label!} forID={name!} />
<HelpItem helpText={t(helpText!)} fieldLabelId={`dynamic:${label}`} />
}
fieldId={name!}
>

2
src/components/dynamic/MultivaluedListComponent.tsx
View file

@ -26,7 +26,7 @@ export const MultiValuedListComponent = ({
<FormGroup
label={t(label!)}
labelIcon={
<HelpItem helpText={t(helpText!)} forLabel={label!} forID={name!} />
<HelpItem helpText={t(helpText!)} fieldLabelId={`dynamic:${label}`} />
}
fieldId={name!}
>

2
src/components/dynamic/MultivaluedRoleComponent.tsx
View file

@ -62,7 +62,7 @@ export const MultivaluedRoleComponent = ({
<FormGroup
label={t(label!)}
labelIcon={
<HelpItem helpText={t(helpText!)} forLabel={label!} forID={name!} />
<HelpItem helpText={t(helpText!)} fieldLabelId={`dynamic:${label}`} />
}
fieldId={name!}
>

3
src/components/dynamic/MultivaluedScopesComponent.tsx
View file

@ -49,8 +49,7 @@ export const MultivaluedScopesComponent = ({
labelIcon={
<HelpItem
helpText={t("realm-settings-help:clientScopesConditionTooltip")}
forLabel={t("clientScopes")}
forID={name!}
fieldLabelId="realm-settings:clientScopesCondition"
/>
}
fieldId={name!}

2
src/components/dynamic/MultivaluedStringComponent.tsx
View file

@ -17,7 +17,7 @@ export const MultiValuedStringComponent = ({
<FormGroup
label={t(label!)}
labelIcon={
<HelpItem helpText={t(helpText!)} forLabel={t(label!)} forID={name!} />
<HelpItem helpText={t(helpText!)} fieldLabelId={`dynamic:${label}`} />
}
fieldId={name!}
>

2
src/components/dynamic/RoleComponent.tsx
View file

@ -123,7 +123,7 @@ export const RoleComponent = ({ name, label, helpText }: ComponentProps) => {
<FormGroup
label={t(label!)}
labelIcon={
<HelpItem helpText={t(helpText!)} forLabel={name!} forID={name!} />
<HelpItem helpText={t(helpText!)} fieldLabelId={`dynamic:${label}`} />
}
validated={errors[fieldName] ? "error" : "default"}
helperTextInvalid={t("common:required")}

3
src/components/dynamic/ScriptComponent.tsx
View file

@ -22,8 +22,7 @@ export const ScriptComponent = ({
labelIcon={
<HelpItem
helpText={<span style={{ whiteSpace: "pre-wrap" }}>{helpText}</span>}
forLabel={t(label!)}
forID={name!}
fieldLabelId={`dynamic:${label}`}
/>
}
fieldId={name!}

2
src/components/dynamic/StringComponent.tsx
View file

@ -19,7 +19,7 @@ export const StringComponent = ({
<FormGroup
label={t(label!)}
labelIcon={
<HelpItem helpText={t(helpText!)} forLabel={t(label!)} forID={name!} />
<HelpItem helpText={t(helpText!)} fieldLabelId={`dynamic:${label}`} />
}
fieldId={name!}
>

15
src/components/help-enabler/HelpItem.tsx
View file

@ -6,18 +6,14 @@ import { useHelp } from "./HelpHeader";
type HelpItemProps = {
helpText: string | ReactNode;
forLabel: string;
forID: string;
fieldLabelId: string;
noVerticalAlign?: boolean;
unWrap?: boolean;
id?: string;
};
export const HelpItem = ({
helpText,
forLabel,
forID,
id,
fieldLabelId,
noVerticalAlign = true,
unWrap = false,
}: HelpItemProps) => {
@ -30,10 +26,11 @@ export const HelpItem = ({
<>
{!unWrap && (
<button
id={id}
aria-label={t(`helpLabel`, { label: forLabel })}
data-testid={`help-label-${t(fieldLabelId)
.toLowerCase()
.replace(/\s/g, "-")}`}
aria-label={t("helpLabel", { label: t(fieldLabelId) })}
onClick={(e) => e.preventDefault()}
aria-describedby={forID}
className="pf-c-form__group-label-help"
>
<HelpIcon noVerticalAlign={noVerticalAlign} />

7
src/components/view-header/ViewHeader.tsx
View file

@ -124,16 +124,13 @@ export const ViewHeader = ({
className="pf-u-mr-lg"
isChecked={isEnabled}
onChange={(value) => {
if (onToggle) {
onToggle(value);
}
onToggle(value);
}}
/>
{helpTextKey && (
<HelpItem
helpText={t(helpTextKey)}
forLabel={t("common:enabled")}
forID={`${titleKey}-switch`}
fieldLabelId={`${titleKey}-switch`}
/>
)}
</ToolbarItem>

10
src/dashboard/Dashboard.tsx
View file

@ -119,10 +119,7 @@ const Dashboard = () => {
<DescriptionListTerm>
{t("enabledFeatures")}{" "}
<HelpItem
forID={t(`common:helpLabel`, {
label: t("enabledFeatures"),
})}
forLabel={t("enabledFeatures")}
fieldLabelId="dashboard:enabledFeatures"
helpText="dashboard:infoEnabledFeatures"
/>
</DescriptionListTerm>
@ -146,10 +143,7 @@ const Dashboard = () => {
<DescriptionListTerm>
{t("disabledFeatures")}{" "}
<HelpItem
forID={t(`common:helpLabel`, {
label: t("disabledFeatures"),
})}
forLabel={t("disabledFeatures")}
fieldLabelId="dashboard:disabledFeatures"
helpText="dashboard:infoDisabledFeatures"
/>
</DescriptionListTerm>

96
src/identity-providers/add/AddMapper.tsx
View file

@ -295,19 +295,8 @@ export default function AddMapper() {
? "identity-providers-help:attributes"
: "identity-providers-help:claims"
}
forLabel={
isSAMLAdvancedAttrToRole
? t("common:attributes")
: t("common:claims")
}
forID={
isSAMLAdvancedAttrToRole
? t(`common:helpLabel`, {
label: t("attributes"),
})
: t(`common:helpLabel`, {
label: t("claim"),
})
fieldLabelId={
isSAMLAdvancedAttrToRole ? "attributes" : "claims"
}
/>
}
@ -326,10 +315,7 @@ export default function AddMapper() {
labelIcon={
<HelpItem
helpText="identity-providers-help:regexAttributeValues"
forLabel={t("regexAttributeValues")}
forID={t(`common:helpLabel`, {
label: t("regexAttributeValues"),
})}
fieldLabelId="identity-providers:regexAttributeValues"
/>
}
fieldId="regexAttributeValues"
@ -363,12 +349,8 @@ export default function AddMapper() {
label={t("template")}
labelIcon={
<HelpItem
id="target-help-icon"
helpText="identity-providers-help:template"
forLabel={t("template")}
forID={t(`common:helpLabel`, {
label: t("template"),
})}
fieldLabelId="identity-providers:template"
/>
}
fieldId="kc-user-session-attribute"
@ -397,12 +379,8 @@ export default function AddMapper() {
label={t("target")}
labelIcon={
<HelpItem
id="user-session-attribute-help-icon"
helpText="identity-providers-help:target"
forLabel={t("target")}
forID={t(`common:helpLabel`, {
label: t("target"),
})}
fieldLabelId="identity-providers:target"
/>
}
fieldId="kc-target"
@ -461,12 +439,8 @@ export default function AddMapper() {
}
labelIcon={
<HelpItem
id="user-session-attribute-help-icon"
helpText="identity-providers-help:userSessionAttribute"
forLabel={t("userSessionAttribute")}
forID={t(`common:helpLabel`, {
label: t("userSessionAttribute"),
})}
fieldLabelId="identity-providers:userSessionAttribute"
/>
}
fieldId="kc-user-session-attribute"
@ -503,18 +477,12 @@ export default function AddMapper() {
}
labelIcon={
<HelpItem
id="user-session-attribute-value-help-icon"
helpText="identity-providers-help:userAttributeValue"
forLabel={
fieldLabelId={
isHardcodedUserSessionAttribute
? t("userSessionAttributeValue")
: t("userAttributeValue")
? "identity-providers:userSessionAttributeValue"
: "identity-providers:userAttributeValue"
}
forID={t(`common:helpLabel`, {
label: isHardcodedUserSessionAttribute
? t("userSessionAttributeValue")
: t("userAttributeValue"),
})}
/>
}
fieldId="kc-user-session-attribute-value"
@ -555,12 +523,8 @@ export default function AddMapper() {
label={t("mapperAttributeName")}
labelIcon={
<HelpItem
id="user-session-attribute-help-icon"
helpText="identity-providers-help:attributeName"
forLabel={t("mapperAttributeName")}
forID={t(`common:helpLabel`, {
label: t("mapperAttributeName"),
})}
fieldLabelId="identity-providers:mapperAttributeName"
/>
}
fieldId="kc-attribute-name"
@ -589,12 +553,8 @@ export default function AddMapper() {
label={t("mapperAttributeFriendlyName")}
labelIcon={
<HelpItem
id="mapper-attribute-friendly-name"
helpText="identity-providers-help:friendlyName"
forLabel={t("mapperAttributeFriendlyName")}
forID={t(`common:helpLabel`, {
label: t("mapperAttributeFriendlyName"),
})}
fieldLabelId="identity-providers:mapperAttributeFriendlyName"
/>
}
fieldId="kc-friendly-name"
@ -627,12 +587,8 @@ export default function AddMapper() {
label={t("claim")}
labelIcon={
<HelpItem
id="claim"
helpText="identity-providers-help:claim"
forLabel={t("claim")}
forID={t(`common:helpLabel`, {
label: t("claim"),
})}
fieldLabelId="identity-providers:claim"
/>
}
fieldId="kc-friendly-name"
@ -666,20 +622,12 @@ export default function AddMapper() {
}
labelIcon={
<HelpItem
id={
isOIDCclaimToRole
? "claim-value-help-icon"
: "user-attribute-name-help-icon"
}
helpText={
isOIDCclaimToRole
? "identity-providers-help:claimValue"
: "identity-providers-help:userAttributeName"
}
forLabel={t("mapperUserAttributeName")}
forID={t(`common:helpLabel`, {
label: t("mapperUserAttributeName"),
})}
fieldLabelId="identity-providers:mapperUserAttributeName"
/>
}
fieldId="kc-user-attribute-name"
@ -725,12 +673,8 @@ export default function AddMapper() {
label={t("socialProfileJSONFieldPath")}
labelIcon={
<HelpItem
id="social-profile-JSON-field-path-help-icon"
helpText="identity-providers-help:socialProfileJSONFieldPath"
forLabel={t("socialProfileJSONFieldPath")}
forID={t(`common:helpLabel`, {
label: t("socialProfileJSONFieldPath"),
})}
fieldLabelId="identity-providers:socialProfileJSONFieldPath"
/>
}
fieldId="kc-social-profile-JSON-field-path"
@ -759,12 +703,8 @@ export default function AddMapper() {
label={t("mapperUserAttributeName")}
labelIcon={
<HelpItem
id="user-attribute-name-help-icon"
helpText="identity-providers-help:socialUserAttributeName"
forLabel={t("mapperUserAttributeName")}
forID={t(`common:helpLabel`, {
label: t("mapperUserAttributeName"),
})}
fieldLabelId="identity-providers:mapperUserAttributeName"
/>
}
fieldId="kc-user-session-attribute-value"
@ -800,12 +740,8 @@ export default function AddMapper() {
label={t("common:role")}
labelIcon={
<HelpItem
id="name-help-icon"
helpText="identity-providers-help:role"
forLabel={t("identity-providers-help:role")}
forID={t(`identity-providers:helpLabel`, {
label: t("role"),
})}
fieldLabelId="role"
/>
}
fieldId="kc-role"

10
src/identity-providers/add/AddMapperForm.tsx
View file

@ -52,10 +52,8 @@ export const AddMapperForm = ({
label={t("common:name")}
labelIcon={
<HelpItem
id="name-help-icon"
helpText="identity-providers-help:addIdpMapperName"
forLabel={t("common:name")}
forID={t(`common:helpLabel`, { label: t("common:name") })}
fieldLabelId="name"
/>
}
fieldId="kc-name"
@ -83,8 +81,7 @@ export const AddMapperForm = ({
labelIcon={
<HelpItem
helpText="identity-providers-help:syncModeOverride"
forLabel={t("syncModeOverride")}
forID={t(`common:helpLabel`, { label: t("syncModeOverride") })}
fieldLabelId="identity-providers:syncModeOverride"
/>
}
fieldId="syncMode"
@ -136,8 +133,7 @@ export const AddMapperForm = ({
? `identity-providers-help:oidcAttributeImporter`
: `identity-providers-help:${mapperType}`
}
forLabel={t("mapperType")}
forID={t(`common:helpLabel`, { label: t("mapperType") })}
fieldLabelId="identity-providers:mapperType"
/>
}
fieldId="identityProviderMapper"

6
src/identity-providers/add/AdvancedSettings.tsx
View file

@ -40,8 +40,7 @@ const LoginFlow = ({
labelIcon={
<HelpItem
helpText={`identity-providers-help:${label}`}
forLabel={t(label)}
forID={label}
fieldLabelId={`identity-providers:${label}`}
/>
}
fieldId={label}
@ -146,8 +145,7 @@ export const AdvancedSettings = ({ isOIDC, isSAML }: AdvancedSettingsProps) => {
labelIcon={
<HelpItem
helpText="identity-providers-help:syncMode"
forLabel={t("syncMode")}
forID="syncMode"
fieldLabelId="identity-providers:syncMode"
/>
}
fieldId="syncMode"

30
src/identity-providers/add/DescriptorSettings.tsx
View file

@ -57,8 +57,7 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
labelIcon={
<HelpItem
helpText={th("ssoServiceUrl")}
forLabel={t("ssoServiceUrl")}
forID="kc-sso-service-url"
fieldLabelId="identity-providers:ssoServiceUrl"
/>
}
fieldId="kc-sso-service-url"
@ -89,8 +88,7 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
labelIcon={
<HelpItem
helpText={th("singleLogoutServiceUrl")}
forLabel={t("singleLogoutServiceUrl")}
forID="single-logout-service-url"
fieldLabelId="identity-providers:singleLogoutServiceUrl"
/>
}
fieldId="single-logout-service-url"
@ -119,8 +117,7 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
labelIcon={
<HelpItem
helpText={th("nameIdPolicyFormat")}
forLabel={t("nameIdPolicyFormat")}
forID="kc-nameIdPolicyFormat"
fieldLabelId="identity-providers:nameIdPolicyFormat"
/>
}
fieldId="kc-nameIdPolicyFormat"
@ -198,8 +195,7 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
labelIcon={
<HelpItem
helpText={th("principalType")}
forLabel={t("principalType")}
forID="kc-principalType"
fieldLabelId="identity-providers:principalType"
/>
}
fieldId="kc-principalType"
@ -253,8 +249,7 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
labelIcon={
<HelpItem
helpText={th("principalAttribute")}
forLabel={t("principalAttribute")}
forID="principalAttribute"
fieldLabelId="identity-providers:principalAttribute"
/>
}
fieldId="principalAttribute"
@ -305,8 +300,7 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
labelIcon={
<HelpItem
helpText={th("signatureAlgorithm")}
forLabel={t("signatureAlgorithm")}
forID="kc-signatureAlgorithm"
fieldLabelId="identity-providers:signatureAlgorithm"
/>
}
fieldId="kc-signatureAlgorithm"
@ -344,8 +338,7 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
labelIcon={
<HelpItem
helpText={th("samlSignatureKeyName")}
forLabel={t("samlSignatureKeyName")}
forID="kc-samlSignatureKeyName"
fieldLabelId="identity-providers:samlSignatureKeyName"
/>
}
fieldId="kc-samlSignatureKeyName"
@ -423,8 +416,7 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
labelIcon={
<HelpItem
helpText={th("allowedClockSkew")}
forLabel={t("allowedClockSkew")}
forID="allowedClockSkew"
fieldLabelId="identity-providers:allowedClockSkew"
/>
}
fieldId="allowedClockSkew"
@ -446,8 +438,7 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
labelIcon={
<HelpItem
helpText={th("attributeConsumingServiceIndex")}
forLabel={t("attributeConsumingServiceIndex")}
forID="attributeConsumingServiceIndex"
fieldLabelId="identity-providers:attributeConsumingServiceIndex"
/>
}
fieldId="attributeConsumingServiceIndex"
@ -469,8 +460,7 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
labelIcon={
<HelpItem
helpText={th("attributeConsumingServiceName")}
forLabel={t("attributeConsumingServiceName")}
forID="attributeConsumingServiceName"
fieldLabelId="identity-providers:attributeConsumingServiceName"
/>
}
fieldId="attributeConsumingServiceName"

3
src/identity-providers/add/ExtendedNonDiscoverySettings.tsx
View file

@ -87,8 +87,7 @@ export const ExtendedNonDiscoverySettings = () => {
labelIcon={
<HelpItem
helpText={"identity-providers-help:allowedClockSkew"}
forLabel={t("allowedClockSkew")}
forID="allowedClockSkew"
fieldLabelId="identity-providers:allowedClockSkew"
/>
}
fieldId="allowedClockSkew"

6
src/identity-providers/add/OIDCAuthentication.tsx
View file

@ -20,7 +20,6 @@ const clientAuthenticationTypes = [
export const OIDCAuthentication = ({ create = true }: { create?: boolean }) => {
const { t } = useTranslation("identity-providers");
const { t: th } = useTranslation("identity-providers-help");
const { control } = useFormContext();
const [openClientAuth, setOpenClientAuth] = useState(false);
@ -36,9 +35,8 @@ export const OIDCAuthentication = ({ create = true }: { create?: boolean }) => {
label={t("clientAuthentication")}
labelIcon={
<HelpItem
helpText={th("clientAuthentication")}
forLabel={t("clientAuthentication")}
forID="clientAuthentication"
helpText="identity-providers-help:clientAuthentication"
fieldLabelId="identity-providers:clientAuthentication"
/>
}
fieldId="clientAuthentication"

6
src/identity-providers/add/OIDCGeneralSettings.tsx
View file

@ -12,7 +12,6 @@ import { useParams } from "react-router-dom";
export const OIDCGeneralSettings = ({ id }: { id: string }) => {
const { t } = useTranslation("identity-providers");
const { t: th } = useTranslation("identity-providers-help");
const { tab } = useParams<IdentityProviderParams>();
const { register, errors } = useFormContext();
@ -25,9 +24,8 @@ export const OIDCGeneralSettings = ({ id }: { id: string }) => {
label={t("alias")}
labelIcon={
<HelpItem
helpText={th("alias")}
forLabel={t("alias")}
forID="alias"
helpText="identity-providers-help:alias"
fieldLabelId="identity-providers:alias"
/>
}
fieldId="alias"

3
src/identity-providers/add/OpenIdConnectSettings.tsx
View file

@ -68,8 +68,7 @@ export const OpenIdConnectSettings = () => {
labelIcon={
<HelpItem
helpText="identity-providers-help:importConfig"
forLabel={t("importConfig")}
forID="kc-import-config"
fieldLabelId="identity-providers:importConfig"
/>
}
validated={errors.discoveryError ? "error" : "default"}

3
src/identity-providers/add/ReqAuthnConstraintsSettings.tsx
View file

@ -24,8 +24,7 @@ export const ReqAuthnConstraints = () => {
labelIcon={
<HelpItem
helpText="identity-providers-help:comparison"
forLabel={t("comparison")}
forID="comparison"
fieldLabelId="identity-providers:comparison"
/>
}
fieldId="comparison"

6
src/identity-providers/add/SamlConnectSettings.tsx
View file

@ -67,8 +67,7 @@ export const SamlConnectSettings = () => {
labelIcon={
<HelpItem
helpText="identity-providers-help:serviceProviderEntityId"
forLabel={t("serviceProviderEntityId")}
forID="kc-service-provider-entity-id"
fieldLabelId="identity-providers:serviceProviderEntityId"
/>
}
>
@ -90,8 +89,7 @@ export const SamlConnectSettings = () => {
labelIcon={
<HelpItem
helpText="identity-providers-help:importConfig"
forLabel={t("importConfig")}
forID="kc-import-config"
fieldLabelId="identity-providers:importConfig"
/>
}
validated={errors.discoveryError ? "error" : "default"}

6
src/identity-providers/add/SamlGeneralSettings.tsx
View file

@ -12,7 +12,6 @@ import type { IdentityProviderParams } from "../routes/IdentityProvider";
export const SamlGeneralSettings = ({ id }: { id: string }) => {
const { t } = useTranslation("identity-providers");
const { t: th } = useTranslation("identity-providers-help");
const { tab } = useParams<IdentityProviderParams>();
const { register, errors } = useFormContext();
@ -25,9 +24,8 @@ export const SamlGeneralSettings = ({ id }: { id: string }) => {
label={t("alias")}
labelIcon={
<HelpItem
helpText={th("alias")}
forLabel={t("alias")}
forID="alias"
helpText="identity-providers-help:alias"
fieldLabelId="identity-providers:alias"
/>
}
fieldId="alias"

11
src/identity-providers/component/ClientIdSecret.tsx
View file

@ -14,7 +14,6 @@ export const ClientIdSecret = ({
create?: boolean;
}) => {
const { t } = useTranslation("identity-providers");
const { t: th } = useTranslation("identity-providers-help");
const { register, errors } = useFormContext();
@ -24,9 +23,8 @@ export const ClientIdSecret = ({
label={t("clientId")}
labelIcon={
<HelpItem
helpText={th("clientId")}
forLabel={t("clientId")}
forID="kc-client-id"
helpText="identity-providers-help:clientId"
fieldLabelId="identity-providers:clientId"
/>
}
fieldId="kc-client-id"
@ -51,9 +49,8 @@ export const ClientIdSecret = ({
label={t("clientSecret")}
labelIcon={
<HelpItem
helpText={th("clientSecret")}
forLabel={t("clientSecret")}
forID="kc-client-secret"
helpText="identity-providers-help:clientSecret"
fieldLabelId="identity-providers:clientSecret"
/>
}
fieldId="kc-client-secret"

6
src/identity-providers/component/DiscoveryEndpointField.tsx
View file

@ -69,8 +69,7 @@ export const DiscoveryEndpointField = ({
labelIcon={
<HelpItem
helpText="identity-providers-help:useDiscoveryEndpoint"
forLabel={t("useDiscoveryEndpoint")}
forID="kc-discovery-endpoint-switch"
fieldLabelId="identity-providers:discoveryEndpoint"
/>
}
>
@ -89,8 +88,7 @@ export const DiscoveryEndpointField = ({
labelIcon={
<HelpItem
helpText="identity-providers-help:discoveryEndpoint"
forLabel={t("discoveryEndpoint")}
forID="kc-discovery-endpoint"
fieldLabelId="identity-providers:discoveryEndpoint"
/>
}
validated={

6
src/identity-providers/component/DisplayOrder.tsx
View file

@ -7,7 +7,6 @@ import { HelpItem } from "../../components/help-enabler/HelpItem";
export const DisplayOrder = () => {
const { t } = useTranslation("identity-providers");
const { t: th } = useTranslation("identity-providers-help");
const { control } = useFormContext();
@ -16,9 +15,8 @@ export const DisplayOrder = () => {
label={t("displayOrder")}
labelIcon={
<HelpItem
helpText={th("displayOrder")}
forLabel={t("displayOrder")}
forID="kc-display-order"
helpText="identity-providers-help:displayOrder"
fieldLabelId="identity-providers:displayOrder"
/>
}
fieldId="kc-display-order"

3
src/identity-providers/component/FormGroupField.tsx
View file

@ -19,8 +19,7 @@ export const FormGroupField: FunctionComponent<FormGroupFieldProps> = ({
labelIcon={
<HelpItem
helpText={`identity-providers-help:${label}`}
forLabel={t(label)}
forID={label}
fieldLabelId={`identity-providers:${label}`}
/>
}
>

6
src/identity-providers/component/RedirectUrl.tsx
View file

@ -9,7 +9,6 @@ import { useAdminClient } from "../../context/auth/AdminClient";
export const RedirectUrl = ({ id }: { id: string }) => {
const { t } = useTranslation("identity-providers");
const { t: th } = useTranslation("identity-providers-help");
const adminClient = useAdminClient();
const { realm } = useRealm();
@ -20,9 +19,8 @@ export const RedirectUrl = ({ id }: { id: string }) => {
label={t("redirectURI")}
labelIcon={
<HelpItem
helpText={th("redirectURI")}
forLabel={t("redirectURI")}
forID="kc-redirect-uri"
helpText="identity-providers-help:redirectURI"
fieldLabelId="identity-providers:redirectURI"
/>
}
fieldId="kc-redirect-uri"

8
src/realm-roles/RolesList.tsx
View file

@ -81,12 +81,8 @@ export const RolesList = ({
{role.name}{" "}
</Link>
<HelpItem
helpText={t("defaultRole")}
forLabel={t("defaultRole")}
forID={t("common:helpLabel", {
label: t("defaultRole"),
})}
id="default-role-help-icon"
helpText={`${messageBundle}:defaultRole`}
fieldLabelId="defaultRole"
/>
</>
);

15
src/realm-settings/ClientProfileForm.tsx
View file

@ -300,9 +300,8 @@ export default function ClientProfileForm() {
<Text className="kc-executors" component={TextVariants.h1}>
{t("executors")}
<HelpItem
helpText={t("realm-settings:executorsHelpText")}
forLabel={t("executorsHelpItem")}
forID={t("executors")}
helpText="realm-settings:executorsHelpText"
fieldLabelId="realm-settings:executors"
/>
</Text>
</FlexItem>
@ -375,10 +374,7 @@ export default function ClientProfileForm() {
<HelpItem
key={type.id}
helpText={type.helpText}
forLabel={t("executorTypeTextHelpText")}
forID={t(`common:helpLabel`, {
label: t("executorTypeTextHelpText"),
})}
fieldLabelId="realm-settings:executorTypeTextHelpText"
/>
<Button
variant="link"
@ -455,10 +451,7 @@ export default function ClientProfileForm() {
<HelpItem
key={type.id}
helpText={type.helpText}
forLabel={t("executorTypeTextHelpText")}
forID={t(`common:helpLabel`, {
label: t("executorTypeTextHelpText"),
})}
fieldLabelId="realm-settings:executorTypeTextHelpText"
/>
))}
</DataListCell>,

14
src/realm-settings/EmailTab.tsx
View file

@ -180,8 +180,7 @@ export const RealmSettingsEmailTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:fromDisplayName"
forLabel={t("authentication")}
forID={t(`common:helpLabel`, { label: t("authentication") })}
fieldLabelId="realm-settings:authentication"
/>
}
>
@ -217,10 +216,7 @@ export const RealmSettingsEmailTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:replyToDisplayName"
forLabel={t("replyToDisplayName")}
forID={t(`common:helpLabel`, {
label: t("replyToDisplayName"),
})}
fieldLabelId="realm-settings:replyToDisplayName"
/>
}
>
@ -238,8 +234,7 @@ export const RealmSettingsEmailTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:envelopeFrom"
forLabel={t("envelopeFrom")}
forID={t(`common:helpLabel`, { label: t("envelopeFrom") })}
fieldLabelId="realm-settings:envelopeFrom"
/>
}
>
@ -371,8 +366,7 @@ export const RealmSettingsEmailTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:password"
forLabel={t("password")}
forID={t(`common:helpLabel`, { label: t("password") })}
fieldLabelId="realm-settings:password"
/>
}
>

10
src/realm-settings/ExecutorForm.tsx
View file

@ -171,18 +171,12 @@ export default function ExecutorForm() {
executors.length > 0 && executors[0].helpText! !== "" ? (
<HelpItem
helpText={executors[0].helpText}
forLabel={t("executorTypeHelpText")}
forID={t(`common:helpLabel`, {
label: t("executorTypeHelpText"),
})}
fieldLabelId="realm-settings:executorTypeHelpText"
/>
) : editMode ? (
<HelpItem
helpText={profileExecutorType?.helpText}
forLabel={t("executorTypeHelpText")}
forID={t(`common:helpLabel`, {
label: t("executorTypeHelpText"),
})}
fieldLabelId="realm-settings:executorTypeHelpText"
/>
) : undefined
}

12
src/realm-settings/GeneralTab.tsx
View file

@ -88,8 +88,7 @@ export const RealmSettingsGeneralTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:frontendUrl"
forLabel={t("frontendUrl")}
forID={t(`common:helpLabel`, { label: t("frontendUrl") })}
fieldLabelId="realm-settings:frontendUrl"
/>
}
>
@ -106,8 +105,7 @@ export const RealmSettingsGeneralTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:requireSsl"
forLabel={t("requireSsl")}
forID={t(`common:helpLabel`, { label: t("requireSsl") })}
fieldLabelId="realm-settings:requireSsl"
/>
}
>
@ -147,8 +145,7 @@ export const RealmSettingsGeneralTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:userManagedAccess"
forLabel={t("userManagedAccess")}
forID={t(`common:helpLabel`, { label: t("userManagedAccess") })}
fieldLabelId="realm-settings:userManagedAccess"
/>
}
fieldId="kc-user-manged-access"
@ -174,8 +171,7 @@ export const RealmSettingsGeneralTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:endpoints"
forLabel={t("endpoints")}
forID={t(`common:helpLabel`, { label: t("endpoints") })}
fieldLabelId="realm-settings:endpoints"
/>
}
fieldId="kc-endpoints"

24
src/realm-settings/JavaKeystoreModal.tsx
View file

@ -106,8 +106,7 @@ JavaKeystoreModalProps) => {
labelIcon={
<HelpItem
helpText="realm-settings-help:displayName"
forLabel={t("loginTheme")}
forID="kc-console-display-name"
fieldLabelId="realm-settings:consoleDisplayName"
/>
}
>
@ -133,8 +132,7 @@ JavaKeystoreModalProps) => {
labelIcon={
<HelpItem
helpText={t("realm-settings-help:enabled")}
forLabel={t("enabled")}
forID="kc-enabled"
fieldLabelId="enabled"
/>
}
>
@ -166,8 +164,7 @@ JavaKeystoreModalProps) => {
labelIcon={
<HelpItem
helpText="realm-settings-help:active"
forLabel={t("active")}
forID="kc-active"
fieldLabelId="realm-settings:active"
/>
}
>
@ -201,8 +198,7 @@ JavaKeystoreModalProps) => {
labelIcon={
<HelpItem
helpText="realm-settings-help:algorithm"
forLabel={t("algorithm")}
forID="kc-email-theme"
fieldLabelId="realm-settings:algorithm"
/>
}
>
@ -248,8 +244,7 @@ JavaKeystoreModalProps) => {
labelIcon={
<HelpItem
helpText="realm-settings-help:keystore"
forLabel={t("keystore")}
forID="kc-keystore"
fieldLabelId="realm-settings:keystore"
/>
}
>
@ -274,8 +269,7 @@ JavaKeystoreModalProps) => {
labelIcon={
<HelpItem
helpText="realm-settings-help:keystorePassword"
forLabel={t("keystorePassword")}
forID="kc-keystore-password"
fieldLabelId="realm-settings:keystorePassword"
/>
}
>
@ -300,8 +294,7 @@ JavaKeystoreModalProps) => {
labelIcon={
<HelpItem
helpText="realm-settings-help:keyAlias"
forLabel={t("keyAlias")}
forID="kc-key-alias"
fieldLabelId="realm-settings:keyAlias"
/>
}
>
@ -326,8 +319,7 @@ JavaKeystoreModalProps) => {
labelIcon={
<HelpItem
helpText="realm-settings-help:keyPassword"
forLabel={t("keyPassword")}
forID="kc-key-password"
fieldLabelId="realm-settings:keyPassword"
/>
}
>

3
src/realm-settings/LocalizationTab.tsx
View file

@ -185,8 +185,7 @@ export const LocalizationTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:internationalization"
forLabel={t("internationalization")}
forID="kc-internationalization"
fieldLabelId="realm-settings:internationalization"
/>
}
>

35
src/realm-settings/LoginTab.tsx
View file

@ -42,10 +42,7 @@ export const RealmSettingsLoginTab = ({
labelIcon={
<HelpItem
helpText={t("userRegistrationHelpText")}
forLabel={t("userRegistration")}
forID={t(`common:helpLabel`, {
label: t("userRegistration"),
})}
fieldLabelId="realm-settings:userRegistration"
/>
}
hasNoPaddingTop
@ -74,9 +71,8 @@ export const RealmSettingsLoginTab = ({
fieldId="kc-forgot-pw"
labelIcon={
<HelpItem
helpText={t("forgotPasswordHelpText")}
forLabel={t("forgotPassword")}
forID={t(`common:helpLabel`, { label: t("forgotPassword") })}
helpText="realm-settings:forgotPasswordHelpText"
fieldLabelId="realm-settings:forgotPassword"
/>
}
hasNoPaddingTop
@ -105,9 +101,8 @@ export const RealmSettingsLoginTab = ({
fieldId="kc-remember-me"
labelIcon={
<HelpItem
helpText={t("rememberMeHelpText")}
forLabel={t("rememberMe")}
forID={t(`common:helpLabel`, { label: t("rememberMe") })}
helpText="realm-settings:rememberMeHelpText"
fieldLabelId="realm-settings:rememberMe"
/>
}
hasNoPaddingTop
@ -140,9 +135,8 @@ export const RealmSettingsLoginTab = ({
fieldId="kc-email-as-username"
labelIcon={
<HelpItem
helpText={t("emailAsUsernameHelpText")}
forLabel={t("emailAsUsername")}
forID={t(`common:helpLabel`, { label: t("emailAsUsername") })}
helpText="realm-settings:emailAsUsernameHelpText"
fieldLabelId="realm-settings:emailAsUsername"
/>
}
hasNoPaddingTop
@ -175,9 +169,8 @@ export const RealmSettingsLoginTab = ({
fieldId="kc-login-with-email"
labelIcon={
<HelpItem
helpText={t("loginWithEmailHelpText")}
forLabel={t("loginWithEmail")}
forID={t(`common:helpLabel`, { label: t("loginWithEmail") })}
helpText="realm-settings:loginWithEmailHelpText"
fieldLabelId="realm-settings:loginWithEmail"
/>
}
hasNoPaddingTop
@ -206,9 +199,8 @@ export const RealmSettingsLoginTab = ({
fieldId="kc-duplicate-emails"
labelIcon={
<HelpItem
helpText={t("duplicateEmailsHelpText")}
forLabel={t("duplicateEmails")}
forID={t(`common:helpLabel`, { label: t("duplicateEmails") })}
helpText="realm-settings:duplicateEmailsHelpText"
fieldLabelId="realm-settings:duplicateEmails"
/>
}
hasNoPaddingTop
@ -249,9 +241,8 @@ export const RealmSettingsLoginTab = ({
fieldId="kc-verify-email"
labelIcon={
<HelpItem
helpText={t("verifyEmailHelpText")}
forLabel={t("verifyEmail")}
forID={t(`common:helpLabel`, { label: t("verifyEmail") })}
helpText="realm-settings:verifyEmailHelpText"
fieldLabelId="realm-settings:verifyEmail"
/>
}
hasNoPaddingTop

13
src/realm-settings/NewClientPolicyCondition.tsx
View file

@ -227,15 +227,12 @@ export default function NewClientPolicyCondition() {
<HelpItem
helpText={
conditionType
? t(
`realm-settings-help:${camelCase(
conditionType.replace(/-/g, " ")
)}`
)
: t("anyClient")
? `realm-settings-help:${camelCase(
conditionType.replace(/-/g, " ")
)}`
: "realm-settings:anyClient"
}
forLabel={t("conditionType")}
forID="conditionType"
fieldLabelId="realm-settings:conditionType"
/>
}
>

20
src/realm-settings/NewClientPolicyForm.tsx
View file

@ -504,9 +504,8 @@ export default function NewClientPolicyForm() {
<Text className="kc-conditions" component={TextVariants.h1}>
{t("conditions")}
<HelpItem
helpText={t("realm-settings-help:conditions")}
forLabel={t("conditionsHelpItem")}
forID={t("conditions")}
helpText="realm-settings:realm-settings-help:conditions"
fieldLabelId="realm-settings:conditions"
/>
</Text>
</FlexItem>
@ -570,10 +569,7 @@ export default function NewClientPolicyForm() {
<>
<HelpItem
helpText={type.helpText}
forLabel={t("conditionTypeHelpText")}
forID={t(`common:helpLabel`, {
label: t("conditionTypeHelpText"),
})}
fieldLabelId={condition.condition}
/>
<Button
variant="link"
@ -625,9 +621,8 @@ export default function NewClientPolicyForm() {
>
{t("clientProfiles")}
<HelpItem
helpText={t("realm-settings-help:clientProfiles")}
forLabel={t("clientProfilesHelpItem")}
forID={t("clientProfiles")}
helpText="realm-settings-help:clientProfiles"
fieldLabelId="realm-settings:clientProfiles"
/>
</Text>
</FlexItem>
@ -677,10 +672,7 @@ export default function NewClientPolicyForm() {
(profile) => type === profile.name
)?.description
}
forLabel={profile}
forID={t(`common:helpLabel`, {
label: profile,
})}
fieldLabelId={profile}
/>
<Button
variant="link"

17
src/realm-settings/RSAGeneratedModal.tsx
View file

@ -105,8 +105,7 @@ export const RSAGeneratedModal = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:displayName"
forLabel={t("loginTheme")}
forID="kc-console-display-name"
fieldLabelId="realm-settings:loginTheme"
/>
}
>
@ -131,9 +130,8 @@ export const RSAGeneratedModal = ({
fieldId="kc-enabled"
labelIcon={
<HelpItem
helpText={t("realm-settings-help:enabled")}
forLabel={t("enabled")}
forID="kc-enabled"
helpText="realm-settings:realm-settings-help:enabled"
fieldLabelId="enabled"
/>
}
>
@ -165,8 +163,7 @@ export const RSAGeneratedModal = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:active"
forLabel={t("active")}
forID="kc-active"
fieldLabelId="realm-settings:active"
/>
}
>
@ -200,8 +197,7 @@ export const RSAGeneratedModal = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:algorithm"
forLabel={t("algorithm")}
forID="kc-algorithm"
fieldLabelId="realm-settings:algorithm"
/>
}
>
@ -244,8 +240,7 @@ export const RSAGeneratedModal = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:AESKeySize"
forLabel={t("AESKeySize")}
forID="kc-aes-key-size"
fieldLabelId="realm-settings:AESKeySize"
/>
}
>

18
src/realm-settings/RSAModal.tsx
View file

@ -124,8 +124,7 @@ export const RSAModal = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:displayName"
forLabel={t("loginTheme")}
forID="kc-console-display-name"
fieldLabelId="realm-settings:consoleDisplayName"
/>
}
>
@ -151,8 +150,7 @@ export const RSAModal = ({
labelIcon={
<HelpItem
helpText={t("realm-settings-help:enabled")}
forLabel={t("enabled")}
forID="kc-enabled"
fieldLabelId="enabled"
/>
}
>
@ -184,8 +182,7 @@ export const RSAModal = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:active"
forLabel={t("active")}
forID="kc-active"
fieldLabelId="realm-settings:active"
/>
}
>
@ -219,8 +216,7 @@ export const RSAModal = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:algorithm"
forLabel={t("algorithm")}
forID="kc-algorithm"
fieldLabelId="realm-settings:algorithm"
/>
}
>
@ -262,8 +258,7 @@ export const RSAModal = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:privateRSAKey"
forLabel={t("privateRSAKey")}
forID="kc-rsa-key"
fieldLabelId="realm-settings:privateRSAKey"
/>
}
>
@ -292,8 +287,7 @@ export const RSAModal = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:x509Certificate"
forLabel={t("x509Certificate")}
forID="kc-x509-certificatw"
fieldLabelId="realm-settings:x509Certificate"
/>
}
>

14
src/realm-settings/RealmSettingsTabs.tsx
View file

@ -390,11 +390,8 @@ export const RealmSettingsTabs = ({
{t("profiles")}
<span className="kc-help-text">
<HelpItem
helpText={t("clientPoliciesProfilesHelpText")}
forLabel={t("clientPoliciesProfiles")}
forID={t(`common:helpLabel`, {
label: t("clientPoliciesProfiles"),
})}
helpText="realm-settings:clientPoliciesProfilesHelpText"
fieldLabelId="realm-settings:clientPoliciesProfiles"
/>
</span>
</TabTitleText>
@ -412,11 +409,8 @@ export const RealmSettingsTabs = ({
{t("policies")}
<span className="kc-help-text">
<HelpItem
helpText={t("clientPoliciesPoliciesHelpText")}
forLabel={t("clientPoliciesPolicies")}
forID={t(`common:helpLabel`, {
label: t("clientPoliciesPolicies"),
})}
helpText="realm-settings:clientPoliciesPoliciesHelpText"
fieldLabelId="realm-settings:clientPoliciesPolicies"
/>
</span>
</TabTitleText>

44
src/realm-settings/SessionsTab.tsx
View file

@ -63,9 +63,7 @@ export const RealmSettingsSessionsTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:ssoSessionIdle"
forLabel={t("SSOSessionIdle")}
forID="SSOSessionIdle"
id="SSOSessionIdle"
fieldLabelId="realm-settings:SSOSessionIdle"
/>
}
>
@ -92,9 +90,7 @@ export const RealmSettingsSessionsTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:ssoSessionMax"
forLabel={t("SSOSessionMax")}
forID="SSOSessionMax"
id="SSOSessionMax"
fieldLabelId="realm-settings:SSOSessionMax"
/>
}
>
@ -121,9 +117,7 @@ export const RealmSettingsSessionsTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:ssoSessionIdleRememberMe"
forLabel={t("SSOSessionIdleRememberMe")}
forID="SSOSessionIdleRememberMe"
id="SSOSessionIdleRememberMe"
fieldLabelId="realm-settings:SSOSessionIdleRememberMe"
/>
}
>
@ -150,9 +144,7 @@ export const RealmSettingsSessionsTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:ssoSessionMaxRememberMe"
forLabel={t("SSOSessionMaxRememberMe")}
forID="SSOSessionMaxRememberMe"
id="SSOSessionMaxRememberMe"
fieldLabelId="realm-settings:SSOSessionMaxRememberMe"
/>
}
>
@ -190,9 +182,7 @@ export const RealmSettingsSessionsTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:clientSessionIdle"
forLabel={t("clientSessionIdle")}
forID="clientSessionIdle"
id="clientSessionIdle"
fieldLabelId="realm-settings:clientSessionIdle"
/>
}
>
@ -219,9 +209,7 @@ export const RealmSettingsSessionsTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:clientSessionMax"
forLabel={t("clientSessionMax")}
forID="clientSessionMax"
id="clientSessionMax"
fieldLabelId="realm-settings:clientSessionMax"
/>
}
>
@ -259,9 +247,7 @@ export const RealmSettingsSessionsTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:offlineSessionIdle"
forLabel={t("offlineSessionIdle")}
forID="offlineSessionIdle"
id="offlineSessionIdle"
fieldLabelId="realm-settings:offlineSessionIdle"
/>
}
>
@ -289,9 +275,7 @@ export const RealmSettingsSessionsTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:offlineSessionMaxLimited"
forLabel={t("offlineSessionMaxLimited")}
forID="offlineSessionMaxLimited"
id="offlineSessionMaxLimited"
fieldLabelId="realm-settings:offlineSessionMaxLimited"
/>
}
>
@ -320,9 +304,7 @@ export const RealmSettingsSessionsTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:offlineSessionMax"
forLabel={t("offlineSessionMax")}
forID="offlineSessionMax"
id="offlineSessionMax"
fieldLabelId="realm-settings:offlineSessionMax"
/>
}
>
@ -361,9 +343,7 @@ export const RealmSettingsSessionsTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:loginTimeout"
forLabel={t("loginTimeout")}
forID="loginTimeout"
id="loginTimeout"
fieldLabelId="realm-settings:loginTimeout"
/>
}
>
@ -390,9 +370,7 @@ export const RealmSettingsSessionsTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:loginActionTimeout"
forLabel={t("loginActionTimeout")}
forID="loginActionTimeout"
id="loginActionTimeout"
fieldLabelId="realm-settings:loginActionTimeout"
/>
}
>

12
src/realm-settings/ThemesTab.tsx
View file

@ -49,8 +49,7 @@ export const RealmSettingsThemesTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:loginTheme"
forLabel={t("loginTheme")}
forID="kc-login-theme"
fieldLabelId="realm-settings:loginTheme"
/>
}
>
@ -92,8 +91,7 @@ export const RealmSettingsThemesTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:accountTheme"
forLabel={t("accountTheme")}
forID="kc-account-theme"
fieldLabelId="realm-settings:accountTheme"
/>
}
>
@ -135,8 +133,7 @@ export const RealmSettingsThemesTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:adminConsoleTheme"
forLabel={t("adminTheme")}
forID="kc-admin-console-theme"
fieldLabelId="realm-settings:adminTheme"
/>
}
>
@ -180,8 +177,7 @@ export const RealmSettingsThemesTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:emailTheme"
forLabel={t("emailTheme")}
forID="kc-email-theme"
fieldLabelId="realm-settings:emailTheme"
/>
}
>

42
src/realm-settings/TokensTab.tsx
View file

@ -62,7 +62,7 @@ export const RealmSettingsTokensTab = ({
const offlineSessionMaxEnabled = useWatch({
control,
name: "offlineSessionMaxLifespanEnabled",
defaultValue: realm?.offlineSessionMaxLifespanEnabled,
defaultValue: realm.offlineSessionMaxLifespanEnabled,
});
return (
@ -82,8 +82,7 @@ export const RealmSettingsTokensTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:defaultSigAlg"
forLabel={t("defaultSigAlg")}
forID={t("common:helpLabel", { label: t("algorithm") })}
fieldLabelId="realm-settings:algorithm"
/>
}
>
@ -137,9 +136,7 @@ export const RealmSettingsTokensTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:revokeRefreshToken"
forLabel={t("revokeRefreshToken")}
forID="revokeRefreshToken"
id="revokeRefreshToken"
fieldLabelId="realm-settings:revokeRefreshToken"
/>
}
>
@ -165,8 +162,7 @@ export const RealmSettingsTokensTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:refreshTokenMaxReuse"
forLabel={t("refreshTokenMaxReuse")}
forID="refreshTokenMaxReuse"
fieldLabelId="realm-settings:refreshTokenMaxReuse"
/>
}
fieldId="refreshTokenMaxReuse"
@ -205,14 +201,12 @@ export const RealmSettingsTokensTab = ({
label={t("accessTokenLifespan")}
fieldId="accessTokenLifespan"
helperText={`It is recommended for this value to be shorter than the SSO session idle timeout: ${interpolateTimespan(
forHumans(realm?.ssoSessionIdleTimeout!)
forHumans(realm.ssoSessionIdleTimeout!)
)}`}
labelIcon={
<HelpItem
helpText="realm-settings-help:accessTokenLifespan"
forLabel={t("accessTokenLifespan")}
forID="accessTokenLifespan"
id="accessTokenLifespan"
fieldLabelId="realm-settings:accessTokenLifespan"
/>
}
>
@ -224,9 +218,7 @@ export const RealmSettingsTokensTab = ({
render={({ onChange, value }) => (
<TimeSelector
validated={
value > realm?.ssoSessionIdleTimeout!
? "warning"
: "default"
value > realm.ssoSessionIdleTimeout! ? "warning" : "default"
}
className="kc-access-token-lifespan"
data-testid="access-token-lifespan-input"
@ -245,9 +237,7 @@ export const RealmSettingsTokensTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:accessTokenLifespanImplicitFlow"
forLabel={t("accessTokenLifespanImplicitFlow")}
forID="accessTokenLifespanImplicitFlow"
id="accessTokenLifespanImplicitFlow"
fieldLabelId="realm-settings:accessTokenLifespanImplicitFlow"
/>
}
>
@ -273,9 +263,7 @@ export const RealmSettingsTokensTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:clientLoginTimeout"
forLabel={t("clientLoginTimeout")}
forID="clientLoginTimeout"
id="clientLoginTimeout"
fieldLabelId="realm-settings:clientLoginTimeout"
/>
}
>
@ -304,9 +292,7 @@ export const RealmSettingsTokensTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:offlineSessionMax"
forLabel={t("offlineSessionMax")}
forID="offlineSessionMax"
id="offlineSessionMax"
fieldLabelId="realm-settings:offlineSessionMax"
/>
}
>
@ -346,9 +332,7 @@ export const RealmSettingsTokensTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:userInitiatedActionLifespan"
forLabel={t("userInitiatedActionLifespan")}
forID="userInitiatedActionLifespan"
id="userInitiatedActionLifespan"
fieldLabelId="realm-settings:userInitiatedActionLifespan"
/>
}
>
@ -375,9 +359,7 @@ export const RealmSettingsTokensTab = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:defaultAdminInitiatedActionLifespan"
forLabel={t("defaultAdminInitiated")}
forID="defaultAdminInitiated"
id="defaultAdminInitiated"
fieldLabelId="realm-settings:defaultAdminInitiated"
/>
}
>

16
src/realm-settings/event-config/EventConfigForm.tsx
View file

@ -56,8 +56,7 @@ export const EventConfigForm = ({
labelIcon={
<HelpItem
helpText={`realm-settings-help:save-${type}-events`}
forLabel={t("saveEvents")}
forID={t(`common:helpLabel`, { label: t("saveEvents") })}
fieldLabelId="realm-settings:saveEvents"
/>
}
>
@ -93,10 +92,7 @@ export const EventConfigForm = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:includeRepresentation"
forLabel={t("includeRepresentation")}
forID={t(`common:helpLabel`, {
label: t("includeRepresentation"),
})}
fieldLabelId="realm-settings:includeRepresentation"
/>
}
>
@ -124,8 +120,7 @@ export const EventConfigForm = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:expiration"
forLabel={t("expiration")}
forID={t(`common:helpLabel`, { label: t("expiration") })}
fieldLabelId="realm-settings:expiration"
/>
}
>
@ -166,10 +161,7 @@ export const EventConfigForm = ({
labelIcon={
<HelpItem
helpText={`realm-settings-help:${type}-clearEvents`}
forLabel={
type === "user" ? t("clearUserEvents") : t("clearAdminEvents")
}
forID={`clear-${type}-events`}
fieldLabelId={`realm-settings:clear-${type}-events`}
/>
}
>

3
src/realm-settings/event-config/EventListenersForm.tsx
View file

@ -41,8 +41,7 @@ export const EventListenersForm = ({
labelIcon={
<HelpItem
helpText={t("eventListenersHelpText")}
forLabel={t("eventListeners")}
forID={t(`common:helpLabel`, { label: t("eventListeners") })}
fieldLabelId="realm-settings:eventListeners"
/>
}
>

15
src/realm-settings/key-providers/aes-generated/AESGeneratedForm.tsx
View file

@ -122,8 +122,7 @@ export const AESGeneratedForm = ({
labelIcon={
<HelpItem
helpText="client-scopes-help:mapperName"
forLabel={t("common:name")}
forID="name"
fieldLabelId="name"
/>
}
fieldId="id"
@ -150,8 +149,7 @@ export const AESGeneratedForm = ({
labelIcon={
<HelpItem
helpText="client-scopes-help:mapperName"
forLabel={t("common:name")}
forID="name"
fieldLabelId="name"
/>
}
fieldId="name"
@ -202,8 +200,7 @@ export const AESGeneratedForm = ({
labelIcon={
<HelpItem
helpText={t("realm-settings-help:enabled")}
forLabel={t("enabled")}
forID="kc-enabled"
fieldLabelId="enabled"
/>
}
>
@ -235,8 +232,7 @@ export const AESGeneratedForm = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:active"
forLabel={t("active")}
forID="kc-active"
fieldLabelId="realm-settings:active"
/>
}
>
@ -270,8 +266,7 @@ export const AESGeneratedForm = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:AESKeySize"
forLabel={t("AESKeySize")}
forID="kc-aes-key-size"
fieldLabelId="realm-settings:AESKeySize"
/>
}
>

15
src/realm-settings/key-providers/ecdsa-generated/ECDSAGeneratedForm.tsx
View file

@ -122,8 +122,7 @@ export const ECDSAGeneratedForm = ({
labelIcon={
<HelpItem
helpText="client-scopes-help:mapperName"
forLabel={t("common:name")}
forID={t("common:helpLabel", { label: t("common:name") })}
fieldLabelId="client-scopes:providerId"
/>
}
fieldId="id"
@ -150,8 +149,7 @@ export const ECDSAGeneratedForm = ({
labelIcon={
<HelpItem
helpText="client-scopes-help:mapperName"
forLabel={t("common:name")}
forID={t("common:helpLabel", { label: t("common:name") })}
fieldLabelId="name"
/>
}
fieldId="name"
@ -201,8 +199,7 @@ export const ECDSAGeneratedForm = ({
labelIcon={
<HelpItem
helpText={t("realm-settings-help:enabled")}
forLabel={t("enabled")}
forID={t("common:helpLabel", { label: t("enabled") })}
fieldLabelId="enabled"
/>
}
>
@ -230,8 +227,7 @@ export const ECDSAGeneratedForm = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:active"
forLabel={t("active")}
forID={t("common:helpLabel", { label: t("active") })}
fieldLabelId="realm-settings:active"
/>
}
>
@ -261,8 +257,7 @@ export const ECDSAGeneratedForm = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:ellipticCurve"
forLabel={t("ellipticCurve")}
forID={t("common:helpLabel", { label: t("ellipticCurve") })}
fieldLabelId="realm-settings:ellipticCurve"
/>
}
>

18
src/realm-settings/key-providers/hmac-generated/HMACGeneratedForm.tsx
View file

@ -126,8 +126,7 @@ export const HMACGeneratedForm = ({
labelIcon={
<HelpItem
helpText="client-scopes-help:mapperName"
forLabel={t("common:name")}
forID={t("common:helpLabel", { label: t("common:name") })}
fieldLabelId="realm-settings:providerId"
/>
}
fieldId="id"
@ -154,8 +153,7 @@ export const HMACGeneratedForm = ({
labelIcon={
<HelpItem
helpText="client-scopes-help:mapperName"
forLabel={t("common:name")}
forID={t("common:helpLabel", { label: t("common:name") })}
fieldLabelId="name"
/>
}
fieldId="name"
@ -206,8 +204,7 @@ export const HMACGeneratedForm = ({
labelIcon={
<HelpItem
helpText={t("realm-settings-help:enabled")}
forLabel={t("enabled")}
forID={t("common:helpLabel", { label: t("enabled") })}
fieldLabelId="enabled"
/>
}
>
@ -235,8 +232,7 @@ export const HMACGeneratedForm = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:active"
forLabel={t("active")}
forID={t("common:helpLabel", { label: t("active") })}
fieldLabelId="realm-settings:active"
/>
}
>
@ -266,8 +262,7 @@ export const HMACGeneratedForm = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:secretSize"
forLabel={t("secretSize")}
forID={t("common:helpLabel", { label: t("secretSize") })}
fieldLabelId="realm-settings:secretSize"
/>
}
>
@ -306,8 +301,7 @@ export const HMACGeneratedForm = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:algorithm"
forLabel={t("algorithm")}
forID={t("common:helpLabel", { label: t("algorithm") })}
fieldLabelId="realm-settings:algorithm"
/>
}
>

27
src/realm-settings/key-providers/java-keystore/JavaKeystoreForm.tsx
View file

@ -123,8 +123,7 @@ export const JavaKeystoreForm = ({
labelIcon={
<HelpItem
helpText="client-scopes-help:mapperName"
forLabel={t("common:name")}
forID={t("common:helpLabel", { label: t("common:name") })}
fieldLabelId="realm-settings:providerId"
/>
}
fieldId="id"
@ -151,8 +150,7 @@ export const JavaKeystoreForm = ({
labelIcon={
<HelpItem
helpText="client-scopes-help:mapperName"
forLabel={t("common:name")}
forID={t("common:helpLabel", { label: t("common:name") })}
fieldLabelId="name"
/>
}
fieldId="name"
@ -203,8 +201,7 @@ export const JavaKeystoreForm = ({
labelIcon={
<HelpItem
helpText={t("realm-settings-help:enabled")}
forLabel={t("enabled")}
forID={t("common:helpLabel", { label: t("enabled") })}
fieldLabelId="realm-settings:enabled"
/>
}
>
@ -232,8 +229,7 @@ export const JavaKeystoreForm = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:active"
forLabel={t("active")}
forID={t("common:helpLabel", { label: t("active") })}
fieldLabelId="realm-settings:active"
/>
}
>
@ -263,8 +259,7 @@ export const JavaKeystoreForm = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:algorithm"
forLabel={t("algorithm")}
forID={t("common:helpLabel", { label: t("algorithm") })}
fieldLabelId="realm-settings:algorithm"
/>
}
>
@ -304,8 +299,7 @@ export const JavaKeystoreForm = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:keystore"
forLabel={t("keystore")}
forID="kc-keystore"
fieldLabelId="realm-settings:keystore"
/>
}
>
@ -330,8 +324,7 @@ export const JavaKeystoreForm = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:keystorePassword"
forLabel={t("keystorePassword")}
forID={t("common:helpLabel", { label: t("keystorePassword") })}
fieldLabelId="realm-settings:keystorePassword"
/>
}
>
@ -356,8 +349,7 @@ export const JavaKeystoreForm = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:keyAlias"
forLabel={t("keyAlias")}
forID={t("common:helpLabel", { label: t("keyAlias") })}
fieldLabelId="realm-settings:keyAlias"
/>
}
>
@ -382,8 +374,7 @@ export const JavaKeystoreForm = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:keyPassword"
forLabel={t("keyPassword")}
forID={t("common:helpLabel", { label: t("keyPassword") })}
fieldLabelId="realm-settings:keyPassword"
/>
}
>

42
src/realm-settings/key-providers/rsa-generated/RSAGeneratedForm.tsx
View file

@ -128,8 +128,7 @@ export const RSAGeneratedForm = ({
labelIcon={
<HelpItem
helpText="client-scopes-help:mapperName"
forLabel={t("common:name")}
forID={t("common:helpLabel", { label: t("common:name") })}
fieldLabelId="client-scopes:providerId"
/>
}
fieldId="id"
@ -156,8 +155,7 @@ export const RSAGeneratedForm = ({
labelIcon={
<HelpItem
helpText="client-scopes-help:mapperName"
forLabel={t("common:name")}
forID={t("common:helpLabel", { label: t("common:name") })}
fieldLabelId="name"
/>
}
fieldId="name"
@ -172,18 +170,16 @@ export const RSAGeneratedForm = ({
name="name"
control={form.control}
defaultValue={providerType}
render={({ onChange, value }) => {
return (
<TextInput
id="name"
type="text"
aria-label={t("consoleDisplayName")}
value={value}
onChange={(value) => onChange(value)}
data-testid="display-name-input"
/>
);
}}
render={({ onChange, value }) => (
<TextInput
id="name"
type="text"
aria-label={t("consoleDisplayName")}
value={value}
onChange={(value) => onChange(value)}
data-testid="display-name-input"
/>
)}
/>
)}
{editMode && (
@ -206,9 +202,8 @@ export const RSAGeneratedForm = ({
fieldId="kc-enabled"
labelIcon={
<HelpItem
helpText={t("realm-settings-help:enabled")}
forLabel={t("enabled")}
forID={t("common:helpLabel", { label: t("enabled") })}
helpText="realm-settings-help:enabled"
fieldLabelId="enabled"
/>
}
>
@ -236,8 +231,7 @@ export const RSAGeneratedForm = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:active"
forLabel={t("active")}
forID={t("common:helpLabel", { label: t("active") })}
fieldLabelId="realm-settings:active"
/>
}
>
@ -267,8 +261,7 @@ export const RSAGeneratedForm = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:secretSize"
forLabel={t("secretSize")}
forID={t("common:helpLabel", { label: t("secretSize") })}
fieldLabelId="realm-settings:secretSize"
/>
}
>
@ -307,8 +300,7 @@ export const RSAGeneratedForm = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:algorithm"
forLabel={t("algorithm")}
forID={t("common:helpLabel", { label: t("algorithm") })}
fieldLabelId="realm-settings:algorithm"
/>
}
>

21
src/realm-settings/key-providers/rsa/RSAForm.tsx
View file

@ -130,8 +130,7 @@ export const RSAForm = ({
labelIcon={
<HelpItem
helpText="client-scopes-help:mapperName"
forLabel={t("common:name")}
forID={t("common:helpLabel", { label: t("common:name") })}
fieldLabelId="realm-settings:providerId"
/>
}
fieldId="id"
@ -158,8 +157,7 @@ export const RSAForm = ({
labelIcon={
<HelpItem
helpText="client-scopes-help:mapperName"
forLabel={t("common:name")}
forID={t("common:helpLabel", { label: t("common:name") })}
fieldLabelId="name"
/>
}
fieldId="name"
@ -210,8 +208,7 @@ export const RSAForm = ({
labelIcon={
<HelpItem
helpText={t("realm-settings-help:enabled")}
forLabel={t("enabled")}
forID={t("common:helpLabel", { label: t("enabled") })}
fieldLabelId="enabled"
/>
}
>
@ -239,8 +236,7 @@ export const RSAForm = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:active"
forLabel={t("active")}
forID={t("common:helpLabel", { label: t("active") })}
fieldLabelId="active"
/>
}
>
@ -270,8 +266,7 @@ export const RSAForm = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:algorithm"
forLabel={t("algorithm")}
forID={t("common:helpLabel", { label: t("algorithm") })}
fieldLabelId="realm-settings:algorithm"
/>
}
>
@ -310,8 +305,7 @@ export const RSAForm = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:privateRSAKey"
forLabel={t("privateRSAKey")}
forID={t("common:helpLabel", { label: t("privateRSAKey") })}
fieldLabelId="realm-settings:privateRSAKey"
/>
}
>
@ -340,8 +334,7 @@ export const RSAForm = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:x509Certificate"
forLabel={t("x509Certificate")}
forID={t("common:helpLabel", { label: t("x509Certificate") })}
fieldLabelId="realm-settings:x509Certificate"
/>
}
>

6
src/realm-settings/security-defences/BruteForceDetection.tsx
View file

@ -67,8 +67,7 @@ export const BruteForceDetection = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:failureFactor"
forLabel={t("failureFactor")}
forID="failureFactor"
fieldLabelId="realm-settings:failureFactor"
/>
}
fieldId="failureFactor"
@ -133,8 +132,7 @@ export const BruteForceDetection = ({
labelIcon={
<HelpItem
helpText="realm-settings-help:quickLoginCheckMilliSeconds"
forLabel={t("quickLoginCheckMilliSeconds")}
forID="quickLoginCheckMilliSeconds"
fieldLabelId="realm-settings:quickLoginCheckMilliSeconds"
/>
}
fieldId="quickLoginCheckMilliSeconds"

3
src/realm-settings/security-defences/HelpLinkTextInput.tsx
View file

@ -30,8 +30,7 @@ export const HelpLinkTextInput = ({
<FormattedLink href={url} title={t("common:learnMore")} />
</Trans>
}
forLabel={t(name)}
forID={name}
fieldLabelId={name}
/>
}
>

3
src/realm-settings/security-defences/Time.tsx
View file

@ -23,8 +23,7 @@ export const Time = ({
labelIcon={
<HelpItem
helpText={`realm-settings-help:${name}`}
forLabel={t(name)}
forID={name}
fieldLabelId={`realm-settings:${name}`}
/>
}
validated={

49
src/user-federation/kerberos/KerberosSettingsRequired.tsx
View file

@ -30,7 +30,7 @@ export const KerberosSettingsRequired = ({
showSectionDescription = false,
}: KerberosSettingsRequiredProps) => {
const { t } = useTranslation("user-federation");
const helpText = useTranslation("user-federation-help").t;
const { t: helpText } = useTranslation("user-federation-help");
const adminClient = useAdminClient();
const { realm } = useRealm();
@ -64,22 +64,14 @@ export const KerberosSettingsRequired = ({
label={t("consoleDisplayName")}
labelIcon={
<HelpItem
helpText={helpText("consoleDisplayNameHelp")}
forLabel={t("consoleDisplayName")}
forID="kc-console-display-name"
helpText="users-federation-help:consoleDisplayNameHelp"
fieldLabelId="users-federation:consoleDisplayName"
/>
}
fieldId="kc-console-display-name"
isRequired
>
{/* These hidden fields are required so data object written back matches data retrieved */}
{/* <TextInput
hidden
type="text"
id="kc-console-id"
name="id"
ref={form.register}
/> */}
<TextInput
hidden
type="text"
@ -127,9 +119,8 @@ export const KerberosSettingsRequired = ({
label={t("kerberosRealm")}
labelIcon={
<HelpItem
helpText={helpText("kerberosRealmHelp")}
forLabel={t("kerberosRealm")}
forID="kc-kerberos-realm"
helpText="users-federation-help:kerberosRealmHelp"
fieldLabelId="users-federation:kc-kerberos-realm"
/>
}
fieldId="kc-kerberos-realm"
@ -159,9 +150,8 @@ export const KerberosSettingsRequired = ({
label={t("serverPrincipal")}
labelIcon={
<HelpItem
helpText={helpText("serverPrincipalHelp")}
forLabel={t("serverPrincipal")}
forID="kc-server-principal"
helpText="users-federation-help:serverPrincipalHelp"
fieldLabelId="users-federation:serverPrincipal"
/>
}
fieldId="kc-server-principal"
@ -191,9 +181,8 @@ export const KerberosSettingsRequired = ({
label={t("keyTab")}
labelIcon={
<HelpItem
helpText={helpText("keyTabHelp")}
forLabel={t("keyTab")}
forID="kc-key-tab"
helpText="users-federation-help:keyTabHelp"
fieldLabelId="users-federation:keyTab"
/>
}
fieldId="kc-key-tab"
@ -221,9 +210,8 @@ export const KerberosSettingsRequired = ({
label={t("debug")}
labelIcon={
<HelpItem
helpText={helpText("debugHelp")}
forLabel={t("debug")}
forID="kc-debug"
helpText="users-federation-help:debugHelp"
fieldLabelId="users-federation:debug"
/>
}
fieldId="kc-debug"
@ -250,9 +238,8 @@ export const KerberosSettingsRequired = ({
label={t("allowPasswordAuthentication")}
labelIcon={
<HelpItem
helpText={helpText("allowPasswordAuthenticationHelp")}
forLabel={t("allowPasswordAuthentication")}
forID="kc-allow-password-authentication"
helpText="users-federation-help:allowPasswordAuthenticationHelp"
fieldLabelId="users-federation:allowPasswordAuthentication"
/>
}
fieldId="kc-allow-password-authentication"
@ -279,9 +266,8 @@ export const KerberosSettingsRequired = ({
label={t("editMode")}
labelIcon={
<HelpItem
helpText={helpText("editModeKerberosHelp")}
forLabel={t("editMode")}
forID="kc-edit-mode"
helpText="users-federation-help:editModeKerberosHelp"
fieldLabelId="users-federation:editMode"
/>
}
isRequired
@ -320,9 +306,8 @@ export const KerberosSettingsRequired = ({
label={t("updateFirstLogin")}
labelIcon={
<HelpItem
helpText={helpText("updateFirstLoginHelp")}
forLabel={t("updateFirstLogin")}
forID="kc-update-first-login"
helpText="users-federation-help:updateFirstLoginHelp"
fieldLabelId="users-federation:updateFirstLogin"
/>
}
fieldId="kc-update-first-login"

17
src/user-federation/ldap/LdapSettingsAdvanced.tsx
View file

@ -18,7 +18,7 @@ export const LdapSettingsAdvanced = ({
showSectionDescription = false,
}: LdapSettingsAdvancedProps) => {
const { t } = useTranslation("user-federation");
const helpText = useTranslation("user-federation-help").t;
const { t: helpText } = useTranslation("user-federation-help");
return (
<>
@ -35,9 +35,8 @@ export const LdapSettingsAdvanced = ({
label={t("enableLdapv3Password")}
labelIcon={
<HelpItem
helpText={helpText("enableLdapv3PasswordHelp")}
forLabel={t("enableLdapv3Password")}
forID="kc-enable-ldapv3-password"
helpText="users-federation-help:enableLdapv3PasswordHelp"
fieldLabelId="users-federation:enableLdapv3Password"
/>
}
fieldId="kc-enable-ldapv3-password"
@ -64,9 +63,8 @@ export const LdapSettingsAdvanced = ({
label={t("validatePasswordPolicy")}
labelIcon={
<HelpItem
helpText={helpText("validatePasswordPolicyHelp")}
forLabel={t("validatePasswordPolicy")}
forID="kc-validate-password-policy"
helpText="users-federation-help:validatePasswordPolicyHelp"
fieldLabelId="users-federation:validatePasswordPolicy"
/>
}
fieldId="kc-validate-password-policy"
@ -93,9 +91,8 @@ export const LdapSettingsAdvanced = ({
label={t("trustEmail")}
labelIcon={
<HelpItem
helpText={helpText("trustEmailHelp")}
forLabel={t("trustEmail")}
forID="kc-trust-email"
helpText="users-federation-help:trustEmailHelp"
fieldLabelId="users-federation:trustEmail"
/>
}
fieldId="kc-trust-email"

40
src/user-federation/ldap/LdapSettingsConnection.tsx
View file

@ -105,9 +105,8 @@ export const LdapSettingsConnection = ({
label={t("connectionURL")}
labelIcon={
<HelpItem
helpText={helpText("consoleDisplayConnectionUrlHelp")}
forLabel={t("connectionURL")}
forID="kc-console-connection-url"
helpText="users-federation-help:consoleDisplayConnectionUrlHelp"
fieldLabelId="users-federation:connectionURL"
/>
}
fieldId="kc-console-connection-url"
@ -136,9 +135,8 @@ export const LdapSettingsConnection = ({
label={t("enableStartTls")}
labelIcon={
<HelpItem
helpText={helpText("enableStartTlsHelp")}
forLabel={t("enableStartTls")}
forID="kc-enable-start-tls"
helpText="users-federation-help:enableStartTlsHelp"
fieldLabelId="users-federation:enableStartTls"
/>
}
fieldId="kc-enable-start-tls"
@ -165,9 +163,8 @@ export const LdapSettingsConnection = ({
label={t("useTruststoreSpi")}
labelIcon={
<HelpItem
helpText={helpText("useTruststoreSpiHelp")}
forLabel={t("useTruststoreSpi")}
forID="kc-use-truststore-spi"
helpText="users-federation-help:useTruststoreSpiHelp"
fieldLabelId="users-federation:useTruststoreSpi"
/>
}
fieldId="kc-use-truststore-spi"
@ -200,9 +197,8 @@ export const LdapSettingsConnection = ({
label={t("connectionPooling")}
labelIcon={
<HelpItem
helpText={helpText("connectionPoolingHelp")}
forLabel={t("connectionPooling")}
forID="kc-connection-pooling"
helpText="users-federation-help:connectionPoolingHelp"
fieldLabelId="users-federation:connectionPooling"
/>
}
fieldId="kc-connection-pooling"
@ -228,9 +224,8 @@ export const LdapSettingsConnection = ({
label={t("connectionTimeout")}
labelIcon={
<HelpItem
helpText={helpText("connectionTimeoutHelp")}
forLabel={t("connectionTimeout")}
forID="kc-console-connection-timeout"
helpText="users-federation-help:connectionTimeoutHelp"
fieldLabelId="users-federation:consoleTimeout"
/>
}
fieldId="kc-console-connection-timeout"
@ -256,9 +251,8 @@ export const LdapSettingsConnection = ({
label={t("bindType")}
labelIcon={
<HelpItem
helpText={helpText("bindTypeHelp")}
forLabel={t("bindType")}
forID="kc-bind-type"
helpText="users-federation-help:bindTypeHelp"
fieldLabelId="users-federation:bindType"
/>
}
fieldId="kc-bind-type"
@ -297,9 +291,8 @@ export const LdapSettingsConnection = ({
label={t("bindDn")}
labelIcon={
<HelpItem
helpText={helpText("bindDnHelp")}
forLabel={t("bindDn")}
forID="kc-console-bind-dn"
helpText="users-federation-help:bindDnHelp"
fieldLabelId="users-federation:bindDn"
/>
}
fieldId="kc-console-bind-dn"
@ -323,9 +316,8 @@ export const LdapSettingsConnection = ({
label={t("bindCredentials")}
labelIcon={
<HelpItem
helpText={helpText("bindCredentialsHelp")}
forLabel={t("bindCredentials")}
forID="kc-console-bind-credentials"
helpText="users-federation-help:bindCredentialsHelp"
fieldLabelId="users-federation:bindCredentials"
/>
}
fieldId="kc-console-bind-credentials"

Some files were not shown because too many files have changed in this diff Show more