Use new routing conventions for identity provider routes (#910)

src/identity-providers/routes.ts

@@ -0,0 +1,16 @@
+import type { RouteDef } from "../route-config";
+import { IdentityProviderRoute } from "./routes/IdentityProvider";
+import { IdentityProviderKeycloakOidcRoute } from "./routes/IdentityProviderKeycloakOidc";
+import { IdentityProviderOidcRoute } from "./routes/IdentityProviderOidc";
+import { IdentityProvidersRoute } from "./routes/IdentityProviders";
+import { IdentityProviderTabRoute } from "./routes/IdentityProviderTab";
+
+const routes: RouteDef[] = [
+  IdentityProvidersRoute,
+  IdentityProviderOidcRoute,
+  IdentityProviderKeycloakOidcRoute,
+  IdentityProviderRoute,
+  IdentityProviderTabRoute,
+];
+
+export default routes;

src/identity-providers/routes/IdentityProvider.ts

@@ -0,0 +1,25 @@
+import type { LocationDescriptorObject } from "history";
+import { generatePath } from "react-router-dom";
+import type { RouteDef } from "../../route-config";
+import {
+  AddIdentityProvider,
+  IdentityProviderCrumb,
+} from "../add/AddIdentityProvider";
+
+export type IdentityProviderParams = {
+  realm: string;
+  id: string;
+};
+
+export const IdentityProviderRoute: RouteDef = {
+  path: "/:realm/identity-providers/:id",
+  component: AddIdentityProvider,
+  breadcrumb: () => IdentityProviderCrumb,
+  access: "manage-identity-providers",
+};
+
+export const toIdentityProvider = (
+  params: IdentityProviderParams
+): LocationDescriptorObject => ({
+  pathname: generatePath(IdentityProviderRoute.path, params),
+});

src/identity-providers/routes/IdentityProviderKeycloakOidc.ts

@@ -0,0 +1,19 @@
+import type { LocationDescriptorObject } from "history";
+import { generatePath } from "react-router-dom";
+import type { RouteDef } from "../../route-config";
+import { AddOpenIdConnect } from "../add/AddOpenIdConnect";
+
+export type IdentityProviderKeycloakOidcParams = { realm: string };
+
+export const IdentityProviderKeycloakOidcRoute: RouteDef = {
+  path: "/:realm/identity-providers/keycloak-oidc",
+  component: AddOpenIdConnect,
+  breadcrumb: (t) => t("identity-providers:addKeycloakOpenIdProvider"),
+  access: "manage-identity-providers",
+};
+
+export const toIdentityProviderKeycloakOidc = (
+  params: IdentityProviderKeycloakOidcParams
+): LocationDescriptorObject => ({
+  pathname: generatePath(IdentityProviderKeycloakOidcRoute.path, params),
+});

src/identity-providers/routes/IdentityProviderOidc.ts

@@ -0,0 +1,19 @@
+import type { LocationDescriptorObject } from "history";
+import { generatePath } from "react-router-dom";
+import type { RouteDef } from "../../route-config";
+import { AddOpenIdConnect } from "../add/AddOpenIdConnect";
+
+export type IdentityProviderOidcParams = { realm: string };
+
+export const IdentityProviderOidcRoute: RouteDef = {
+  path: "/:realm/identity-providers/oidc",
+  component: AddOpenIdConnect,
+  breadcrumb: (t) => t("identity-providers:addOpenIdProvider"),
+  access: "manage-identity-providers",
+};
+
+export const toIdentityProviderOidc = (
+  params: IdentityProviderOidcParams
+): LocationDescriptorObject => ({
+  pathname: generatePath(IdentityProviderOidcRoute.path, params),
+});

src/identity-providers/routes/IdentityProviderTab.ts

@@ -0,0 +1,24 @@
+import type { LocationDescriptorObject } from "history";
+import { generatePath } from "react-router-dom";
+import type { RouteDef } from "../../route-config";
+import { DetailSettings } from "../add/DetailSettings";
+
+export type IdentityProviderTab = "settings";
+
+export type IdentityProviderTabParams = {
+  realm: string;
+  id: string;
+  tab?: IdentityProviderTab;
+};
+
+export const IdentityProviderTabRoute: RouteDef = {
+  path: "/:realm/identity-providers/:id/:tab?",
+  component: DetailSettings,
+  access: "manage-identity-providers",
+};
+
+export const toIdentityProviderTab = (
+  params: IdentityProviderTabParams
+): LocationDescriptorObject => ({
+  pathname: generatePath(IdentityProviderTabRoute.path, params),
+});

src/identity-providers/routes/IdentityProviders.ts

@@ -0,0 +1,19 @@
+import type { LocationDescriptorObject } from "history";
+import { generatePath } from "react-router-dom";
+import type { RouteDef } from "../../route-config";
+import { IdentityProvidersSection } from "../IdentityProvidersSection";
+
+export type IdentityProvidersParams = { realm: string };
+
+export const IdentityProvidersRoute: RouteDef = {
+  path: "/:realm/identity-providers",
+  component: IdentityProvidersSection,
+  breadcrumb: (t) => t("identityProviders"),
+  access: "view-identity-providers",
+};
+
+export const toIdentityProviders = (
+  params: IdentityProvidersParams
+): LocationDescriptorObject => ({
+  pathname: generatePath(IdentityProvidersRoute.path, params),
+});

src/route-config.ts

@@ -9,13 +9,7 @@ import { DashboardSection } from "./dashboard/Dashboard";
 import eventRoutes from "./events/routes";
 import { GroupsSection } from "./groups/GroupsSection";
 import { SearchGroups } from "./groups/SearchGroups";
-import {
-  AddIdentityProvider,
-  IdentityProviderCrumb,
-} from "./identity-providers/add/AddIdentityProvider";
-import { AddOpenIdConnect } from "./identity-providers/add/AddOpenIdConnect";
-import { DetailSettings } from "./identity-providers/add/DetailSettings";
-import { IdentityProvidersSection } from "./identity-providers/IdentityProvidersSection";
+import identityProviders from "./identity-providers/routes";
 import { PageNotFoundSection } from "./PageNotFoundSection";
 import realmRoleRoutes from "./realm-roles/routes";
 import realmSettingRoutes from "./realm-settings/routes";
@@ -40,40 +34,12 @@ export const routes: RouteDef[] = [
   ...clientRoutes,
   ...clientScopesRoutes,
   ...eventRoutes,
+  ...identityProviders,
   ...realmRoleRoutes,
   ...realmRoutes,
   ...realmSettingRoutes,
   ...sessionRoutes,
   ...userRoutes,
-  {
-    path: "/:realm/identity-providers",
-    component: IdentityProvidersSection,
-    breadcrumb: (t) => t("identityProviders"),
-    access: "view-identity-providers",
-  },
-  {
-    path: "/:realm/identity-providers/oidc",
-    component: AddOpenIdConnect,
-    breadcrumb: (t) => t("identity-providers:addOpenIdProvider"),
-    access: "manage-identity-providers",
-  },
-  {
-    path: "/:realm/identity-providers/keycloak-oidc",
-    component: AddOpenIdConnect,
-    breadcrumb: (t) => t("identity-providers:addKeycloakOpenIdProvider"),
-    access: "manage-identity-providers",
-  },
-  {
-    path: "/:realm/identity-providers/:id",
-    component: AddIdentityProvider,
-    breadcrumb: () => IdentityProviderCrumb,
-    access: "manage-identity-providers",
-  },
-  {
-    path: "/:realm/identity-providers/:id/:tab?",
-    component: DetailSettings,
-    access: "manage-identity-providers",
-  },
   {
     path: "/:realm/user-federation",
     component: UserFederationSection,