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

Remove capabities step from wizard for SAML (#2191)

Browse source
This commit is contained in:
Erik Jan de Wit 2022-03-09 17:45:53 +01:00 committed by GitHub
parent 62c13adda7
commit 3bdb8ce80f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
src/clients/add/NewClientForm.tsx
View file

@ -39,16 +39,17 @@ export default function NewClientForm() {
implicitFlowEnabled: false,
directAccessGrantsEnabled: true,
standardFlowEnabled: true,
frontchannelLogout: true,
});
const { addAlert, addError } = useAlerts();
const methods = useForm<ClientRepresentation>({ defaultValues: client });
const protocol = methods.watch("protocol");
const save = async () => {
try {
const newClient = await adminClient.clients.create({
...convertFormValuesToObject(client),
...client,
clientId: client.clientId?.trim(),
frontchannelLogout: true,
});
addAlert(t("createSuccess"), AlertVariant.success);
history.push(
@ -65,17 +66,23 @@ export default function NewClientForm() {
...client,
...convertFormValuesToObject(methods.getValues()),
});
setShowCapabilityConfig(true);
if (!isFinalStep()) {
setShowCapabilityConfig(true);
}
onNext?.();
}
};
const isFinalStep = () =>
showCapabilityConfig || protocol !== "openid-connect";
const back = () => {
setClient({ ...client, ...convertFormValuesToObject(methods.getValues()) });
methods.reset({
...client,
...convertFormValuesToObject(methods.getValues()),
});
setShowCapabilityConfig(false);
};
const onGoToStep = (newStep: { id?: string | number }) => {
@ -89,40 +96,34 @@ export default function NewClientForm() {
const Footer = () => (
<WizardFooter>
<WizardContextConsumer>
{({ activeStep, onNext, onBack, onClose }) => {
return (
<>
<Button
variant="primary"
data-testid={
activeStep.name === t("capabilityConfig") ? "save" : "next"
}
type="submit"
onClick={() => {
forward(onNext);
}}
>
{activeStep.name === t("capabilityConfig")
? t("common:save")
: t("common:next")}
</Button>
<Button
variant="secondary"
data-testid="back"
onClick={() => {
back();
onBack();
}}
isDisabled={activeStep.name === t("generalSettings")}
>
{t("common:back")}
</Button>
<Button data-testid="cancel" variant="link" onClick={onClose}>
{t("common:cancel")}
</Button>
</>
);
}}
{({ activeStep, onNext, onBack, onClose }) => (
<>
<Button
variant="primary"
data-testid={isFinalStep() ? "save" : "next"}
type="submit"
onClick={() => {
forward(onNext);
}}
>
{isFinalStep() ? t("common:save") : t("common:next")}
</Button>
<Button
variant="secondary"
data-testid="back"
onClick={() => {
back();
onBack();
}}
isDisabled={activeStep.name === t("generalSettings")}
>
{t("common:back")}
</Button>
<Button data-testid="cancel" variant="link" onClick={onClose}>
{t("common:cancel")}
</Button>
</>
)}
</WizardContextConsumer>
</WizardFooter>
);