Use React Router v6 for the routable tabs of clients page (#4123)

This commit is contained in:
Jon Koops 2023-01-04 11:33:43 +01:00 committed by GitHub
parent 63cac73a12
commit 2c4805fe50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -13,7 +13,6 @@ import type ClientRepresentation from "@keycloak/keycloak-admin-client/lib/defs/
import type { ClientQuery } from "@keycloak/keycloak-admin-client/lib/resources/clients"; import type { ClientQuery } from "@keycloak/keycloak-admin-client/lib/resources/clients";
import { useState } from "react"; import { useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { useHistory } from "react-router-dom";
import { Link } from "react-router-dom-v5-compat"; import { Link } from "react-router-dom-v5-compat";
import { useAlerts } from "../components/alert/Alerts"; import { useAlerts } from "../components/alert/Alerts";
import { useConfirmDialog } from "../components/confirm-dialog/ConfirmDialog"; import { useConfirmDialog } from "../components/confirm-dialog/ConfirmDialog";
@ -35,8 +34,8 @@ import { isRealmClient, getProtocolName } from "./utils";
import helpUrls from "../help-urls"; import helpUrls from "../help-urls";
import { useAccess } from "../context/access/Access"; import { useAccess } from "../context/access/Access";
import { import {
routableTab,
RoutableTabs, RoutableTabs,
useRoutableTab,
} from "../components/routable-tabs/RoutableTabs"; } from "../components/routable-tabs/RoutableTabs";
import { ClientsTab, toClients } from "./routes/Clients"; import { ClientsTab, toClients } from "./routes/Clients";
@ -46,7 +45,6 @@ export default function ClientsSection() {
const { adminClient } = useAdminClient(); const { adminClient } = useAdminClient();
const { realm } = useRealm(); const { realm } = useRealm();
const history = useHistory();
const [key, setKey] = useState(0); const [key, setKey] = useState(0);
const refresh = () => setKey(new Date().getTime()); const refresh = () => setKey(new Date().getTime());
@ -67,6 +65,11 @@ export default function ClientsSection() {
return await adminClient.clients.find({ ...params }); return await adminClient.clients.find({ ...params });
}; };
const useTab = (tab: ClientsTab) => useRoutableTab(toClients({ realm, tab }));
const listTab = useTab("list");
const initialAccessTokenTab = useTab("initial-access-token");
const [toggleDeleteDialog, DeleteConfirm] = useConfirmDialog({ const [toggleDeleteDialog, DeleteConfirm] = useConfirmDialog({
titleKey: t("clientDelete", { clientId: selectedClient?.clientId }), titleKey: t("clientDelete", { clientId: selectedClient?.clientId }),
messageKey: "clients:clientDeleteConfirm", messageKey: "clients:clientDeleteConfirm",
@ -140,12 +143,6 @@ export default function ClientsSection() {
); );
}; };
const route = (tab: ClientsTab) =>
routableTab({
to: toClients({ realm, tab }),
history,
});
return ( return (
<> <>
<ViewHeader <ViewHeader
@ -166,7 +163,7 @@ export default function ClientsSection() {
<Tab <Tab
data-testid="list" data-testid="list"
title={<TabTitleText>{t("clientsList")}</TabTitleText>} title={<TabTitleText>{t("clientsList")}</TabTitleText>}
{...route("list")} {...listTab}
> >
<DeleteConfirm /> <DeleteConfirm />
<KeycloakDataTable <KeycloakDataTable
@ -242,7 +239,7 @@ export default function ClientsSection() {
<Tab <Tab
data-testid="initialAccessToken" data-testid="initialAccessToken"
title={<TabTitleText>{t("initialAccessToken")}</TabTitleText>} title={<TabTitleText>{t("initialAccessToken")}</TabTitleText>}
{...route("initial-access-token")} {...initialAccessTokenTab}
> >
<InitialAccessTokenList /> <InitialAccessTokenList />
</Tab> </Tab>