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

Fix additional UX issues with User Federation (#681)

Browse source 
* change title and breadcrumb

* only show tabs on edit not create
This commit is contained in:
mfrances17 2021-06-09 16:13:56 -04:00 committed by GitHub
parent 5a9b01c15f
commit 5d71a4f049
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 60 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/route-config.ts
View file

@ -243,7 +243,7 @@ export const routes: RoutesFn = (t: TFunction) => [
{
path: "/:realm/user-federation/ldap/new",
component: UserFederationLdapSettings,
breadcrumb: t("common:settings"),
breadcrumb: t("user-federation:addOneLdap"),
access: "view-realm",
},
{

106
src/user-federation/UserFederationLdapSettings.tsx
View file

@ -131,7 +131,7 @@ const LdapSettingsHeader = ({
<>
<DisableConfirm />
{!id ? (
<ViewHeader titleKey="LDAP" />
<ViewHeader titleKey={t("addOneLdap")} />
) : (
<ViewHeader
titleKey="LDAP"
@ -286,6 +286,51 @@ export const UserFederationLdapSettings = () => {
},
});
const addLdapFormContent = () => {
return (
<>
<ScrollForm
sections={[
t("generalOptions"),
t("connectionAndAuthenticationSettings"),
t("ldapSearchingAndUpdatingSettings"),
t("synchronizationSettings"),
t("kerberosIntegration"),
t("cacheSettings"),
t("advancedSettings"),
]}
>
<LdapSettingsGeneral form={form} />
<LdapSettingsConnection form={form} />
<LdapSettingsSearching form={form} />
<LdapSettingsSynchronization form={form} />
<LdapSettingsKerberosIntegration form={form} />
<SettingsCache form={form} />
<LdapSettingsAdvanced form={form} />
</ScrollForm>
<Form onSubmit={form.handleSubmit(save)}>
<ActionGroup className="keycloak__form_actions">
<Button
isDisabled={!form.formState.isDirty}
variant="primary"
type="submit"
data-testid="ldap-save"
>
{t("common:save")}
</Button>
<Button
variant="link"
onClick={() => history.push(`/${realm}/user-federation`)}
data-testid="ldap-cancel"
>
{t("common:cancel")}
</Button>
</ActionGroup>
</Form>
</>
);
};
return (
<>
<DeleteConfirm />
@ -305,52 +350,15 @@ export const UserFederationLdapSettings = () => {
)}
/>
<PageSection variant="light" isFilled>
<KeycloakTabs isBox>
<Tab
id="settings"
eventKey="settings"
title={<TabTitleText>{t("common:settings")}</TabTitleText>}
>
<ScrollForm
sections={[
t("generalOptions"),
t("connectionAndAuthenticationSettings"),
t("ldapSearchingAndUpdatingSettings"),
t("synchronizationSettings"),
t("kerberosIntegration"),
t("cacheSettings"),
t("advancedSettings"),
]}
{id ? (
<KeycloakTabs isBox>
<Tab
id="settings"
eventKey="settings"
title={<TabTitleText>{t("common:settings")}</TabTitleText>}
>
<LdapSettingsGeneral form={form} />
<LdapSettingsConnection form={form} />
<LdapSettingsSearching form={form} />
<LdapSettingsSynchronization form={form} />
<LdapSettingsKerberosIntegration form={form} />
<SettingsCache form={form} />
<LdapSettingsAdvanced form={form} />
</ScrollForm>
<Form onSubmit={form.handleSubmit(save)}>
<ActionGroup className="keycloak__form_actions">
<Button
isDisabled={!form.formState.isDirty}
variant="primary"
type="submit"
data-testid="ldap-save"
>
{t("common:save")}
</Button>
<Button
variant="link"
onClick={() => history.push(`/${realm}/user-federation`)}
data-testid="ldap-cancel"
>
{t("common:cancel")}
</Button>
</ActionGroup>
</Form>
</Tab>
{id && (
{addLdapFormContent()}
</Tab>
<Tab
id="mappers"
eventKey="mappers"
@ -359,8 +367,10 @@ export const UserFederationLdapSettings = () => {
>
<LdapMapperList />
</Tab>
)}
</KeycloakTabs>
</KeycloakTabs>
) : (
addLdapFormContent()
)}
</PageSection>
</>
);

1
src/user-federation/messages.json
View file

@ -7,6 +7,7 @@
"providers": "Add providers",
"addKerberos": "Add Kerberos providers",
"addLdap": "Add LDAP providers",
"addOneLdap": "Add LDAP provider",
"addKerberosWizardTitle": "Add Kerberos user federation provider",
"addLdapWizardTitle": "Add LDAP user federation provider",