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

Merge pull request #815 from keycloak/revert-813-ay11

Browse source 
Revert "Ay11"
This commit is contained in:
agagancarczyk 2021-07-09 16:11:50 +01:00 committed by GitHub
commit 3c16cbe5e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/clients/ClientSettings.tsx
View file

@ -78,13 +78,12 @@ export const ClientSettings = ({ save, reset }: ClientSettingsProps) => {
<HelpItem <HelpItem
helpText="clients-help:validRedirectURIs" helpText="clients-help:validRedirectURIs"
forLabel={t("validRedirectUri")} forLabel={t("validRedirectUri")}
forID={t(`common:helpLabel`, { label: t("validRedirectUri") })} forID="kc-redirect"
/> />
} }
> >
<MultiLineInput <MultiLineInput
name="redirectUris" name="redirectUris"
aria-label={t("validRedirectUri")}
addButtonLabel="clients:addRedirectUri" addButtonLabel="clients:addRedirectUri"
/> />
</FormGroup> </FormGroup>
@ -95,7 +94,7 @@ export const ClientSettings = ({ save, reset }: ClientSettingsProps) => {
<HelpItem <HelpItem
helpText="clients-help:homeURL" helpText="clients-help:homeURL"
forLabel={t("homeURL")} forLabel={t("homeURL")}
forID={t(`common:helpLabel`, { label: t("homeURL") })} forID="kc-home-url"
/> />
} }
> >
@ -113,13 +112,12 @@ export const ClientSettings = ({ save, reset }: ClientSettingsProps) => {
<HelpItem <HelpItem
helpText="clients-help:webOrigins" helpText="clients-help:webOrigins"
forLabel={t("webOrigins")} forLabel={t("webOrigins")}
forID={t(`common:helpLabel`, { label: t("webOrigins") })} forID="kc-web-origins"
/> />
} }
> >
<MultiLineInput <MultiLineInput
name="webOrigins" name="webOrigins"
aria-label={t("webOrigins")}
addButtonLabel="clients:addWebOrigins" addButtonLabel="clients:addWebOrigins"
/> />
</FormGroup> </FormGroup>
@ -199,7 +197,7 @@ export const ClientSettings = ({ save, reset }: ClientSettingsProps) => {
control={control} control={control}
render={({ onChange, value }) => ( render={({ onChange, value }) => (
<Switch <Switch
id="kc-consent-switch" id="kc-consent"
label={t("common:on")} label={t("common:on")}
labelOff={t("common:off")} labelOff={t("common:off")}
isChecked={value} isChecked={value}
@ -219,7 +217,7 @@ export const ClientSettings = ({ save, reset }: ClientSettingsProps) => {
control={control} control={control}
render={({ onChange, value }) => ( render={({ onChange, value }) => (
<Switch <Switch
id="kc-display-on-client-switch" id="kc-display-on-client"
label={t("common:on")} label={t("common:on")}
labelOff={t("common:off")} labelOff={t("common:off")}
isChecked={value === "true"} isChecked={value === "true"}

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

@ -49,7 +49,7 @@ export const CapabilityConfig = ({
<HelpItem <HelpItem
helpText="clients-help:authentication" helpText="clients-help:authentication"
forLabel={t("authentication")} forLabel={t("authentication")}
forID={t(`common:helpLabel`, { label: t("authentication") })} forID="kc-authentication"
/> />
} }
> >
@ -60,7 +60,7 @@ export const CapabilityConfig = ({
render={({ onChange, value }) => ( render={({ onChange, value }) => (
<Switch <Switch
data-testid="authentication" data-testid="authentication"
id="kc-authentication-switch" id="kc-authentication"
name="publicClient" name="publicClient"
label={t("common:on")} label={t("common:on")}
labelOff={t("common:off")} labelOff={t("common:off")}
@ -84,7 +84,7 @@ export const CapabilityConfig = ({
<HelpItem <HelpItem
helpText="clients-help:authorization" helpText="clients-help:authorization"
forLabel={t("authorization")} forLabel={t("authorization")}
forID={t(`common:helpLabel`, { label: t("authorization") })} forID="kc-authorization"
/> />
} }
> >
@ -95,7 +95,7 @@ export const CapabilityConfig = ({
render={({ onChange, value }) => ( render={({ onChange, value }) => (
<Switch <Switch
data-testid="authorization" data-testid="authorization"
id="kc-authorization-switch" id="kc-authorization"
name="authorizationServicesEnabled" name="authorizationServicesEnabled"
label={t("common:on")} label={t("common:on")}
labelOff={t("common:off")} labelOff={t("common:off")}
@ -135,9 +135,7 @@ export const CapabilityConfig = ({
<HelpItem <HelpItem
helpText="clients-help:standardFlow" helpText="clients-help:standardFlow"
forLabel={t("standardFlow")} forLabel={t("standardFlow")}
forID={t(`common:helpLabel`, { forID="kc-flow-standard"
label: t("standardFlow"),
})}
/> />
</InputGroup> </InputGroup>
)} )}
@ -161,9 +159,7 @@ export const CapabilityConfig = ({
<HelpItem <HelpItem
helpText="clients-help:directAccess" helpText="clients-help:directAccess"
forLabel={t("directAccess")} forLabel={t("directAccess")}
forID={t(`common:helpLabel`, { forID="kc-flow-direct"
label: t("directAccess"),
})}
/> />
</InputGroup> </InputGroup>
)} )}
@ -187,9 +183,7 @@ export const CapabilityConfig = ({
<HelpItem <HelpItem
helpText="clients-help:implicitFlow" helpText="clients-help:implicitFlow"
forLabel={t("implicitFlow")} forLabel={t("implicitFlow")}
forID={t(`common:helpLabel`, { forID="kc-flow-implicit"
label: t("implicitFlow"),
})}
/> />
</InputGroup> </InputGroup>
)} )}
@ -219,9 +213,7 @@ export const CapabilityConfig = ({
<HelpItem <HelpItem
helpText="clients-help:serviceAccount" helpText="clients-help:serviceAccount"
forLabel={t("serviceAccount")} forLabel={t("serviceAccount")}
forID={t(`common:helpLabel`, { forID="kc-flow-service-account"
label: t("serviceAccount"),
})}
/> />
</InputGroup> </InputGroup>
)} )}
@ -240,9 +232,7 @@ export const CapabilityConfig = ({
<HelpItem <HelpItem
helpText="clients-help:encryptAssertions" helpText="clients-help:encryptAssertions"
forLabel={t("encryptAssertions")} forLabel={t("encryptAssertions")}
forID={t(`common:helpLabel`, { forID="kc-encrypt"
label: t("encryptAssertions"),
})}
/> />
} }
label={t("encryptAssertions")} label={t("encryptAssertions")}
@ -270,7 +260,7 @@ export const CapabilityConfig = ({
<HelpItem <HelpItem
helpText="clients-help:clientSignature" helpText="clients-help:clientSignature"
forLabel={t("clientSignature")} forLabel={t("clientSignature")}
forID={t(`common:helpLabel`, { label: t("clientSignature") })} forID="kc-client-signature"
/> />
} }
label={t("clientSignature")} label={t("clientSignature")}

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

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

2
src/components/list-empty-state/ListEmptyState.tsx
View file

@ -47,7 +47,7 @@ export const ListEmptyState = ({
) : ( ) : (
hasIcon && <EmptyStateIcon icon={icon ? icon : PlusCircleIcon} /> hasIcon && <EmptyStateIcon icon={icon ? icon : PlusCircleIcon} />
)} )}
<Title headingLevel="h1" size="lg"> <Title headingLevel="h4" size="lg">
{message} {message}
</Title> </Title>
<EmptyStateBody>{instructions}</EmptyStateBody> <EmptyStateBody>{instructions}</EmptyStateBody>

2
src/components/multi-line-input/MultiLineInput.tsx
View file

@ -64,7 +64,6 @@ export const MultiLineInput = ({
variant={ButtonVariant.link} variant={ButtonVariant.link}
onClick={() => remove(index)} onClick={() => remove(index)}
tabIndex={-1} tabIndex={-1}
aria-label={t("common:remove")}
isDisabled={index === fields.length - 1} isDisabled={index === fields.length - 1}
> >
<MinusCircleIcon /> <MinusCircleIcon />
@ -75,7 +74,6 @@ export const MultiLineInput = ({
variant={ButtonVariant.link} variant={ButtonVariant.link}
onClick={() => append({})} onClick={() => append({})}
tabIndex={-1} tabIndex={-1}
aria-label={t("common:add")}
isDisabled={ isDisabled={
rest.isDisabled || rest.isDisabled ||
!(currentValues && currentValues[index]?.value) !(currentValues && currentValues[index]?.value)

2
src/components/scroll-form/ScrollPanel.tsx
View file

@ -14,7 +14,7 @@ export const ScrollPanel = (props: ScrollPanelProps) => {
return ( return (
<section {...rest} className="kc-form-panel__panel"> <section {...rest} className="kc-form-panel__panel">
<Title <Title
headingLevel="h1" headingLevel="h4"
size="xl" size="xl"
className="kc-form-panel__title" className="kc-form-panel__title"
id={scrollId} id={scrollId}

8
src/dashboard/Dashboard.tsx
View file

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