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 share dashboard flow (#3645)

Steven Teya28f6f988cce
diff --git a/apps/web/app/api/dashboards/route.ts b/apps/web/app/api/dashboards/route.ts
index 250326bcd8..06d67cdd09 100644
--- a/apps/web/app/api/dashboards/route.ts
+++ b/apps/web/app/api/dashboards/route.ts
@@ -33,12 +33,14 @@ export const POST = withWorkspace(
const { canTrackConversions } = getPlanCapabilities(workspace.plan);
- if ("key" in params) {
- const { domain, key } = params;
+ if ("linkId" in params || ("domain" in params && "key" in params)) {
const link = await getLinkOrThrow({
workspaceId: workspace.id,
- domain,
- key,
+ ...("linkId" in params
+ ? { linkId: params.linkId }
+ : "domain" in params && "key" in params
+ ? { domain: params.domain, key: params.key }
+ : {}),
});
if (link.folderId) {
diff --git a/apps/web/lib/zod/schemas/dashboard.ts b/apps/web/lib/zod/schemas/dashboard.ts
index 35ddd80cec..f20a599a08 100644
--- a/apps/web/lib/zod/schemas/dashboard.ts
+++ b/apps/web/lib/zod/schemas/dashboard.ts
@@ -14,11 +14,17 @@ export const dashboardSchema = z.object({
updatedAt: z.date(),
});
-export const createDashboardQuerySchema = domainKeySchema.or(
- z.object({
- folderId: z.string(),
- }),
-);
+export const createDashboardQuerySchema = domainKeySchema
+ .or(
+ z.object({
+ folderId: z.string(),
+ }),
+ )
+ .or(
+ z.object({
+ linkId: z.string(),
+ }),
+ );
export const updateDashboardBodySchema = dashboardSchema.pick({
showConversions: true,
diff --git a/apps/web/scripts/misc/disable-workspace-links.ts b/apps/web/scripts/misc/disable-workspace-links.ts
new file mode 100644
index 0000000000..8eb87bf2d0
--- /dev/null
+++ b/apps/web/scripts/misc/disable-workspace-links.ts
@@ -0,0 +1,90 @@
+import { prisma } from "@dub/prisma";
+import { LEGAL_USER_ID } from "@dub/utils";
+import "dotenv-flow/config";
+import { linkCache } from "../../lib/api/links/cache";
+import { updateConfig } from "../../lib/edge-config";
+
+// script to get the top google ads campaign ids in fraud events
+async function main() {
+ const project = await prisma.project.findUniqueOrThrow({
+ where: {
+ slug: "xxx",
+ },
+ include: {
+ users: {
+ select: {
+ user: {
+ select: {
+ id: true,
+ email: true,
+ },
+ },
+ },
+ },
+ },
+ });
+
+ if (project.users.length === 0) {
+ console.log("No users found");
+ return;
+ }
+
+ const linksToDisable = await prisma.link.findMany({
+ where: {
+ projectId: project.id,
+ disabledAt: null,
+ },
+ });
+
+ if (linksToDisable.length > 0) {
+ const disabledLinks = await prisma.link.updateMany({
+ where: {
+ id: {
+ in: linksToDisable.map((link) => link.id),
+ },
+ },
+ data: {
+ disabledAt: new Date(),
+ },
+ });
+
+ console.log(`Disabled ${disabledLinks.count} links`);
+
+ const res = await linkCache.expireMany(linksToDisable);
+ console.log(res);
+ }
+
+ const userToBan = project.users[0].user;
+
+ await prisma.projectUsers.update({
+ where: {
+ userId_projectId: {
+ userId: userToBan.id,
+ projectId: project.id,
+ },
+ },
+ data: {
+ userId: LEGAL_USER_ID,
+ },
+ });
+
+ await prisma.project.update({
+ where: {
+ id: project.id,
+ },
+ data: {
+ name: userToBan.email!,
+ },
+ });
+
+ await updateConfig({
+ key: "emails",
+ value: userToBan.email!,
+ });
+
+ console.log(
+ `Banned ${userToBan.email}, transfered project ${project.slug} to legal user`,
+ );
+}
+
+main();
diff --git a/apps/web/scripts/misc/fraud-campaign-ids.ts b/apps/web/scripts/misc/fraud-campaign-ids.ts
index 8644d539ad..5e9a8756e0 100644
--- a/apps/web/scripts/misc/fraud-campaign-ids.ts
+++ b/apps/web/scripts/misc/fraud-campaign-ids.ts
@@ -2,6 +2,7 @@ import { prisma } from "@dub/prisma";
import { getSearchParams } from "@dub/utils";
import "dotenv-flow/config";
+// script to get the top google ads campaign ids in fraud events
async function main() {
const fraudEvents = await prisma.fraudEvent.findMany({
where: {
diff --git a/apps/web/scripts/misc/remove-fraud-events.ts b/apps/web/scripts/misc/remove-fraud-events.ts
index 6f15a50131..6a3871f362 100644
--- a/apps/web/scripts/misc/remove-fraud-events.ts
+++ b/apps/web/scripts/misc/remove-fraud-events.ts
@@ -5,6 +5,7 @@ import "dotenv-flow/config";
const programId = "prog_xxx";
const excludedCampaignIds: string[] = [];
+// script to remove fraud events for certain campaign ids
async function main() {
const fraudEvents = await prisma.fraudEvent.findMany({
where: {
diff --git a/apps/web/ui/analytics/share-button.tsx b/apps/web/ui/analytics/share-button.tsx
index 507c301b6c..4e09e627f3 100644
--- a/apps/web/ui/analytics/share-button.tsx
+++ b/apps/web/ui/analytics/share-button.tsx
@@ -1,10 +1,15 @@
import { useCheckFolderPermission } from "@/lib/swr/use-folder-permissions";
import { Button, ReferredVia, useMediaQuery } from "@dub/ui";
+import { useSearchParams } from "next/navigation";
import { memo, useContext } from "react";
-import { useShareDashboardModal } from "../modals/share-dashboard-modal";
+import {
+ ShareDashboardModalInnerProps,
+ useShareDashboardModal,
+} from "../modals/share-dashboard-modal";
import { AnalyticsContext } from "./analytics-provider";
export function ShareButton() {
+ const searchParams = useSearchParams();
const { domain, key, folderId, partnerPage } = useContext(AnalyticsContext);
const canUpdateFolder = useCheckFolderPermission(
@@ -14,25 +19,27 @@ export function ShareButton() {
if (partnerPage) return null;
- return domain && key ? (
+ const linkId = searchParams.get("linkId");
+
+ return linkId && !linkId.includes(",") ? (
+ <ShareButtonInner linkId={linkId} />
+ ) : domain && key ? (
<ShareButtonInner domain={domain} _key={key} />
- ) : folderId && canUpdateFolder ? (
+ ) : folderId && !folderId.includes(",") && canUpdateFolder ? (
<ShareButtonInner folderId={folderId} />
) : null;
}
const ShareButtonInner = memo(
- ({
- domain,
- _key,
- folderId,
- }:
- | { domain: string; _key: string; folderId?: never }
- | { folderId: string; domain?: never; _key?: never }) => {
+ ({ linkId, domain, _key, folderId }: ShareDashboardModalInnerProps) => {
const { isMobile } = useMediaQuery();
const { ShareDashboardModal, setShowShareDashboardModal } =
useShareDashboardModal(
- domain && _key ? { domain, _key } : { folderId: folderId! },
+ linkId
+ ? { linkId }
+ : domain && _key
+ ? { domain, _key }
+ : { folderId: folderId! },
);
return (
diff --git a/apps/web/ui/modals/share-dashboard-modal.tsx b/apps/web/ui/modals/share-dashboard-modal.tsx
index 9741167285..f7800d5a47 100644
--- a/apps/web/ui/modals/share-dashboard-modal.tsx
+++ b/apps/web/ui/modals/share-dashboard-modal.tsx
@@ -30,13 +30,21 @@ import { toast } from "sonner";
import useSWR from "swr";
import * as z from "zod/v4";
-type ShareDashboardModalInnerProps =
+export type ShareDashboardModalInnerProps =
| {
+ linkId: string;
+ domain?: never;
+ _key?: never;
+ folderId?: never;
+ }
+ | {
+ linkId?: never;
domain: string;
_key: string;
folderId?: never;
}
| {
+ linkId?: never;
folderId: string;
domain?: never;
_key?: never;
@@ -56,6 +64,7 @@ function ShareDashboardModal(props: ShareDashboardModalProps) {
}
function ShareDashboardModalInner({
+ linkId,
domain,
_key: key,
folderId,
@@ -66,8 +75,17 @@ function ShareDashboardModalInner({
const { folder, error: folderError } = useFolder({ folderId });
const { data: link, error: linkError } = useSWR<LinkProps>(
- workspaceId && domain && key
- ? `/api/links/info?${new URLSearchParams({ workspaceId, domain, key }).toString()}`
+ workspaceId && (linkId || (domain && key))
+ ? `/api/links/info?${new URLSearchParams({
+ workspaceId,
+ ...(linkId
+ ? {
+ linkId,
+ }
+ : domain && key
+ ? { domain, key }
+ : {}),
+ }).toString()}`
: undefined,
fetcher,
{
@@ -76,10 +94,10 @@ function ShareDashboardModalInner({
);
const { data: dashboard, mutate } = useSWR<DashboardProps>(
- folder?.id
- ? `/api/folders/${folder.id}/dashboard?workspaceId=${workspaceId}`
- : link?.id
- ? `/api/links/${link.id}/dashboard?workspaceId=${workspaceId}`
+ linkId || link?.id
+ ? `/api/links/${linkId || link?.id}/dashboard?workspaceId=${workspaceId}`
+ : folder?.id
+ ? `/api/folders/${folder.id}/dashboard?workspaceId=${workspaceId}`
: undefined,
fetcher,
{
@@ -116,7 +134,14 @@ function ShareDashboardModalInner({
setIsCreating(true);
const res = await fetch(
- `/api/dashboards?${new URLSearchParams({ workspaceId, ...(domain && key ? { domain, key } : { folderId: folderId! }) }).toString()}`,
+ `/api/dashboards?${new URLSearchParams({
+ workspaceId,
+ ...(linkId
+ ? { linkId }
+ : domain && key
+ ? { domain, key }
+ : { folderId: folderId! }),
+ }).toString()}`,
{
method: "POST",
headers: {