Thanks to visit codestin.com
Credit goes to github.com

Skip to content

added ability to have / in url #23667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonkoops merged 5 commits into from
Oct 17, 2023
Merged

added ability to have / in url #23667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b87302b
added ability to have `/` in url
edewit Oct 3, 2023
27524d8
use the new util function everywhere
edewit Oct 3, 2023
100cbde
update review comments
edewit Oct 6, 2023
5feb0c8
more review
edewit Oct 16, 2023
378415e
Move to dedicated utility file
jonkoops Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/authentication/routes/Authentication.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import { generateEncodedPath } from "../../utils/generateEncodedPath";
import type { AppRouteObject } from "../../routes";

export type AuthenticationTab = "flows" | "required-actions" | "policies";
Expand Down Expand Up @@ -31,6 +31,6 @@ export const toAuthentication = (
: AuthenticationRoute.path;

return {
pathname: generatePath(path, params),
pathname: generateEncodedPath(path, params),
};
};
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/authentication/routes/CreateFlow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import { generateEncodedPath } from "../../utils/generateEncodedPath";
import type { AppRouteObject } from "../../routes";

export type CreateFlowParams = { realm: string };
Expand All @@ -17,5 +17,5 @@ export const CreateFlowRoute: AppRouteObject = {
};

export const toCreateFlow = (params: CreateFlowParams): Partial<Path> => ({
pathname: generatePath(CreateFlowRoute.path, params),
pathname: generateEncodedPath(CreateFlowRoute.path, params),
});
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/authentication/routes/Flow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import { generateEncodedPath } from "../../utils/generateEncodedPath";
import type { AppRouteObject } from "../../routes";

