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 onboarding button, clear workspace product cache when slug changes

Steven Teycee073e0ea11
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/route.ts
index fc21418e35..7a28e26ca4 100644
--- a/apps/web/app/api/workspaces/[idOrSlug]/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/route.ts
@@ -8,6 +8,7 @@ import { withWorkspace } from "@/lib/auth";
import { getFeatureFlags } from "@/lib/edge-config";
import { jackson } from "@/lib/jackson";
import { storage } from "@/lib/storage";
+import { redis } from "@/lib/upstash";
import {
createWorkspaceSchema,
WorkspaceSchema,
@@ -130,7 +131,7 @@ export const PATCH = withWorkspace(
}
try {
- const response = await prisma.project.update({
+ const updatedWorkspace = await prisma.project.update({
where: {
slug: workspace.slug,
},
@@ -160,15 +161,22 @@ export const PATCH = withWorkspace(
},
});
- if (slug !== workspace.slug) {
- await prisma.user.updateMany({
- where: {
- defaultWorkspace: workspace.slug,
- },
- data: {
- defaultWorkspace: slug,
- },
- });
+ if (updatedWorkspace.slug !== workspace.slug) {
+ await Promise.allSettled([
+ prisma.user.updateMany({
+ where: {
+ defaultWorkspace: workspace.slug,
+ },
+ data: {
+ defaultWorkspace: updatedWorkspace.slug,
+ },
+ }),
+ // refresh the workspace product cache for both workspaces
+ redis.del(
+ `workspace:product:${updatedWorkspace.slug}`,
+ `workspace:product:${workspace.slug}`,
+ ),
+ ]);
}
waitUntil(
@@ -181,13 +189,13 @@ export const PATCH = withWorkspace(
// Sync the allowedHostnames cache for workspace domains
const current = JSON.stringify(workspace.allowedHostnames);
- const next = JSON.stringify(response.allowedHostnames);
- const domains = response.domains.map(({ slug }) => slug);
+ const next = JSON.stringify(updatedWorkspace.allowedHostnames);
+ const domains = updatedWorkspace.domains.map(({ slug }) => slug);
if (current !== next) {
if (
- Array.isArray(response.allowedHostnames) &&
- response.allowedHostnames.length > 0
+ Array.isArray(updatedWorkspace.allowedHostnames) &&
+ updatedWorkspace.allowedHostnames.length > 0
) {
allowedHostnamesCache.mset({
allowedHostnames: next,
@@ -204,10 +212,10 @@ export const PATCH = withWorkspace(
return NextResponse.json(
WorkspaceSchema.parse({
- ...response,
- id: prefixWorkspaceId(response.id),
+ ...updatedWorkspace,
+ id: prefixWorkspaceId(updatedWorkspace.id),
flags: await getFeatureFlags({
- workspaceId: response.id,
+ workspaceId: updatedWorkspace.id,
}),
}),
);
diff --git a/apps/web/ui/layout/toolbar/onboarding/onboarding-button.tsx b/apps/web/ui/layout/toolbar/onboarding/onboarding-button.tsx
index 305975d79f..ed4a535bc0 100644
--- a/apps/web/ui/layout/toolbar/onboarding/onboarding-button.tsx
+++ b/apps/web/ui/layout/toolbar/onboarding/onboarding-button.tsx
@@ -6,6 +6,7 @@ import useDomainsCount from "@/lib/swr/use-domains-count";
import usePartnersCount from "@/lib/swr/use-partners-count";
import useWorkspace from "@/lib/swr/use-workspace";
import useWorkspaceUsers from "@/lib/swr/use-workspace-users";
+import { useAnalyticsConnectedStatus } from "@/ui/analytics/use-analytics-connected-status";
import { CheckCircleFill } from "@/ui/shared/icons";
import {
Button,
@@ -47,10 +48,11 @@ function OnboardingButtonInner({
});
const { users, loading: usersLoading } = useWorkspaceUsers();
+ const { isConnected: connectedAnalytics } = useAnalyticsConnectedStatus();
const { data: customersCount, loading: customersCountLoading } =
useCustomersCount<number>({
includeParams: [],
- enabled: canTrackConversions,
+ enabled: canTrackConversions && !connectedAnalytics,
});
const { partnersCount, loading: partnersCountLoading } =
@@ -84,7 +86,7 @@ function OnboardingButtonInner({
{
display: "Set up conversion tracking",
cta: `/${slug}/settings/analytics`,
- checked: customersCount && customersCount > 0,
+ checked: connectedAnalytics || (customersCount && customersCount > 0),
recommended: true,
},
{
@@ -113,6 +115,7 @@ function OnboardingButtonInner({
slug,
defaultProgramId,
domainsCount,
+ connectedAnalytics,
customersCount,
partnersCount,
totalLinks,