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

fixed merge error

Browse source
This commit is contained in:
Erik Jan de Wit 2021-05-18 10:34:16 +02:00
parent f064218251
commit cef90aa238
3 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/groups/GroupsSection.tsx
View file

@ -66,10 +66,10 @@ export const GroupsSection = () => {
} }
return groups; return groups;
} }
return []; return [];
}, },
(groups: GroupRepresentation[]) => { (groups: GroupRepresentation[]) => {
if (groups.length) setSubGroups(groups); if (groups.length) setSubGroups(groups);
}, },
[id] [id]
); );

2
src/realm-settings/RealmSettingsSection.tsx
View file

@ -1,4 +1,4 @@
import React, { useState } from "react"; import React, { useEffect, useState } from "react";
import { useHistory } from "react-router-dom"; import { useHistory } from "react-router-dom";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { Controller, FormProvider, useForm } from "react-hook-form"; import { Controller, FormProvider, useForm } from "react-hook-form";

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

@ -1,4 +1,4 @@
import React, { useEffect } from "react"; import React from "react";
import { import {
ActionGroup, ActionGroup,
AlertVariant, AlertVariant,
@ -26,7 +26,7 @@ import ComponentRepresentation from "keycloak-admin/lib/defs/componentRepresenta
import { Controller, useForm } from "react-hook-form"; import { Controller, useForm } from "react-hook-form";
import { useConfirmDialog } from "../components/confirm-dialog/ConfirmDialog"; import { useConfirmDialog } from "../components/confirm-dialog/ConfirmDialog";
import { asyncStateFetch, useAdminClient } from "../context/auth/AdminClient"; import { useAdminClient, useFetch } from "../context/auth/AdminClient";
import { useAlerts } from "../components/alert/Alerts"; import { useAlerts } from "../components/alert/Alerts";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { ViewHeader } from "../components/view-header/ViewHeader"; import { ViewHeader } from "../components/view-header/ViewHeader";
@ -35,7 +35,6 @@ import { ScrollForm } from "../components/scroll-form/ScrollForm";
import { KeycloakTabs } from "../components/keycloak-tabs/KeycloakTabs"; import { KeycloakTabs } from "../components/keycloak-tabs/KeycloakTabs";
import { LdapMapperList } from "./ldap/mappers/LdapMapperList"; import { LdapMapperList } from "./ldap/mappers/LdapMapperList";
import { useErrorHandler } from "react-error-boundary";
type ldapComponentRepresentation = ComponentRepresentation & { type ldapComponentRepresentation = ComponentRepresentation & {
config?: { config?: {
@ -179,24 +178,24 @@ export const UserFederationLdapSettings = () => {
const history = useHistory(); const history = useHistory();
const adminClient = useAdminClient(); const adminClient = useAdminClient();
const { realm } = useRealm(); const { realm } = useRealm();
const errorHandler = useErrorHandler();
const { id } = useParams<{ id: string }>(); const { id } = useParams<{ id: string }>();
const { addAlert } = useAlerts(); const { addAlert } = useAlerts();
useEffect(() => { useFetch(
if (id) { async () => {
return asyncStateFetch( if (id) {
() => adminClient.components.findOne({ id }), return await adminClient.components.findOne({ id });
(fetchedComponent) => { }
if (fetchedComponent) { return undefined;
setupForm(fetchedComponent); },
} (fetchedComponent) => {
}, if (fetchedComponent) {
errorHandler setupForm(fetchedComponent);
); }
} },
}, []); []
);
const setupForm = (component: ComponentRepresentation) => { const setupForm = (component: ComponentRepresentation) => {
Object.entries(component).map((entry) => { Object.entries(component).map((entry) => {