The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Merge branch 'main' into staging-sandbox
Kiran K6daec839fa48
diff --cc apps/web/app/api/workspaces/[idOrSlug]/invites/reset/route.tsindex 7aaf9706f5,c4f1e5df37..6e1c37226e--- a/apps/web/app/api/workspaces/[idOrSlug]/invites/reset/route.ts+++ b/apps/web/app/api/workspaces/[idOrSlug]/invites/reset/route.ts@@@ -6,9 -5,7 +6,9 @@@ import { NextResponse } from "next/servexport const POST = withWorkspace(async ({ workspace }) => {+ assertNotStagingWorkspace(workspace);+- const response = await prisma.project.update({+ const { inviteCode } = await prisma.project.update({where: {id: workspace.id,},diff --cc apps/web/ui/workspaces/workspace-selector.tsxindex 9347a1f9dc,1fbcb28ca0..6898915772--- a/apps/web/ui/workspaces/workspace-selector.tsx+++ b/apps/web/ui/workspaces/workspace-selector.tsx@@@ -1,7 -1,6 +1,7 @@@import useWorkspaces from "@/lib/swr/use-workspaces";- import { Button, Combobox } from "@dub/ui";- import { OG_AVATAR_URL, cn } from "@dub/utils";+ import { BlurImage, Button, Combobox } from "@dub/ui";+ import { cn } from "@dub/utils";+import { WorkspaceEnvironment } from "@prisma/client";import { useMemo, useState } from "react";import { useAddWorkspaceModal } from "../modals/add-workspace-modal";@@@ -24,32 -19,21 +24,34 @@@ export function WorkspaceSelector(const { AddWorkspaceModal, setShowAddWorkspaceModal } =useAddWorkspaceModal();- const workspaceOptions = useMemo(() => {- return workspaces?.map((workspace) => ({- value: workspace.slug,- label: workspace.name,- icon: (- <BlurImage- src={workspace.logo || `https://avatar.vercel.sh/${workspace.id}`}- alt={workspace.id}- width={16}- height={16}- className="size-4 rounded-full"- />- ),- }));- }, [workspaces]);+ const filteredWorkspaces = useMemo(() => {+ if (!workspaces) {+ return [];+ }++ return workspaces.filter(+ (workspace) =>+ !environments || environments.includes(workspace.environment),+ );+ }, [workspaces, environments]);++ const workspaceOptions = useMemo(+ () =>+ filteredWorkspaces.map((workspace) => ({+ value: workspace.slug,+ label: workspace.name,+ icon: (- <img- src={workspace.logo || `${OG_AVATAR_URL}${workspace.name}`}- alt={workspace.name}++ <BlurImage++ src={workspace.logo || `https://avatar.vercel.sh/${workspace.id}`}++ alt={workspace.id}++ width={16}++ height={16}+ className="size-4 rounded-full"+ />+ ),+ })),+ [filteredWorkspaces],+ );const selectedOption = useMemo(() => {if (!selectedWorkspace) {