Skip to content

Open-source status page, incident response and uptime monitoring

fix: multi workspace slug (#808)

Maximilian Kaske4bdb6383c31a
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/page.tsx
index 39972683a..5dcd82695 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/page.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/page.tsx
@@ -3,7 +3,7 @@ import { redirect } from "next/navigation";
export default function DashboardRedirect({
params,
}: {
- params: { workspaceId: string };
+ params: { workspaceSlug: string };
}) {
- return redirect(`/app/${params.workspaceId}/monitors`);
+ return redirect(`/app/${params.workspaceSlug}/monitors`);
}
diff --git a/apps/web/src/components/workspace/select-workspace.tsx b/apps/web/src/components/workspace/select-workspace.tsx
index 4441499e4..fc871ce84 100644
--- a/apps/web/src/components/workspace/select-workspace.tsx
+++ b/apps/web/src/components/workspace/select-workspace.tsx
@@ -60,19 +60,16 @@ export function SelectWorkspace() {
<DropdownMenuLabel>Workspaces</DropdownMenuLabel>
<DropdownMenuSeparator />
{workspaces.map((workspace) => (
- <DropdownMenuItem
- key={workspace.id}
- onClick={() => {
- if (workspace.slug !== active && typeof window !== "undefined") {
- window.location.href = `/app/${workspace.slug}/monitors`;
- }
- }}
- className="justify-between"
- >
- <span className="truncate">{workspace.slug}</span>
- {active === workspace.slug ? (
- <Check className="ml-2 h-4 w-4" />
- ) : null}
+ <DropdownMenuItem key={workspace.id} asChild>
+ <a
+ href={`/app/${workspace.slug}/monitors`}
+ className="justify-between"
+ >
+ <span className="truncate">{workspace.slug}</span>
+ {active === workspace.slug ? (
+ <Check className="ml-2 h-4 w-4" />
+ ) : null}
+ </a>
</DropdownMenuItem>
))}
<DropdownMenuSeparator />
diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.ts
index 847e46230..6a52672c3 100644
--- a/apps/web/src/middleware.ts
+++ b/apps/web/src/middleware.ts
@@ -89,9 +89,13 @@ export default auth(async (req) => {
({ workspace }) => workspace.slug === workspaceSlug,
);
if (hasAccessToWorkspace) {
- const response = NextResponse.next();
- response.cookies.set("workspace-slug", workspaceSlug);
- return response;
+ const workspaceCookie = req.cookies.get("workspace-slug")?.value;
+ const hasChanged = workspaceCookie !== workspaceSlug;
+ if (hasChanged) {
+ const response = NextResponse.redirect(url);
+ response.cookies.set("workspace-slug", workspaceSlug);
+ return response;
+ }
} else {
return NextResponse.redirect(new URL("/app", req.url));
}
diff --git a/packages/api/src/router/workspace.ts b/packages/api/src/router/workspace.ts
index 714fd5eac..6ad3e3722 100644
--- a/packages/api/src/router/workspace.ts
+++ b/packages/api/src/router/workspace.ts
@@ -76,8 +76,6 @@ export const workspaceRouter = createTRPCRouter({
}),
getUserWorkspaces: protectedProcedure.query(async (opts) => {
- console.log(opts.ctx.user);
-
const result = await opts.ctx.db.query.usersToWorkspaces.findMany({
where: eq(usersToWorkspaces.userId, opts.ctx.user.id),
with: {