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.

Move live-to-staging workspace sync to a background job

Kiran Kc0377708cc3d
diff --git a/apps/web/app/(ee)/api/stripe/webhook/checkout-session-completed.ts b/apps/web/app/(ee)/api/stripe/webhook/checkout-session-completed.ts
index 904980ba85..6023e2bfaf 100644
--- a/apps/web/app/(ee)/api/stripe/webhook/checkout-session-completed.ts
+++ b/apps/web/app/(ee)/api/stripe/webhook/checkout-session-completed.ts
@@ -3,10 +3,10 @@ import { claimDotLinkDomain } from "@/lib/api/domains/claim-dot-link-domain";
import { reactivateProgram } from "@/lib/api/programs/reactivate-program";
import { onboardingStepCache } from "@/lib/api/workspaces/onboarding-step-cache";
import { tokenCache } from "@/lib/auth/token-cache";
+import { syncStagingWorkspaceJob } from "@/lib/jobs/handlers/sync-staging-workspace-job";
import { wouldGainPartnerAccess } from "@/lib/plans/has-partner-access";
import { prisma } from "@/lib/prisma";
import { queueCreateStagingWorkspace } from "@/lib/sandbox/create-staging-workspace";
-import { syncWorkspacePlanToStaging } from "@/lib/sandbox/sync-workspace";
import { stripe } from "@/lib/stripe";
import { getSubscriptionBillingFields } from "@/lib/stripe/workspace-subscription-fields";
import { redis } from "@/lib/upstash";
@@ -142,7 +142,10 @@ export async function checkoutSessionCompleted(
queueCreateStagingWorkspace(updatedWorkspace),
- syncWorkspacePlanToStaging(updatedWorkspace),
+ syncStagingWorkspaceJob.dispatch({
+ action: "sync-workspace",
+ workspaceId: updatedWorkspace.id,
+ }),
// if workspace had a program from before and is upgrading to an eligible plan, reactivate it
updatedWorkspace.defaultProgramId &&
diff --git a/apps/web/app/(ee)/api/stripe/webhook/customer-subscription-deleted.ts b/apps/web/app/(ee)/api/stripe/webhook/customer-subscription-deleted.ts
index e345b0211b..15f339fff1 100644
--- a/apps/web/app/(ee)/api/stripe/webhook/customer-subscription-deleted.ts
+++ b/apps/web/app/(ee)/api/stripe/webhook/customer-subscription-deleted.ts
@@ -6,9 +6,9 @@ import { includeTags } from "@/lib/api/links/include-tags";
import { stripAdvancedRewardModifiersForProgram } from "@/lib/api/partners/strip-advanced-reward-modifiers";
import { deactivateProgram } from "@/lib/api/programs/deactivate-program";
import { tokenCache } from "@/lib/auth/token-cache";
+import { syncStagingWorkspaceJob } from "@/lib/jobs/handlers/sync-staging-workspace-job";
import { wouldLoseAdvancedFeatures } from "@/lib/plans/would-lose-advanced-features";
import { prisma } from "@/lib/prisma";
-import { syncWorkspacePlanToStaging } from "@/lib/sandbox/sync-workspace";
import { stripe } from "@/lib/stripe";
import { recordLink } from "@/lib/tinybird";
import { sendEmail } from "@dub/email";
@@ -206,7 +206,10 @@ export async function customerSubscriptionDeleted(
hashedKeys: workspace.restrictedTokens.map(({ hashedKey }) => hashedKey),
}),
- syncWorkspacePlanToStaging(updatedWorkspace),
+ syncStagingWorkspaceJob.dispatch({
+ action: "sync-workspace",
+ workspaceId: updatedWorkspace.id,
+ }),
]);
// Reset cancellation feedback dedupe so a future resubscribe + cancel can send again
diff --git a/apps/web/app/(ee)/api/stripe/webhook/utils/update-workspace-plan.ts b/apps/web/app/(ee)/api/stripe/webhook/utils/update-workspace-plan.ts
index bd0870aedc..a1a0faa563 100644
--- a/apps/web/app/(ee)/api/stripe/webhook/utils/update-workspace-plan.ts
+++ b/apps/web/app/(ee)/api/stripe/webhook/utils/update-workspace-plan.ts
@@ -6,6 +6,7 @@ import { deactivateProgram } from "@/lib/api/programs/deactivate-program";
import { reactivateProgram } from "@/lib/api/programs/reactivate-program";
import { tokenCache } from "@/lib/auth/token-cache";
import { qstash } from "@/lib/cron";
+import { syncStagingWorkspaceJob } from "@/lib/jobs/handlers/sync-staging-workspace-job";
import { syncUserPlanToPlain } from "@/lib/plain/sync-user-plan";
import { getPlanCapabilities } from "@/lib/plan-capabilities";
import {
@@ -15,7 +16,6 @@ import {
import { wouldLoseAdvancedFeatures } from "@/lib/plans/would-lose-advanced-features";
import { prisma } from "@/lib/prisma";
import { queueCreateStagingWorkspace } from "@/lib/sandbox/create-staging-workspace";
-import { syncWorkspacePlanToStaging } from "@/lib/sandbox/sync-workspace";
import {
getSubscriptionBillingFields,
getSubscriptionTrialEndsAt,
@@ -278,7 +278,10 @@ export async function updateWorkspacePlan({
await Promise.all([
queueCreateStagingWorkspace(updatedWorkspace),
- syncWorkspacePlanToStaging(updatedWorkspace),
+ syncStagingWorkspaceJob.dispatch({
+ action: "sync-workspace",
+ workspaceId: updatedWorkspace.id,
+ }),
]);
const workspaceOwners = updatedWorkspace.users.map((user) => user.user);
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-composite-chart.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-composite-chart.tsx
index c9efeb8583..bd809f6d3a 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-composite-chart.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-composite-chart.tsx
@@ -12,7 +12,13 @@ import { CommissionStatusBadges } from "@/ui/partners/commission-status-badges";
import SimpleDateRangePicker from "@/ui/shared/simple-date-range-picker";
import { Filter, LoadingSpinner, ToggleGroup, useRouterStuff } from "@dub/ui";
import { Areas, TimeSeriesChart, XAxis, YAxis } from "@dub/ui/charts";
-import { CircleDotted, Hyperlink, MoneyBill2, Sliders, User } from "@dub/ui/icons";
+import {
+ CircleDotted,
+ Hyperlink,
+ MoneyBill2,
+ Sliders,
+ User,
+} from "@dub/ui/icons";
import {
capitalize,
cn,
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-table.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-table.tsx
index fb8163ffba..950f47eb3c 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-table.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-table.tsx
@@ -1,10 +1,10 @@
"use client";
+import { formatCommissionDescriptionTooltip } from "@/lib/commissions/format-commission-description-tooltip";
import usePartnerEarningsCount from "@/lib/swr/use-partner-earnings-count";
import usePartnerProfile from "@/lib/swr/use-partner-profile";
import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
import { PartnerEarningsResponse } from "@/lib/types";
-import { formatCommissionDescriptionTooltip } from "@/lib/commissions/format-commission-description-tooltip";
import { CustomerRowItem } from "@/ui/customers/customer-row-item";
import { CommissionStatusBadges } from "@/ui/partners/commission-status-badges";
import { CommissionTypeBadge } from "@/ui/partners/commission-type-badge";
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/billing/payment-methods/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/billing/payment-methods/route.ts
index 477c557a0a..6245d01cc7 100644
--- a/apps/web/app/api/workspaces/[idOrSlug]/billing/payment-methods/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/billing/payment-methods/route.ts
@@ -6,8 +6,8 @@ import {
DIRECT_DEBIT_PAYMENT_TYPES_INFO,
PAYMENT_METHOD_TYPES,
} from "@/lib/constants/payouts";
-import { SANDBOX_PAYMENT_METHOD } from "@/lib/sandbox/mock-payment-provider";
import { isProductionEnvironment } from "@/lib/sandbox/environment";
+import { SANDBOX_PAYMENT_METHOD } from "@/lib/sandbox/mock-payment-provider";
import { assertNotStagingWorkspace } from "@/lib/sandbox/workspace-guards";
import { stripe } from "@/lib/stripe";
import { APP_DOMAIN } from "@dub/utils";
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.ts
index f88ed02239..90f237a011 100644
--- a/apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.ts
@@ -3,10 +3,9 @@ import { assertRoleAllowedForPlan } from "@/lib/api/workspaces/assert-role-plan"
import { onboardingStepCache } from "@/lib/api/workspaces/onboarding-step-cache";
import { withSession } from "@/lib/auth";
import { exceededLimitError } from "@/lib/exceeded-limit-error";
+import { syncStagingWorkspaceJob } from "@/lib/jobs/handlers/sync-staging-workspace-job";
import { prisma } from "@/lib/prisma";
-import { syncWorkspaceMemberToStaging } from "@/lib/sandbox/sync-workspace";
import { PlanProps } from "@/lib/types";
-import { waitUntil } from "@vercel/functions";
import { NextResponse } from "next/server";
// POST /api/workspaces/[idOrSlug]/invites/accept – accept a workspace invite
@@ -64,7 +63,6 @@ export const POST = withSession(async ({ session, params }) => {
plan: true,
planPeriod: true,
usersLimit: true,
- stagingWorkspaceId: true,
_count: {
select: {
users: {
@@ -164,16 +162,11 @@ export const POST = withSession(async ({ session, params }) => {
step: "completed",
});
- waitUntil(
- syncWorkspaceMemberToStaging({
- workspace,
- user: {
- id: session.user.id,
- role: invite.role,
- isMachine: false,
- },
- }),
- );
+ await syncStagingWorkspaceJob.dispatch({
+ action: "add-member",
+ workspaceId: workspace.id,
+ userId: session.user.id,
+ });
return NextResponse.json({ message: "Invite accepted." });
});
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/route.ts
index dd02dba697..c39fb068da 100644
--- a/apps/web/app/api/workspaces/[idOrSlug]/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/route.ts
@@ -9,8 +9,8 @@ import { workspaceProductCache } from "@/lib/api/workspaces/workspace-product-ca
import { withWorkspace } from "@/lib/auth";
import { getFeatureFlags } from "@/lib/edge-config";
import { jackson } from "@/lib/jackson";
+import { syncStagingWorkspaceJob } from "@/lib/jobs/handlers/sync-staging-workspace-job";
import { prisma } from "@/lib/prisma";
-import { syncWorkspaceSettingsToStaging } from "@/lib/sandbox/sync-workspace";
import { assertNotStagingWorkspace } from "@/lib/sandbox/workspace-guards";
import { mergeSiteVisitTrackingSettings } from "@/lib/sitemaps/site-visit-tracking";
import { storage } from "@/lib/storage";
@@ -284,7 +284,10 @@ export const PATCH = withWorkspace(
}
}
- await syncWorkspaceSettingsToStaging(updatedWorkspace);
+ await syncStagingWorkspaceJob.dispatch({
+ action: "sync-workspace",
+ workspaceId: updatedWorkspace.id,
+ });
})(),
);
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/users/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/users/route.ts
index 973a360c0d..311b11df0c 100644
--- a/apps/web/app/api/workspaces/[idOrSlug]/users/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/users/route.ts
@@ -2,12 +2,9 @@ import { DubApiError } from "@/lib/api/errors";
import { throwIfNoAccess } from "@/lib/api/tokens/throw-if-no-access";
import { assertRoleAllowedForPlan } from "@/lib/api/workspaces/assert-role-plan";
import { withWorkspace } from "@/lib/auth";
+import { syncStagingWorkspaceJob } from "@/lib/jobs/handlers/sync-staging-workspace-job";
import { generateRandomName } from "@/lib/names";
import { prisma } from "@/lib/prisma";
-import {
- removeWorkspaceMemberFromStaging,
- syncWorkspaceMemberRoleToStaging,
-} from "@/lib/sandbox/sync-workspace";
import { assertNotStagingWorkspace } from "@/lib/sandbox/workspace-guards";
import {
getWorkspaceUsersQuerySchema,
@@ -15,7 +12,6 @@ import {
} from "@/lib/zod/schemas/workspaces";
import { pluralize } from "@dub/utils";
import { WorkspaceRole } from "@prisma/client";
-import { waitUntil } from "@vercel/functions";
import { NextResponse } from "next/server";
import * as z from "zod/v4";
@@ -90,15 +86,11 @@ export const PATCH = withWorkspace(
},
});
- waitUntil(
- syncWorkspaceMemberRoleToStaging({
- workspace,
- user: {
- id: workspaceUser.userId,
- role: workspaceUser.role,
- },
- }),
- );
+ await syncStagingWorkspaceJob.dispatch({
+ action: "update-member-role",
+ workspaceId: workspace.id,
+ userId: workspaceUser.userId,
+ });
return NextResponse.json(workspaceUser);
},
@@ -225,12 +217,13 @@ export const DELETE = withWorkspace(
}),
]);
- waitUntil(
- removeWorkspaceMemberFromStaging({
- workspace,
- user: projectUser.user,
- }),
- );
+ if (!projectUser.user.isMachine) {
+ await syncStagingWorkspaceJob.dispatch({
+ action: "remove-member",
+ workspaceId: workspace.id,
+ userId,
+ });
+ }
// delete the user if it's a machine user
if (projectUser.user.isMachine) {
diff --git a/apps/web/app/app.dub.co/(auth)/invites/[code]/page.tsx b/apps/web/app/app.dub.co/(auth)/invites/[code]/page.tsx
index 83706c30e7..94a66e8972 100644
--- a/apps/web/app/app.dub.co/(auth)/invites/[code]/page.tsx
+++ b/apps/web/app/app.dub.co/(auth)/invites/[code]/page.tsx
@@ -1,12 +1,11 @@
import { onboardingStepCache } from "@/lib/api/workspaces/onboarding-step-cache";
import { getSession } from "@/lib/auth";
+import { syncStagingWorkspaceJob } from "@/lib/jobs/handlers/sync-staging-workspace-job";
import { prisma } from "@/lib/prisma";
-import { syncWorkspaceMemberToStaging } from "@/lib/sandbox/sync-workspace";
import EmptyState from "@/ui/shared/empty-state";
import { LoadingSpinner } from "@dub/ui";
import { LinkBroken, Users6 } from "@dub/ui/icons";
import { redirect } from "next/navigation";
-import { after } from "next/server";
import { Suspense } from "react";
export default async function InvitesPage(props: {
@@ -47,7 +46,6 @@ async function VerifyInvite({ code }: { code: string }) {
id: true,
slug: true,
usersLimit: true,
- stagingWorkspaceId: true,
users: {
where: {
userId: session.user.id,
@@ -117,15 +115,11 @@ async function VerifyInvite({ code }: { code: string }) {
});
}
- after(
- syncWorkspaceMemberToStaging({
- workspace,
- user: {
- id: workspaceUser.userId,
- role: workspaceUser.role,
- },
- }),
- );
+ await syncStagingWorkspaceJob.dispatch({
+ action: "add-member",
+ workspaceId: workspace.id,
+ userId: workspaceUser.userId,
+ });
// Complete onboarding just in case
await onboardingStepCache.set({
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/[commissionId]/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/[commissionId]/page.tsx
index 0483f43e52..424b18cb74 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/[commissionId]/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/[commissionId]/page.tsx
@@ -9,12 +9,10 @@ import { CustomerAvatar } from "@/ui/customers/customer-avatar";
import { PageContent } from "@/ui/layout/page-content";
import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
import { CommissionTypeIcon } from "@/ui/partners/comission-type-icon";
+import { CommissionDescriptionLabel } from "@/ui/partners/commission-description-label";
import { CommissionRowMenu } from "@/ui/partners/commission-row-menu";
import { CommissionStatusBadges } from "@/ui/partners/commission-status-badges";
-import { CommissionDescriptionLabel } from "@/ui/partners/commission-description-label";
-import {
- CommissionTypeBadge,
-} from "@/ui/partners/commission-type-badge";
+import { CommissionTypeBadge } from "@/ui/partners/commission-type-badge";
import { useEditCommissionModal } from "@/ui/partners/edit-commission-modal";
import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";
import { PartnerAvatar } from "@/ui/partners/partner-avatar";
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-table.tsx
index 6e757931cb..7e3b845223 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-table.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-table.tsx
@@ -1,11 +1,11 @@
"use client";
+import { formatCommissionDescriptionTooltip } from "@/lib/commissions/format-commission-description-tooltip";
import useCommissionsCount from "@/lib/swr/use-commissions-count";
import useGroups from "@/lib/swr/use-groups";
import useProgram from "@/lib/swr/use-program";
import useWorkspace from "@/lib/swr/use-workspace";
import { CommissionResponse } from "@/lib/types";
-import { formatCommissionDescriptionTooltip } from "@/lib/commissions/format-commission-description-tooltip";
import { CustomerRowItem } from "@/ui/customers/customer-row-item";
import { useBulkEditCommissionsModal } from "@/ui/partners/bulk-edit-commissions-modal";
import { CommissionRowMenu } from "@/ui/partners/commission-row-menu";
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/[payoutId]/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/[payoutId]/page.tsx
index dc36b364fa..345fcdb833 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/[payoutId]/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/[payoutId]/page.tsx
@@ -1,20 +1,18 @@
"use client";
import { clientAccessCheck } from "@/lib/client-access-check";
+import { formatCommissionDescriptionTooltip } from "@/lib/commissions/format-commission-description-tooltip";
import { usePayout } from "@/lib/swr/use-payout";
import useWorkspace from "@/lib/swr/use-workspace";
import { CommissionResponse, PayoutResponse } from "@/lib/types";
-import { formatCommissionDescriptionTooltip } from "@/lib/commissions/format-commission-description-tooltip";
import { CustomerAvatar } from "@/ui/customers/customer-avatar";
import { PageContent } from "@/ui/layout/page-content";
import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
import { ActivityEvent } from "@/ui/partners/activity-event";
import { CommissionTypeIcon } from "@/ui/partners/comission-type-icon";
-import { CommissionRowMenu } from "@/ui/partners/commission-row-menu";
import { CommissionDescriptionLabel } from "@/ui/partners/commission-description-label";
-import {
- CommissionTypeBadge,
-} from "@/ui/partners/commission-type-badge";
+import { CommissionRowMenu } from "@/ui/partners/commission-row-menu";
+import { CommissionTypeBadge } from "@/ui/partners/commission-type-badge";
import { PartnerAvatar } from "@/ui/partners/partner-avatar";
import { PayoutStatusBadges } from "@/ui/partners/payout-status-badges";
import { ConditionalLink } from "@/ui/shared/conditional-link";
diff --git a/apps/web/lib/actions/partners/confirm-payouts.ts b/apps/web/lib/actions/partners/confirm-payouts.ts
index 0ab8e3e6bf..03b3d0b6bc 100644
--- a/apps/web/lib/actions/partners/confirm-payouts.ts
+++ b/apps/web/lib/actions/partners/confirm-payouts.ts
@@ -18,8 +18,8 @@ import { exceededLimitError } from "@/lib/exceeded-limit-error";
import { createTremendousCampaignJob } from "@/lib/jobs/handlers/create-tremendous-campaign-job";
import { CUTOFF_PERIOD_ENUM } from "@/lib/partners/cutoff-period";
import { prisma } from "@/lib/prisma";
-import { mockPaymentProvider } from "@/lib/sandbox/mock-payment-provider";
import { isProductionEnvironment } from "@/lib/sandbox/environment";
+import { mockPaymentProvider } from "@/lib/sandbox/mock-payment-provider";
import { stripe } from "@/lib/stripe";
import { checkPaymentMethodMandate } from "@/lib/stripe/check-payment-method-mandate";
import { getWebhooks } from "@/lib/webhook/get-webhooks";
diff --git a/apps/web/lib/api/workspaces/delete-workspace.ts b/apps/web/lib/api/workspaces/delete-workspace.ts
index 513719606f..5674058dfa 100644
--- a/apps/web/lib/api/workspaces/delete-workspace.ts
+++ b/apps/web/lib/api/workspaces/delete-workspace.ts
@@ -1,5 +1,6 @@
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 {
@@ -16,9 +17,13 @@ import { linkCache } from "../links/cache";
export async function deleteWorkspace(
workspace: Pick<
WorkspaceProps,
- "id" | "slug" | "logo" | "stripeId" | "stagingWorkspaceId"
+ "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: {
diff --git a/apps/web/lib/jobs/handlers/sync-staging-workspace-job.ts b/apps/web/lib/jobs/handlers/sync-staging-workspace-job.ts
new file mode 100644
index 0000000000..cf4cae82ff
--- /dev/null
+++ b/apps/web/lib/jobs/handlers/sync-staging-workspace-job.ts
@@ -0,0 +1,270 @@
+import { prisma } from "@/lib/prisma";
+import { Prisma, Project } from "@prisma/client";
+import * as z from "zod/v4";
+import { defineJob } from "../index";
+
+const syncStagingWorkspaceJobSchema = z.discriminatedUnion("action", [
+ z.object({
+ action: z.literal("add-member"),
+ workspaceId: z.string(),
+ userId: z.string(),
+ }),
+ z.object({
+ action: z.literal("update-member-role"),
+ workspaceId: z.string(),
+ userId: z.string(),
+ }),
+ z.object({
+ action: z.literal("remove-member"),
+ workspaceId: z.string(),
+ userId: z.string(),
+ }),
+ z.object({
+ action: z.literal("sync-workspace"),
+ workspaceId: z.string(),
+ }),
+]);
+
+type ProductionWorkspace = Pick<
+ Project,
+ | "id"
+ | "stagingWorkspaceId"
+ | "name"
+ | "slug"
+ | "logo"
+ | "plan"
+ | "planTier"
+ | "planPeriod"
+ | "stagingWorkspaceId"
+>;
+
+export const syncStagingWorkspaceJob = defineJob({
+ name: "sync-staging-workspace-job",
+ schema: syncStagingWorkspaceJobSchema,
+ defaults: {
+ retries: 3,
+ },
+ async handle(payload) {
+ const workspace = await prisma.project.findUnique({
+ where: {
+ id: payload.workspaceId,
+ },
+ select: {
+ id: true,
+ stagingWorkspaceId: true,
+ name: true,
+ slug: true,
+ logo: true,
+ plan: true,
+ planTier: true,
+ planPeriod: true,
+ },
+ });
+
+ if (!workspace?.stagingWorkspaceId) {
+ return;
+ }
+
+ switch (payload.action) {
+ case "add-member":
+ await addMember({
+ workspace,
+ userId: payload.userId,
+ });
+ break;
+
+ case "update-member-role":
+ await updateMemberRole({
+ workspace,
+ userId: payload.userId,
+ });
+ break;
+
+ case "remove-member":
+ await removeMember({
+ workspace,
+ userId: payload.userId,
+ });
+ break;
+
+ case "sync-workspace":
+ await syncWorkspace({ workspace });
+ break;
+ }
+ },
+});
+
+// We don't sync the machine user from the production workspace to the staging workspace
+async function addMember({
+ workspace,
+ userId,
+}: {
+ workspace: ProductionWorkspace;
+ userId: string;
+}) {
+ if (!workspace.stagingWorkspaceId) {
+ return;
+ }
+
+ const member = await prisma.projectUsers.findUnique({
+ where: {
+ userId_projectId: {
+ userId,
+ projectId: workspace.id,
+ },
+ },
+ select: {
+ role: true,
+ user: {
+ select: {
+ isMachine: true,
+ },
+ },
+ },
+ });
+
+ if (!member || member.user.isMachine) {
+ return;
+ }
+
+ try {
+ await prisma.projectUsers.create({
+ data: {
+ projectId: workspace.stagingWorkspaceId,
+ userId,
+ role: member.role,
+ notificationPreference: {
+ create: {},
+ },
+ },
+ });
+ } catch (error) {
+ // Member may already exist on staging from a prior sync
+ if (
+ error instanceof Prisma.PrismaClientKnownRequestError &&
+ error.code === "P2002"
+ ) {
+ return;
+ }
+
+ throw error;
+ }
+}
+
+async function updateMemberRole({
+ workspace,
+ userId,
+}: {
+ workspace: ProductionWorkspace;
+ userId: string;
+}) {
+ if (!workspace.stagingWorkspaceId) {
+ return;
+ }
+
+ const member = await prisma.projectUsers.findUnique({
+ where: {
+ userId_projectId: {
+ userId,
+ projectId: workspace.id,
+ },
+ },
+ select: {
+ role: true,
+ },
+ });
+
+ if (!member) {
+ return;
+ }
+
+ try {
+ await prisma.projectUsers.update({
+ where: {
+ userId_projectId: {
+ userId,
+ projectId: workspace.stagingWorkspaceId,
+ },
+ },
+ data: {
+ role: member.role,
+ },
+ });
+ } catch (error) {
+ // Member may not exist on staging yet
+ if (
+ error instanceof Prisma.PrismaClientKnownRequestError &&
+ error.code === "P2025"
+ ) {
+ return;
+ }
+ throw error;
+ }
+}
+
+async function removeMember({
+ workspace,
+ userId,
+}: {
+ workspace: ProductionWorkspace;
+ userId: string;
+}) {
+ if (!workspace.stagingWorkspaceId) {
+ return;
+ }
+
+ const user = await prisma.user.findUnique({
+ where: {
+ id: userId,
+ },
+ select: {
+ isMachine: true,
+ },
+ });
+
+ if (!user || user.isMachine) {
+ return;
+ }
+
+ await Promise.allSettled([
+ prisma.projectUsers.delete({
+ where: {
+ userId_projectId: {
+ userId,
+ projectId: workspace.stagingWorkspaceId,
+ },
+ },
+ }),
+
+ prisma.restrictedToken.deleteMany({
+ where: {
+ projectId: workspace.stagingWorkspaceId,
+ userId,
+ },
+ }),
+ ]);
+}
+
+async function syncWorkspace({
+ workspace,
+}: {
+ workspace: ProductionWorkspace;
+}) {
+ if (!workspace.stagingWorkspaceId) {
+ return;
+ }
+
+ await prisma.project.update({
+ where: {
+ id: workspace.stagingWorkspaceId,
+ },
+ data: {
+ logo: workspace.logo,
+ name: `${workspace.name} (Staging)`,
+ slug: `${workspace.slug}-staging`,
+ plan: workspace.plan,
+ planTier: workspace.planTier,
+ planPeriod: workspace.planPeriod,
+ },
+ });
+}
diff --git a/apps/web/lib/jobs/registry.ts b/apps/web/lib/jobs/registry.ts
index 3cc5049bc4..c38cd078ba 100644
--- a/apps/web/lib/jobs/registry.ts
+++ b/apps/web/lib/jobs/registry.ts
@@ -34,6 +34,11 @@ const jobLoaders = {
import("./handlers/create-staging-workspace-job").then(
(m) => m.createStagingWorkspaceJob,
),
+
+ "sync-staging-workspace-job": () =>
+ import("./handlers/sync-staging-workspace-job").then(
+ (m) => m.syncStagingWorkspaceJob,
+ ),
} as const satisfies Record<string, () => Promise<JobDefinition>>;
const jobCache = new Map<string, JobDefinition>();
diff --git a/apps/web/lib/sandbox/sync-workspace.ts b/apps/web/lib/sandbox/sync-workspace.ts
deleted file mode 100644
index 8f27f4baa9..0000000000
--- a/apps/web/lib/sandbox/sync-workspace.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-import { prisma } from "@/lib/prisma";
-import { Project, WorkspaceRole } from "@prisma/client";
-
-// We don't sync the machine user from the production workspace to the staging workspace
-export async function syncWorkspaceMemberToStaging({
- workspace,
- user,
-}: {
- workspace: Pick<Project, "stagingWorkspaceId">;
- user: { id: string; role: WorkspaceRole };
-}) {
- if (!workspace.stagingWorkspaceId) {
- return;
- }
-
- try {
- await prisma.projectUsers.create({
- data: {
- projectId: workspace.stagingWorkspaceId,
- userId: user.id,
- role: user.role,
- notificationPreference: {
- create: {},
- },
- },
- });
- } catch (error) {
- console.error("[syncWorkspaceMemberToStaging]", error);
- }
-}
-
-export async function syncWorkspaceMemberRoleToStaging({
- workspace,
- user,
-}: {
- workspace: Pick<Project, "stagingWorkspaceId">;
- user: { id: string; role: WorkspaceRole };
-}) {
- if (!workspace.stagingWorkspaceId) {
- return;
- }
-
- try {
- await prisma.projectUsers.update({
- where: {
- userId_projectId: {
- userId: user.id,
- projectId: workspace.stagingWorkspaceId,
- },
- },
- data: {
- role: user.role,
- },
- });
- } catch (error) {
- console.error("[syncWorkspaceMemberRoleToStaging]", error);
- }
-}
-
-export async function removeWorkspaceMemberFromStaging({
- workspace,
- user,
-}: {
- workspace: Pick<Project, "stagingWorkspaceId">;
- user: { id: string; isMachine: boolean };
-}) {
- if (!workspace.stagingWorkspaceId || user.isMachine) {
- return;
- }
-
- try {
- await Promise.allSettled([
- prisma.projectUsers.delete({
- where: {
- userId_projectId: {
- userId: user.id,
- projectId: workspace.stagingWorkspaceId,
- },
- },
- }),
-
- prisma.restrictedToken.deleteMany({
- where: {
- projectId: workspace.stagingWorkspaceId,
- userId: user.id,
- },
- }),
- ]);
- } catch (error) {
- console.error("[removeWorkspaceMemberFromStaging]", error);
- }
-}
-
-export async function syncWorkspaceSettingsToStaging(
- workspace: Pick<
- Project,
- "id" | "stagingWorkspaceId" | "name" | "slug" | "logo"
- >,
-) {
- if (!workspace.stagingWorkspaceId) {
- return;
- }
-
- try {
- await prisma.project.update({
- where: {
- id: workspace.stagingWorkspaceId,
- },
- data: {
- logo: workspace.logo,
- name: `${workspace.name} (Staging)`,
- slug: `${workspace.slug}-staging`,
- },
- });
- } catch (error) {
- console.error("[syncWorkspaceSettingsToStaging]", error);
- }
-}
-
-export async function syncWorkspacePlanToStaging(
- workspace: Pick<
- Project,
- "stagingWorkspaceId" | "plan" | "planTier" | "planPeriod"
- >,
-) {
- if (!workspace.stagingWorkspaceId) {
- return;
- }
-
- try {
- await prisma.project.update({
- where: {
- id: workspace.stagingWorkspaceId,
- },
- data: {
- plan: workspace.plan,
- planTier: workspace.planTier,
- planPeriod: workspace.planPeriod,
- },
- });
- } catch (error) {
- console.error("[syncWorkspacePlanToStaging]", error);
- }
-}
diff --git a/apps/web/tests/workflows/find-groups-with-matching-rules.test.ts b/apps/web/tests/workflows/find-groups-with-matching-rules.test.ts
index 6621c41552..bfd88d3449 100644
--- a/apps/web/tests/workflows/find-groups-with-matching-rules.test.ts
+++ b/apps/web/tests/workflows/find-groups-with-matching-rules.test.ts
@@ -2,9 +2,21 @@ import { findGroupsWithMatchingRules } from "@/lib/api/groups/find-groups-with-m
import type { GroupMoveRules } from "@/lib/api/workflows/move-group/types";
import { describe, expect, it } from "vitest";
-const groupA = { id: "grp_a", name: "Group A", moveRules: [] as GroupMoveRules };
-const groupB = { id: "grp_b", name: "Group B", moveRules: [] as GroupMoveRules };
-const groupC = { id: "grp_c", name: "Group C", moveRules: [] as GroupMoveRules };
+const groupA = {
+ id: "grp_a",
+ name: "Group A",
+ moveRules: [] as GroupMoveRules,
+};
+const groupB = {
+ id: "grp_b",
+ name: "Group B",
+ moveRules: [] as GroupMoveRules,
+};
+const groupC = {
+ id: "grp_c",
+ name: "Group C",
+ moveRules: [] as GroupMoveRules,
+};
describe("findGroupsWithMatchingRules", () => {
it("returns no conflict when partnerGroup eq/in filters are disjoint", () => {
diff --git a/apps/web/ui/shared/upgrade-required-toast.tsx b/apps/web/ui/shared/upgrade-required-toast.tsx
index 0fb6fc91a3..049e994767 100644
--- a/apps/web/ui/shared/upgrade-required-toast.tsx
+++ b/apps/web/ui/shared/upgrade-required-toast.tsx
@@ -40,9 +40,7 @@ export const UpgradeRequiredToast = ({
{title ||
`You've discovered a ${capitalize(planToUpgradeTo)} feature!`}
</p>
- <p className="text-[13px] leading-snug text-neutral-500">
- {message}
- </p>
+ <p className="text-[13px] leading-snug text-neutral-500">{message}</p>
</div>
</div>
<Link
diff --git a/packages/ui/src/nav/nav.tsx b/packages/ui/src/nav/nav.tsx
index 18f4f74a8c..8838726a66 100644
--- a/packages/ui/src/nav/nav.tsx
+++ b/packages/ui/src/nav/nav.tsx
@@ -212,9 +212,8 @@ export function Nav({
className="group/nav relative flex"
onMouseLeave={() => {
const list = navListRef.current;
- const openTrigger = list?.querySelector<HTMLElement>(
- "[data-state=open]",
- );
+ const openTrigger =
+ list?.querySelector<HTMLElement>("[data-state=open]");
// Keep the pill on the open trigger so it doesn't flicker into the dropdown
if (list && openTrigger) {
setHoverStyle(getHoverStyle(list, openTrigger));