Use React Router v6 for the routable tabs of the user federation LDAP settings page (#4126)

apps/admin-ui/src/user-federation/CreateUserFederationLdapSettings.tsx

@@ -0,0 +1,49 @@
+import { AlertVariant, PageSection } from "@patternfly/react-core";
+import { FormProvider, useForm } from "react-hook-form";
+import { useTranslation } from "react-i18next";
+import { useNavigate } from "react-router-dom-v5-compat";
+
+import { useAlerts } from "../components/alert/Alerts";
+import { useAdminClient } from "../context/auth/AdminClient";
+import { useRealm } from "../context/realm-context/RealmContext";
+import { toUserFederation } from "./routes/UserFederation";
+import { ExtendedHeader } from "./shared/ExtendedHeader";
+import {
+  LdapComponentRepresentation,
+  serializeFormData,
+  UserFederationLdapForm,
+} from "./UserFederationLdapForm";
+
+export default function CreateUserFederationLdapSettings() {
+  const { t } = useTranslation("user-federation");
+  const form = useForm<LdapComponentRepresentation>({ mode: "onChange" });
+  const navigate = useNavigate();
+  const { adminClient } = useAdminClient();
+  const { realm } = useRealm();
+  const { addAlert, addError } = useAlerts();
+
+  const onSubmit = async (formData: LdapComponentRepresentation) => {
+    try {
+      await adminClient.components.create(serializeFormData(formData));
+      addAlert(t("createSuccess"), AlertVariant.success);
+      navigate(toUserFederation({ realm }));
+    } catch (error) {
+      addError("user-federation:createError", error);
+    }
+  };
+
+  return (
+    <FormProvider {...form}>
+      <ExtendedHeader
+        provider="LDAP"
+        noDivider
+        save={() => form.handleSubmit(onSubmit)()}
+      />
+      <PageSection variant="light" className="pf-u-p-0">
+        <PageSection variant="light">
+          <UserFederationLdapForm onSubmit={onSubmit} />
+        </PageSection>
+      </PageSection>
+    </FormProvider>
+  );
+}

apps/admin-ui/src/user-federation/UserFederationLdapForm.tsx

@@ -0,0 +1,113 @@
+import type ComponentRepresentation from "@keycloak/keycloak-admin-client/lib/defs/componentRepresentation";
+import { ActionGroup, Button, Form } from "@patternfly/react-core";
+import { useFormContext } from "react-hook-form";
+import { useTranslation } from "react-i18next";
+import { useNavigate } from "react-router-dom-v5-compat";
+
+import { ScrollForm } from "../components/scroll-form/ScrollForm";
+import { useRealm } from "../context/realm-context/RealmContext";
+import { LdapSettingsAdvanced } from "./ldap/LdapSettingsAdvanced";
+import { LdapSettingsConnection } from "./ldap/LdapSettingsConnection";
+import { LdapSettingsGeneral } from "./ldap/LdapSettingsGeneral";
+import { LdapSettingsKerberosIntegration } from "./ldap/LdapSettingsKerberosIntegration";
+import { LdapSettingsSearching } from "./ldap/LdapSettingsSearching";
+import { LdapSettingsSynchronization } from "./ldap/LdapSettingsSynchronization";
+import { toUserFederation } from "./routes/UserFederation";
+import { SettingsCache } from "./shared/SettingsCache";
+
+export type LdapComponentRepresentation = ComponentRepresentation & {
+  config?: {
+    periodicChangedUsersSync?: boolean;
+    periodicFullSync?: boolean;
+  };
+};
+
+export type UserFederationLdapFormProps = {
+  id?: string;
+  onSubmit: (formData: LdapComponentRepresentation) => void;
+};
+
+export const UserFederationLdapForm = ({
+  id,
+  onSubmit,
+}: UserFederationLdapFormProps) => {
+  const { t } = useTranslation("user-federation");
+  const form = useFormContext<LdapComponentRepresentation>();
+  const navigate = useNavigate();
+  const { realm } = useRealm();
+
+  return (
+    <>
+      <ScrollForm
+        sections={[
+          {
+            title: t("generalOptions"),
+            panel: <LdapSettingsGeneral form={form} vendorEdit={!!id} />,
+          },
+          {
+            title: t("connectionAndAuthenticationSettings"),
+            panel: <LdapSettingsConnection form={form} id={id} />,
+          },
+          {
+            title: t("ldapSearchingAndUpdatingSettings"),
+            panel: <LdapSettingsSearching form={form} />,
+          },
+          {
+            title: t("synchronizationSettings"),
+            panel: <LdapSettingsSynchronization form={form} />,
+          },
+          {
+            title: t("kerberosIntegration"),
+            panel: <LdapSettingsKerberosIntegration form={form} />,
+          },
+          { title: t("cacheSettings"), panel: <SettingsCache form={form} /> },
+          {
+            title: t("advancedSettings"),
+            panel: <LdapSettingsAdvanced form={form} id={id} />,
+          },
+        ]}
+      />
+      <Form onSubmit={form.handleSubmit(onSubmit)}>
+        <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={() => navigate(toUserFederation({ realm }))}
+            data-testid="ldap-cancel"
+          >
+            {t("common:cancel")}
+          </Button>
+        </ActionGroup>
+      </Form>
+    </>
+  );
+};
+
+export function serializeFormData(
+  formData: LdapComponentRepresentation
+): LdapComponentRepresentation {
+  const { config } = formData;
+
+  if (config?.periodicChangedUsersSync !== undefined) {
+    if (config.periodicChangedUsersSync === false) {
+      config.changedSyncPeriod = ["-1"];
+    }
+    delete config.periodicChangedUsersSync;
+  }
+
+  if (config?.periodicFullSync !== undefined) {
+    if (config.periodicFullSync === false) {
+      config.fullSyncPeriod = ["-1"];
+    }
+    delete config.periodicFullSync;
+  }
+
+  return formData;
+}

apps/admin-ui/src/user-federation/UserFederationLdapSettings.tsx

@@ -1,151 +1,69 @@
-import { useState } from "react";
+import type ComponentRepresentation from "@keycloak/keycloak-admin-client/lib/defs/componentRepresentation";
 import {
-  ActionGroup,
   AlertVariant,
-  Button,
-  Form,
   PageSection,
   Tab,
   TabTitleText,
 } from "@patternfly/react-core";
-
-import { LdapSettingsAdvanced } from "./ldap/LdapSettingsAdvanced";
-import { LdapSettingsKerberosIntegration } from "./ldap/LdapSettingsKerberosIntegration";
-import { SettingsCache } from "./shared/SettingsCache";
-import { LdapSettingsSynchronization } from "./ldap/LdapSettingsSynchronization";
-import { LdapSettingsGeneral } from "./ldap/LdapSettingsGeneral";
-import { LdapSettingsConnection } from "./ldap/LdapSettingsConnection";
-import { LdapSettingsSearching } from "./ldap/LdapSettingsSearching";
-
-import { useRealm } from "../context/realm-context/RealmContext";
-import type ComponentRepresentation from "@keycloak/keycloak-admin-client/lib/defs/componentRepresentation";
-
-import { FormProvider, useForm, useFormContext } from "react-hook-form";
-import { useAdminClient, useFetch } from "../context/auth/AdminClient";
-import { useAlerts } from "../components/alert/Alerts";
+import { useState } from "react";
+import { FormProvider, useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
-import { useHistory } from "react-router-dom";
-import { useNavigate, useParams } from "react-router-dom-v5-compat";
-import { ScrollForm } from "../components/scroll-form/ScrollForm";
+import { useParams } from "react-router-dom-v5-compat";
 
+import { useAlerts } from "../components/alert/Alerts";
+import { KeycloakSpinner } from "../components/keycloak-spinner/KeycloakSpinner";
+import {
+  RoutableTabs,
+  useRoutableTab,
+} from "../components/routable-tabs/RoutableTabs";
+import { useAdminClient, useFetch } from "../context/auth/AdminClient";
+import { useRealm } from "../context/realm-context/RealmContext";
 import { LdapMapperList } from "./ldap/mappers/LdapMapperList";
-import { toUserFederation } from "./routes/UserFederation";
+import {
+  toUserFederationLdap,
+  UserFederationLdapParams,
+  UserFederationLdapTab,
+} from "./routes/UserFederationLdap";
 import { ExtendedHeader } from "./shared/ExtendedHeader";
 import {
-  routableTab,
-  RoutableTabs,
-} from "../components/routable-tabs/RoutableTabs";
-import { toUserFederationLdap } from "./routes/UserFederationLdap";
-
-type ldapComponentRepresentation = ComponentRepresentation & {
-  config?: {
-    periodicChangedUsersSync?: boolean;
-    periodicFullSync?: boolean;
-  };
-};
-
-const AddLdapFormContent = ({
-  save,
-}: {
-  save: (component: ldapComponentRepresentation) => void;
-}) => {
-  const { t } = useTranslation("user-federation");
-  const form = useFormContext();
-  const { id } = useParams<{ id: string }>();
-  const navigate = useNavigate();
-
-  const { realm } = useRealm();
-
-  return (
-    <>
-      <ScrollForm
-        sections={[
-          {
-            title: t("generalOptions"),
-            panel: <LdapSettingsGeneral form={form} vendorEdit={!!id} />,
-          },
-          {
-            title: t("connectionAndAuthenticationSettings"),
-            panel: <LdapSettingsConnection form={form} id={id} />,
-          },
-          {
-            title: t("ldapSearchingAndUpdatingSettings"),
-            panel: <LdapSettingsSearching form={form} />,
-          },
-          {
-            title: t("synchronizationSettings"),
-            panel: <LdapSettingsSynchronization form={form} />,
-          },
-          {
-            title: t("kerberosIntegration"),
-            panel: <LdapSettingsKerberosIntegration form={form} />,
-          },
-          { title: t("cacheSettings"), panel: <SettingsCache form={form} /> },
-          {
-            title: t("advancedSettings"),
-            panel: <LdapSettingsAdvanced form={form} id={id} />,
-          },
-        ]}
-      />
-      <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={() => navigate(toUserFederation({ realm }))}
-            data-testid="ldap-cancel"
-          >
-            {t("common:cancel")}
-          </Button>
-        </ActionGroup>
-      </Form>
-    </>
-  );
-};
+  LdapComponentRepresentation,
+  serializeFormData,
+  UserFederationLdapForm,
+} from "./UserFederationLdapForm";
 
 export default function UserFederationLdapSettings() {
   const { t } = useTranslation("user-federation");
-  const form = useForm<ComponentRepresentation>({ mode: "onChange" });
-  const navigate = useNavigate();
-  const history = useHistory();
+  const form = useForm<LdapComponentRepresentation>({ mode: "onChange" });
   const { adminClient } = useAdminClient();
   const { realm } = useRealm();
-
-  const { id } = useParams<{ id: string }>();
+  const { id } = useParams<UserFederationLdapParams>();
   const { addAlert, addError } = useAlerts();
   const [component, setComponent] = useState<ComponentRepresentation>();
   const [refreshCount, setRefreshCount] = useState(0);
 
-  const editMode = component?.config?.editMode;
   const refresh = () => setRefreshCount((count) => count + 1);
 
   useFetch(
-    async () => {
-      if (id) {
-        return await adminClient.components.findOne({ id });
-      }
-      return undefined;
-    },
-    (fetchedComponent) => {
-      if (fetchedComponent) {
-        setupForm(fetchedComponent);
-        setComponent(fetchedComponent);
-      } else if (id) {
+    () => adminClient.components.findOne({ id: id! }),
+    (component) => {
+      if (!component) {
         throw new Error(t("common:notFound"));
       }
+
+      setComponent(component);
+      setupForm(component);
     },
-    [refreshCount]
+    [id, refreshCount]
   );
 
+  const useTab = (tab: UserFederationLdapTab) =>
+    useRoutableTab(toUserFederationLdap({ realm, id: id!, tab }));
+
+  const settingsTab = useTab("settings");
+  const mappersTab = useTab("mappers");
+
   const setupForm = (component: ComponentRepresentation) => {
-    form.reset({ ...component });
+    form.reset(component);
     form.setValue(
       "config.periodicChangedUsersSync",
       component.config?.["changedSyncPeriod"]?.[0] !== "-1"
@@ -157,80 +75,58 @@ export default function UserFederationLdapSettings() {
     );
   };
 
-  const save = async (component: ldapComponentRepresentation) => {
-    if (component.config?.periodicChangedUsersSync !== undefined) {
-      if (component.config.periodicChangedUsersSync === false) {
-        component.config.changedSyncPeriod = ["-1"];
-      }
-      delete component.config.periodicChangedUsersSync;
-    }
-    if (component.config?.periodicFullSync !== undefined) {
-      if (component.config.periodicFullSync === false) {
-        component.config.fullSyncPeriod = ["-1"];
-      }
-      delete component.config.periodicFullSync;
-    }
+  const onSubmit = async (formData: LdapComponentRepresentation) => {
     try {
-      if (!id) {
-        await adminClient.components.create(component);
-        navigate(toUserFederation({ realm }));
-      } else {
-        await adminClient.components.update({ id }, component);
-      }
-      addAlert(t(id ? "saveSuccess" : "createSuccess"), AlertVariant.success);
+      await adminClient.components.update(
+        { id: id! },
+        serializeFormData(formData)
+      );
+      addAlert(t("saveSuccess"), AlertVariant.success);
       refresh();
     } catch (error) {
-      addError(`user-federation:${id ? "saveError" : "createError"}`, error);
+      addError("user-federation:saveError", error);
     }
   };
 
+  if (!component) {
+    return <KeycloakSpinner />;
+  }
+
   return (
     <FormProvider {...form}>
       <ExtendedHeader
         provider="LDAP"
         noDivider
-        editMode={editMode}
-        save={() => form.handleSubmit(save)()}
+        editMode={component.config?.editMode}
+        save={() => form.handleSubmit(onSubmit)()}
       />
       <PageSection variant="light" className="pf-u-p-0">
-        {id ? (
-          <RoutableTabs
-            defaultLocation={toUserFederationLdap({
-              realm,
-              id,
-              tab: "settings",
-            })}
-            isBox
+        <RoutableTabs
+          defaultLocation={toUserFederationLdap({
+            realm,
+            id: id!,
+            tab: "settings",
+          })}
+          isBox
+        >
+          <Tab
+            id="settings"
+            title={<TabTitleText>{t("common:settings")}</TabTitleText>}
+            {...settingsTab}
           >
-            <Tab
-              id="settings"
-              title={<TabTitleText>{t("common:settings")}</TabTitleText>}
-              {...routableTab({
-                to: toUserFederationLdap({ realm, id, tab: "settings" }),
-                history,
-              })}
-            >
-              <PageSection variant="light">
-                <AddLdapFormContent save={save} />
-              </PageSection>
-            </Tab>
-            <Tab
-              id="mappers"
-              title={<TabTitleText>{t("common:mappers")}</TabTitleText>}
-              data-testid="ldap-mappers-tab"
-              {...routableTab({
-                to: toUserFederationLdap({ realm, id, tab: "mappers" }),
-                history,
-              })}
-            >
-              <LdapMapperList />
-            </Tab>
-          </RoutableTabs>
-        ) : (
-          <PageSection variant="light">
-            <AddLdapFormContent save={save} />
-          </PageSection>
-        )}
+            <PageSection variant="light">
+              <UserFederationLdapForm id={id} onSubmit={onSubmit} />
+            </PageSection>
+          </Tab>
+          <Tab
+            id="mappers"
+            title={<TabTitleText>{t("common:mappers")}</TabTitleText>}
+            data-testid="ldap-mappers-tab"
+            {...mappersTab}
+          >
+            <LdapMapperList />
+          </Tab>
+        </RoutableTabs>
       </PageSection>
     </FormProvider>
   );

apps/admin-ui/src/user-federation/routes/NewLdapUserFederation.ts

@@ -7,7 +7,7 @@ export type NewLdapUserFederationParams = { realm: string };
 
 export const NewLdapUserFederationRoute: RouteDef = {
   path: "/:realm/user-federation/ldap/new",
-  component: lazy(() => import("../UserFederationLdapSettings")),
+  component: lazy(() => import("../CreateUserFederationLdapSettings")),
   breadcrumb: (t) =>
     t("user-federation:addProvider", { provider: "LDAP", count: 1 }),
   access: "view-realm",

apps/admin-ui/src/user-federation/routes/UserFederationLdap.ts

@@ -3,7 +3,7 @@ import type { Path } from "react-router-dom-v5-compat";
 import { generatePath } from "react-router-dom-v5-compat";
 import type { RouteDef } from "../../route-config";
 
-type UserFederationLdapTab = "settings" | "mappers";
+export type UserFederationLdapTab = "settings" | "mappers";
 
 export type UserFederationLdapParams = {
   realm: string;