export type FlowParams = {
Expand Down Expand Up @@ -30,6 +30,6 @@ export const toFlow = (params: FlowParams): Partial<Path> => {
const path = params.builtIn ? FlowWithBuiltInRoute.path : FlowRoute.path;

return {
pathname: generatePath(path, params),
pathname: generateEncodedPath(path, params),
};
};
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/client-scopes/routes/ClientScope.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import { generateEncodedPath } from "../../utils/generateEncodedPath";
import type { AppRouteObject } from "../../routes";

export type ClientScopeTab = "settings" | "mappers" | "scope";
Expand All @@ -26,6 +26,6 @@ export const toClientScope = (params: ClientScopeParams): Partial<Path> => {
const path = ClientScopeRoute.path;

return {
pathname: generatePath(path, params),
pathname: generateEncodedPath(path, params),
};
};
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/client-scopes/routes/ClientScopes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import { generateEncodedPath } from "../../utils/generateEncodedPath";
import type { AppRouteObject } from "../../routes";

export type ClientScopesParams = { realm: string };
Expand All @@ -17,5 +17,5 @@ export const ClientScopesRoute: AppRouteObject = {
};

export const toClientScopes = (params: ClientScopesParams): Partial<Path> => ({
pathname: generatePath(ClientScopesRoute.path, params),
pathname: generateEncodedPath(ClientScopesRoute.path, params),
});
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/client-scopes/routes/Mapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import { generateEncodedPath } from "../../utils/generateEncodedPath";
import type { AppRouteObject } from "../../routes";

export type MapperParams = {
Expand All @@ -21,5 +21,5 @@ export const MapperRoute: AppRouteObject = {
};

export const toMapper = (params: MapperParams): Partial<Path> => ({
pathname: generatePath(MapperRoute.path, params),
pathname: generateEncodedPath(MapperRoute.path, params),
});
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/client-scopes/routes/NewClientScope.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import { generateEncodedPath } from "../../utils/generateEncodedPath";
import type { AppRouteObject } from "../../routes";

export type NewClientScopeParams = { realm: string };
Expand All @@ -19,5 +19,5 @@ export const NewClientScopeRoute: AppRouteObject = {
export const toNewClientScope = (
params: NewClientScopeParams,
): Partial<Path> => ({
pathname: generatePath(NewClientScopeRoute.path, params),
pathname: generateEncodedPath(NewClientScopeRoute.path, params),
});
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/clients/routes/AddClient.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import { generateEncodedPath } from "../../utils/generateEncodedPath";
import type { AppRouteObject } from "../../routes";

export type AddClientParams = { realm: string };
Expand All @@ -17,5 +17,5 @@ export const AddClientRoute: AppRouteObject = {
};

export const toAddClient = (params: AddClientParams): Partial<Path> => ({
pathname: generatePath(AddClientRoute.path, params),
pathname: generateEncodedPath(AddClientRoute.path, params),
});
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/clients/routes/AddRegistrationProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import { generateEncodedPath } from "../../utils/generateEncodedPath";
import type { AppRouteObject } from "../../routes";
import { ClientRegistrationTab } from "./ClientRegistration";

Expand Down Expand Up @@ -35,6 +35,6 @@ export const toRegistrationProvider = (
: AddRegistrationProviderRoute.path;

return {
pathname: generatePath(path, params),
pathname: generateEncodedPath(path, params),
};
};
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/clients/routes/AuthenticationTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import { generateEncodedPath } from "../../utils/generateEncodedPath";
import type { AppRouteObject } from "../../routes";

export type AuthorizationTab =
Expand Down Expand Up @@ -32,5 +32,5 @@ export const AuthorizationRoute: AppRouteObject = {
export const toAuthorizationTab = (
params: AuthorizationParams,
): Partial<Path> => ({
pathname: generatePath(AuthorizationRoute.path, params),
pathname: generateEncodedPath(AuthorizationRoute.path, params),
});
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/clients/routes/Client.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import { generateEncodedPath } from "../../utils/generateEncodedPath";
import type { AppRouteObject } from "../../routes";

export type ClientTab =
Expand Down Expand Up @@ -34,5 +34,5 @@ export const ClientRoute: AppRouteObject = {
};

export const toClient = (params: ClientParams): Partial<Path> => ({
pathname: generatePath(ClientRoute.path, params),
pathname: generateEncodedPath(ClientRoute.path, params),
});
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/clients/routes/ClientRegistration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import { generateEncodedPath } from "../../utils/generateEncodedPath";
import type { AppRouteObject } from "../../routes";

export type ClientRegistrationTab = "anonymous" | "authenticated";
Expand All @@ -24,5 +24,5 @@ export const ClientRegistrationRoute: AppRouteObject = {
export const toClientRegistration = (
params: ClientRegistrationParams,
): Partial<Path> => ({
pathname: generatePath(ClientRegistrationRoute.path, params),
pathname: generateEncodedPath(ClientRegistrationRoute.path, params),
});
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/clients/routes/ClientRole.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import { generateEncodedPath } from "../../utils/generateEncodedPath";
import type { AppRouteObject } from "../../routes";

export type ClientRoleTab =
Expand Down Expand Up @@ -28,5 +28,5 @@ export const ClientRoleRoute: AppRouteObject = {
} satisfies AppRouteObject;

export const toClientRole = (params: ClientRoleParams): Partial<Path> => ({
pathname: generatePath(ClientRoleRoute.path, params),
pathname: generateEncodedPath(ClientRoleRoute.path, params),
});
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/clients/routes/ClientScopeTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import { generateEncodedPath } from "../../utils/generateEncodedPath";
import type { AppRouteObject } from "../../routes";

export type ClientScopesTab = "setup" | "evaluate";
Expand All @@ -25,5 +25,5 @@ export const ClientScopesRoute: AppRouteObject = {
export const toClientScopesTab = (
params: ClientScopesParams,
): Partial<Path> => ({
pathname: generatePath(ClientScopesRoute.path, params),
pathname: generateEncodedPath(ClientScopesRoute.path, params),
});
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/clients/routes/Clients.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import { generateEncodedPath } from "../../utils/generateEncodedPath";
import type { AppRouteObject } from "../../routes";

export type ClientsTab =
Expand Down Expand Up @@ -33,6 +33,6 @@ export const toClients = (params: ClientsParams): Partial<Path> => {
const path = params.tab ? ClientsRouteWithTab.path : ClientsRoute.path;

return {
pathname: generatePath(path, params),
pathname: generateEncodedPath(path, params),
};
};
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/clients/routes/CreateInitialAccessToken.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import { generateEncodedPath } from "../../utils/generateEncodedPath";
import type { AppRouteObject } from "../../routes";

export type CreateInitialAccessTokenParams = { realm: string };
Expand All @@ -21,5 +21,5 @@ export const CreateInitialAccessTokenRoute: AppRouteObject = {
export const toCreateInitialAccessToken = (
params: CreateInitialAccessTokenParams,
): Partial<Path> => ({
pathname: generatePath(CreateInitialAccessTokenRoute.path, params),
pathname: generateEncodedPath(CreateInitialAccessTokenRoute.path, params),
});
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/clients/routes/DedicatedScopeDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import type { AppRouteObject } from "../../routes";
import { generateEncodedPath } from "../../utils/generateEncodedPath";

export type DedicatedScopeTab = "mappers" | "scope";

Expand Down Expand Up @@ -35,6 +35,6 @@ export const toDedicatedScope = (
: DedicatedScopeDetailsRoute.path;

return {
pathname: generatePath(path, params),
pathname: generateEncodedPath(path, params),
};
};
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/clients/routes/ImportClient.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import { generateEncodedPath } from "../../utils/generateEncodedPath";
import type { AppRouteObject } from "../../routes";

export type ImportClientParams = { realm: string };
Expand All @@ -17,5 +17,5 @@ export const ImportClientRoute: AppRouteObject = {
};

export const toImportClient = (params: ImportClientParams): Partial<Path> => ({
pathname: generatePath(ImportClientRoute.path, params),
pathname: generateEncodedPath(ImportClientRoute.path, params),
});
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/clients/routes/Mapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import type { AppRouteObject } from "../../routes";
import { generateEncodedPath } from "../../utils/generateEncodedPath";

export type MapperParams = {
realm: string;
Expand All @@ -23,5 +23,5 @@ export const MapperRoute: AppRouteObject = {
};

export const toMapper = (params: MapperParams): Partial<Path> => ({
pathname: generatePath(MapperRoute.path, params),
pathname: generateEncodedPath(MapperRoute.path, params),
});
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/clients/routes/NewPermission.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import { generateEncodedPath } from "../../utils/generateEncodedPath";
import type { AppRouteObject } from "../../routes";

export type PermissionType = "resource" | "scope";
Expand Down Expand Up @@ -36,6 +36,6 @@ export const toNewPermission = (params: NewPermissionParams): Partial<Path> => {
: NewPermissionRoute.path;

return {
pathname: generatePath(path, params),
pathname: generateEncodedPath(path, params),
};
};
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/clients/routes/NewPolicy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import { generateEncodedPath } from "../../utils/generateEncodedPath";
import type { AppRouteObject } from "../../routes";

export type NewPolicyParams = { realm: string; id: string; policyType: string };
Expand All @@ -19,5 +19,5 @@ export const NewPolicyRoute: AppRouteObject = {
};

export const toCreatePolicy = (params: NewPolicyParams): Partial<Path> => ({
pathname: generatePath(NewPolicyRoute.path, params),
pathname: generateEncodedPath(NewPolicyRoute.path, params),
});
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/clients/routes/NewResource.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import { generateEncodedPath } from "../../utils/generateEncodedPath";
import type { AppRouteObject } from "../../routes";

export type NewResourceParams = { realm: string; id: string };
Expand All @@ -17,5 +17,5 @@ export const NewResourceRoute: AppRouteObject = {
};

export const toCreateResource = (params: NewResourceParams): Partial<Path> => ({
pathname: generatePath(NewResourceRoute.path, params),
pathname: generateEncodedPath(NewResourceRoute.path, params),
});
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/clients/routes/NewRole.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import { generateEncodedPath } from "../../utils/generateEncodedPath";
import type { AppRouteObject } from "../../routes";

export type NewRoleParams = { realm: string; clientId: string };
Expand All @@ -17,5 +17,5 @@ export const NewRoleRoute: AppRouteObject = {
};

export const toCreateRole = (params: NewRoleParams): Partial<Path> => ({
pathname: generatePath(NewRoleRoute.path, params),
pathname: generateEncodedPath(NewRoleRoute.path, params),
});
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/clients/routes/NewScope.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import { generateEncodedPath } from "../../utils/generateEncodedPath";
import type { AppRouteObject } from "../../routes";

export type NewScopeParams = { realm: string; id: string };
Expand All @@ -17,5 +17,5 @@ export const NewScopeRoute: AppRouteObject = {
};

export const toNewScope = (params: NewScopeParams): Partial<Path> => ({
pathname: generatePath(NewScopeRoute.path, params),
pathname: generateEncodedPath(NewScopeRoute.path, params),
});
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/clients/routes/PermissionDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import { generateEncodedPath } from "../../utils/generateEncodedPath";
import type { AppRouteObject } from "../../routes";
import type { PermissionType } from "./NewPermission";

Expand All @@ -27,5 +27,5 @@ export const PermissionDetailsRoute: AppRouteObject = {
export const toPermissionDetails = (
params: PermissionDetailsParams,
): Partial<Path> => ({
pathname: generatePath(PermissionDetailsRoute.path, params),
pathname: generateEncodedPath(PermissionDetailsRoute.path, params),
});
4 changes: 2 additions & 2 deletions js/apps/admin-ui/src/clients/routes/PolicyDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { lazy } from "react";
import type { Path } from "react-router-dom";
import { generatePath } from "react-router-dom";
import { generateEncodedPath } from "../../utils/generateEncodedPath";
import type { AppRouteObject } from "../../routes";

export type PolicyDetailsParams = {
Expand All @@ -26,5 +26,5 @@ export const PolicyDetailsRoute: AppRouteObject = {
export const toPolicyDetails = (
params: PolicyDetailsParams,
): Partial<Path> => ({
pathname: generatePath(PolicyDetailsRoute.path, params),
pathname: generateEncodedPath(PolicyDetailsRoute.path, params),
});
Loading