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

Replace GenerateId component with React's useId() hook (#4536)

Browse source
This commit is contained in:
Jon Koops 2023-03-03 13:27:23 +01:00 committed by GitHub
parent d581778922
commit 22e15d0dd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
apps/admin-ui/src/clients/keys/Certificate.tsx
View file

@ -1,7 +1,8 @@
import { useTranslation } from "react-i18next";
import { FormGroup, GenerateId } from "@patternfly/react-core";
import type CertificateRepresentation from "@keycloak/keycloak-admin-client/lib/defs/certificateRepresentation";
import { FormGroup } from "@patternfly/react-core";
import { useId } from "react";
import { useTranslation } from "react-i18next";
import { HelpItem } from "../../components/help-enabler/HelpItem";
import { KeycloakTextArea } from "../../components/keycloak-text-area/KeycloakTextArea";
@ -30,26 +31,22 @@ const CertificateDisplay = ({ id, keyInfo }: CertificateDisplayProps) => {
export const Certificate = ({ keyInfo, plain = false }: CertificateProps) => {
const { t } = useTranslation("clients");
return (
<GenerateId prefix="certificate">
{(id) =>
plain ? (
<CertificateDisplay id={id} keyInfo={keyInfo} />
) : (
<FormGroup
label={t("certificate")}
fieldId={id}
labelIcon={
<HelpItem
helpText="clients-help:certificate"
fieldLabelId={`clients:${id}`}
/>
}
>
<CertificateDisplay id={id} keyInfo={keyInfo} />
</FormGroup>
)
const id = useId();
return plain ? (
<CertificateDisplay id={id} keyInfo={keyInfo} />
) : (
<FormGroup
label={t("certificate")}
fieldId={id}
labelIcon={
<HelpItem
helpText="clients-help:certificate"
fieldLabelId={`clients:${id}`}
/>
}
</GenerateId>
>
<CertificateDisplay id={id} keyInfo={keyInfo} />
</FormGroup>
);
};