Use new routing conventions for realm role routes (#893)

src/realm-roles/routes.ts

@@ -0,0 +1,16 @@
+import type { RouteDef } from "../route-config";
+import { AddRoleRoute } from "./routes/AddRole";
+import { AddRoleToClientRoute } from "./routes/AddRoleToClient";
+import { ClientRoleRoute } from "./routes/ClientRole";
+import { RealmRoleRoute } from "./routes/RealmRole";
+import { RealmRolesRoute } from "./routes/RealmRoles";
+
+const routes: RouteDef[] = [
+  AddRoleToClientRoute,
+  ClientRoleRoute,
+  RealmRolesRoute,
+  AddRoleRoute,
+  RealmRoleRoute,
+];
+
+export default routes;

src/realm-roles/routes/AddRole.ts

@@ -0,0 +1,17 @@
+import type { LocationDescriptorObject } from "history";
+import { generatePath } from "react-router-dom";
+import type { RouteDef } from "../../route-config";
+import { RealmRoleTabs } from "../RealmRoleTabs";
+
+export type AddRoleParams = { realm: string };
+
+export const AddRoleRoute: RouteDef = {
+  path: "/:realm/roles/add-role",
+  component: RealmRoleTabs,
+  breadcrumb: (t) => t("roles:createRole"),
+  access: "manage-realm",
+};
+
+export const toAddRole = (params: AddRoleParams): LocationDescriptorObject => ({
+  pathname: generatePath(AddRoleRoute.path, params),
+});

src/realm-roles/routes/AddRoleToClient.ts

@@ -0,0 +1,22 @@
+import type { LocationDescriptorObject } from "history";
+import { generatePath } from "react-router-dom";
+import type { RouteDef } from "../../route-config";
+import { RealmRoleTabs } from "../RealmRoleTabs";
+
+export type AddRoleToClientParams = {
+  realm: string;
+  clientId: string;
+};
+
+export const AddRoleToClientRoute: RouteDef = {
+  path: "/:realm/clients/:clientId/roles/add-role",
+  component: RealmRoleTabs,
+  breadcrumb: (t) => t("roles:createRole"),
+  access: "manage-realm",
+};
+
+export const toAddRoleToClient = (
+  params: AddRoleToClientParams
+): LocationDescriptorObject => ({
+  pathname: generatePath(AddRoleToClientRoute.path, params),
+});

src/realm-roles/routes/ClientRole.ts

@@ -0,0 +1,24 @@
+import type { LocationDescriptorObject } from "history";
+import { generatePath } from "react-router-dom";
+import type { RouteDef } from "../../route-config";
+import { RealmRoleTabs } from "../RealmRoleTabs";
+
+export type ClientRoleParams = {
+  realm: string;
+  clientId: string;
+  id: string;
+  tab?: string;
+};
+
+export const ClientRoleRoute: RouteDef = {
+  path: "/:realm/clients/:clientId/roles/:id/:tab?",
+  component: RealmRoleTabs,
+  breadcrumb: (t) => t("roles:roleDetails"),
+  access: "view-realm",
+};
+
+export const toClientRole = (
+  params: ClientRoleParams
+): LocationDescriptorObject => ({
+  pathname: generatePath(ClientRoleRoute.path, params),
+});

src/realm-roles/routes/RealmRole.ts

@@ -0,0 +1,23 @@
+import type { LocationDescriptorObject } from "history";
+import { generatePath } from "react-router-dom";
+import type { RouteDef } from "../../route-config";
+import { RealmRoleTabs } from "../RealmRoleTabs";
+
+export type RealmRoleParams = {
+  realm: string;
+  id: string;
+  tab?: string;
+};
+
+export const RealmRoleRoute: RouteDef = {
+  path: "/:realm/roles/:id/:tab?",
+  component: RealmRoleTabs,
+  breadcrumb: (t) => t("roles:roleDetails"),
+  access: "view-realm",
+};
+
+export const toRealmRole = (
+  params: RealmRoleParams
+): LocationDescriptorObject => ({
+  pathname: generatePath(RealmRoleRoute.path, params),
+});

src/realm-roles/routes/RealmRoles.ts

@@ -0,0 +1,19 @@
+import type { LocationDescriptorObject } from "history";
+import { generatePath } from "react-router-dom";
+import type { RouteDef } from "../../route-config";
+import { RealmRolesSection } from "../RealmRolesSection";
+
+export type RealmRolesParams = { realm: string };
+
+export const RealmRolesRoute: RouteDef = {
+  path: "/:realm/roles",
+  component: RealmRolesSection,
+  breadcrumb: (t) => t("roles:roleList"),
+  access: "view-realm",
+};
+
+export const toRealmRoles = (
+  params: RealmRolesParams
+): LocationDescriptorObject => ({
+  pathname: generatePath(RealmRolesRoute.path, params),
+});

src/route-config.ts

@@ -17,8 +17,7 @@ import { AddOpenIdConnect } from "./identity-providers/add/AddOpenIdConnect";
 import { DetailSettings } from "./identity-providers/add/DetailSettings";
 import { IdentityProvidersSection } from "./identity-providers/IdentityProvidersSection";
 import { PageNotFoundSection } from "./PageNotFoundSection";
-import { RealmRolesSection } from "./realm-roles/RealmRolesSection";
-import { RealmRoleTabs } from "./realm-roles/RealmRoleTabs";
+import realmRoleRoutes from "./realm-roles/routes";
 import { AESGeneratedSettings } from "./realm-settings/key-providers/aes-generated/AESGeneratedForm";
 import { ECDSAGeneratedSettings } from "./realm-settings/key-providers/ecdsa-generated/ECDSAGeneratedForm";
 import { HMACGeneratedSettings } from "./realm-settings/key-providers/hmac-generated/HMACGeneratedForm";
@@ -51,37 +50,8 @@ export const routes: RouteDef[] = [
   ...authenticationRoutes,
   ...clientRoutes,
   ...clientScopesRoutes,
+  ...realmRoleRoutes,
   ...realmRoutes,
-  {
-    path: "/:realm/clients/:clientId/roles/add-role",
-    component: RealmRoleTabs,
-    breadcrumb: (t) => t("roles:createRole"),
-    access: "manage-realm",
-  },
-  {
-    path: "/:realm/clients/:clientId/roles/:id/:tab?",
-    component: RealmRoleTabs,
-    breadcrumb: (t) => t("roles:roleDetails"),
-    access: "view-realm",
-  },
-  {
-    path: "/:realm/roles",
-    component: RealmRolesSection,
-    breadcrumb: (t) => t("roles:roleList"),
-    access: "view-realm",
-  },
-  {
-    path: "/:realm/roles/add-role",
-    component: RealmRoleTabs,
-    breadcrumb: (t) => t("roles:createRole"),
-    access: "manage-realm",
-  },
-  {
-    path: "/:realm/roles/:id/:tab?",
-    component: RealmRoleTabs,
-    breadcrumb: (t) => t("roles:roleDetails"),
-    access: "view-realm",
-  },
   {
     path: "/:realm/users",
     component: UsersSection,