From bdd39c4e37a2a1c0e01e032416db9263c040a558 Mon Sep 17 00:00:00 2001
From: Jon Koops <jonkoops@gmail.com>
Date: Thu, 5 Jan 2023 15:24:05 +0100
Subject: [PATCH] Use React Router v6 for the routable tabs of the dedicated
 scope page (#4131)

---
 .../src/clients/scopes/DedicatedScopes.tsx     | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/apps/admin-ui/src/clients/scopes/DedicatedScopes.tsx b/apps/admin-ui/src/clients/scopes/DedicatedScopes.tsx
index cc21923693..ed2069234a 100644
--- a/apps/admin-ui/src/clients/scopes/DedicatedScopes.tsx
+++ b/apps/admin-ui/src/clients/scopes/DedicatedScopes.tsx
@@ -9,15 +9,14 @@ import {
 } from "@patternfly/react-core";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { useHistory } from "react-router-dom";
 import { useNavigate } from "react-router-dom-v5-compat";
 
 import { MapperList } from "../../client-scopes/details/MapperList";
 import { useAlerts } from "../../components/alert/Alerts";
 import { KeycloakSpinner } from "../../components/keycloak-spinner/KeycloakSpinner";
 import {
-  routableTab,
   RoutableTabs,
+  useRoutableTab,
 } from "../../components/routable-tabs/RoutableTabs";
 import { ViewHeader } from "../../components/view-header/ViewHeader";
 import { useAdminClient, useFetch } from "../../context/auth/AdminClient";
@@ -32,7 +31,6 @@ import { DedicatedScope } from "./DecicatedScope";
 
 export default function DedicatedScopes() {
   const { t } = useTranslation("clients");
-  const history = useHistory();
   const navigate = useNavigate();
   const { realm, clientId } = useParams<DedicatedScopeDetailsParams>();
 
@@ -43,11 +41,11 @@ export default function DedicatedScopes() {
 
   useFetch(() => adminClient.clients.findOne({ id: clientId }), setClient, []);
 
-  const route = (tab: DedicatedScopeTab) =>
-    routableTab({
-      to: toDedicatedScope({ realm, clientId, tab }),
-      history,
-    });
+  const useTab = (tab: DedicatedScopeTab) =>
+    useRoutableTab(toDedicatedScope({ realm, clientId, tab }));
+
+  const mappersTab = useTab("mappers");
+  const scopeTab = useTab("scope");
 
   if (!client) {
     return <KeycloakSpinner />;
@@ -118,7 +116,7 @@ export default function DedicatedScopes() {
           <Tab
             title={<TabTitleText>{t("mappers")}</TabTitleText>}
             data-testid="mappersTab"
-            {...route("mappers")}
+            {...mappersTab}
           >
             <MapperList
               model={client}
@@ -132,7 +130,7 @@ export default function DedicatedScopes() {
           <Tab
             title={<TabTitleText>{t("scope")}</TabTitleText>}
             data-testid="scopeTab"
-            {...route("scope")}
+            {...scopeTab}
           >
             <DedicatedScope client={client} />
           </Tab>