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 K9a07c0f1b457
diff --cc apps/web/app/(ee)/api/admin/ban/delete-workspace-admin.tsindex 0000000000,33651d1980..f245707ddcmode 000000,100644..100644--- a/apps/web/app/(ee)/api/admin/ban/delete-workspace-admin.ts+++ b/apps/web/app/(ee)/api/admin/ban/delete-workspace-admin.ts@@@ -1,0 -1,121 +1,124 @@@+ import { linkCache } from "@/lib/api/links/cache";++import { getWorkspaceLogoStorageKey } from "@/lib/api/workspaces/workspace-logo";+ import { qstash } from "@/lib/cron";+ import { prisma } from "@/lib/prisma";+ import { storage } from "@/lib/storage";+ import { stripe } from "@/lib/stripe";+ import { cancelSubscription } from "@/lib/stripe/cancel-subscription";+ import { WorkspaceProps } from "@/lib/types";+ import {+ APP_DOMAIN_WITH_NGROK,+ DUB_DOMAINS_ARRAY,+ LEGAL_USER_ID,+ LEGAL_WORKSPACE_ID,- R2_URL,+ } from "@dub/utils";+ import { addToStripeFraudValueLists } from "app/(ee)/api/stripe/webhook/utils/add-to-stripe-fraud-value-lists";+ import Stripe from "stripe";+ import { deleteProgramAdmin } from "../programs/delete/delete-program-admin";++ export async function deleteWorkspaceAdmin(+ workspace: Pick<+ WorkspaceProps,+ "id" | "slug" | "logo" | "stripeId" | "defaultProgramId"+ >,+ ) {+ while (true) {+ const defaultDomainLinks = await prisma.link.findMany({+ where: {+ projectId: workspace.id,+ domain: {+ in: DUB_DOMAINS_ARRAY,+ },+ },+ select: {+ id: true,+ domain: true,+ key: true,+ },+ take: 100,+ });++ if (defaultDomainLinks.length === 0) {+ break;+ }++ const [redisRes, prismaRes] = await Promise.allSettled([+ linkCache.expireMany(defaultDomainLinks),+ prisma.link.updateMany({+ where: {+ id: {+ in: defaultDomainLinks.map((link) => link.id),+ },+ },+ data: {+ projectId: LEGAL_WORKSPACE_ID,+ userId: LEGAL_USER_ID,+ },+ }),+ ]);++ console.log(+ `Banned ${defaultDomainLinks.length} default domain links for ${workspace.slug}`,+ redisRes,+ prismaRes,+ );+ }+++ const logoKey = getWorkspaceLogoStorageKey({++ workspaceId: workspace.id,++ logoUrl: workspace.logo,++ });+++ const deleteWorkspaceResponse = await Promise.allSettled([+ // delete workspace logo if it's a custom logo stored in R2- workspace.logo &&- workspace.logo.startsWith(`${R2_URL}/logos/${workspace.id}`) &&- storage.delete({ key: workspace.logo.replace(`${R2_URL}/`, "") }),++ logoKey && storage.delete({ key: logoKey }),++ // if they have a Stripe subscription, cancel it + add to fraud value lists+ workspace.stripeId &&+ cancelSubscription({+ customerId: workspace.stripeId,+ immediateCancellation: true,+ reason: "Customer was banned from Dub",+ }).then(async (res) => {+ console.log("Cancelled Stripe subscription", res);++ const stripeCustomer = (await stripe.customers.retrieve(+ workspace.stripeId!,+ {+ expand: ["invoice_settings.default_payment_method"],+ },+ )) as Stripe.Customer;++ const defaultPaymentMethod =+ stripeCustomer.invoice_settings?.default_payment_method;++ await addToStripeFraudValueLists({+ customerId: workspace.stripeId!,+ customerEmail: stripeCustomer.email,+ cardFingerprint:+ defaultPaymentMethod && typeof defaultPaymentMethod !== "string"+ ? defaultPaymentMethod.card?.fingerprint+ : undefined,+ });+ }),++ workspace.defaultProgramId &&+ deleteProgramAdmin(workspace.defaultProgramId),+ ]);++ console.log(`Deleted workspace ${workspace.slug}`, deleteWorkspaceResponse);++ // Queue the workspace for deletion+ const res = await qstash.publishJSON({+ url: `${APP_DOMAIN_WITH_NGROK}/api/cron/workspaces/delete`,+ body: {+ workspaceId: workspace.id,+ },+ });++ console.log("Queued workspace deletion", res);++ return {+ deleteWorkspaceResponse,+ };+ }diff --cc apps/web/app/(ee)/api/stripe/integration/webhook/coupon-deleted.tsindex 18eab7445d,2bcda448d1..e335f64545--- a/apps/web/app/(ee)/api/stripe/integration/webhook/coupon-deleted.ts+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/coupon-deleted.ts@@@ -18,9 -20,10 +20,10 @@@ export async function couponDeleted("mode">): Promise<WebhookHandlerResponse> {const coupon = event.data.object;- const stripeAccountId = event.account as string;+ const stripeAccountId = workspace.stripeConnectId!;+ const programId = workspace.defaultProgramId;- if (!workspace.defaultProgramId) {+ if (!programId) {return {response: `Workspace ${workspace.id} for stripe account ${stripeAccountId} has no programs.`,};diff --cc apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/layout.tsxindex d5204db9c1,ccda53564e..5c99ef766b--- a/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/layout.tsx+++ b/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/layout.tsx@@@ -1,7 -1,7 +1,8 @@@import { getProgram } from "@/lib/fetchers/get-program";import { getProgramSlugs } from "@/lib/fetchers/get-program-slugs";+import { isProductionEnvironment } from "@/lib/sandbox/environment";import { formatRewardDescription } from "@/ui/partners/format-reward-description";+ import { AuroraGradient } from "@/ui/shared/aurora-gradient";import { Grid } from "@dub/ui";import { cn, constructMetadata, PARTNERS_DOMAIN } from "@dub/utils";import { redirect } from "next/navigation";diff --cc apps/web/app/api/tokens/route.tsindex 0830afb18f,6890fa207a..42526f02b1--- a/apps/web/app/api/tokens/route.ts+++ b/apps/web/app/api/tokens/route.ts@@@ -5,8 -5,8 +5,9 @@@ import { parseRequestBody } from "@/libimport { hashToken, withWorkspace } from "@/lib/auth";import { generateRandomName } from "@/lib/names";import { prisma } from "@/lib/prisma";+import { isProductionEnvironment } from "@/lib/sandbox/environment";- import { ratelimit } from "@/lib/upstash";+ import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";+ import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";import { createTokenSchema, tokenSchema } from "@/lib/zod/schemas/token";import { sendEmail } from "@dub/email";import APIKeyCreated from "@dub/email/templates/api-key-created";diff --cc apps/web/app/api/workspaces/[idOrSlug]/invites/route.tsindex 119001821f,270ac14c7a..68ead1f189--- a/apps/web/app/api/workspaces/[idOrSlug]/invites/route.ts+++ b/apps/web/app/api/workspaces/[idOrSlug]/invites/route.ts@@@ -4,8 -4,9 +4,10 @@@ import { assertRoleAllowedForPlan } froimport { withWorkspace } from "@/lib/auth";import { exceededLimitError } from "@/lib/exceeded-limit-error";import { prisma } from "@/lib/prisma";+import { assertNotStagingWorkspace } from "@/lib/sandbox/workspace-guards";- import { ratelimit, redis } from "@/lib/upstash";+ import { redis } from "@/lib/upstash";+ import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";+ import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";import { inviteTeammatesSchema } from "@/lib/zod/schemas/invites";import {getWorkspaceUsersQuerySchema,diff --cc apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/discounts/group-discounts.tsxindex 6b8f54e3db,c105187588..317af0cae0--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/discounts/group-discounts.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/discounts/group-discounts.tsx@@@ -1,16 -1,17 +1,20 @@@"use client";+import { useCopyDiscountToLiveModal } from "@/lib/sandbox/components/copy-discount-to-live-modal";+import { isStagingEnvironment } from "@/lib/sandbox/environment";+ import { useDiscounts } from "@/lib/swr/use-discounts";import useGroup from "@/lib/swr/use-group";+import useWorkspace from "@/lib/swr/use-workspace";import type { DiscountProps, GroupProps } from "@/lib/types";import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";- import { useDiscountSheet } from "@/ui/partners/discounts/add-edit-discount-sheet";+ import {+ DiscountSheet,+ useDiscountSheet,+ } from "@/ui/partners/discounts/add-edit-discount-sheet";+ import { CustomItemsAccordion } from "@/ui/partners/groups/custom-rewards-accordion";import { ProgramRewardDescription } from "@/ui/partners/program-reward-description";- import { Button, useRouterStuff } from "@dub/ui";+ import { Button, DiscountCode, useRouterStuff } from "@dub/ui";import { cn, isClickOnInteractiveChild } from "@dub/utils";- import { BadgePercent } from "lucide-react";import Link from "next/link";import { useParams } from "next/navigation";import { useEffect, useState } from "react";@@@ -79,10 -80,7 +87,10 @@@ const DiscountItem = (const As = discount ? Link : "div";return (- <>+ <div>+ {discount && isStagingEnvironment(environment) && (+ <CopyDiscountToLiveModal />+ )}<Ashref={discountdiff --cc apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/rewards/page.tsxindex ffe6204fe3,65ee464626..450eb0424c--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/rewards/page.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/rewards/page.tsx@@@ -1,5 -1,393 +1,422 @@@- import { GroupRewards } from "./group-rewards";+ "use client";++ import { getPlanCapabilities } from "@/lib/plan-capabilities";++import { useCopyRewardToLiveModal } from "@/lib/sandbox/components/copy-reward-to-live-modal";++import { isStagingEnvironment } from "@/lib/sandbox/environment";+ import useGroup from "@/lib/swr/use-group";+ import { useRewards } from "@/lib/swr/use-rewards";+ import useWorkspace from "@/lib/swr/use-workspace";+ import type { GroupProps, RewardProps } from "@/lib/types";+ import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";+ import { useRewardHistorySheet } from "@/ui/activity-logs/reward-history-sheet";+ import { useAdvancedUpsellModal } from "@/ui/partners/advanced-upsell-modal";+ import { CustomItemsAccordion } from "@/ui/partners/groups/custom-rewards-accordion";+ import { ProgramRewardDescription } from "@/ui/partners/program-reward-description";+ import {+ RewardSheet,+ useRewardSheet,+ } from "@/ui/partners/rewards/add-edit-reward-sheet";+ import { REWARD_EVENT_DESCRIPTIONS } from "@/ui/partners/rewards/reward-event-descriptions";+ import { REWARD_EVENT_ICON } from "@/ui/partners/rewards/reward-event-icon";+ import {+ Button,+ TimestampTooltip,+ TooltipContent,+ useRouterStuff,+ } from "@dub/ui";-import { cn, formatDate } from "@dub/utils";++import { cn, formatDate, isClickOnInteractiveChild } from "@dub/utils";+ import { EventType } from "@prisma/client";+ import Link from "next/link";+ import { useParams } from "next/navigation";+ import { useEffect, useState } from "react";export default function GroupRewardsPage() {- return <GroupRewards />;+ const { group, loading } = useGroup();+ const { rewards: groupRewards } = useRewards({ groupId: group?.id });+ const { searchParams } = useRouterStuff();++ const [rewardSheetState, setRewardSheetState] = useState<+ { open: false; rewardId: string | null } | { open: true; rewardId: string }+ >({ open: false, rewardId: null });++ useEffect(() => {+ const rewardId = searchParams.get("rewardId");++ if (rewardId) {+ setRewardSheetState({ open: true, rewardId });+ } else {+ setRewardSheetState({ open: false, rewardId: null });+ }+ }, [searchParams]);++ const rewards =+ [+ group?.clickReward,+ group?.leadReward,+ group?.saleReward,+ group?.referralReward,+ group?.customReward,+ ].filter(Boolean) ?? [];++ const currentReward = getCurrentReward({+ rewardId: rewardSheetState.rewardId,+ defaultRewards: rewards,+ rewards: groupRewards,+ });++ const isNewReward = rewardSheetState.rewardId?.startsWith("new-");+ const newRewardEvent = isNewReward+ ? (rewardSheetState.rewardId?.replace("new-", "") as EventType)+ : undefined;++ return (+ <div>+ {rewardSheetState.rewardId && (currentReward || isNewReward) && (+ <RewardSheetWrapper+ reward={currentReward}+ event={newRewardEvent}+ isOpen={rewardSheetState.open}+ setIsOpen={(open) =>+ setRewardSheetState((s) => ({ ...s, open }) as any)+ }+ isDefault={+ Boolean(isNewReward) ||+ rewards.some((reward) => reward?.id === currentReward?.id)+ }+ />+ )}++ <div className="flex flex-col gap-6">+ {loading || !group ? (+ <>+ {Array.from({ length: 5 }).map((_, index) => (+ <RewardSkeleton key={index} />+ ))}+ </>+ ) : (+ <>+ <RewardItem reward={group.saleReward} event="sale" group={group} />+ <RewardItem reward={group.leadReward} event="lead" group={group} />+ <RewardItem+ reward={group.clickReward}+ event="click"+ group={group}+ />++ <div className="flex items-center gap-3">+ <h3 className="text-sm font-medium text-neutral-800">+ Additional rewards+ </h3>+ <hr className="min-w-0 flex-1 border-neutral-200" />+ </div>++ <RewardItem+ reward={group.referralReward}+ event="referral"+ group={group}+ />++ <RewardItem+ reward={group.customReward}+ event="custom"+ group={group}+ />+ </>+ )}+ </div>+ </div>+ );+ }++ const RewardSheetWrapper = ({+ reward,+ event,+ isOpen,+ setIsOpen,+ isDefault,+ }: {+ reward?: RewardProps | null;+ event?: EventType;+ isOpen: boolean;+ setIsOpen: (open: boolean) => void;+ isDefault: boolean;+ }) => {+ return (+ <RewardSheet+ isOpen={isOpen}+ setIsOpen={setIsOpen}+ event={event || reward?.event || "sale"}+ reward={reward || undefined}+ isDefault={isDefault}+ />+ );+ };++ const RewardItem = ({+ reward,+ event,+ group,+ }: {+ reward?: RewardProps | null;+ event: EventType;+ group: GroupProps;+ }) => {+ const { slug } = useParams();- const { plan } = useWorkspace();++ const { plan, environment } = useWorkspace();+ const { queryParams } = useRouterStuff();- const { canCreateReferralReward } = getPlanCapabilities(plan);++ const { openCopyRewardToLiveModal, CopyRewardToLiveModal } =++ useCopyRewardToLiveModal();+ const { advancedUpsellModal, setShowAdvancedUpsellModal } =+ useAdvancedUpsellModal();+++ const { canCreateReferralReward } = getPlanCapabilities(plan);+++ const { RewardSheet, setIsOpen } = useRewardSheet({+ event,+ reward: reward || undefined,+ });++ const {+ loading: activityLogsLoading,+ hasActivityLogs,+ finalActivityLogDate,+ rewardHistorySheet,+ setIsOpen: setHistoryOpen,+ } = useRewardHistorySheet({+ reward: reward ?? null,+ });++ const Icon = REWARD_EVENT_ICON[event];+ const As = reward ? Link : "div";++ const lastUpdatedDate = finalActivityLogDate ?? reward?.updatedAt;++ return (+ <>+ {advancedUpsellModal}+ {RewardSheet}+ {rewardHistorySheet}++ {reward && isStagingEnvironment(environment) && <CopyRewardToLiveModal />}+ <div>+ <As+ href={+ reward+ ? `/${slug}/program/groups/${group.slug}/rewards?rewardId=${reward.id}`+ : "#"+ }+ {...(reward ? { scroll: false } : {})}+ className={cn(- "flex flex-col gap-4 rounded-lg p-6 transition-all md:flex-row md:items-center",- reward &&- "cursor-pointer border border-neutral-200 hover:border-neutral-300",++ "flex cursor-pointer flex-col gap-4 rounded-lg p-6 transition-all md:flex-row md:items-center",++ reward && "border border-neutral-200 hover:border-neutral-300",+ !reward && "bg-neutral-50 hover:bg-neutral-100",+ )}++ onClick={(e) => {++ e.preventDefault();++ if (isClickOnInteractiveChild(e)) return;++ queryParams({++ set: {++ rewardId: reward?.id ?? `new-${event}`,++ },++ });++ }}+ >+ <div className="flex size-10 shrink-0 items-center justify-center rounded-full border border-neutral-200 bg-white">+ <Icon className="size-4 text-neutral-600" />+ </div>+ <div className="flex flex-1 flex-col justify-between gap-y-4 md:flex-row md:items-center">+ <div className="flex w-full items-center gap-2">+ {reward ? (+ <div className="flex min-w-0 flex-1 flex-col gap-1">+ <div className="text-sm font-normal">+ <ProgramRewardDescription+ reward={reward}+ amountClassName="text-blue-600"+ />+ </div>++ <div className="flex items-center gap-1 text-xs font-medium text-neutral-500">+ <span>Last updated </span>+ {!lastUpdatedDate ? (+ <div className="h-3 w-16 animate-pulse rounded bg-neutral-100" />+ ) : (+ <TimestampTooltip+ timestamp={lastUpdatedDate}+ side="left"+ rows={["local", "utc", "unix"]}+ >+ <span>+ {formatDate(lastUpdatedDate, {+ month: "short",+ day: "numeric",+ year: "numeric",+ })}+ </span>+ </TimestampTooltip>+ )}++ {activityLogsLoading ? (+ <div className="ml-1 h-3 w-20 animate-pulse rounded bg-neutral-100" />+ ) : hasActivityLogs ? (+ <>+ <span+ className="ml-1 size-1 shrink-0 rounded-full bg-neutral-400"+ aria-hidden+ />+ <Button+ variant="outline"+ text="View history"+ className="h-4 w-fit px-1 py-0.5 text-xs font-medium text-neutral-500"+ onClick={(e) => {+ e.preventDefault();+ e.stopPropagation();+ setHistoryOpen(true);+ }}+ />+ </>+ ) : null}+ </div>+ </div>+ ) : (+ <div className="flex flex-col">+ <span className="text-sm font-medium text-neutral-900">+ {REWARD_EVENT_DESCRIPTIONS[event].title}+ </span>+ <span className="text-sm font-normal text-neutral-500">+ {REWARD_EVENT_DESCRIPTIONS[event].description}.{" "}+ <Link+ href={REWARD_EVENT_DESCRIPTIONS[event].learnMoreHref}+ target="_blank"+ rel="noopener noreferrer"+ className="underline decoration-neutral-400 decoration-dotted underline-offset-2 hover:text-neutral-600"+ >+ Learn more ↗+ </Link>+ </span>+ </div>+ )}+ </div>++ {reward ? (- <Button- text="Edit"- variant="secondary"- className="h-9 w-fit rounded-lg"- onClick={(e) => {- e.preventDefault();- e.stopPropagation();- queryParams({- set: {- rewardId: reward.id,- },- });- }}- />++ <div className="flex items-center gap-2">++ {isStagingEnvironment(environment) && (++ <Button++ text="Copy to live"++ variant="secondary"++ className="h-9 w-fit rounded-lg"++ onClick={(e) => {++ e.preventDefault();++ e.stopPropagation();++ openCopyRewardToLiveModal(reward);++ }}++ />++ )}++++ <Button++ text="Edit"++ variant="secondary"++ className="h-9 w-fit rounded-lg"++ onClick={(e) => {++ e.preventDefault();++ e.stopPropagation();++ queryParams({++ set: {++ rewardId: reward.id,++ },++ });++ }}++ />++ </div>+ ) : (+ <div className="flex flex-col-reverse items-center gap-2 md:flex-row">+ {group.slug !== DEFAULT_PARTNER_GROUP.slug &&+ (event !== "referral" || canCreateReferralReward) && (+ <CopyDefaultRewardButton event={event} />+ )}+ <Button+ text="Create"+ variant="primary"+ className="h-9 w-full rounded-lg md:w-fit"+ disabledTooltip={+ event === "referral" && !canCreateReferralReward ? (+ <TooltipContent+ title="Referral rewards are only available on the Advanced plan and above."+ cta="Upgrade to Advanced"+ onClick={() => setShowAdvancedUpsellModal(true)}+ />+ ) : undefined+ }+ onClick={(e) => {+ e.preventDefault();+ e.stopPropagation();+ setIsOpen(true);+ }}+ />+ </div>+ )}+ </div>+ </As>+ <CustomItemsAccordion group={group} event={event} />+ </div>+ </>+ );+ };++ const CopyDefaultRewardButton = ({ event }: { event: EventType }) => {+ const { group: defaultGroup } = useGroup({+ groupIdOrSlug: DEFAULT_PARTNER_GROUP.slug,+ });++ const defaultReward = defaultGroup?.[`${event}Reward`];++ const { RewardSheet, setIsOpen } = useRewardSheet({+ event,+ defaultRewardValues: defaultReward ?? undefined,+ });++ return defaultReward ? (+ <>+ {RewardSheet}+ <Button+ text="Duplicate default group"+ variant="secondary"+ className="animate-fade-in h-9 w-full rounded-lg md:w-fit"+ onClick={(e) => {+ e.preventDefault();+ e.stopPropagation();+ setIsOpen(true);+ }}+ />+ </>+ ) : null;+ };++ const RewardSkeleton = () => {+ return (+ <div className="flex items-center gap-4 rounded-lg bg-neutral-50 p-6">+ <div className="flex size-10 animate-pulse items-center justify-center rounded-full border border-neutral-200 bg-neutral-100" />+ <div className="flex flex-1 items-center justify-between">+ <div className="h-4 w-64 animate-pulse rounded bg-neutral-100" />+ <div className="h-6 w-24 animate-pulse rounded-full bg-neutral-100" />+ </div>+ </div>+ );+ };++ function getCurrentReward({+ rewardId,+ defaultRewards,+ rewards,+ }: {+ rewardId: string | null;+ defaultRewards: (RewardProps | null | undefined)[];+ rewards: RewardProps[] | undefined;+ }): RewardProps | undefined {+ if (!rewardId) {+ return undefined;+ }++ return (+ defaultRewards.find((reward) => reward?.id === rewardId) ??+ rewards?.find((reward) => reward.id === rewardId)+ );}diff --cc apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/plan-usage.tsxindex 3446965a3f,a10d6cf126..d5ea29cea7--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/plan-usage.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/plan-usage.tsx@@@ -40,11 -45,11 +45,12 @@@ importisLegacyBusinessPlan,isWorkspaceBillingTrialActive,nFormatter,+ sleep,} from "@dub/utils";import NumberFlow from "@number-flow/react";+import { WorkspaceEnvironment } from "@prisma/client";import Link from "next/link";- import { CSSProperties, ReactNode, useMemo } from "react";+ import { ComponentProps, CSSProperties, ReactNode, useMemo } from "react";import { toast } from "sonner";import { UsageChart } from "./usage-chart";@@@ -79,7 -84,8 +85,9 @@@ export default function PlanUsage()trialEndsAt,subscriptionCanceledAt,billingCycleEndsAt,+ environment,+ defaultProgramId,+ loading,mutate,} = useWorkspace();@@@ -328,8 -347,9 +360,9 @@@text="Start paid plan"variant="primary"className="h-9"- disabled={Boolean(permissionsError)}+ disabled={Boolean(managePlanError)}onClick={() => setShowStartPaidPlanModal(true)}+ data-testid={testIds.billing.startPaidPlan}/></DynamicTooltipWrapper>) : showPendingCancellation ? (diff --cc apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsxindex b370db96c0,da5a8f34f2..b314cbf76d--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx@@@ -54,7 -57,7 +58,8 @@@ export default function WorkspaceMemberconst { setShowInviteCodeModal, InviteCodeModal } = useInviteCodeModal();- const { role, plan, planPeriod, usersLimit, environment } = useWorkspace();- const { role, plan, planPeriod, usersLimit, slug } = useWorkspace();++ const { role, plan, planPeriod, usersLimit, slug, environment } =++ useWorkspace();const { data: session } = useSession();const { id: workspaceId } = useWorkspace();const { users: workspaceUsers } = useWorkspaceUsers();@@@ -290,26 -293,10 +298,30 @@@});};+ const { error: inviteNewTeammatesError } = clientAccessCheck({+ action: "workspaces.write",+ role,+ environment,+ customPermissionDescription: "invite new teammates",+ restrictedEnvironments: [WorkspaceEnvironment.staging],+ restrictedEnvironmentMessage:+ "Teammates can only be invited from your production workspace (members are automatically synced to staging).",+ });++ const { error: generateInviteLinksError } = clientAccessCheck({+ action: "workspaces.write",+ role,+ environment,+ customPermissionDescription: "generate invite links",+ restrictedEnvironments: [WorkspaceEnvironment.staging],+ restrictedEnvironmentMessage:+ "Invite links can only be generated from your production workspace (members are automatically synced to staging).",+ });++ if (role === "viewer") {+ return <AccessDenied slug={slug} />;+ }+return (<><InviteWorkspaceUserModal />diff --cc apps/web/lib/actions/partners/create-program.tsindex eff467d801,e138ad47c2..60deaa80d6--- a/apps/web/lib/actions/partners/create-program.ts+++ b/apps/web/lib/actions/partners/create-program.ts@@@ -105,141 -109,136 +111,142 @@@ export const createProgram = async (}// create a new program- const program = await prisma.$transaction(async (tx) => {- const folderId = createId({ prefix: "fold_" });- const defaultGroupId = createId({ prefix: "grp_" });+ const { updatedWorkspace, program } = await prisma.$transaction(+ async (tx) => {+ const folderId = createId({ prefix: "fold_" });+ const defaultGroupId = createId({ prefix: "grp_" });- const programFolder = await tx.folder.upsert({- where: {- name_projectId: {+ const programFolder = await tx.folder.upsert({+ where: {+ name_projectId: {+ name: "Partner Links",+ projectId: workspace.id,+ },+ },+ update: {},+ create: {+ id: folderId,name: "Partner Links",projectId: workspace.id,- },- },- update: {},- create: {- id: folderId,- name: "Partner Links",- projectId: workspace.id,- accessLevel: "write",- users: {- create: {- userId: user.id,- role: "owner",+ accessLevel: "write",+ users: {+ create: {+ userId: user.id,+ role: "owner",+ },},},- },- });+ });- const programData = await tx.program.create({- data: {- id: programId,- workspaceId: workspace.id,- name,- slug: workspace.slug,- domain,- url,- logo: logoUrl, // TODO: remove after we refactor all program.logo fields to use group.logo instead- defaultFolderId: programFolder.id,- defaultGroupId,- supportEmail,- helpUrl,- termsUrl,- messagingEnabledAt: canMessagePartners ? new Date() : null,- ...(type &&- (amountInCents != null || amountInPercentage != null) && {- rewards: {- create: {- id: createId({ prefix: "rw_" }),- groupId: defaultGroupId,- type,- amountInCents: type === "flat" ? amountInCents : null,- amountInPercentage:- type === "percentage" && amountInPercentage != null- ? amountInPercentage- : null,- maxDuration,- event: defaultRewardType,+ const programData = await tx.program.create({+ data: {+ id: programId,+ workspaceId: workspace.id,+ name,+ slug: workspace.slug,+ domain,+ url,+ logo: logoUrl, // TODO: remove after we refactor all program.logo fields to use group.logo instead+ defaultFolderId: programFolder.id,+ defaultGroupId,+ supportEmail,+ helpUrl,+ termsUrl,+ messagingEnabledAt: canMessagePartners ? new Date() : null,+ ...(type &&+ (amountInCents != null || amountInPercentage != null) && {+ rewards: {+ create: {+ id: createId({ prefix: "rw_" }),++ groupId: defaultGroupId,+ type,+ amountInCents: type === "flat" ? amountInCents : null,+ amountInPercentage:+ type === "percentage" && amountInPercentage != null+ ? amountInPercentage+ : null,+ maxDuration,+ event: defaultRewardType,+ },},- },- }),- },- include: {- rewards: true,- },- });+ }),+ },+ include: {+ rewards: true,+ },+ });- const createdReward = programData.rewards?.[0];+ const createdReward = programData.rewards?.[0];- await tx.partnerGroup.upsert({- where: {- programId_slug: {+ await tx.partnerGroup.upsert({+ where: {+ programId_slug: {+ programId,+ slug: DEFAULT_PARTNER_GROUP.slug,+ },+ },+ create: {+ id: defaultGroupId,programId,slug: DEFAULT_PARTNER_GROUP.slug,- },- },- create: {- id: defaultGroupId,- programId,- slug: DEFAULT_PARTNER_GROUP.slug,- name: DEFAULT_PARTNER_GROUP.name,- color: DEFAULT_PARTNER_GROUP.color,- ...(logoUrl && { logo: logoUrl }),- ...(createdReward && {- [REWARD_EVENT_COLUMN_MAPPING[createdReward.event]]: createdReward.id,- }),- additionalLinks: sanitizeAdditionalLinks([- {- domain: getDomainWithoutWWW(programData.url!),- validationMode: "domain",- },- ]),- maxPartnerLinks: DEFAULT_ADDITIONAL_PARTNER_LINKS,- partnerGroupDefaultLinks: {- create: {- id: createId({ prefix: "pgdl_" }),- programId,- domain: programData.domain!,- url: programData.url!,+ name: DEFAULT_PARTNER_GROUP.name,+ color: DEFAULT_PARTNER_GROUP.color,+ ...(logoUrl && { logo: logoUrl }),+ ...(createdReward && {+ [REWARD_EVENT_COLUMN_MAPPING[createdReward.event]]:+ createdReward.id,+ }),+ additionalLinks: sanitizeAdditionalLinks([+ {+ domain: getDomainWithoutWWW(programData.url!),+ validationMode: "domain",+ },+ ]),+ maxPartnerLinks: DEFAULT_ADDITIONAL_PARTNER_LINKS,+ partnerGroupDefaultLinks: {+ create: {+ id: createId({ prefix: "pgdl_" }),+ programId,+ domain: programData.domain!,+ url: programData.url!,+ },},},- },- update: {}, // noop- });+ update: {}, // noop+ });- // folder might be upserted, so we need to check if it was created- const didCreateFolder = programFolder.id === folderId;+ // folder might be upserted, so we need to check if it was created+ const didCreateFolder = programFolder.id === folderId;- await tx.project.update({- where: {- id: workspace.id,- },- data: {- defaultProduct: "program",- defaultProgramId: programData.id,- ...(didCreateFolder && {- foldersUsage: {- increment: 1,+ const updatedWorkspace = await tx.project.update({+ where: {+ id: workspace.id,+ },+ data: {+ defaultProduct: "program",+ defaultProgramId: programData.id,+ ...(didCreateFolder && {+ foldersUsage: {+ increment: 1,+ },+ }),+ store: {+ ...store,+ programOnboarding: undefined,},- }),- store: {- ...store,- programOnboarding: undefined,+ // if the workspace doesn't have an invoice prefix, generate one+ ...(!workspace.invoicePrefix && {+ invoicePrefix: generateRandomString(8),+ }),},- // if the workspace doesn't have an invoice prefix, generate one- ...(!workspace.invoicePrefix && {- invoicePrefix: generateRandomString(8),- }),- },- });+ });- return programData;- });+ return {+ updatedWorkspace,+ program: programData,+ };+ },+ );waitUntil(Promise.allSettled([@@@ -313,7 -312,14 +320,16 @@@],}),+ queueCreateStagingWorkspace(updatedWorkspace),+++ log({+ message: `:tada: New program created: ${+ program.url+ ? `<${program.url}|*${program.name}*>`+ : `*${program.name}*`+ } (\`${program.slug}\`) → *${capitalize(workspace.plan)}* plan`,+ type: "alerts",+ }),]),);diff --cc apps/web/lib/api/workspaces/delete-workspace.tsindex 5674058dfa,bdfc715eab..8eb53a6f41--- a/apps/web/lib/api/workspaces/delete-workspace.ts+++ b/apps/web/lib/api/workspaces/delete-workspace.ts@@@ -1,46 -1,14 +1,40 @@@+import { getWorkspaceLogoStorageKey } from "@/lib/api/workspaces/workspace-logo";import { prisma } from "@/lib/prisma";+import { assertNotStagingWorkspace } from "@/lib/sandbox/workspace-guards";import { storage } from "@/lib/storage";import { WorkspaceProps } from "@/lib/types";- import {- APP_DOMAIN_WITH_NGROK,- DUB_DOMAINS_ARRAY,- LEGAL_USER_ID,- LEGAL_WORKSPACE_ID,- } from "@dub/utils";-import { APP_DOMAIN_WITH_NGROK, prettyPrint, R2_URL } from "@dub/utils";++import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";import { waitUntil } from "@vercel/functions";import { qstash } from "../../cron";import { cancelSubscription } from "../../stripe/cancel-subscription";- import { linkCache } from "../links/cache";export async function deleteWorkspace(- workspace: Pick<WorkspaceProps, "id" | "slug" | "logo" | "stripeId">,+ workspace: Pick<+ WorkspaceProps,+ "id" | "slug" | "logo" | "stripeId" | "stagingWorkspaceId" | "environment"+ >,) {+ assertNotStagingWorkspace(workspace, {+ message: "Workspace deletion is not permitted for staging environments.",+ });++ const stagingWorkspace = workspace.stagingWorkspaceId+ ? await prisma.project.findUnique({+ where: {+ id: workspace.stagingWorkspaceId,+ },+ select: {+ id: true,+ slug: true,+ },+ })+ : null;++ const workspaces = [+ workspace,+ ...(stagingWorkspace ? [stagingWorkspace] : []),+ ];+await Promise.all([// Remove the usersprisma.projectUsers.deleteMany({@@@ -94,94 -44,19 +88,17 @@@cancelSubscription({ customerId: workspace.stripeId }),// Delete workspace logo if it's a custom logo stored in R2- workspace.logo &&- workspace.logo.startsWith(`${R2_URL}/logos/${workspace.id}`) &&- storage.delete({ key: workspace.logo.replace(`${R2_URL}/`, "") }),-- // Queue the workspace for deletion- qstash.publishJSON({- url: `${APP_DOMAIN_WITH_NGROK}/api/cron/workspaces/delete`,- body: {- workspaceId: workspace.id,- },- }),- ]).then((results) => {- console.log(prettyPrint(results));- }),+ logoKey && storage.delete({ key: logoKey }),++ // Queue the workspace(s) for deletion+ ...workspaces.map((ws) =>+ qstash.publishJSON({+ url: `${APP_DOMAIN_WITH_NGROK}/api/cron/workspaces/delete`,+ body: {+ workspaceId: ws.id,+ },+ }),+ ),+ ]),);}-- export async function deleteWorkspaceAdmin(- workspace: Pick<WorkspaceProps, "id" | "slug" | "logo" | "stripeId">,- ) {- while (true) {- const defaultDomainLinks = await prisma.link.findMany({- where: {- projectId: workspace.id,- domain: {- in: DUB_DOMAINS_ARRAY,- },- },- select: {- id: true,- domain: true,- key: true,- },- take: 100,- });-- if (defaultDomainLinks.length === 0) {- break;- }-- const [redisRes, prismaRes] = await Promise.allSettled([- linkCache.expireMany(defaultDomainLinks),- prisma.link.updateMany({- where: {- id: {- in: defaultDomainLinks.map((link) => link.id),- },- },- data: {- projectId: LEGAL_WORKSPACE_ID,- userId: LEGAL_USER_ID,- },- }),- ]);-- console.log(- `Banned ${defaultDomainLinks.length} default domain links for ${workspace.slug}`,- redisRes,- prismaRes,- );- }-- const logoKey = getWorkspaceLogoStorageKey({- workspaceId: workspace.id,- logoUrl: workspace.logo,- });-- const deleteWorkspaceResponse = await Promise.allSettled([- // delete workspace logo if it's a custom logo stored in R2- logoKey && storage.delete({ key: logoKey }),-- // if they have a Stripe subscription, cancel it- workspace.stripeId &&- cancelSubscription({- customerId: workspace.stripeId,- reason: "Customer was banned from Dub",- }),-- // Queue the workspace for deletion- qstash.publishJSON({- url: `${APP_DOMAIN_WITH_NGROK}/api/cron/workspaces/delete`,- body: {- workspaceId: workspace.id,- },- }),- ]);-- console.log(`Deleted workspace ${workspace.slug}`, deleteWorkspaceResponse);-- return {- deleteWorkspaceResponse,- };- }diff --cc apps/web/lib/jobs/handlers/create-discount-code-for-link-job.tsindex 0000000000,c7dcadaf18..d7f48b5b34mode 000000,100644..100644--- a/apps/web/lib/jobs/handlers/create-discount-code-for-link-job.ts+++ b/apps/web/lib/jobs/handlers/create-discount-code-for-link-job.ts@@@ -1,0 -1,143 +1,144 @@@+ import { DubApiError } from "@/lib/api/errors";+ import { createDiscountCode } from "@/lib/discounts/create-discount-code";+ import { isNonRecoverableDiscountError } from "@/lib/discounts/discount-error";+ import { isDiscountDeleted } from "@/lib/discounts/is-discount-deleted";+ import { prisma } from "@/lib/prisma";+ import * as z from "zod/v4";+ import { defineJob } from "../index";++ const inputSchema = z.object({+ linkId: z+ .string()+ .describe("The ID of the link to create a discount code for."),+ });++ // Create a discount code for a single default partner link.+ // Fan-out from sync and discount publish can queue thousands of jobs; flow+ // control caps concurrent creates so we don't stampede Stripe/Shopify.+ export const createDiscountCodeForLinkJob = defineJob({+ name: "create-discount-code-for-link-job",+ schema: inputSchema,+ defaults: {+ flowControl: {+ key: "create-discount-code-for-link",+ parallelism: 20,+ },+ },+ async handle({ linkId }) {+ const link = await prisma.link.findUnique({+ where: {+ id: linkId,+ },+ select: {+ id: true,+ discountCode: true,+ partnerGroupDefaultLinkId: true,+ linkReward: {+ select: {+ discount: true,+ },+ },+ programEnrollment: {+ select: {+ discount: true,+ partner: {+ select: {+ id: true,+ name: true,+ },+ },+ program: {+ select: {+ id: true,+ },+ },+ },+ },+ project: {+ select: {+ id: true,+ webhookEnabled: true,+ stripeConnectId: true,+ shopifyStoreId: true,++ environment: true,+ },+ },+ },+ });++ if (!link || !link.project) {+ console.info(`Link ${linkId} not found. Skipping...`);+ return;+ }++ if (link.discountCode) {+ console.info(`Link ${linkId} already has a discount code. Skipping...`);+ return;+ }++ if (link.partnerGroupDefaultLinkId === null) {+ console.info(`Link ${linkId} is not a default link. Skipping...`);+ return;+ }++ if (!link.programEnrollment) {+ console.info(+ `Link ${linkId} is not associated with a program enrollment. Skipping...`,+ );+ return;+ }++ const {+ project: workspace,+ programEnrollment: { program, partner },+ } = link;++ const discount =+ link.linkReward?.discount ?? link.programEnrollment.discount;++ if (!discount) {+ console.info(+ `Partner ${partner.id} does not have a discount with program ${program.id}. Skipping...`,+ );+ return;+ }++ if (isDiscountDeleted(discount)) {+ console.info(`Discount ${discount.id} is soft-deleted. Skipping...`);+ return;+ }++ if (!discount.autoProvisionEnabledAt) {+ console.info(+ `Discount ${discount.id} does not have auto-provision enabled. Skipping...`,+ );+ return;+ }++ try {+ await createDiscountCode({+ workspace,+ partner,+ link,+ discount,+ });+ } catch (error) {+ if (isNonRecoverableDiscountError(error)) {+ console.warn(error.message);+ return;+ }++ if (+ error instanceof DubApiError &&+ (error.code === "conflict" || error.code === "bad_request")+ ) {+ console.warn(error.message);+ return;+ }++ throw error;+ }++ console.info(`Discount code created for link ${linkId}.`);+ },+ });diff --cc apps/web/lib/jobs/handlers/program-application-reminder-job.tsindex 0000000000,6432c9dab4..c7b84ff914mode 000000,100644..100644--- a/apps/web/lib/jobs/handlers/program-application-reminder-job.ts+++ b/apps/web/lib/jobs/handlers/program-application-reminder-job.ts@@@ -1,0 -1,104 +1,110 @@@+ import { prisma } from "@/lib/prisma";+ import { sendEmail } from "@dub/email";+ import ProgramApplicationReminder from "@dub/email/templates/program-application-reminder";++import { WorkspaceEnvironment } from "@prisma/client";+ import * as z from "zod/v4";+ import { defineJob } from "../index";++ const inputSchema = z.object({+ applicationId: z.string(),+ });++ // Sends an email to a program application email if they haven't verified their account on Dub yet+ export const programApplicationReminderJob = defineJob({+ name: "program-application-reminder-job",+ schema: inputSchema,+ async handle(input) {+ const { applicationId } = input;++ const application = await prisma.programApplication.findFirst({+ where: {+ id: applicationId,+ // Only send reminders for applications that were created less than 3 days ago+ createdAt: {+ gt: new Date(Date.now() - 3 * 24 * 60 * 60 * 1000),+ },++ program: {++ workspace: {++ environment: WorkspaceEnvironment.production,++ },++ },+ },+ select: {+ id: true,+ email: true,+ enrollment: {+ select: {+ id: true,+ },+ },+ program: {+ select: {+ id: true,+ name: true,+ slug: true,+ supportEmail: true,+ },+ },+ },+ });++ if (!application) {+ console.info(`Application ${applicationId} not found. Skipping...`);+ return;+ }++ if (application.enrollment) {+ console.info(+ `Partner with applicationId ${application.id} has already been enrolled in program ${application.program.name}. Skipping...`,+ );+ return;+ }++ const programEnrollment = await prisma.programEnrollment.findFirst({+ where: {+ programId: application.program.id,+ partner: {+ email: application.email,+ },+ },+ select: {+ id: true,+ },+ });++ if (programEnrollment) {+ console.info(+ `Partner with email ${application.email} is already enrolled in program ${application.program.name}. Skipping reminder...`,+ );+ return;+ }++ await sendEmail({+ subject: `Complete your application for ${application.program.name}`,+ to: application.email,+ replyTo: application.program.supportEmail || "noreply",+ variant: "notifications",+ react: ProgramApplicationReminder({+ email: application.email,+ program: {+ name: application.program.name,+ slug: application.program.slug,+ },+ }),+ });++ await programApplicationReminderJob.dispatch(+ {+ applicationId: application.id,+ },+ {+ // repeat every 24 hours, but it'll be canceled if the application is more than 3 days old or is associated with a partner+ delay: 24 * 60 * 60,+ },+ );++ console.info(+ `Email sent to ${application.email} for application ${applicationId}.`,+ );+ },+ });diff --cc apps/web/lib/jobs/handlers/publish-discount-codes-creation-job.tsindex 0000000000,c9730d8d1d..70f01e0953mode 000000,100644..100644--- a/apps/web/lib/jobs/handlers/publish-discount-codes-creation-job.ts+++ b/apps/web/lib/jobs/handlers/publish-discount-codes-creation-job.ts@@@ -1,0 -1,148 +1,149 @@@+ import { CRON_BATCH_SIZE } from "@/lib/cron";+ import { isNonRecoverableDiscountError } from "@/lib/discounts/discount-error";+ import { getDiscountProvider } from "@/lib/discounts/discount-provider";+ import { isDiscountDeleted } from "@/lib/discounts/is-discount-deleted";+ import { prisma } from "@/lib/prisma";+ import { ACTIVE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";+ import * as z from "zod/v4";+ import { defineJob } from "../index";+ import { createDiscountCodeForLinkJob } from "./create-discount-code-for-link-job";++ const inputSchema = z.object({+ discountId: z.string(),+ startingAfter: z.string().optional(),+ });++ // Page default links for a discount and enqueue per-link create-discount-code-for-link jobs+ export const publishDiscountCodesCreationJob = defineJob({+ name: "publish-discount-codes-creation-job",+ schema: inputSchema,+ async handle({ discountId, startingAfter }) {+ const discount = await prisma.discount.findUnique({+ where: {+ id: discountId,+ },+ include: {+ program: {+ select: {+ id: true,+ workspace: {+ select: {+ id: true,+ stripeConnectId: true,+ shopifyStoreId: true,++ environment: true,+ },+ },+ },+ },+ },+ });++ if (!discount) {+ console.info(`Discount ${discountId} not found. Skipping...`);+ return;+ }++ if (isDiscountDeleted(discount)) {+ console.info(`Discount ${discountId} is soft-deleted. Skipping...`);+ return;+ }++ if (!discount.autoProvisionEnabledAt) {+ console.info(+ `Discount ${discountId} does not have auto-provision enabled. Skipping...`,+ );+ return;+ }++ const { program } = discount;++ if (!program) {+ console.info(`Discount ${discountId} has no program. Skipping...`);+ return;+ }++ const discountProvider = getDiscountProvider(discount.provider);++ try {+ await discountProvider.assertDiscountIntegration({+ workspace: program.workspace,+ });+ } catch (error) {+ if (isNonRecoverableDiscountError(error)) {+ console.warn(error.message);+ return;+ }++ throw error;+ }++ // Get default links for the program+ const partnerLinks = await prisma.link.findMany({+ where: {+ programId: program.id,+ discountCode: null,+ partnerGroupDefaultLinkId: {+ not: null,+ },+ programEnrollment: {+ status: {+ in: ACTIVE_ENROLLMENT_STATUSES,+ },+ },+ OR: [+ {+ linkReward: {+ discountId,+ },+ },+ {+ programEnrollment: {+ discountId,+ },+ },+ ],+ },+ select: {+ id: true,+ },+ ...(startingAfter && {+ skip: 1,+ cursor: {+ id: startingAfter,+ },+ }),+ orderBy: {+ id: "asc",+ },+ take: CRON_BATCH_SIZE,+ });++ if (partnerLinks.length === 0) {+ console.info(`No more links found for discount ${discountId}.`);+ return;+ }++ await createDiscountCodeForLinkJob.dispatchBatch(+ partnerLinks.map((link) => ({+ linkId: link.id,+ })),+ );++ if (partnerLinks.length === CRON_BATCH_SIZE) {+ const startingAfter = partnerLinks[partnerLinks.length - 1].id;++ await publishDiscountCodesCreationJob.dispatch(+ { discountId, startingAfter },+ { label: discountId },+ );++ console.info(+ `Queued next batch for discount ${discountId} (startingAfter: ${startingAfter}).`,+ );+ return;+ }++ console.info(`Finished queuing jobs for discount ${discountId}.`);+ },+ });diff --cc apps/web/ui/layout/sidebar/workspace-dropdown.tsxindex ea58d96b81,09ceaeca02..dd554a6404--- a/apps/web/ui/layout/sidebar/workspace-dropdown.tsx+++ b/apps/web/ui/layout/sidebar/workspace-dropdown.tsx@@@ -230,44 -228,51 +244,55 @@@ function WorkspaceList(Workspaces</p><div className="flex flex-col gap-0.5">- {workspaces.map(({ id, name, slug, logo, disabledAt }) => {- const isActive = selected.slug === slug;- return (- <Link- key={slug}- className={cn(- "flex w-full items-center gap-x-2 rounded-md px-2 py-2 transition-all duration-75",- "hover:bg-neutral-200/50 active:bg-neutral-200/80",- "outline-none focus-visible:ring-2 focus-visible:ring-black/50",- isActive && "bg-neutral-200/50",- )}- href={href(slug)}- shallow={false}- onClick={() => setOpenPopover(false)}- >- <BlurImage- src={logo || `https://avatar.vercel.sh/${id}`}- width={28}- height={28}- alt={id}- className="size-5 shrink-0 overflow-hidden rounded-full"- draggable={false}- />- <span className="min-w-0 flex-1 truncate text-base leading-5 text-neutral-900 sm:text-sm">- {name}- </span>- {disabledAt && (- <StatusBadge- variant="neutral"- size="sm"- icon={null}- className="shrink-0"- >- Disabled- </StatusBadge>- )}- {isActive ? (- <Check2- className="size-4 shrink-0 text-black"- aria-hidden="true"+ {workspaces+ .filter(+ (workspace) => !isStagingEnvironment(workspace.environment),+ )- .map(({ id, name, slug, logo }) => {++ .map(({ id, name, slug, logo, disabledAt }) => {+ const isActive = activeSlug === slug;+ return (+ <Link+ key={slug}+ className={cn(- "relative flex w-full items-center gap-x-2 rounded-md px-2 py-2 transition-all duration-75",++ "flex w-full items-center gap-x-2 rounded-md px-2 py-2 transition-all duration-75",+ "hover:bg-neutral-200/50 active:bg-neutral-200/80",+ "outline-none focus-visible:ring-2 focus-visible:ring-black/50",+ isActive && "bg-neutral-200/50",+ )}+ href={href(slug)}+ shallow={false}+ onClick={() => setOpenPopover(false)}+ >+ <BlurImage+ src={logo || `https://avatar.vercel.sh/${id}`}+ width={28}+ height={28}+ alt={id}+ className="size-5 shrink-0 overflow-hidden rounded-full"+ draggable={false}/>- <span className="block truncate text-base leading-5 text-neutral-900 sm:max-w-[140px] sm:text-sm">- ) : null}- </Link>- );- })}++ <span className="min-w-0 flex-1 truncate text-base leading-5 text-neutral-900 sm:text-sm">+ {name}+ </span>- {activeSlug === slug ? (- <span className="absolute inset-y-0 right-0 flex items-center pr-3 text-black">- <Check2 className="size-4" aria-hidden="true" />- </span>++ {disabledAt && (++ <StatusBadge++ variant="neutral"++ size="sm"++ icon={null}++ className="shrink-0"++ >++ Disabled++ </StatusBadge>++ )}++ {isActive ? (++ <Check2++ className="size-4 shrink-0 text-black"++ aria-hidden="true"++ />+ ) : null}+ </Link>+ );+ })}<buttonkey="add"onClick={() => {diff --cc packages/ui/src/icons/nucleo/index.tsindex 07dcb1a273,909344d4f1..5585aed189--- a/packages/ui/src/icons/nucleo/index.ts+++ b/packages/ui/src/icons/nucleo/index.ts@@@ -141,10 -141,9 +141,10 @@@ export * from "./input-password"export * from "./input-password-pointer";export * from "./input-search";export * from "./invoice-dollar";+export * from "./isolated-cube";export * from "./key";- export * from "./layout-sidebar";export * from "./layers-3";+ export * from "./layout-sidebar";export * from "./license";export * from "./life-ring";export * from "./lines-y";