From 386201595bf67005a6c1ab1465b14fcb81cbfb2e Mon Sep 17 00:00:00 2001
From: Jon Koops <jonkoops@gmail.com>
Date: Tue, 9 Nov 2021 18:53:06 +0100
Subject: [PATCH] Use route functions for navigation in groups (#1474)

* Use route functions for navigation in groups

* pass testid to link
---
 src/groups/GroupTable.tsx    |  3 ++-
 src/groups/GroupsSection.tsx | 22 ++++++++++------------
 src/groups/MembersModal.tsx  |  3 ++-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/groups/GroupTable.tsx b/src/groups/GroupTable.tsx
index ab5d2c058e..3f32ee3006 100644
--- a/src/groups/GroupTable.tsx
+++ b/src/groups/GroupTable.tsx
@@ -23,6 +23,7 @@ import { getLastId } from "./groupIdUtils";
 import { GroupPickerDialog } from "../components/group/GroupPickerDialog";
 import { useSubGroups } from "./SubGroupsContext";
 import { useConfirmDialog } from "../components/confirm-dialog/ConfirmDialog";
+import { toGroups } from "./routes/Groups";
 
 export const GroupTable = () => {
   const { t } = useTranslation("groups");
@@ -60,7 +61,7 @@ export const GroupTable = () => {
     }
 
     if (!groupsData) {
-      history.push(`/${realm}/groups`);
+      history.push(toGroups({ realm }));
     }
 
     return groupsData || [];
diff --git a/src/groups/GroupsSection.tsx b/src/groups/GroupsSection.tsx
index ef9e6dc58b..7341e5dd9d 100644
--- a/src/groups/GroupsSection.tsx
+++ b/src/groups/GroupsSection.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { useHistory, useLocation } from "react-router-dom";
+import { Link, useHistory, useLocation } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 import {
   DropdownItem,
@@ -23,6 +23,8 @@ import { getId, getLastId } from "./groupIdUtils";
 import { Members } from "./Members";
 import { GroupAttributes } from "./GroupAttributes";
 import { GroupsModal } from "./GroupsModal";
+import { toGroups } from "./routes/Groups";
+import { toGroupsSearch } from "./routes/GroupsSearch";
 
 import "./GroupsSection.css";
 
@@ -80,12 +82,13 @@ export default function GroupsSection() {
 
   const SearchDropdown = (
     <DropdownItem
-      data-testid="searchGroup"
       key="searchGroup"
-      onClick={() => history.push(`/${realm}/groups/search`)}
-    >
-      {t("searchGroup")}
-    </DropdownItem>
+      component={
+        <Link data-testid="searchGroup" to={toGroupsSearch({ realm })}>
+          {t("searchGroup")}
+        </Link>
+      }
+    />
   );
 
   return (
@@ -120,12 +123,7 @@ export default function GroupsSection() {
                   key="deleteGroup"
                   onClick={() => {
                     deleteGroup({ id });
-                    history.push(
-                      location.pathname.substr(
-                        0,
-                        location.pathname.lastIndexOf("/")
-                      )
-                    );
+                    history.push(toGroups({ realm }));
                   }}
                 >
                   {t("deleteGroup")}
diff --git a/src/groups/MembersModal.tsx b/src/groups/MembersModal.tsx
index 4a5b73a662..98f5acf673 100644
--- a/src/groups/MembersModal.tsx
+++ b/src/groups/MembersModal.tsx
@@ -15,6 +15,7 @@ import { useAlerts } from "../components/alert/Alerts";
 import { KeycloakDataTable } from "../components/table-toolbar/KeycloakDataTable";
 import { ListEmptyState } from "../components/list-empty-state/ListEmptyState";
 import { emptyFormatter } from "../util";
+import { toAddUser } from "../user/routes/AddUser";
 import _ from "lodash";
 
 type MemberModalProps = {
@@ -30,7 +31,7 @@ export const MemberModal = ({ groupId, onClose }: MemberModalProps) => {
 
   const history = useHistory();
   const { realm } = useRealm();
-  const goToCreate = () => history.push(`/${realm}/users/add-user`);
+  const goToCreate = () => history.push(toAddUser({ realm }));
 
   const loader = async (first?: number, max?: number, search?: string) => {
     const members = await adminClient.groups.listMembers({ id: groupId });