Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

fix workspace redirect edge case

Steven Tey95b77a8bb057
diff --git a/apps/web/lib/middleware/app.ts b/apps/web/lib/middleware/app.ts
index dbff5f41e5..f0db528fa2 100644
--- a/apps/web/lib/middleware/app.ts
+++ b/apps/web/lib/middleware/app.ts
@@ -121,6 +121,9 @@ export async function AppMiddleware(req: NextRequest) {
const pendingInvite = await prismaEdge.projectInvite.findFirst({
where: {
email: user.email,
+ expires: {
+ gte: new Date(),
+ },
},
select: {
project: {
diff --git a/apps/web/lib/middleware/workspaces.ts b/apps/web/lib/middleware/workspaces.ts
index 9340a2da74..012d403978 100644
--- a/apps/web/lib/middleware/workspaces.ts
+++ b/apps/web/lib/middleware/workspaces.ts
@@ -46,6 +46,9 @@ export async function WorkspacesMiddleware(req: NextRequest, user: UserProps) {
const projectInvite = await prismaEdge.projectInvite.findFirst({
where: {
email: user.email,
+ expires: {
+ gte: new Date(),
+ },
},
select: {
project: {
diff --git a/apps/web/ui/layout/sidebar/workspace-dropdown.tsx b/apps/web/ui/layout/sidebar/workspace-dropdown.tsx
index 753c7d0c0d..9b4543f4ae 100644
--- a/apps/web/ui/layout/sidebar/workspace-dropdown.tsx
+++ b/apps/web/ui/layout/sidebar/workspace-dropdown.tsx
@@ -62,7 +62,6 @@ export function WorkspaceDropdown() {
} else {
return {
name: session?.user?.name || session?.user?.email,
- slug: "/",
image: getUserAvatarUrl(session?.user),
plan: "free",
};
@@ -132,7 +131,7 @@ function WorkspaceList({
}: {
selected: {
name: string;
- slug: string;
+ slug?: string; // undefined if the user is on the personal account
image: string;
plan: PlanProps;
};
@@ -157,9 +156,11 @@ function WorkspaceList({
if (link) {
// if we're on a link page, navigate back to the workspace root
return `/${slug}/links`;
- } else {
+ } else if (selected.slug) {
// else, we keep the path but remove all query params
return pathname.replace(selected.slug, slug).split("?")[0] || "/";
+ } else {
+ return "/";
}
},
[link, programId, pathname, selected.slug],
@@ -187,7 +188,7 @@ function WorkspaceList({
<div className="truncate text-sm font-medium leading-5 text-neutral-900">
{selected.name}
</div>
- {selected.slug !== "/" && (
+ {selected.slug && (
<div
className={cn(
"truncate text-xs capitalize leading-tight",
@@ -204,21 +205,23 @@ function WorkspaceList({
{/* Settings and Invite members options */}
<div className="flex flex-row gap-1">
<Link
- href={`/${selected.slug}/settings`}
+ href={`/${selected.slug ? selected.slug : "account"}/settings`}
className="flex items-center justify-start gap-x-2 rounded-lg border border-neutral-200 px-2 py-1 text-neutral-700 outline-none transition-all duration-75 hover:bg-neutral-100/50 focus-visible:ring-2 focus-visible:ring-black/50 active:bg-neutral-200/80"
onClick={() => setOpenPopover(false)}
>
<Gear className="size-4 text-neutral-800" />
<span className="block truncate text-sm">Settings</span>
</Link>
- <Link
- href={`/${selected.slug}/settings/people`}
- className="flex items-center justify-start gap-x-2 rounded-lg border border-neutral-200 px-2 py-1 text-neutral-700 outline-none transition-all duration-75 hover:bg-neutral-100/50 focus-visible:ring-2 focus-visible:ring-black/50 active:bg-neutral-200/80"
- onClick={() => setOpenPopover(false)}
- >
- <UserPlus className="size-4 text-neutral-800" />
- <span className="block truncate text-sm">Invite members</span>
- </Link>
+ {selected.slug && (
+ <Link
+ href={`/${selected.slug}/settings/people`}
+ className="flex items-center justify-start gap-x-2 rounded-lg border border-neutral-200 px-2 py-1 text-neutral-700 outline-none transition-all duration-75 hover:bg-neutral-100/50 focus-visible:ring-2 focus-visible:ring-black/50 active:bg-neutral-200/80"
+ onClick={() => setOpenPopover(false)}
+ >
+ <UserPlus className="size-4 text-neutral-800" />
+ <span className="block truncate text-sm">Invite members</span>
+ </Link>
+ )}
</div>
</div>