diff --git a/frontend/src/Router.test.tsx b/frontend/src/Router.test.tsx index 8c8322ae..412ee8ca 100644 --- a/frontend/src/Router.test.tsx +++ b/frontend/src/Router.test.tsx @@ -28,8 +28,8 @@ describe("Router", () => { expect(segmentsToRoute(segments)).toEqual({ type: "profile" }); }); - it("returns browser session list for sessions", () => { - const segments: string[] = ["sessions"]; + it("returns browser session list for browser-sessions", () => { + const segments: string[] = ["browser-sessions"]; expect(segmentsToRoute(segments)).toEqual({ type: "browser-session-list", }); @@ -57,10 +57,10 @@ describe("Router", () => { }); }); - it("returns session detail route correctly", () => { - const segments: string[] = ["sessions", "session-id"]; + it("returns browser session detail route correctly", () => { + const segments: string[] = ["browser-sessions", "session-id"]; expect(segmentsToRoute(segments)).toEqual({ - type: "session", + type: "browser-session", id: "session-id", }); }); diff --git a/frontend/src/Router.tsx b/frontend/src/Router.tsx index 47ca94a3..7d7e47fe 100644 --- a/frontend/src/Router.tsx +++ b/frontend/src/Router.tsx @@ -29,7 +29,7 @@ type ProfileRoute = { type: "profile" }; type SessionOverviewRoute = { type: "sessions-overview" }; type OAuth2ClientRoute = { type: "client"; id: string }; type OAuth2SessionList = { type: "oauth2-session-list" }; -type BrowserSessionRoute = { type: "session"; id: string }; +type BrowserSessionRoute = { type: "browser-session"; id: string }; type BrowserSessionListRoute = { type: "browser-session-list" }; type CompatSessionListRoute = { type: "compat-session-list" }; type VerifyEmailRoute = { type: "verify-email"; id: string }; @@ -57,9 +57,9 @@ const routeToSegments = (route: Route): string[] => { case "client": return ["clients", route.id]; case "browser-session-list": - return ["sessions"]; - case "session": - return ["sessions", route.id]; + return ["browser-sessions"]; + case "browser-session": + return ["browser-sessions", route.id]; case "oauth2-session-list": return ["oauth2-sessions"]; case "compat-session-list": @@ -104,7 +104,7 @@ export const segmentsToRoute = (segments: string[]): Route => { return { type: "sessions-overview" }; } - if (matches("sessions")) { + if (matches("browser-sessions")) { return { type: "browser-session-list" }; } @@ -124,8 +124,8 @@ export const segmentsToRoute = (segments: string[]): Route => { return { type: "client", id: segments[1] }; } - if (matches("sessions", P)) { - return { type: "session", id: segments[1] }; + if (matches("browser-sessions", P)) { + return { type: "browser-session", id: segments[1] }; } return { type: "unknown", segments }; @@ -194,7 +194,7 @@ const InnerRouter: React.FC = () => { return ; case "client": return ; - case "session": + case "browser-session": return ; case "verify-email": return ; diff --git a/frontend/src/components/UserSessionsOverview/__snapshots__/UserSessionsOverview.test.tsx.snap b/frontend/src/components/UserSessionsOverview/__snapshots__/UserSessionsOverview.test.tsx.snap index 73a22a90..15a09b84 100644 --- a/frontend/src/components/UserSessionsOverview/__snapshots__/UserSessionsOverview.test.tsx.snap +++ b/frontend/src/components/UserSessionsOverview/__snapshots__/UserSessionsOverview.test.tsx.snap @@ -31,7 +31,7 @@ exports[`UserSessionsOverview > render a with sessions View all @@ -127,7 +127,7 @@ exports[`UserSessionsOverview > render an simple 1`] = View all