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.

Partner tags (#3092)

Tim Wilsondccaa6fc4941
diff --git a/apps/web/app/(ee)/api/admin/partners/delete-account/route.ts b/apps/web/app/(ee)/api/admin/partners/delete-account/route.ts
index 7844c87a57..15e35c43de 100644
--- a/apps/web/app/(ee)/api/admin/partners/delete-account/route.ts
+++ b/apps/web/app/(ee)/api/admin/partners/delete-account/route.ts
@@ -22,6 +22,15 @@ export const POST = withAdmin(
program: true,
links: true,
groupId: true,
+ programPartnerTags: {
+ select: {
+ partnerTag: {
+ select: {
+ id: true,
+ },
+ },
+ },
+ },
},
},
},
diff --git a/apps/web/app/(ee)/api/cron/tags/delete-link-tag/route.ts b/apps/web/app/(ee)/api/cron/tags/delete-link-tag/route.ts
new file mode 100644
index 0000000000..23a6765e5b
--- /dev/null
+++ b/apps/web/app/(ee)/api/cron/tags/delete-link-tag/route.ts
@@ -0,0 +1,97 @@
+import { handleAndReturnErrorResponse } from "@/lib/api/errors";
+import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
+import { includeTags } from "@/lib/api/links/include-tags";
+import { queueLinkTagDeletion } from "@/lib/api/tags/queue-tag-deletion";
+import { CRON_BATCH_SIZE } from "@/lib/cron";
+import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
+import { recordLink } from "@/lib/tinybird/record-link";
+import { prisma } from "@dub/prisma";
+import * as z from "zod/v4";
+import { logAndRespond } from "../../utils";
+
+export const dynamic = "force-dynamic";
+
+const schema = z.object({
+ id: z.string(),
+});
+
+// POST /api/cron/tags/delete-link-tag
+export async function POST(req: Request) {
+ try {
+ const rawBody = await req.text();
+ await verifyQstashSignature({ req, rawBody });
+
+ const { id: tagId } = schema.parse(JSON.parse(rawBody));
+
+ const tag = await prisma.tag.findUnique({
+ where: {
+ id: tagId,
+ },
+ });
+
+ if (!tag || tag.projectId !== null) {
+ return logAndRespond(
+ `Link tag ${tagId} not found or not marked for deletion. Skipping...`,
+ );
+ }
+
+ const linkTags = await prisma.linkTag.findMany({
+ where: {
+ tagId,
+ },
+ select: {
+ id: true,
+ linkId: true,
+ },
+ take: CRON_BATCH_SIZE,
+ });
+
+ if (linkTags.length === 0) {
+ await prisma.tag.delete({
+ where: {
+ id: tagId,
+ },
+ });
+
+ return logAndRespond(
+ `No LinkTag rows left. Link tag ${tagId} deleted from database.`,
+ );
+ }
+
+ const linkIds = [...new Set(linkTags.map((lt) => lt.linkId))];
+
+ const { count } = await prisma.linkTag.deleteMany({
+ where: {
+ id: {
+ in: linkTags.map((lt) => lt.id),
+ },
+ },
+ });
+
+ console.log(`Deleted ${count} link–tag associations`);
+
+ const linksToUpdate = await prisma.link.findMany({
+ where: {
+ id: {
+ in: linkIds,
+ },
+ },
+ include: {
+ ...includeTags,
+ ...includeProgramEnrollment,
+ },
+ });
+
+ console.log(`Found ${linksToUpdate.length} links to update in Tinybird`);
+
+ await recordLink(linksToUpdate);
+
+ await queueLinkTagDeletion({
+ tagId,
+ delay: 2,
+ });
+ return logAndRespond("Batch completed, starting next batch...");
+ } catch (error) {
+ return handleAndReturnErrorResponse(error);
+ }
+}
diff --git a/apps/web/app/(ee)/api/cron/tags/delete-partner-tag/route.ts b/apps/web/app/(ee)/api/cron/tags/delete-partner-tag/route.ts
new file mode 100644
index 0000000000..0e4b686562
--- /dev/null
+++ b/apps/web/app/(ee)/api/cron/tags/delete-partner-tag/route.ts
@@ -0,0 +1,100 @@
+import { handleAndReturnErrorResponse } from "@/lib/api/errors";
+import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
+import { includeTags } from "@/lib/api/links/include-tags";
+import { queuePartnerTagDeletion } from "@/lib/api/tags/queue-tag-deletion";
+import { CRON_BATCH_SIZE } from "@/lib/cron";
+import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
+import { recordLink } from "@/lib/tinybird";
+import { prisma } from "@dub/prisma";
+import * as z from "zod/v4";
+import { logAndRespond } from "../../utils";
+
+export const dynamic = "force-dynamic";
+
+const schema = z.object({
+ id: z.string(),
+});
+
+// POST /api/cron/tags/delete-partner-tag
+export async function POST(req: Request) {
+ try {
+ const rawBody = await req.text();
+ await verifyQstashSignature({ req, rawBody });
+
+ const { id: partnerTagId } = schema.parse(JSON.parse(rawBody));
+
+ const partnerTag = await prisma.partnerTag.findUnique({
+ where: {
+ id: partnerTagId,
+ },
+ });
+
+ if (!partnerTag || partnerTag.programId !== null) {
+ return logAndRespond(
+ `Partner tag ${partnerTagId} not found or not marked for deletion. Skipping...`,
+ );
+ }
+
+ const programPartnerTags = await prisma.programPartnerTag.findMany({
+ where: {
+ partnerTagId,
+ },
+ select: {
+ id: true,
+ programEnrollment: {
+ select: {
+ id: true,
+ },
+ },
+ },
+ take: CRON_BATCH_SIZE,
+ });
+
+ if (programPartnerTags.length === 0) {
+ await prisma.partnerTag.delete({
+ where: {
+ id: partnerTagId,
+ },
+ });
+
+ return logAndRespond(
+ `No ProgramPartnerTag rows left. Partner tag ${partnerTagId} deleted from database.`,
+ );
+ }
+
+ const { count } = await prisma.programPartnerTag.deleteMany({
+ where: {
+ id: {
+ in: programPartnerTags.map((row) => row.id),
+ },
+ },
+ });
+ console.log(`Deleted ${count} program–partner tag associations`);
+
+ const linksToUpdate = await prisma.link.findMany({
+ where: {
+ programEnrollment: {
+ id: {
+ in: programPartnerTags.map((row) => row.programEnrollment.id),
+ },
+ },
+ },
+ include: {
+ ...includeTags,
+ ...includeProgramEnrollment,
+ },
+ });
+
+ console.log(`Found ${linksToUpdate.length} links to update in Tinybird`);
+
+ await recordLink(linksToUpdate);
+
+ await queuePartnerTagDeletion({
+ partnerTagId,
+ delay: 2,
+ });
+ return logAndRespond("Batch completed, starting next batch...");
+ } catch (error) {
+ return handleAndReturnErrorResponse(error);
+ }
+}
diff --git a/apps/web/app/(ee)/api/partners/count/route.ts b/apps/web/app/(ee)/api/partners/count/route.ts
index e7ff1a798a..462abe0142 100644
--- a/apps/web/app/(ee)/api/partners/count/route.ts
+++ b/apps/web/app/(ee)/api/partners/count/route.ts
@@ -2,17 +2,42 @@ import { getPartnersCount } from "@/lib/api/partners/get-partners-count";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { withWorkspace } from "@/lib/auth";
import { partnersCountQuerySchema } from "@/lib/zod/schemas/partners";
+import { parseFilterValue } from "@dub/utils";
import { NextResponse } from "next/server";
+function parsePartnerFilterParams(
+ searchParams: Record<string, string | undefined>,
+) {
+ const partnerTagIdParsed = parseFilterValue(searchParams.partnerTagId);
+ const groupIdParsed = parseFilterValue(searchParams.groupId);
+ const countryParsed = parseFilterValue(searchParams.country);
+
+ return {
+ partnerTagId: partnerTagIdParsed?.values,
+ partnerTagIdOperator: partnerTagIdParsed?.sqlOperator,
+ groupId: groupIdParsed?.values,
+ groupIdOperator: groupIdParsed?.sqlOperator,
+ country: countryParsed?.values,
+ countryOperator: countryParsed?.sqlOperator,
+ };
+}
+
// GET /api/partners/count - get the count of partners for a program
export const GET = withWorkspace(
async ({ workspace, searchParams }) => {
const programId = getDefaultProgramIdOrThrow(workspace);
+ const filterOverrides = parsePartnerFilterParams(searchParams);
const parsedParams = partnersCountQuerySchema.parse(searchParams);
const count = await getPartnersCount({
...parsedParams,
- programId,
+ partnerTagId: filterOverrides.partnerTagId ?? parsedParams.partnerTagId,
+ partnerTagIdOperator: filterOverrides.partnerTagIdOperator,
+ groupId: filterOverrides.groupId ?? parsedParams.groupId,
+ groupIdOperator: filterOverrides.groupIdOperator,
+ country: filterOverrides.country ?? parsedParams.country,
+ countryOperator: filterOverrides.countryOperator,
+ programId: programId as string,
});
return NextResponse.json(count);
diff --git a/apps/web/app/(ee)/api/partners/route.ts b/apps/web/app/(ee)/api/partners/route.ts
index 32845284cc..fc07db3cac 100644
--- a/apps/web/app/(ee)/api/partners/route.ts
+++ b/apps/web/app/(ee)/api/partners/route.ts
@@ -12,14 +12,44 @@ import {
getPartnersQuerySchemaExtended,
partnerPlatformSchema,
} from "@/lib/zod/schemas/partners";
-import { toCentsNumber } from "@dub/utils";
+import { parseFilterValue, toCentsNumber } from "@dub/utils";
import { NextResponse } from "next/server";
import * as z from "zod/v4";
+function parsePartnerFilterParams(
+ searchParams: Record<string, string | undefined>,
+) {
+ const partnerTagIdParsed = parseFilterValue(searchParams.partnerTagId);
+ const groupIdParsed = parseFilterValue(searchParams.groupId);
+ const countryParsed = parseFilterValue(searchParams.country);
+
+ return {
+ partnerTagId: partnerTagIdParsed?.values,
+ partnerTagIdOperator: partnerTagIdParsed?.sqlOperator,
+ groupId: groupIdParsed?.values,
+ groupIdOperator: groupIdParsed?.sqlOperator,
+ country: countryParsed?.values,
+ countryOperator: countryParsed?.sqlOperator,
+ };
+}
+
// GET /api/partners - get all partners for a program
export const GET = withWorkspace(
async ({ workspace, searchParams }) => {
const programId = getDefaultProgramIdOrThrow(workspace);
+ const filterOverrides = parsePartnerFilterParams(searchParams);
+ const paramsToParse = {
+ ...searchParams,
+ ...(filterOverrides.partnerTagId && {
+ partnerTagId: filterOverrides.partnerTagId,
+ }),
+ ...(filterOverrides.groupId !== undefined && {
+ groupId: filterOverrides.groupId,
+ }),
+ ...(filterOverrides.country !== undefined && {
+ country: filterOverrides.country,
+ }),
+ };
const {
sortBy: sortByWithOldFields,
includePartnerPlatforms,
@@ -38,7 +68,7 @@ export const GET = withWorkspace(
]),
),
})
- .parse(searchParams);
+ .parse(paramsToParse);
// get the final sortBy field (replace old fields with new fields)
const sortBy =
@@ -54,6 +84,12 @@ export const GET = withWorkspace(
console.time("getPartners");
const partners = await getPartners({
...parsedParams,
+ partnerTagId: filterOverrides.partnerTagId ?? parsedParams.partnerTagId,
+ partnerTagIdOperator: filterOverrides.partnerTagIdOperator,
+ groupId: filterOverrides.groupId ?? parsedParams.groupId,
+ groupIdOperator: filterOverrides.groupIdOperator,
+ country: filterOverrides.country ?? parsedParams.country,
+ countryOperator: filterOverrides.countryOperator,
sortBy,
programId,
});
diff --git a/apps/web/app/(ee)/api/partners/tags/count/route.ts b/apps/web/app/(ee)/api/partners/tags/count/route.ts
new file mode 100644
index 0000000000..033c21895a
--- /dev/null
+++ b/apps/web/app/(ee)/api/partners/tags/count/route.ts
@@ -0,0 +1,37 @@
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { withWorkspace } from "@/lib/auth";
+import { getPartnerTagsCountQuerySchema } from "@/lib/zod/schemas/partner-tags";
+import { prisma } from "@dub/prisma";
+import { NextResponse } from "next/server";
+
+// GET /api/partners/tags/count - get count of partner tags
+export const GET = withWorkspace(
+ async ({ workspace, headers, searchParams }) => {
+ const programId = getDefaultProgramIdOrThrow(workspace);
+
+ const { search } = getPartnerTagsCountQuerySchema.parse(searchParams);
+
+ const count = await prisma.partnerTag.count({
+ where: {
+ programId,
+ ...(search && {
+ name: {
+ contains: search,
+ },
+ }),
+ },
+ });
+
+ return NextResponse.json(count, { headers });
+ },
+ {
+ requiredPlan: [
+ "business",
+ "business extra",
+ "business max",
+ "business plus",
+ "advanced",
+ "enterprise",
+ ],
+ },
+);
diff --git a/apps/web/app/(ee)/api/partners/tags/route.ts b/apps/web/app/(ee)/api/partners/tags/route.ts
new file mode 100644
index 0000000000..8a9d9f717a
--- /dev/null
+++ b/apps/web/app/(ee)/api/partners/tags/route.ts
@@ -0,0 +1,58 @@
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { withWorkspace } from "@/lib/auth";
+import {
+ PartnerTagSchema,
+ getPartnerTagsQuerySchema,
+} from "@/lib/zod/schemas/partner-tags";
+import { prisma } from "@dub/prisma";
+import { NextResponse } from "next/server";
+import * as z from "zod/v4";
+
+// GET /api/partners/tags - get all partner tags
+export const GET = withWorkspace(
+ async ({ workspace, headers, searchParams }) => {
+ const programId = getDefaultProgramIdOrThrow(workspace);
+
+ const { search, ids, sortBy, sortOrder, page, pageSize } =
+ getPartnerTagsQuerySchema.parse(searchParams);
+
+ const partnerTags = await prisma.partnerTag.findMany({
+ where: {
+ programId,
+ ...(search && {
+ name: {
+ contains: search,
+ },
+ }),
+ ...(ids && {
+ id: {
+ in: ids,
+ },
+ }),
+ },
+ select: {
+ id: true,
+ name: true,
+ },
+ orderBy: {
+ [sortBy]: sortOrder,
+ },
+ take: pageSize,
+ skip: ((page ?? 1) - 1) * pageSize,
+ });
+
+ return NextResponse.json(z.array(PartnerTagSchema).parse(partnerTags), {
+ headers,
+ });
+ },
+ {
+ requiredPlan: [
+ "business",
+ "business extra",
+ "business max",
+ "business plus",
+ "advanced",
+ "enterprise",
+ ],
+ },
+);
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 89333e1e73..0c811e71bc 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
@@ -97,6 +97,7 @@ export async function checkoutSessionCompleted(
domainsLimit: limits.domains,
aiLimit: limits.ai,
tagsLimit: limits.tags,
+ partnerTagsLimit: limits.partnerTags,
foldersLimit: limits.folders,
groupsLimit: limits.groups,
networkInvitesLimit: limits.networkInvites,
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 09fc21d2bc..02fc6b61d6 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
@@ -123,6 +123,7 @@ export async function customerSubscriptionDeleted(
domainsLimit: FREE_PLAN.limits.domains!,
aiLimit: FREE_PLAN.limits.ai!,
tagsLimit: FREE_PLAN.limits.tags!,
+ partnerTagsLimit: FREE_PLAN.limits.partnerTags!,
foldersLimit: FREE_PLAN.limits.folders!,
groupsLimit: FREE_PLAN.limits.groups!,
networkInvitesLimit: FREE_PLAN.limits.networkInvites!,
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 d953e78bdb..09309a2fea 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
@@ -107,6 +107,7 @@ export async function updateWorkspacePlan({
domainsLimit: limits.domains,
aiLimit: limits.ai,
tagsLimit: limits.tags,
+ partnerTagsLimit: limits.partnerTags,
foldersLimit: limits.folders,
groupsLimit: limits.groups,
networkInvitesLimit: limits.networkInvites,
diff --git a/apps/web/app/api/tags/[id]/route.ts b/apps/web/app/api/tags/[id]/route.ts
index f5324bb6e9..cdc9af738c 100644
--- a/apps/web/app/api/tags/[id]/route.ts
+++ b/apps/web/app/api/tags/[id]/route.ts
@@ -1,11 +1,8 @@
import { DubApiError } from "@/lib/api/errors";
-import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
-import { includeTags } from "@/lib/api/links/include-tags";
+import { markLinkTagDeleted } from "@/lib/api/tags/mark-link-tag-deleted";
import { withWorkspace } from "@/lib/auth";
-import { recordLink } from "@/lib/tinybird";
import { LinkTagSchema, updateTagBodySchema } from "@/lib/zod/schemas/tags";
import { prisma } from "@dub/prisma";
-import { waitUntil } from "@vercel/functions";
import { NextResponse } from "next/server";
// PATCH /api/tags/[id] – update a tag for a workspace
@@ -62,54 +59,20 @@ export const PUT = PATCH;
export const DELETE = withWorkspace(
async ({ params, workspace }) => {
const { id } = params;
- try {
- const response = await prisma.tag.delete({
- where: {
- id,
- projectId: workspace.id,
- },
- include: {
- links: {
- select: {
- link: {
- include: {
- ...includeTags,
- ...includeProgramEnrollment,
- },
- },
- },
- },
- },
- });
-
- if (!response) {
- throw new DubApiError({
- code: "not_found",
- message: "Tag not found.",
- });
- }
-
- // update links metadata in tinybird after deleting a tag
- waitUntil(
- recordLink(
- response.links.map(({ link }) => ({
- ...link,
- tags: link.tags.filter(({ tag }) => tag.id !== id),
- })),
- ),
- );
- return NextResponse.json({ id });
- } catch (error) {
- if (error.code === "P2025") {
- throw new DubApiError({
- code: "not_found",
- message: "Tag not found.",
- });
- }
+ const deleted = await markLinkTagDeleted({
+ tagId: id,
+ projectId: workspace.id,
+ });
- throw error;
+ if (!deleted) {
+ throw new DubApiError({
+ code: "not_found",
+ message: "Tag not found.",
+ });
}
+
+ return NextResponse.json({ id });
},
{
requiredPermissions: ["tags.write"],
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/program-analytics-shell.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/program-analytics-shell.tsx
index d1702f51d9..225f2a6951 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/program-analytics-shell.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/program-analytics-shell.tsx
@@ -8,7 +8,7 @@ import useWorkspace from "@/lib/swr/use-workspace";
import { AnalyticsContext } from "@/ui/analytics/analytics-provider";
import { DeviceSection } from "@/ui/analytics/device-section";
import { LocationSection } from "@/ui/analytics/location-section";
-import { PartnerSection } from "@/ui/analytics/partner-section";
+import { PartnerSegmentsSection } from "@/ui/analytics/partner-segments-section";
import { ReferrersUTMs } from "@/ui/analytics/referrers-utms";
import { useAnalyticsFilters } from "@/ui/analytics/use-analytics-filters";
import { useAnalyticsQuery } from "@/ui/analytics/use-analytics-query";
@@ -287,7 +287,7 @@ export function ProgramAnalyticsShell({ children }: { children: ReactNode }) {
<ApplicationsAnalyticsCards stage={applicationsStage} />
) : (
<div className="grid grid-cols-1 gap-5 md:grid-cols-2">
- <PartnerSection />
+ <PartnerSegmentsSection />
<ReferrersUTMs />
<LocationSection />
<DeviceSection />
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx
index 2db17218d7..aad941f3de 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx
@@ -21,6 +21,8 @@ import { useUnbanPartnerModal } from "@/ui/modals/unban-partner-modal";
import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";
import { PartnerRowItem } from "@/ui/partners/partner-row-item";
import { PartnerStatusBadges } from "@/ui/partners/partner-status-badges";
+import { PartnerTagsList } from "@/ui/partners/partner-tags-list";
+import { useUpdatePartnerTagsModal } from "@/ui/partners/update-partner-tags-modal";
import { AnimatedEmptyState } from "@/ui/shared/animated-empty-state";
import { CountryFlag } from "@/ui/shared/country-flag";
import { ThreeDots } from "@/ui/shared/icons";
@@ -49,6 +51,7 @@ import {
Dots,
EnvelopeArrowRight,
LoadingSpinner,
+ Tag,
Trash,
UserDelete,
Users,
@@ -67,7 +70,7 @@ import { Command } from "cmdk";
import { LockOpen } from "lucide-react";
import { useAction } from "next-safe-action/hooks";
import { useParams, useRouter } from "next/navigation";
-import { useMemo, useState } from "react";
+import { memo, useMemo, useState } from "react";
import { toast } from "sonner";
import useSWR from "swr";
import { usePartnerFilters } from "./use-partner-filters";
@@ -77,6 +80,7 @@ const partnersColumns = {
"partner",
"group",
"createdAt",
+ "tags",
"status",
"location",
"totalClicks",
@@ -96,6 +100,7 @@ const partnersColumns = {
defaultVisible: [
"partner",
"group",
+ "tags",
"location",
"totalClicks",
"totalLeads",
@@ -160,50 +165,6 @@ export function PartnersTable() {
const { groups } = useGroups();
- const [pendingChangeGroupPartners, setPendingChangeGroupPartners] = useState<
- EnrolledPartnerProps[]
- >([]);
-
- const { ChangeGroupModal, setShowChangeGroupModal } = useChangeGroupModal({
- partners: pendingChangeGroupPartners,
- });
-
- const [pendingArchivePartners, setPendingArchivePartners] = useState<
- EnrolledPartnerProps[]
- >([]);
-
- const { BulkArchivePartnersModal, setShowBulkArchivePartnersModal } =
- useBulkArchivePartnersModal({
- partners: pendingArchivePartners,
- onConfirm: async () => {
- await mutatePrefix("/api/partners");
- },
- });
-
- const [pendingDeactivatePartners, setPendingDeactivatePartners] = useState<
- EnrolledPartnerProps[]
- >([]);
-
- const { BulkDeactivatePartnersModal, setShowBulkDeactivatePartnersModal } =
- useBulkDeactivatePartnersModal({
- partners: pendingDeactivatePartners,
- onConfirm: async () => {
- await mutatePrefix("/api/partners");
- },
- });
-
- const [pendingBanPartners, setPendingBanPartners] = useState<
- EnrolledPartnerProps[]
- >([]);
-
- const { BulkBanPartnersModal, setShowBulkBanPartnersModal } =
- useBulkBanPartnersModal({
- partners: pendingBanPartners,
- onConfirm: async () => {
- await mutatePrefix("/api/partners");
- },
- });
-
const { columnVisibility, setColumnVisibility } = useColumnVisibility(
"partners-table-columns-v2",
partnersColumns,
@@ -266,6 +227,13 @@ export function PartnersTable() {
);
},
},
+ {
+ id: "tags",
+ header: "Tags",
+ minSize: 120,
+ maxSize: 200,
+ cell: ({ row }) => <PartnerTagsCell partner={row.original} />,
+ },
{
id: "createdAt",
header: "Enrolled",
@@ -528,42 +496,13 @@ export function PartnersTable() {
getRowId: (row) => row.id,
selectionControls: (table) => (
- <>
- <Button
- variant="primary"
- text="Change group"
- icon={<Users6 className="size-3.5 shrink-0" />}
- className="h-7 w-fit rounded-lg px-2.5"
- loading={false}
- onClick={() => {
- const partners = table
- .getSelectedRowModel()
- .rows.map((row) => row.original);
-
- setPendingChangeGroupPartners(partners);
- setShowChangeGroupModal(true);
- }}
- />
-
- {(!searchParams.get("status") ||
- searchParams.get("status") === "approved") && (
- <BulkActionsMenu
- table={table}
- onArchivePartners={(partners) => {
- setPendingArchivePartners(partners);
- setShowBulkArchivePartnersModal(true);
- }}
- onDeactivatePartners={(partners) => {
- setPendingDeactivatePartners(partners);
- setShowBulkDeactivatePartnersModal(true);
- }}
- onBanPartners={(partners) => {
- setPendingBanPartners(partners);
- setShowBulkBanPartnersModal(true);
- }}
- />
- )}
- </>
+ <PartnersBulkActionsBar
+ table={table}
+ showBulkActionsMenu={
+ !searchParams.get("status") ||
+ searchParams.get("status") === "approved"
+ }
+ />
),
thClassName: "border-l-0",
tdClassName: "border-l-0",
@@ -575,10 +514,6 @@ export function PartnersTable() {
return (
<div className="flex flex-col gap-4">
- <ChangeGroupModal />
- <BulkArchivePartnersModal />
- <BulkDeactivatePartnersModal />
- <BulkBanPartnersModal />
<PartnersFilters sortBy={sortBy} sortOrder={sortOrder} status={status} />
{partners?.length !== 0 ? (
<Table {...tableProps} table={table} />
@@ -611,8 +546,15 @@ function PartnersFilters({
sortOrder: "asc" | "desc";
status: ProgramEnrollmentStatus;
}) {
- const { filters, activeFilters, onSelect, onRemove, onRemoveAll } =
- usePartnerFilters({ sortBy, sortOrder, status });
+ const {
+ filters,
+ activeFilters,
+ onSelect,
+ onRemove,
+ onRemoveFilter,
+ onRemoveAll,
+ onToggleOperator,
+ } = usePartnerFilters({ sortBy, sortOrder, status });
return (
<div>
@@ -623,6 +565,7 @@ function PartnersFilters({
activeFilters={activeFilters}
onSelect={onSelect}
onRemove={onRemove}
+ onRemoveFilter={onRemoveFilter}
/>
<SearchBoxPersisted
placeholder="Search by name, email, or company"
@@ -638,7 +581,9 @@ function PartnersFilters({
activeFilters={activeFilters}
onSelect={onSelect}
onRemove={onRemove}
+ onRemoveFilter={onRemoveFilter}
onRemoveAll={onRemoveAll}
+ onToggleOperator={onToggleOperator}
/>
</div>
)}
@@ -740,6 +685,11 @@ function RowMenuButton({
partners: [row.original],
});
+ const { UpdatePartnerTagsModal, setShowUpdatePartnerTagsModal } =
+ useUpdatePartnerTagsModal({
+ partners: [row.original],
+ });
+
const { ArchivePartnerModal, setShowArchivePartnerModal } =
useArchivePartnerModal({
partner: row.original,
@@ -794,6 +744,7 @@ function RowMenuButton({
return (
<>
<ChangeGroupModal />
+ <UpdatePartnerTagsModal />
<ArchivePartnerModal />
<BanPartnerModal />
<UnbanPartnerModal />
@@ -816,6 +767,15 @@ function RowMenuButton({
}}
/>
+ <MenuItem
+ icon={Tag}
+ label="Update tags"
+ onSelect={() => {
+ setShowUpdatePartnerTagsModal(true);
+ setIsOpen(false);
+ }}
+ />
+
<MenuItem
icon={
isResendingInvite ? LoadingSpinner : EnvelopeArrowRight
@@ -878,6 +838,15 @@ function RowMenuButton({
setIsOpen(false);
}}
/>
+
+ <MenuItem
+ icon={Tag}
+ label="Update tags"
+ onSelect={() => {
+ setShowUpdatePartnerTagsModal(true);
+ setIsOpen(false);
+ }}
+ />
</Command.Group>
<Command.Separator className="border-t border-neutral-200" />
@@ -959,6 +928,136 @@ function RowMenuButton({
);
}
+const PartnerTagsCell = memo(function PartnerTagsCell({
+ partner,
+}: {
+ partner: EnrolledPartnerProps;
+}) {
+ const { UpdatePartnerTagsModal, setShowUpdatePartnerTagsModal } =
+ useUpdatePartnerTagsModal({
+ partners: [partner],
+ });
+
+ return (
+ <>
+ <UpdatePartnerTagsModal />
+ <PartnerTagsList
+ compact
+ tags={partner.tags}
+ onAddTag={() => {
+ setShowUpdatePartnerTagsModal(true);
+ }}
+ />
+ </>
+ );
+});
+
+const PartnersBulkActionsBar = memo(function PartnersBulkActionsBar({
+ table,
+ showBulkActionsMenu,
+}: {
+ table: TableType<EnrolledPartnerProps>;
+ showBulkActionsMenu: boolean;
+}) {
+ const [pendingChangeGroupPartners, setPendingChangeGroupPartners] = useState<
+ EnrolledPartnerProps[]
+ >([]);
+ const [pendingEditTagsPartners, setPendingEditTagsPartners] = useState<
+ EnrolledPartnerProps[]
+ >([]);
+ const [pendingArchivePartners, setPendingArchivePartners] = useState<
+ EnrolledPartnerProps[]
+ >([]);
+ const [pendingDeactivatePartners, setPendingDeactivatePartners] = useState<
+ EnrolledPartnerProps[]
+ >([]);
+ const [pendingBanPartners, setPendingBanPartners] = useState<
+ EnrolledPartnerProps[]
+ >([]);
+
+ const { ChangeGroupModal, setShowChangeGroupModal } = useChangeGroupModal({
+ partners: pendingChangeGroupPartners,
+ });
+ const { UpdatePartnerTagsModal, setShowUpdatePartnerTagsModal } =
+ useUpdatePartnerTagsModal({
+ partners: pendingEditTagsPartners,
+ });
+
+ const { BulkArchivePartnersModal, setShowBulkArchivePartnersModal } =
+ useBulkArchivePartnersModal({
+ partners: pendingArchivePartners,
+ onConfirm: async () => {
+ await mutatePrefix("/api/partners");
+ },
+ });
+ const { BulkDeactivatePartnersModal, setShowBulkDeactivatePartnersModal } =
+ useBulkDeactivatePartnersModal({
+ partners: pendingDeactivatePartners,
+ onConfirm: async () => {
+ await mutatePrefix("/api/partners");
+ },
+ });
+ const { BulkBanPartnersModal, setShowBulkBanPartnersModal } =
+ useBulkBanPartnersModal({
+ partners: pendingBanPartners,
+ onConfirm: async () => {
+ await mutatePrefix("/api/partners");
+ },
+ });
+
+ return (
+ <>
+ <ChangeGroupModal />
+ <UpdatePartnerTagsModal />
+ <BulkArchivePartnersModal />
+ <BulkDeactivatePartnersModal />
+ <BulkBanPartnersModal />
+ <Button
+ variant="primary"
+ text="Change group"
+ icon={<Users6 className="size-3.5 shrink-0" />}
+ className="h-7 w-fit rounded-lg px-2.5"
+ loading={false}
+ onClick={() => {
+ setPendingChangeGroupPartners(
+ table.getSelectedRowModel().rows.map((row) => row.original),
+ );
+ setShowChangeGroupModal(true);
+ }}
+ />
+ <Button
+ variant="secondary"
+ text="Update tags"
+ icon={<Tag className="size-3.5 shrink-0" />}
+ className="h-7 w-fit rounded-lg px-2.5"
+ onClick={() => {
+ setPendingEditTagsPartners(
+ table.getSelectedRowModel().rows.map((row) => row.original),
+ );
+ setShowUpdatePartnerTagsModal(true);
+ }}
+ />
+ {showBulkActionsMenu && (
+ <BulkActionsMenu
+ table={table}
+ onArchivePartners={(partners) => {
+ setPendingArchivePartners(partners);
+ setShowBulkArchivePartnersModal(true);
+ }}
+ onDeactivatePartners={(partners) => {
+ setPendingDeactivatePartners(partners);
+ setShowBulkDeactivatePartnersModal(true);
+ }}
+ onBanPartners={(partners) => {
+ setPendingBanPartners(partners);
+ setShowBulkBanPartnersModal(true);
+ }}
+ />
+ )}
+ </>
+ );
+});
+
function MenuItem({
icon: IconComp,
label,
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/use-partner-filters.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/use-partner-filters.tsx
index 0d946d3ba0..4acbabf236 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/use-partner-filters.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/use-partner-filters.tsx
@@ -1,6 +1,10 @@
import useGroups from "@/lib/swr/use-groups";
+import { usePartnerTags } from "@/lib/swr/use-partner-tags";
+import { usePartnerTagsCount } from "@/lib/swr/use-partner-tags-count";
import usePartnersCount from "@/lib/swr/use-partners-count";
import useWorkspace from "@/lib/swr/use-workspace";
+import { PartnerTagProps } from "@/lib/types";
+import { PARTNER_TAGS_MAX_PAGE_SIZE } from "@/lib/zod/schemas/partner-tags";
import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";
import { PartnerStatusBadges } from "@/ui/partners/partner-status-badges";
import { CountryFlag } from "@/ui/shared/country-flag";
@@ -13,11 +17,68 @@ import {
InvoiceDollar,
MarketingTarget,
MoneyBills2,
+ Tag,
UserPlus,
Users6,
} from "@dub/ui/icons";
-import { cn, COUNTRIES, currencyFormatter, nFormatter } from "@dub/utils";
-import { useMemo } from "react";
+import {
+ buildFilterValue,
+ cn,
+ COUNTRIES,
+ currencyFormatter,
+ nFormatter,
+ parseFilterValue,
+ type FilterOperator,
+ type ParsedFilter,
+} from "@dub/utils";
+import { useCallback, useMemo, useState } from "react";
+import { useDebounce } from "use-debounce";
+
+const SINGLE_VALUE_FILTER_KEYS = ["status"] as const;
+const MULTI_VALUE_FILTER_KEYS = ["partnerTagId", "groupId", "country"] as const;
+
+function buildMultiValueParam(
+ parsed: ParsedFilter | undefined,
+ values: string[],
+): string {
+ return buildFilterValue({
+ operator: parsed?.operator ?? (values.length > 1 ? "IS_ONE_OF" : "IS"),
+ sqlOperator: parsed?.sqlOperator ?? "IN",
+ values,
+ });
+}
+
+function activeFiltersToSearchParams(
+ activeFilters: Array<
+ | { key: string; values: string[]; operator: FilterOperator }
+ | { key: string; value: string }
+ >,
+): Record<string, string> {
+ return Object.fromEntries(
+ activeFilters.flatMap((f) => {
+ if ("values" in f && Array.isArray(f.values) && "operator" in f) {
+ const values = f.values as string[];
+ const op: FilterOperator =
+ (f as { operator?: FilterOperator }).operator ??
+ (values.length > 1 ? "IS_ONE_OF" : "IS");
+ return [
+ [
+ f.key,
+ buildFilterValue({
+ operator: op,
+ sqlOperator: op.includes("NOT") ? "NOT IN" : "IN",
+ values,
+ }),
+ ],
+ ];
+ }
+ if ("value" in f && f.value != null) {
+ return [[f.key, f.value]];
+ }
+ return [];
+ }),
+ );
+}
const PARTNER_METRIC_RANGE = [
{
@@ -80,6 +141,7 @@ const PARTNER_METRIC_RANGE = [
export type PartnerFilterKey =
| "groupId"
+ | "partnerTagId"
| "status"
| "country"
| (typeof PARTNER_METRIC_RANGE)[number]["filterKey"];
@@ -88,6 +150,7 @@ export function usePartnerFilters(
extraSearchParams: Record<string, string>,
enabledFilters: PartnerFilterKey[] = [
"groupId",
+ "partnerTagId",
"status",
"country",
"totalClicks",
@@ -103,8 +166,6 @@ export function usePartnerFilters(
extraSearchParams.status ||
"approved") as ProgramEnrollmentStatus;
- const { groups } = useGroups();
-
const cohortParams = useMemo(
() => ({
...(searchParamsObj.groupId && { groupId: searchParamsObj.groupId }),
@@ -114,6 +175,19 @@ export function usePartnerFilters(
[searchParamsObj.groupId, searchParamsObj.country, searchParamsObj.search],
);
+ const [selectedFilter, setSelectedFilter] = useState<string | null>(null);
+ const [search, setSearch] = useState("");
+ const [debouncedSearch] = useDebounce(search, 500);
+
+ const { partnerTags, partnerTagsAsync } = usePartnerTagFilterOptions({
+ search: selectedFilter === "partnerTagId" ? debouncedSearch : "",
+ enabled: enabledFilters.includes("partnerTagId"),
+ status,
+ cohortParams,
+ });
+
+ const { groups } = useGroups();
+
const { partnersCount: countriesCount } = usePartnersCount<
| {
country: string;
@@ -185,12 +259,31 @@ export function usePartnerFilters(
},
]
: []),
+ ...(enabledFilters.includes("partnerTagId")
+ ? [
+ {
+ key: "partnerTagId",
+ icon: Tag,
+ label: "Tag",
+ multiple: true,
+ shouldFilter: !partnerTagsAsync,
+ options:
+ partnerTags?.map(({ id, name, count, hideDuringSearch }) => ({
+ value: id,
+ label: name,
+ right: nFormatter(count, { full: true }),
+ hideDuringSearch,
+ })) ?? null,
+ },
+ ]
+ : []),
...(enabledFilters.includes("status")
? [
{
key: "status",
icon: CircleDotted,
label: "Status",
+ singleSelect: true,
options:
statusCount
?.filter(
@@ -283,111 +376,199 @@ export function usePartnerFilters(
};
}),
],
- [groupsCount, groups, statusCount, countriesCount, slug, enabledFilters],
+ [
+ enabledFilters,
+ groupsCount,
+ groups,
+ slug,
+ partnerTags,
+ partnerTagsAsync,
+ statusCount,
+ countriesCount,
+ ],
+ );
+
+ const partnerTagIdParsed = useMemo(
+ () => parseFilterValue(searchParamsObj.partnerTagId),
+ [searchParamsObj.partnerTagId],
+ );
+ const groupIdParsed = useMemo(
+ () => parseFilterValue(searchParamsObj.groupId),
+ [searchParamsObj.groupId],
+ );
+ const countryParsed = useMemo(
+ () => parseFilterValue(searchParamsObj.country),
+ [searchParamsObj.country],
+ );
+
+ const parsedByKey = useMemo(
+ () => ({
+ partnerTagId: partnerTagIdParsed,
+ groupId: groupIdParsed,
+ country: countryParsed,
+ }),
+ [partnerTagIdParsed, groupIdParsed, countryParsed],
);
const activeFilters = useMemo(() => {
- const { groupId, status: statusParam, country } = searchParamsObj;
+ const multiValueFilters = MULTI_VALUE_FILTER_KEYS.flatMap((key) => {
+ if (!enabledFilters.includes(key)) return [];
+ const parsed = parsedByKey[key];
+ if (!parsed) return [];
+ return [{ key, values: parsed.values, operator: parsed.operator }];
+ });
+ const singleValueFilters = SINGLE_VALUE_FILTER_KEYS.flatMap((key) => {
+ if (!enabledFilters.includes(key)) return [];
+ const value = searchParamsObj[key];
+ if (!value) return [];
+ return [{ key, value }];
+ });
+ const metricFilters = PARTNER_METRIC_RANGE.filter((m) =>
+ enabledFilters.includes(m.filterKey),
+ ).flatMap((m) => {
+ const minRaw = searchParamsObj[m.minParam];
+ const maxRaw = searchParamsObj[m.maxParam];
+ const min =
+ minRaw !== undefined && minRaw !== "" ? Number(minRaw) : undefined;
+ const max =
+ maxRaw !== undefined && maxRaw !== "" ? Number(maxRaw) : undefined;
+ const minOk = min !== undefined && Number.isFinite(min);
+ const maxOk = max !== undefined && Number.isFinite(max);
+ if (!minOk && !maxOk) {
+ return [];
+ }
+ return [
+ {
+ key: m.filterKey,
+ value: encodeRangeToken(
+ minOk ? min : undefined,
+ maxOk ? max : undefined,
+ ),
+ },
+ ];
+ });
+ return [...multiValueFilters, ...singleValueFilters, ...metricFilters];
+ }, [searchParamsObj, enabledFilters, parsedByKey]);
- return [
- ...(enabledFilters.includes("groupId") && groupId
- ? [{ key: "groupId", value: groupId }]
- : []),
- ...(enabledFilters.includes("status") && statusParam
- ? [{ key: "status", value: statusParam }]
- : []),
- ...(enabledFilters.includes("country") && country
- ? [{ key: "country", value: country }]
- : []),
- ...PARTNER_METRIC_RANGE.filter((m) =>
- enabledFilters.includes(m.filterKey),
- ).flatMap((m) => {
- const minRaw = searchParamsObj[m.minParam];
- const maxRaw = searchParamsObj[m.maxParam];
- const min =
- minRaw !== undefined && minRaw !== "" ? Number(minRaw) : undefined;
- const max =
- maxRaw !== undefined && maxRaw !== "" ? Number(maxRaw) : undefined;
- const minOk = min !== undefined && Number.isFinite(min);
- const maxOk = max !== undefined && Number.isFinite(max);
- if (!minOk && !maxOk) {
- return [];
- }
- return [
- {
- key: m.filterKey,
- value: encodeRangeToken(
- minOk ? min : undefined,
- maxOk ? max : undefined,
- ),
+ const onSelect = useCallback(
+ (key: string, value: unknown) => {
+ const metric = PARTNER_METRIC_RANGE.find((m) => m.filterKey === key);
+ if (metric) {
+ const { min, max } = parseRangeToken(String(value));
+ queryParams({
+ set: {
+ ...(min != null ? { [metric.minParam]: String(min) } : {}),
+ ...(max != null ? { [metric.maxParam]: String(max) } : {}),
},
- ];
- }),
- ];
- }, [searchParamsObj, enabledFilters]);
+ del: [
+ ...(min == null ? [metric.minParam] : []),
+ ...(max == null ? [metric.maxParam] : []),
+ "page",
+ ],
+ });
+ return;
+ }
- const onSelect = (key: string, value: unknown) => {
- const metric = PARTNER_METRIC_RANGE.find((m) => m.filterKey === key);
- if (metric) {
- const { min, max } = parseRangeToken(String(value));
- queryParams({
- set: {
- ...(min != null ? { [metric.minParam]: String(min) } : {}),
- ...(max != null ? { [metric.maxParam]: String(max) } : {}),
- },
- del: [
- ...(min == null ? [metric.minParam] : []),
- ...(max == null ? [metric.maxParam] : []),
- "page",
- ],
- });
- return;
- }
+ if (
+ MULTI_VALUE_FILTER_KEYS.includes(
+ key as (typeof MULTI_VALUE_FILTER_KEYS)[number],
+ )
+ ) {
+ const parsed = parsedByKey[key as keyof typeof parsedByKey];
+ const currentValues = parsed?.values ?? [];
+ const next = String(value);
+ const newValues = currentValues.includes(next)
+ ? currentValues
+ : [...currentValues, next];
+ const newParam = buildMultiValueParam(parsed, newValues);
+ return queryParams({ set: { [key]: newParam }, del: "page" });
+ }
+ return queryParams({ set: { [key]: value as string }, del: "page" });
+ },
+ [queryParams, parsedByKey],
+ );
- queryParams({
- set: { [key]: value as string },
- del: "page",
- });
- };
+ const onRemove = useCallback(
+ (key: string, value?: unknown) => {
+ const metric = PARTNER_METRIC_RANGE.find((m) => m.filterKey === key);
+ if (metric) {
+ queryParams({
+ del: [metric.minParam, metric.maxParam, "page"],
+ });
+ return;
+ }
- const onRemove = (key: string, _value?: unknown) => {
- const metric = PARTNER_METRIC_RANGE.find((m) => m.filterKey === key);
- if (metric) {
- queryParams({
- del: [metric.minParam, metric.maxParam, "page"],
- });
- return;
- }
+ if (
+ MULTI_VALUE_FILTER_KEYS.includes(
+ key as (typeof MULTI_VALUE_FILTER_KEYS)[number],
+ ) &&
+ value
+ ) {
+ const parsed = parsedByKey[key as keyof typeof parsedByKey];
+ const newValues = (parsed?.values ?? []).filter((v) => v !== value);
+ if (newValues.length === 0) {
+ return queryParams({ del: [key, "page"] });
+ }
+ const newParam = buildMultiValueParam(parsed, newValues);
+ return queryParams({ set: { [key]: newParam }, del: "page" });
+ }
+ return queryParams({ del: [key, "page"] });
+ },
+ [queryParams, parsedByKey],
+ );
- queryParams({
- del: [key, "page"],
- });
- };
+ const onRemoveFilter = useCallback(
+ (key: string) => {
+ onRemove(key);
+ },
+ [onRemove],
+ );
- const onRemoveFilter = (key: string) => {
- onRemove(key);
- };
+ const onToggleOperator = useCallback(
+ (key: string) => {
+ if (
+ !MULTI_VALUE_FILTER_KEYS.includes(
+ key as (typeof MULTI_VALUE_FILTER_KEYS)[number],
+ )
+ ) {
+ return;
+ }
+ const raw = searchParamsObj[key];
+ if (!raw) return;
- const onRemoveAll = () =>
- queryParams({
- del: [
- "status",
- "country",
- "groupId",
- "search",
- "totalClicksMin",
- "totalClicksMax",
- "totalLeadsMin",
- "totalLeadsMax",
- "totalConversionsMin",
- "totalConversionsMax",
- "totalSaleAmountMin",
- "totalSaleAmountMax",
- "totalCommissionsMin",
- "totalCommissionsMax",
- "page",
- ],
- });
+ const isNegated = raw.startsWith("-");
+ const cleanValue = isNegated ? raw.slice(1) : raw;
+ const newParam = isNegated ? cleanValue : `-${cleanValue}`;
+
+ queryParams({ set: { [key]: newParam }, del: "page" });
+ },
+ [queryParams, searchParamsObj],
+ );
+
+ const onRemoveAll = useCallback(
+ () =>
+ queryParams({
+ del: [
+ "status",
+ "country",
+ "groupId",
+ "partnerTagId",
+ "search",
+ "totalClicksMin",
+ "totalClicksMax",
+ "totalLeadsMin",
+ "totalLeadsMax",
+ "totalConversionsMin",
+ "totalConversionsMax",
+ "totalSaleAmountMin",
+ "totalSaleAmountMax",
+ "totalCommissionsMin",
+ "totalCommissionsMax",
+ "page",
+ ],
+ }),
+ [queryParams],
+ );
const searchQuery = useMemo(() => {
const acc: Record<string, string> = {
@@ -397,10 +578,10 @@ export function usePartnerFilters(
if (searchParamsObj.search) {
acc.search = searchParamsObj.search;
}
- for (const { key, value } of activeFilters) {
- const metric = PARTNER_METRIC_RANGE.find((m) => m.filterKey === key);
- if (metric) {
- const { min, max } = parseRangeToken(String(value));
+ for (const f of activeFilters) {
+ const metric = PARTNER_METRIC_RANGE.find((m) => m.filterKey === f.key);
+ if (metric && "value" in f && f.value != null) {
+ const { min, max } = parseRangeToken(String(f.value));
if (min != null) {
acc[metric.minParam] = String(min);
}
@@ -408,11 +589,11 @@ export function usePartnerFilters(
acc[metric.maxParam] = String(max);
}
} else {
- acc[key] = String(value);
+ Object.assign(acc, activeFiltersToSearchParams([f]));
}
}
return new URLSearchParams(acc).toString();
- }, [activeFilters, workspaceId, extraSearchParams, searchParamsObj.search]);
+ }, [activeFilters, searchParamsObj.search, workspaceId, extraSearchParams]);
return {
filters,
@@ -421,6 +602,97 @@ export function usePartnerFilters(
onRemove,
onRemoveFilter,
onRemoveAll,
+ onToggleOperator,
+ setSelectedFilter,
+ setSearch,
searchQuery,
};
}
+
+function usePartnerTagFilterOptions({
+ search,
+ enabled = true,
+ status,
+ cohortParams,
+}: {
+ search: string;
+ enabled?: boolean;
+ status: ProgramEnrollmentStatus;
+ cohortParams: {
+ groupId?: string;
+ country?: string;
+ search?: string;
+ };
+}) {
+ const { searchParamsObj } = useRouterStuff();
+
+ const tagIds = useMemo(() => {
+ const parsed = parseFilterValue(searchParamsObj.partnerTagId);
+ return parsed?.values ?? [];
+ }, [searchParamsObj.partnerTagId]);
+
+ const { partnerTagsCount } = usePartnerTagsCount({ enabled });
+ const useAsync = Boolean(
+ enabled &&
+ partnerTagsCount &&
+ partnerTagsCount > PARTNER_TAGS_MAX_PAGE_SIZE,
+ );
+ const { partnerTags, isLoading: isLoadingPartnerTags } = usePartnerTags({
+ query: { search: useAsync ? search : "" },
+ enabled,
+ });
+
+ const { partnerTags: selectedPartnerTags } = usePartnerTags({
+ query: { ids: tagIds },
+ enabled: enabled && useAsync,
+ });
+
+ const { partnersCount } = usePartnersCount<
+ {
+ partnerTagId: string;
+ _count: number;
+ }[]
+ >({
+ groupBy: "partnerTagId",
+ status,
+ ...cohortParams,
+ enabled,
+ });
+
+ const tagsResult = useMemo(() => {
+ return isLoadingPartnerTags ||
+ // Consider tags loading if we can't find the currently filtered tag
+ (tagIds?.length &&
+ tagIds.some(
+ (id) =>
+ ![...(selectedPartnerTags ?? []), ...(partnerTags ?? [])].some(
+ (t) => t.id === id,
+ ),
+ ))
+ ? null
+ : (
+ [
+ ...(partnerTags ?? []),
+ // Add selected tag to list if not already in tags
+ ...(selectedPartnerTags
+ ?.filter((st) => !partnerTags?.some((t) => t.id === st.id))
+ ?.map((st) => ({ ...st, hideDuringSearch: true })) ?? []),
+ ] as (PartnerTagProps & { hideDuringSearch?: boolean })[]
+ )
+ ?.map((tag) => ({
+ ...tag,
+ count:
+ partnersCount?.find(({ partnerTagId }) => partnerTagId === tag.id)
+ ?._count || 0,
+ }))
+ .sort((a, b) => b.count - a.count) ?? null;
+ }, [
+ isLoadingPartnerTags,
+ partnerTags,
+ selectedPartnerTags,
+ partnersCount,
+ tagIds,
+ ]);
+
+ return { partnerTags: tagsResult, partnerTagsAsync: useAsync };
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/upgrade/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/upgrade/page.tsx
index 73e978a919..6ec3ad6fd2 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/upgrade/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/upgrade/page.tsx
@@ -179,7 +179,7 @@ export default function WorkspaceBillingUpgradePage() {
stripeId &&
isDowngradePlan({
currentPlan: currentPlan || "free",
- currentTier: currentPlanTier,
+ currentTier: currentPlanTier ?? undefined,
newPlan: plan.name,
newTier: planTier,
}),
diff --git a/apps/web/lib/actions/partners/delete-program-invite.ts b/apps/web/lib/actions/partners/delete-program-invite.ts
index a8095686f3..820fbe802a 100644
--- a/apps/web/lib/actions/partners/delete-program-invite.ts
+++ b/apps/web/lib/actions/partners/delete-program-invite.ts
@@ -40,6 +40,11 @@ export const deleteProgramInviteAction = authActionClient
program: true,
partner: true,
links: true,
+ programPartnerTags: {
+ include: {
+ partnerTag: true,
+ },
+ },
},
});
@@ -61,7 +66,15 @@ export const deleteProgramInviteAction = authActionClient
},
}),
- bulkDeleteLinks(linksToDelete),
+ bulkDeleteLinks(
+ linksToDelete.map((link) => ({
+ ...link,
+ programEnrollment: {
+ groupId: programEnrollment.groupId,
+ programPartnerTags: programEnrollment.programPartnerTags,
+ },
+ })),
+ ),
prisma.discoveredPartner.delete({
where: {
diff --git a/apps/web/lib/actions/partners/tags/create-partner-tag.ts b/apps/web/lib/actions/partners/tags/create-partner-tag.ts
new file mode 100644
index 0000000000..7cf1f8d07a
--- /dev/null
+++ b/apps/web/lib/actions/partners/tags/create-partner-tag.ts
@@ -0,0 +1,57 @@
+"use server";
+
+import { createId } from "@/lib/api/create-id";
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import {
+ PartnerTagSchema,
+ createPartnerTagSchema,
+} from "@/lib/zod/schemas/partner-tags";
+import { prisma } from "@dub/prisma";
+import { INFINITY_NUMBER } from "@dub/utils";
+import { authActionClient } from "../../safe-action";
+
+// Create a partner tag
+export const createPartnerTagAction = authActionClient
+ .inputSchema(createPartnerTagSchema)
+ .action(async ({ parsedInput, ctx }) => {
+ const { workspace } = ctx;
+ const { name } = parsedInput;
+
+ const programId = getDefaultProgramIdOrThrow(workspace);
+
+ const partnerTagsLimit = (
+ workspace as unknown as { partnerTagsLimit: number }
+ ).partnerTagsLimit;
+
+ if (partnerTagsLimit < INFINITY_NUMBER) {
+ const existingCount = await prisma.partnerTag.count({
+ where: { programId },
+ });
+ if (existingCount >= partnerTagsLimit) {
+ throw new Error(
+ partnerTagsLimit === 0
+ ? "Partner tags are not available on your plan. Upgrade to create partner tags."
+ : `You've reached the maximum of ${partnerTagsLimit} partner tags per program on your plan. Upgrade to Advanced or Enterprise for unlimited partner tags.`,
+ );
+ }
+ }
+
+ try {
+ const partnerTag = await prisma.partnerTag.create({
+ data: {
+ id: createId({ prefix: "ptag_" }),
+ programId,
+ name,
+ },
+ });
+
+ return {
+ partnerTag: PartnerTagSchema.parse(partnerTag),
+ };
+ } catch (e) {
+ if (e.code === "P2002")
+ throw new Error("A tag with that name already exists.");
+
+ throw e;
+ }
+ });
diff --git a/apps/web/lib/actions/partners/tags/delete-partner-tag.ts b/apps/web/lib/actions/partners/tags/delete-partner-tag.ts
new file mode 100644
index 0000000000..ada77c9679
--- /dev/null
+++ b/apps/web/lib/actions/partners/tags/delete-partner-tag.ts
@@ -0,0 +1,25 @@
+"use server";
+
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { markPartnerTagDeleted } from "@/lib/api/tags/mark-partner-tag-deleted";
+import { deletePartnerTagSchema } from "@/lib/zod/schemas/partner-tags";
+import { authActionClient } from "../../safe-action";
+
+// Delete a partner tag
+export const deletePartnerTagAction = authActionClient
+ .inputSchema(deletePartnerTagSchema)
+ .action(async ({ parsedInput, ctx }) => {
+ const { workspace } = ctx;
+ const { partnerTagId } = parsedInput;
+
+ const programId = getDefaultProgramIdOrThrow(workspace);
+
+ const deleted = await markPartnerTagDeleted({
+ partnerTagId,
+ programId,
+ });
+
+ if (!deleted) {
+ throw new Error("Partner tag not found.");
+ }
+ });
diff --git a/apps/web/lib/actions/partners/tags/update-partner-tag.ts b/apps/web/lib/actions/partners/tags/update-partner-tag.ts
new file mode 100644
index 0000000000..d81c52d585
--- /dev/null
+++ b/apps/web/lib/actions/partners/tags/update-partner-tag.ts
@@ -0,0 +1,37 @@
+"use server";
+
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { updatePartnerTagSchema } from "@/lib/zod/schemas/partner-tags";
+import { prisma } from "@dub/prisma";
+import { authActionClient } from "../../safe-action";
+
+// Update a partner tag
+export const updatePartnerTagAction = authActionClient
+ .inputSchema(updatePartnerTagSchema)
+ .action(async ({ parsedInput, ctx }) => {
+ const { workspace } = ctx;
+ const { partnerTagId, name } = parsedInput;
+
+ const programId = getDefaultProgramIdOrThrow(workspace);
+
+ try {
+ const { count } = await prisma.partnerTag.updateMany({
+ where: {
+ id: partnerTagId,
+ programId,
+ },
+ data: {
+ name,
+ },
+ });
+
+ if (count === 0) {
+ throw new Error("Partner tag not found.");
+ }
+ } catch (e) {
+ if (e.code === "P2002")
+ throw new Error("A tag with that name already exists.");
+
+ throw e;
+ }
+ });
diff --git a/apps/web/lib/actions/partners/tags/update-program-partner-tags.ts b/apps/web/lib/actions/partners/tags/update-program-partner-tags.ts
new file mode 100644
index 0000000000..2cf43d6d2f
--- /dev/null
+++ b/apps/web/lib/actions/partners/tags/update-program-partner-tags.ts
@@ -0,0 +1,120 @@
+"use server";
+
+import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
+import { includeTags } from "@/lib/api/links/include-tags";
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { recordLink } from "@/lib/tinybird";
+import { updatePartnerTagsSchema } from "@/lib/zod/schemas/partner-tags";
+import { prisma } from "@dub/prisma";
+import { waitUntil } from "@vercel/functions";
+import { authActionClient } from "../../safe-action";
+
+const PARTNER_LINKS_TINYBIRD_BATCH_SIZE = 500;
+
+// Update a partner's tags
+export const updateProgramPartnerTagsAction = authActionClient
+ .inputSchema(updatePartnerTagsSchema)
+ .action(async ({ parsedInput, ctx }) => {
+ const { workspace } = ctx;
+ const {
+ partnerIds: partnerIdsInput,
+ addTagIds: addTagIdsInput,
+ removeTagIds: removeTagIdsInput,
+ } = parsedInput;
+
+ const partnerIds = [...new Set(partnerIdsInput)];
+ const addTagIds = [...new Set(addTagIdsInput ?? [])];
+ const removeTagIds = [...new Set(removeTagIdsInput ?? [])];
+
+ const programId = getDefaultProgramIdOrThrow(workspace);
+
+ if (partnerIds.length === 0)
+ throw new Error("At least one partner ID is required.");
+
+ if (addTagIds.length === 0 && removeTagIds.length === 0) {
+ throw new Error("At least one tag to add or remove is required.");
+ }
+
+ const [partnerCount, addTagCount] = await Promise.all([
+ prisma.programEnrollment.count({
+ where: {
+ programId,
+ partnerId: {
+ in: partnerIds,
+ },
+ },
+ }),
+ prisma.partnerTag.count({
+ where: {
+ programId,
+ id: {
+ in: addTagIds,
+ },
+ },
+ }),
+ ]);
+
+ if (partnerCount !== partnerIds.length)
+ throw new Error("One or more partners are not enrolled in the program.");
+
+ if (addTagCount !== addTagIds?.length)
+ throw new Error("One or more tags are not valid.");
+
+ const addTagCombos = addTagIds.flatMap((partnerTagId) =>
+ partnerIds.map((partnerId) => ({ partnerId, partnerTagId })),
+ );
+
+ await prisma.$transaction(async (tx) => {
+ await Promise.all([
+ tx.programPartnerTag.deleteMany({
+ where: {
+ programId,
+ partnerId: {
+ in: partnerIds,
+ },
+ partnerTagId: {
+ in: removeTagIds,
+ },
+ },
+ }),
+ tx.programPartnerTag.createMany({
+ data: addTagCombos.map(({ partnerId, partnerTagId }) => ({
+ programId,
+ partnerId,
+ partnerTagId,
+ })),
+ skipDuplicates: true,
+ }),
+ ]);
+ });
+
+ // Sync updated partner tags to Tinybird for analytics (top_partner_tags)
+ waitUntil(
+ (async () => {
+ let cursor: string | undefined;
+
+ while (true) {
+ const links = await prisma.link.findMany({
+ where: {
+ programId,
+ partnerId: { in: partnerIds },
+ },
+ include: {
+ ...includeTags,
+ ...includeProgramEnrollment,
+ },
+ orderBy: { id: "asc" },
+ take: PARTNER_LINKS_TINYBIRD_BATCH_SIZE,
+ ...(cursor ? { cursor: { id: cursor }, skip: 1 } : {}),
+ });
+
+ if (links.length === 0) {
+ break;
+ }
+
+ await recordLink(links);
+ cursor = links[links.length - 1]!.id;
+ }
+ })(),
+ );
+ });
diff --git a/apps/web/lib/analytics/constants.ts b/apps/web/lib/analytics/constants.ts
index d4a7f5f7bb..2fd7c7b5a6 100644
--- a/apps/web/lib/analytics/constants.ts
+++ b/apps/web/lib/analytics/constants.ts
@@ -83,6 +83,7 @@ export const VALID_ANALYTICS_ENDPOINTS = [
"top_base_urls",
"top_partners",
"top_groups",
+ "top_partner_tags",
"utm_sources",
"utm_mediums",
"utm_campaigns",
@@ -116,6 +117,7 @@ export const SINGULAR_ANALYTICS_ENDPOINTS = {
top_base_urls: "url",
top_groups: "groupId",
top_partners: "partnerId",
+ top_partner_tags: "partnerTagId",
};
export const VALID_ANALYTICS_FILTERS = [
@@ -125,6 +127,7 @@ export const VALID_ANALYTICS_FILTERS = [
"tagId",
"folderId",
"groupId",
+ "partnerTagId",
"partnerId",
"customerId",
"interval",
diff --git a/apps/web/lib/analytics/filter-helpers.ts b/apps/web/lib/analytics/filter-helpers.ts
index 256221a525..14aeacc740 100644
--- a/apps/web/lib/analytics/filter-helpers.ts
+++ b/apps/web/lib/analytics/filter-helpers.ts
@@ -93,6 +93,7 @@ export function extractWorkspaceLinkFilters(params: {
folderId?: ParsedFilter;
tagId?: ParsedFilter;
partnerId?: ParsedFilter;
+ partnerTagId?: ParsedFilter;
groupId?: ParsedFilter;
tenantId?: ParsedFilter;
}) {
@@ -108,6 +109,7 @@ export function extractWorkspaceLinkFilters(params: {
const tagId = extractFilter(params.tagId);
const folderId = extractFilter(params.folderId);
const partnerId = extractFilter(params.partnerId);
+ const partnerTagId = extractFilter(params.partnerTagId);
const groupId = extractFilter(params.groupId);
const tenantId = extractFilter(params.tenantId);
@@ -122,6 +124,8 @@ export function extractWorkspaceLinkFilters(params: {
folderIdOperator: folderId.operator,
partnerId: partnerId.values,
partnerIdOperator: partnerId.operator,
+ partnerTagId: partnerTagId.values,
+ partnerTagIdOperator: partnerTagId.operator,
groupId: groupId.values,
groupIdOperator: groupId.operator,
tenantId: tenantId.values,
diff --git a/apps/web/lib/analytics/get-analytics.ts b/apps/web/lib/analytics/get-analytics.ts
index 624b381e40..f94b1f8ceb 100644
--- a/apps/web/lib/analytics/get-analytics.ts
+++ b/apps/web/lib/analytics/get-analytics.ts
@@ -1,6 +1,7 @@
+import { FOLDER_WORKSPACE_ACCESS } from "@/lib/folder/constants";
import { tb } from "@/lib/tinybird";
+import { FolderAccessLevel } from "@/lib/types";
import { prisma } from "@dub/prisma";
-import { FolderAccessLevel } from "@dub/prisma/client";
import { linkConstructor, punyEncode } from "@dub/utils";
import * as z from "zod/v4";
import { decodeKeyIfCaseSensitive } from "../api/links/case-sensitivity";
@@ -103,6 +104,7 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
"top_link_tags",
"top_domains",
"top_partners",
+ "top_partner_tags",
"top_groups",
].includes(groupBy!)
? "v4_group_by_link_metadata"
@@ -132,8 +134,9 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
const folderIdFilter = ensureParsedFilter(params.folderId);
const partnerIdFilter = ensureParsedFilter(params.partnerId);
+ const partnerTagIdFilter = ensureParsedFilter(params.partnerTagId);
- const {
+ let {
domain: domainParam,
domainOperator,
linkId: linkIdParam,
@@ -144,6 +147,8 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
tagIdOperator,
partnerId: partnerIdParam,
partnerIdOperator,
+ partnerTagId: partnerTagIdParam,
+ partnerTagIdOperator,
groupId: groupIdParam,
groupIdOperator,
tenantId: tenantIdParam,
@@ -151,6 +156,7 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
} = extractWorkspaceLinkFilters({
...params,
partnerId: partnerIdFilter,
+ partnerTagId: partnerTagIdFilter,
linkId: normalizedLinkId,
folderId: folderIdFilter,
});
@@ -161,6 +167,8 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
programId: params.programId,
partnerId: partnerIdParam,
partnerIdOperator,
+ partnerTagId: partnerTagIdParam,
+ partnerTagIdOperator,
tenantId: tenantIdParam,
tenantIdOperator,
groupId: groupIdParam,
@@ -312,7 +320,14 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
return analyticsResponse.top_folders
.extend({
folder: analyticsResponse.top_folders.shape.folder.extend({
- accessLevel: z.enum(FolderAccessLevel).nullish(),
+ accessLevel: z
+ .enum(
+ Object.keys(FOLDER_WORKSPACE_ACCESS) as [
+ FolderAccessLevel,
+ ...FolderAccessLevel[],
+ ],
+ )
+ .nullish(),
}),
})
.parse({
@@ -322,6 +337,27 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
});
})
.filter((d) => d !== null);
+ } else if (groupBy === "top_partner_tags") {
+ const partnerTags = await prisma.partnerTag.findMany({
+ where: {
+ id: { in: response.data.map((item) => item.groupByField) },
+ },
+ select: {
+ id: true,
+ name: true,
+ },
+ });
+ return response.data
+ .map((item) => {
+ const partnerTag = partnerTags.find((t) => t.id === item.groupByField);
+ if (!partnerTag) return null;
+ return analyticsResponse[groupBy].parse({
+ ...item,
+ partnerTagId: item.groupByField,
+ partnerTag,
+ });
+ })
+ .filter((d) => d !== null);
} else if (groupBy === "top_groups") {
const groups = await prisma.partnerGroup.findMany({
where: {
diff --git a/apps/web/lib/analytics/get-events.ts b/apps/web/lib/analytics/get-events.ts
index bbbf71d01f..32441404a8 100644
--- a/apps/web/lib/analytics/get-events.ts
+++ b/apps/web/lib/analytics/get-events.ts
@@ -95,6 +95,7 @@ export const getEvents = async (params: EventsFilters) => {
const allFilters = [...metadataFilters, ...advancedFilters];
const partnerIdFilter = ensureParsedFilter(params.partnerId);
+ const partnerTagIdFilter = ensureParsedFilter(params.partnerTagId);
const linkIdFilter = ensureParsedFilter(params.linkId);
const folderIdFilter = ensureParsedFilter(params.folderId);
@@ -109,6 +110,8 @@ export const getEvents = async (params: EventsFilters) => {
folderIdOperator,
partnerId: partnerIdParam,
partnerIdOperator,
+ partnerTagId: partnerTagIdParam,
+ partnerTagIdOperator,
groupId: groupIdParam,
groupIdOperator,
tenantId: tenantIdParam,
@@ -116,6 +119,7 @@ export const getEvents = async (params: EventsFilters) => {
} = extractWorkspaceLinkFilters({
...params,
partnerId: partnerIdFilter,
+ partnerTagId: partnerTagIdFilter,
linkId: linkIdFilter,
folderId: folderIdFilter,
});
@@ -131,6 +135,8 @@ export const getEvents = async (params: EventsFilters) => {
folderIdOperator,
partnerId: partnerIdParam,
partnerIdOperator,
+ partnerTagId: partnerTagIdParam,
+ partnerTagIdOperator,
tenantId: tenantIdParam,
tenantIdOperator,
groupId: groupIdParam,
diff --git a/apps/web/lib/api/create-id.ts b/apps/web/lib/api/create-id.ts
index f84afc8d97..d233b23840 100644
--- a/apps/web/lib/api/create-id.ts
+++ b/apps/web/lib/api/create-id.ts
@@ -32,7 +32,8 @@ const prefixes = [
"dub_embed_", // dub embed
"audit_", // audit log
"import_", // import log
- "grp_", // group
+ "grp_", // partner group
+ "ptag_", // partner tag
"bnty_", // bounty
"bnty_sub_", // bounty submission
"wf_", // workflow
diff --git a/apps/web/lib/api/links/create-link.ts b/apps/web/lib/api/links/create-link.ts
index f4ea48f268..7d9f747c93 100644
--- a/apps/web/lib/api/links/create-link.ts
+++ b/apps/web/lib/api/links/create-link.ts
@@ -157,8 +157,17 @@ export async function createLink(link: ProcessedLinkProps) {
// Record link in Tinybird
recordLink({
...response,
- ...(partner?.groupId && {
- programEnrollment: { groupId: partner.groupId },
+ ...(partner && {
+ programEnrollment: {
+ ...(partner?.groupId && {
+ groupId: partner.groupId,
+ }),
+ programPartnerTags: partner?.partnerTagIds.map(
+ (partnerTagId: string) => ({
+ partnerTagId,
+ }),
+ ),
+ },
}),
}),
diff --git a/apps/web/lib/api/links/include-program-enrollment.ts b/apps/web/lib/api/links/include-program-enrollment.ts
index 1b521e0fad..5bf56bc0c7 100644
--- a/apps/web/lib/api/links/include-program-enrollment.ts
+++ b/apps/web/lib/api/links/include-program-enrollment.ts
@@ -4,6 +4,11 @@ export const includeProgramEnrollment = {
programEnrollment: {
select: {
groupId: true,
+ programPartnerTags: {
+ select: {
+ partnerTagId: true,
+ },
+ },
},
},
} satisfies Prisma.LinkInclude;
diff --git a/apps/web/lib/api/links/update-link.ts b/apps/web/lib/api/links/update-link.ts
index 1189c7c334..4780b1719a 100644
--- a/apps/web/lib/api/links/update-link.ts
+++ b/apps/web/lib/api/links/update-link.ts
@@ -186,8 +186,17 @@ export async function updateLink({
// Record link in Tinybird
recordLink({
...response,
- ...(partner?.groupId && {
- programEnrollment: { groupId: partner.groupId },
+ ...(partner && {
+ programEnrollment: {
+ ...(partner?.groupId && {
+ groupId: partner.groupId,
+ }),
+ programPartnerTags: partner?.partnerTagIds.map(
+ (partnerTagId: string) => ({
+ partnerTagId,
+ }),
+ ),
+ },
}),
}),
diff --git a/apps/web/lib/api/links/utils/transform-link.ts b/apps/web/lib/api/links/utils/transform-link.ts
index 30e54405bf..e2e30df057 100644
--- a/apps/web/lib/api/links/utils/transform-link.ts
+++ b/apps/web/lib/api/links/utils/transform-link.ts
@@ -24,7 +24,11 @@ export type ExpandedLink = Link & {
DiscountProps,
"id" | "amount" | "type" | "maxDuration" | "couponId" | "couponTestId"
> | null;
- programEnrollment?: Pick<ProgramEnrollmentProps, "groupId"> | null;
+ programEnrollment?:
+ | (Pick<ProgramEnrollmentProps, "groupId"> & {
+ programPartnerTags?: { partnerTagId: string }[] | null;
+ })
+ | null;
};
// Transform link with additional properties
diff --git a/apps/web/lib/api/partner-profile/get-partner-for-program.ts b/apps/web/lib/api/partner-profile/get-partner-for-program.ts
index 9a69ce6342..059286a5c8 100644
--- a/apps/web/lib/api/partner-profile/get-partner-for-program.ts
+++ b/apps/web/lib/api/partner-profile/get-partner-for-program.ts
@@ -21,6 +21,14 @@ export async function getPartnerForProgram({
industryInterests: true,
preferredEarningStructures: true,
salesChannels: true,
+ programPartnerTags: {
+ where: {
+ programId,
+ },
+ include: {
+ partnerTag: true,
+ },
+ },
platforms: true,
},
},
@@ -48,6 +56,7 @@ export async function getPartnerForProgram({
toCentsNumber(programEnrollment.totalCommissions ?? 0),
id: partner.id,
createdAt: new Date(programEnrollment.createdAt),
+ tags: partner.programPartnerTags.map(({ partnerTag }) => partnerTag),
links,
lastLeadAt: links.reduce((acc, link) => {
return link.lastLeadAt && link.lastLeadAt > (acc ?? new Date(0))
diff --git a/apps/web/lib/api/partners/get-partners-count.ts b/apps/web/lib/api/partners/get-partners-count.ts
index 2dcec84e6d..512afd56cf 100644
--- a/apps/web/lib/api/partners/get-partners-count.ts
+++ b/apps/web/lib/api/partners/get-partners-count.ts
@@ -4,43 +4,108 @@ import { Prisma, ProgramEnrollmentStatus } from "@dub/prisma/client";
import * as z from "zod/v4";
import {
buildMetricRangeWhere,
+ buildNullableStringListWhere,
buildPartnerEmailSearchWhere,
buildProgramEnrollmentWhereForList,
+ mergePartnerCountryAndSearchWhere,
} from "./program-enrollment-query";
type PartnersCountFilters = z.infer<typeof partnersCountQuerySchema> & {
programId: string;
+ partnerTagIdOperator?: "IN" | "NOT IN";
+ groupIdOperator?: "IN" | "NOT IN";
+ countryOperator?: "IN" | "NOT IN";
};
export async function getPartnersCount<T>(
filters: PartnersCountFilters,
): Promise<T> {
+ // const {
+
const { groupBy, programId, ...enrollmentFilters } = filters;
const enrollmentBase = { ...enrollmentFilters, programId };
- const { status, country, search, email, partnerIds, groupId } =
- enrollmentFilters;
+ const {
+ status,
+ country,
+ search,
+ email,
+ partnerIds,
+ groupId,
+ partnerTagId,
+ tenantId,
+ partnerTagIdOperator = "IN",
+ groupIdOperator = "IN",
+ countryOperator = "IN",
+ } = enrollmentFilters;
+
+ const enrollmentScope: Prisma.ProgramEnrollmentWhereInput = {
+ programId,
+ ...(tenantId ? { tenantId } : {}),
+ };
+
+ const partnerTagIdNotIn = partnerTagIdOperator === "NOT IN";
+ const groupIdNotIn = groupIdOperator === "NOT IN";
+ const countryNotIn = countryOperator === "NOT IN";
+
+ const groupIdWhere = buildNullableStringListWhere(
+ "groupId",
+ groupId,
+ groupIdNotIn,
+ );
+ const countryWhere = buildNullableStringListWhere(
+ "country",
+ country,
+ countryNotIn,
+ );
+
+ const emailSearchWhere = buildPartnerEmailSearchWhere({ email, search });
+ const partnerTagFilter = partnerTagId
+ ? {
+ programPartnerTags: {
+ ...(partnerTagIdNotIn
+ ? {
+ none: {
+ programId,
+ partnerTagId: { in: partnerTagId },
+ },
+ }
+ : {
+ some: {
+ programId,
+ partnerTagId: { in: partnerTagId },
+ },
+ }),
+ },
+ }
+ : undefined;
const commonWhere: Prisma.PartnerWhereInput = {
- ...buildPartnerEmailSearchWhere({ email, search }),
+ ...emailSearchWhere,
...(partnerIds && {
id: { in: partnerIds },
}),
+ ...(partnerTagFilter ?? {}),
+ };
+
+ const partnerWhereWithCountry: Prisma.PartnerWhereInput = {
+ ...mergePartnerCountryAndSearchWhere(countryWhere, emailSearchWhere),
+ ...(partnerIds && {
+ id: { in: partnerIds },
+ }),
+ ...(partnerTagFilter ?? {}),
};
const enrollmentMetricWhere = buildMetricRangeWhere(enrollmentBase);
- // Get partner count by country
if (groupBy === "country") {
const partners = await prisma.partner.groupBy({
by: ["country"],
where: {
programs: {
some: {
- programId,
- ...(groupId && {
- groupId,
- }),
+ ...enrollmentScope,
+ ...(groupIdWhere ?? {}),
status:
status === "approved_invited"
? {
@@ -63,21 +128,13 @@ export async function getPartnersCount<T>(
return partners as T;
}
- // Get partner count by status
if (groupBy === "status") {
const partners = await prisma.programEnrollment.groupBy({
by: ["status"],
where: {
- programId,
- ...(groupId && {
- groupId,
- }),
- partner: {
- ...(country && {
- country,
- }),
- ...commonWhere,
- },
+ ...enrollmentScope,
+ ...(groupIdWhere ?? {}),
+ partner: partnerWhereWithCountry,
...enrollmentMetricWhere,
},
_count: true,
@@ -101,18 +158,12 @@ export async function getPartnersCount<T>(
return partners as T;
}
- // Get partner count by group
if (groupBy === "groupId") {
const partners = await prisma.programEnrollment.groupBy({
by: ["groupId"],
where: {
- programId,
- partner: {
- ...(country && {
- country,
- }),
- ...commonWhere,
- },
+ ...enrollmentScope,
+ partner: partnerWhereWithCountry,
status:
status === "approved_invited"
? {
@@ -132,6 +183,29 @@ export async function getPartnersCount<T>(
return partners as T;
}
+ if (groupBy === "partnerTagId") {
+ const enrollmentWhere = buildProgramEnrollmentWhereForList({
+ ...enrollmentBase,
+ partnerTagId: undefined,
+ });
+
+ const partners = await prisma.programPartnerTag.groupBy({
+ by: ["partnerTagId"],
+ where: {
+ programId,
+ programEnrollment: enrollmentWhere,
+ },
+ _count: true,
+ orderBy: {
+ _count: {
+ partnerTagId: "desc",
+ },
+ },
+ });
+
+ return partners as T;
+ }
+
// Get absolute count of partners
const count = await prisma.programEnrollment.count({
where: buildProgramEnrollmentWhereForList(enrollmentBase),
diff --git a/apps/web/lib/api/partners/get-partners.ts b/apps/web/lib/api/partners/get-partners.ts
index 7d2cb7484e..03285df35c 100644
--- a/apps/web/lib/api/partners/get-partners.ts
+++ b/apps/web/lib/api/partners/get-partners.ts
@@ -6,6 +6,9 @@ import { buildProgramEnrollmentWhereForList } from "./program-enrollment-query";
type PartnerFilters = z.infer<typeof getPartnersQuerySchemaExtended> & {
programId: string;
+ partnerTagIdOperator?: "IN" | "NOT IN";
+ groupIdOperator?: "IN" | "NOT IN";
+ countryOperator?: "IN" | "NOT IN";
};
export async function getPartners(filters: PartnerFilters) {
@@ -27,6 +30,14 @@ export async function getPartners(filters: PartnerFilters) {
include: {
partner: {
include: {
+ programPartnerTags: {
+ where: {
+ programId,
+ },
+ include: {
+ partnerTag: true,
+ },
+ },
platforms: true,
},
},
@@ -44,6 +55,7 @@ export async function getPartners(filters: PartnerFilters) {
...programEnrollment,
id: partner.id,
createdAt: new Date(programEnrollment.createdAt),
+ tags: partner.programPartnerTags.map(({ partnerTag }) => partnerTag),
links,
netRevenue:
toCentsNumber(programEnrollment.totalSaleAmount ?? 0) -
diff --git a/apps/web/lib/api/partners/program-enrollment-query.ts b/apps/web/lib/api/partners/program-enrollment-query.ts
index 38e057e944..ec5e71ebc2 100644
--- a/apps/web/lib/api/partners/program-enrollment-query.ts
+++ b/apps/web/lib/api/partners/program-enrollment-query.ts
@@ -35,7 +35,12 @@ export function buildPartnerEmailSearchWhere({
export type PartnerEnrollmentQueryFilters = Omit<
z.infer<typeof getPartnersQuerySchemaExtended>,
"sortBy" | "sortOrder" | "page" | "pageSize" | "includePartnerPlatforms"
-> & { programId: string };
+> & {
+ programId: string;
+ partnerTagIdOperator?: "IN" | "NOT IN";
+ groupIdOperator?: "IN" | "NOT IN";
+ countryOperator?: "IN" | "NOT IN";
+};
function normalizeBounds(
min?: number | null,
@@ -128,6 +133,70 @@ export function buildMetricRangeWhere(
return and.length ? { AND: and } : {};
}
+function normalizeStringList(
+ value: string | string[] | undefined,
+): string[] | undefined {
+ if (value === undefined) return undefined;
+ const list = (Array.isArray(value) ? value : [value]).filter(
+ (v) => typeof v === "string" && v.length > 0,
+ );
+ return list.length === 0 ? undefined : list;
+}
+
+/**
+ * Nullable string column on `ProgramEnrollment` or `Partner` (`groupId` /
+ * `country`). For NOT IN / not, SQL excludes NULL; OR with `null` keeps rows
+ * with no value / unknown.
+ */
+export function buildNullableStringListWhere(
+ field: "groupId",
+ value: string | string[] | undefined,
+ exclude: boolean,
+): Prisma.ProgramEnrollmentWhereInput | undefined;
+export function buildNullableStringListWhere(
+ field: "country",
+ value: string | string[] | undefined,
+ exclude: boolean,
+): Prisma.PartnerWhereInput | undefined;
+export function buildNullableStringListWhere(
+ field: "groupId" | "country",
+ value: string | string[] | undefined,
+ exclude: boolean,
+): Prisma.ProgramEnrollmentWhereInput | Prisma.PartnerWhereInput | undefined {
+ const list = normalizeStringList(value);
+ if (list === undefined) return undefined;
+
+ const inOrEquals = list.length === 1 ? list[0]! : { in: list };
+ const negation = list.length === 1 ? { not: list[0]! } : { notIn: list };
+
+ if (!exclude) {
+ return { [field]: inOrEquals } as
+ | Prisma.ProgramEnrollmentWhereInput
+ | Prisma.PartnerWhereInput;
+ }
+
+ return {
+ OR: [{ [field]: null }, { [field]: negation }],
+ } as Prisma.ProgramEnrollmentWhereInput | Prisma.PartnerWhereInput;
+}
+
+export function mergePartnerCountryAndSearchWhere(
+ countryWhere: Prisma.PartnerWhereInput | undefined,
+ searchWhere: Prisma.PartnerWhereInput,
+): Prisma.PartnerWhereInput {
+ const hasCountry = countryWhere && Object.keys(countryWhere).length > 0;
+ const hasSearch = Object.keys(searchWhere).length > 0;
+
+ if (hasCountry && hasSearch) {
+ return { AND: [countryWhere!, searchWhere] };
+ }
+
+ return {
+ ...(hasCountry ? countryWhere! : {}),
+ ...(hasSearch ? searchWhere : {}),
+ };
+}
+
/** Matches GET /api/partners enrollment filter shape + metric ranges. */
export function buildProgramEnrollmentWhereForList(
filters: PartnerEnrollmentQueryFilters,
@@ -141,10 +210,55 @@ export function buildProgramEnrollmentWhereForList(
partnerIds,
search,
email,
+ partnerTagId,
+ partnerTagIdOperator = "IN",
+ groupIdOperator = "IN",
+ countryOperator = "IN",
} = filters;
const metricWhere = buildMetricRangeWhere(filters);
+ const partnerTagIdNotIn = partnerTagIdOperator === "NOT IN";
+ const groupIdNotIn = groupIdOperator === "NOT IN";
+ const countryNotIn = countryOperator === "NOT IN";
+
+ const searchWhere = buildPartnerEmailSearchWhere({ email, search });
+
+ const countryWhere = buildNullableStringListWhere(
+ "country",
+ country,
+ countryNotIn,
+ );
+
+ const partnerWhere: Prisma.PartnerWhereInput = {
+ ...(partnerTagId && {
+ programPartnerTags: {
+ ...(partnerTagIdNotIn
+ ? {
+ none: {
+ programId,
+ partnerTagId: { in: partnerTagId },
+ },
+ }
+ : {
+ some: {
+ programId,
+ partnerTagId: { in: partnerTagId },
+ },
+ }),
+ },
+ }),
+ ...mergePartnerCountryAndSearchWhere(countryWhere, searchWhere),
+ };
+
+ const hasPartnerWhere = Object.keys(partnerWhere).length > 0;
+
+ const groupIdWhere = buildNullableStringListWhere(
+ "groupId",
+ groupId,
+ groupIdNotIn,
+ );
+
return {
tenantId,
programId,
@@ -159,15 +273,8 @@ export function buildProgramEnrollmentWhereForList(
in: ["approved", "invited"],
}
: status,
- groupId,
- ...(country || search || email
- ? {
- partner: {
- country,
- ...buildPartnerEmailSearchWhere({ email, search }),
- },
- }
- : {}),
+ ...(groupIdWhere ?? {}),
+ ...(hasPartnerWhere ? { partner: partnerWhere } : {}),
...metricWhere,
};
}
diff --git a/apps/web/lib/api/programs/get-default-program-id-or-throw.ts b/apps/web/lib/api/programs/get-default-program-id-or-throw.ts
index 44954318d5..7434b46af7 100644
--- a/apps/web/lib/api/programs/get-default-program-id-or-throw.ts
+++ b/apps/web/lib/api/programs/get-default-program-id-or-throw.ts
@@ -1,10 +1,12 @@
-import { WorkspaceProps } from "@/lib/types";
import { DubApiError } from "../errors";
+import { WorkspaceWithUsers } from "@/lib/types";
export const getDefaultProgramIdOrThrow = (
- workspace: Pick<WorkspaceProps, "defaultProgramId">,
+ workspace: WorkspaceWithUsers | { defaultProgramId?: string | null },
) => {
- const programId = workspace.defaultProgramId;
+ const programId = (
+ workspace as { defaultProgramId?: string | null }
+ ).defaultProgramId;
if (!programId) {
throw new DubApiError({
diff --git a/apps/web/lib/api/tags/mark-link-tag-deleted.ts b/apps/web/lib/api/tags/mark-link-tag-deleted.ts
new file mode 100644
index 0000000000..a2571ace5e
--- /dev/null
+++ b/apps/web/lib/api/tags/mark-link-tag-deleted.ts
@@ -0,0 +1,41 @@
+import { prisma } from "@dub/prisma";
+import { queueLinkTagDeletion } from "./queue-tag-deletion";
+
+// Mark the link tag as deleted (orphan from workspace). LinkTag rows and the
+// Tag row are removed asynchronously via a cron job.
+export async function markLinkTagDeleted({
+ tagId,
+ projectId,
+}: {
+ tagId: string;
+ projectId: string;
+}): Promise<boolean> {
+ try {
+ const updated = await prisma.tag.update({
+ where: {
+ id: tagId,
+ projectId,
+ },
+ data: {
+ projectId: null,
+ },
+ });
+
+ if (!updated) {
+ return false;
+ }
+
+ await queueLinkTagDeletion({
+ tagId,
+ });
+
+ return true;
+ } catch (error) {
+ console.error("markLinkTagDeleted", {
+ reason: error,
+ tagId,
+ projectId,
+ });
+ return false;
+ }
+}
diff --git a/apps/web/lib/api/tags/mark-partner-tag-deleted.ts b/apps/web/lib/api/tags/mark-partner-tag-deleted.ts
new file mode 100644
index 0000000000..9f3ba23f44
--- /dev/null
+++ b/apps/web/lib/api/tags/mark-partner-tag-deleted.ts
@@ -0,0 +1,41 @@
+import { prisma } from "@dub/prisma";
+import { queuePartnerTagDeletion } from "./queue-tag-deletion";
+
+// Mark the partner tag as deleted (orphan from program). ProgramPartnerTag
+// rows and the PartnerTag row are removed asynchronously via a cron job.
+export async function markPartnerTagDeleted({
+ partnerTagId,
+ programId,
+}: {
+ partnerTagId: string;
+ programId: string;
+}): Promise<boolean> {
+ try {
+ const updated = await prisma.partnerTag.update({
+ where: {
+ id: partnerTagId,
+ programId,
+ },
+ data: {
+ programId: null,
+ },
+ });
+
+ if (!updated) {
+ return false;
+ }
+
+ await queuePartnerTagDeletion({
+ partnerTagId,
+ });
+
+ return true;
+ } catch (error) {
+ console.error("markPartnerTagDeleted", {
+ reason: error,
+ partnerTagId,
+ programId,
+ });
+ return false;
+ }
+}
diff --git a/apps/web/lib/api/tags/queue-tag-deletion.ts b/apps/web/lib/api/tags/queue-tag-deletion.ts
new file mode 100644
index 0000000000..78a62db2bb
--- /dev/null
+++ b/apps/web/lib/api/tags/queue-tag-deletion.ts
@@ -0,0 +1,34 @@
+import { qstash } from "@/lib/cron";
+import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
+
+export async function queueLinkTagDeletion({
+ tagId,
+ delay,
+}: {
+ tagId: string;
+ delay?: number;
+}) {
+ return await qstash.publishJSON({
+ url: `${APP_DOMAIN_WITH_NGROK}/api/cron/tags/delete-link-tag`,
+ ...(delay && { delay }),
+ body: {
+ id: tagId,
+ },
+ });
+}
+
+export async function queuePartnerTagDeletion({
+ partnerTagId,
+ delay,
+}: {
+ partnerTagId: string;
+ delay?: number;
+}) {
+ return await qstash.publishJSON({
+ url: `${APP_DOMAIN_WITH_NGROK}/api/cron/tags/delete-partner-tag`,
+ ...(delay && { delay }),
+ body: {
+ id: partnerTagId,
+ },
+ });
+}
diff --git a/apps/web/lib/planetscale/get-partner-enrollment-info.ts b/apps/web/lib/planetscale/get-partner-enrollment-info.ts
index a526394ad5..496f99b9d5 100644
--- a/apps/web/lib/planetscale/get-partner-enrollment-info.ts
+++ b/apps/web/lib/planetscale/get-partner-enrollment-info.ts
@@ -12,6 +12,32 @@ interface QueryResult {
couponTestId: string | null;
groupId: string | null;
tenantId: string | null;
+ /** JSON array from JSON_ARRAYAGG; driver may return a string or parsed array */
+ partnerTagIds: string | string[] | null;
+}
+
+function parsePartnerTagIds(
+ value: QueryResult["partnerTagIds"],
+): string[] {
+ if (value == null) return [];
+ if (Array.isArray(value)) {
+ return value.filter(
+ (id): id is string => typeof id === "string" && id.length > 0,
+ );
+ }
+ if (typeof value === "string") {
+ try {
+ const parsed = JSON.parse(value) as unknown;
+ return Array.isArray(parsed)
+ ? parsed.filter(
+ (id): id is string => typeof id === "string" && id.length > 0,
+ )
+ : [];
+ } catch {
+ return [];
+ }
+ }
+ return [];
}
// Get enrollment info for a partner in a program
@@ -30,23 +56,44 @@ export const getPartnerEnrollmentInfo = async ({
}
const { rows } = await conn.execute<QueryResult>(
- `SELECT
+ `SELECT
Partner.id,
Partner.name,
Partner.image,
- Discount.id as discountId,
+ Discount.id AS discountId,
Discount.amount,
Discount.type,
Discount.maxDuration,
Discount.couponId,
Discount.couponTestId,
ProgramEnrollment.groupId,
- ProgramEnrollment.tenantId
- FROM ProgramEnrollment
- LEFT JOIN Partner ON Partner.id = ProgramEnrollment.partnerId
- LEFT JOIN Discount ON Discount.id = ProgramEnrollment.discountId
- WHERE ProgramEnrollment.partnerId = ? AND ProgramEnrollment.programId = ? LIMIT 1`,
- [partnerId, programId],
+ ProgramEnrollment.tenantId,
+ tagAgg.partnerTagIds
+ FROM
+ ProgramEnrollment
+ LEFT JOIN Partner ON Partner.id = ProgramEnrollment.partnerId
+ LEFT JOIN Discount ON Discount.id = ProgramEnrollment.discountId
+ LEFT JOIN (
+ SELECT
+ programId,
+ partnerId,
+ JSON_ARRAYAGG(partnerTagId) AS partnerTagIds
+ FROM (
+ SELECT DISTINCT
+ programId,
+ partnerId,
+ partnerTagId
+ FROM ProgramPartnerTag
+ WHERE programId = ? AND partnerId = ?
+ ) AS distinct_program_partner_tags
+ GROUP BY programId, partnerId
+ ) AS tagAgg
+ ON tagAgg.programId = ProgramEnrollment.programId
+ AND tagAgg.partnerId = ProgramEnrollment.partnerId
+ WHERE
+ ProgramEnrollment.partnerId = ?
+ AND ProgramEnrollment.programId = ?`,
+ [programId, partnerId, partnerId, programId],
);
const result =
@@ -66,6 +113,7 @@ export const getPartnerEnrollmentInfo = async ({
image: result.image,
groupId: result.groupId,
tenantId: result.tenantId,
+ partnerTagIds: parsePartnerTagIds(result.partnerTagIds),
},
discount: result.discountId
? {
diff --git a/apps/web/lib/swr/use-partner-tags-count.ts b/apps/web/lib/swr/use-partner-tags-count.ts
new file mode 100644
index 0000000000..f0ffec4da1
--- /dev/null
+++ b/apps/web/lib/swr/use-partner-tags-count.ts
@@ -0,0 +1,43 @@
+import { fetcher } from "@dub/utils";
+import useSWR, { SWRConfiguration } from "swr";
+import * as z from "zod/v4";
+import { getPartnerTagsCountQuerySchema } from "../zod/schemas/partner-tags";
+import useWorkspace from "./use-workspace";
+
+const partialQuerySchema = getPartnerTagsCountQuerySchema.partial();
+
+export function usePartnerTagsCount(
+ {
+ query,
+ enabled = true,
+ }: {
+ query?: z.infer<typeof partialQuerySchema>;
+ enabled?: boolean;
+ } = {},
+ swrOptions: SWRConfiguration = {},
+) {
+ const { id: workspaceId } = useWorkspace();
+
+ const { data, isLoading, error } = useSWR<number>(
+ enabled && workspaceId
+ ? `/api/partners/tags/count?${new URLSearchParams(
+ Object.fromEntries(
+ Object.entries({ workspaceId, ...query } as Record<string, unknown>)
+ .filter(([, v]) => v != null)
+ .map(([k, v]) => [k, String(v)]),
+ ),
+ ).toString()}`
+ : undefined,
+ fetcher,
+ {
+ keepPreviousData: true,
+ ...swrOptions,
+ },
+ );
+
+ return {
+ partnerTagsCount: data,
+ isLoading,
+ error,
+ };
+}
diff --git a/apps/web/lib/swr/use-partner-tags.ts b/apps/web/lib/swr/use-partner-tags.ts
new file mode 100644
index 0000000000..059250bb7a
--- /dev/null
+++ b/apps/web/lib/swr/use-partner-tags.ts
@@ -0,0 +1,44 @@
+import { fetcher } from "@dub/utils";
+import useSWR, { SWRConfiguration } from "swr";
+import * as z from "zod/v4";
+import { PartnerTagProps } from "../types";
+import { getPartnerTagsQuerySchema } from "../zod/schemas/partner-tags";
+import useWorkspace from "./use-workspace";
+
+const partialQuerySchema = getPartnerTagsQuerySchema.partial();
+
+export function usePartnerTags(
+ {
+ query,
+ enabled = true,
+ }: {
+ query?: z.infer<typeof partialQuerySchema>;
+ enabled?: boolean;
+ } = {},
+ swrOptions: SWRConfiguration = {},
+) {
+ const { id: workspaceId } = useWorkspace();
+
+ const { data, isLoading, error } = useSWR<PartnerTagProps[]>(
+ enabled && workspaceId
+ ? `/api/partners/tags?${new URLSearchParams(
+ Object.fromEntries(
+ Object.entries({ workspaceId, ...query } as Record<string, unknown>)
+ .filter(([, v]) => v != null)
+ .map(([k, v]) => [k, String(v)]),
+ ),
+ ).toString()}`
+ : undefined,
+ fetcher,
+ {
+ keepPreviousData: true,
+ ...swrOptions,
+ },
+ );
+
+ return {
+ partnerTags: data,
+ isLoading,
+ error,
+ };
+}
diff --git a/apps/web/lib/swr/use-workspace.ts b/apps/web/lib/swr/use-workspace.ts
index 5b424500ed..bdc652b822 100644
--- a/apps/web/lib/swr/use-workspace.ts
+++ b/apps/web/lib/swr/use-workspace.ts
@@ -1,7 +1,8 @@
-import { ExtendedWorkspaceProps } from "@/lib/types";
+import { WorkspaceSchemaExtended } from "@/lib/zod/schemas/workspaces";
import { PRO_PLAN, fetcher, getNextPlan } from "@dub/utils";
import { useParams, useSearchParams } from "next/navigation";
import useSWR, { SWRConfiguration } from "swr";
+import * as z from "zod/v4";
import { MEGA_WORKSPACE_LINKS_LIMIT } from "../constants/misc";
export default function useWorkspace({
@@ -19,7 +20,7 @@ export default function useWorkspace({
data: workspace,
error,
mutate,
- } = useSWR<ExtendedWorkspaceProps>(
+ } = useSWR<z.infer<typeof WorkspaceSchemaExtended>>(
slug && `/api/workspaces/${slug}`,
fetcher,
{
@@ -30,6 +31,8 @@ export default function useWorkspace({
return {
...workspace,
+ id: workspace?.id,
+ slug: workspace?.slug ?? slug ?? undefined,
nextPlan: workspace?.plan ? getNextPlan(workspace.plan) : PRO_PLAN,
role: (workspace?.users && workspace.users[0].role) || "member",
isOwner: workspace?.users && workspace.users[0].role === "owner",
diff --git a/apps/web/lib/tinybird/record-link.ts b/apps/web/lib/tinybird/record-link.ts
index 4f141a9dbf..65628002ab 100644
--- a/apps/web/lib/tinybird/record-link.ts
+++ b/apps/web/lib/tinybird/record-link.ts
@@ -66,7 +66,10 @@ const transformLinkTB = (link: ExpandedLink) => {
program_id: link.programId ?? "",
partner_id: link.partnerId ?? "",
partner_group_id: link.programEnrollment?.groupId ?? "",
- partner_tag_ids: [],
+ partner_tag_ids:
+ link.programEnrollment?.programPartnerTags?.map(
+ ({ partnerTagId }) => partnerTagId,
+ ) ?? [],
workspace_id: link.projectId,
created_at: link.createdAt,
};
diff --git a/apps/web/lib/types.ts b/apps/web/lib/types.ts
index db2efcacdb..7183914d21 100644
--- a/apps/web/lib/types.ts
+++ b/apps/web/lib/types.ts
@@ -135,6 +135,7 @@ import {
NetworkPartnerSchema,
PartnerConversionScoreSchema,
} from "./zod/schemas/partner-network";
+import { PartnerTagSchema } from "./zod/schemas/partner-tags";
import {
createPartnerSchema,
EnrolledPartnerSchema,
@@ -534,6 +535,7 @@ export type PartnerProfileCustomerProps = z.infer<
export type PartnerProfileLinkProps = z.infer<typeof PartnerProfileLinkSchema>;
+export type PartnerTagProps = z.infer<typeof PartnerTagSchema>;
export type PartnerPayoutMethodSetting = z.infer<
typeof partnerPayoutMethodSchema
>;
diff --git a/apps/web/lib/zod/schemas/analytics-response.ts b/apps/web/lib/zod/schemas/analytics-response.ts
index 9a465ad424..efd8c4fed3 100644
--- a/apps/web/lib/zod/schemas/analytics-response.ts
+++ b/apps/web/lib/zod/schemas/analytics-response.ts
@@ -1,6 +1,7 @@
import { TRIGGER_TYPES } from "@/lib/analytics/constants";
import { CONTINENT_CODES } from "@dub/utils";
import * as z from "zod/v4";
+import { PartnerTagSchema } from "./partner-tags";
import { LinkTagSchema } from "./tags";
import { centsSchemaWithDefault } from "./utils";
@@ -487,4 +488,15 @@ export const analyticsResponse = {
"The total amount of sales from this group, in cents",
),
}),
+
+ top_partner_tags: z.object({
+ partnerTagId: z.string().describe("The ID of the partner tag"),
+ partnerTag: PartnerTagSchema,
+ clicks: z.number().describe("The total number of clicks").default(0),
+ leads: z.number().describe("The total number of leads").default(0),
+ sales: z.number().describe("The total number of sales").default(0),
+ saleAmount: centsSchemaWithDefault.describe(
+ "The total amount of sales from this partner tag, in cents",
+ ),
+ }),
} as const;
diff --git a/apps/web/lib/zod/schemas/analytics.ts b/apps/web/lib/zod/schemas/analytics.ts
index 3f458c2b9f..0140736a5f 100644
--- a/apps/web/lib/zod/schemas/analytics.ts
+++ b/apps/web/lib/zod/schemas/analytics.ts
@@ -114,6 +114,15 @@ export const analyticsQuerySchema = z.object({
"Examples: `folder_123`, `folder_123,folder_456`, `-folder_789`. " +
"If not provided, return analytics for all links.",
),
+ partnerTagId: z
+ .string()
+ .optional()
+ .transform(parseFilterValue)
+ .describe(
+ "The partner tag ID(s) to retrieve analytics for. " +
+ "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " +
+ "Examples: `ptag_123`, `ptag_123,ptag_456`, `-ptag_789`.",
+ ),
groupId: z
.string()
.optional()
@@ -461,6 +470,14 @@ export const analyticsFilterTB = z.object({
"The partner ID(s) to retrieve analytics for (with operator support).",
),
partnerIdOperator: z.enum(["IN", "NOT IN"]).optional(),
+ partnerTagId: z
+ .union([z.string(), z.array(z.string())])
+ .transform((v) => (Array.isArray(v) ? v : v.split(",")))
+ .optional()
+ .describe(
+ "The partner tag ID(s) to retrieve analytics for (with operator support).",
+ ),
+ partnerTagIdOperator: z.enum(["IN", "NOT IN"]).optional(),
customerId: z.string().optional(),
start: z.string(),
end: z.string(),
diff --git a/apps/web/lib/zod/schemas/partner-tags.ts b/apps/web/lib/zod/schemas/partner-tags.ts
new file mode 100644
index 0000000000..ac94f08ce6
--- /dev/null
+++ b/apps/web/lib/zod/schemas/partner-tags.ts
@@ -0,0 +1,59 @@
+import * as z from "zod/v4";
+import { getPaginationQuerySchema } from "./misc";
+
+export const PARTNER_TAGS_MAX_PAGE_SIZE = 100;
+
+export const getPartnerTagsQuerySchema = z
+ .object({
+ sortBy: z
+ .enum(["name", "createdAt"])
+ .optional()
+ .default("createdAt")
+ .describe("The field to sort the partner tags by."),
+ sortOrder: z
+ .enum(["asc", "desc"])
+ .optional()
+ .default("asc")
+ .describe("The order to sort the partner tags by."),
+ search: z
+ .string()
+ .optional()
+ .describe("The search term to filter the partner tags by."),
+ ids: z
+ .union([z.string(), z.array(z.string())])
+ .transform((v) => (Array.isArray(v) ? v : v.split(",").filter(Boolean)))
+ .optional()
+ .describe("IDs of partner tags to filter by."),
+ })
+ .extend(getPaginationQuerySchema({ pageSize: PARTNER_TAGS_MAX_PAGE_SIZE }));
+
+export const getPartnerTagsCountQuerySchema = getPartnerTagsQuerySchema.omit({
+ page: true,
+ pageSize: true,
+});
+
+export const PartnerTagSchema = z.object({
+ id: z.string(),
+ name: z.string(),
+});
+
+export const updatePartnerTagsSchema = z.object({
+ workspaceId: z.string(),
+ partnerIds: z.array(z.string()),
+ addTagIds: z.array(z.string()).optional(),
+ removeTagIds: z.array(z.string()).optional(),
+});
+
+export const createPartnerTagSchema = z.object({
+ workspaceId: z.string(),
+ name: z.string().trim().min(1).max(100),
+});
+
+export const updatePartnerTagSchema = createPartnerTagSchema.extend({
+ partnerTagId: z.string(),
+});
+
+export const deletePartnerTagSchema = z.object({
+ workspaceId: z.string(),
+ partnerTagId: z.string(),
+});
diff --git a/apps/web/lib/zod/schemas/partners.ts b/apps/web/lib/zod/schemas/partners.ts
index cf7c9bef9e..82b1ebce13 100644
--- a/apps/web/lib/zod/schemas/partners.ts
+++ b/apps/web/lib/zod/schemas/partners.ts
@@ -26,6 +26,7 @@ import {
} from "./images";
import { createLinkBodySchema } from "./links";
import { booleanQuerySchema, getPaginationQuerySchema } from "./misc";
+import { PartnerTagSchema } from "./partner-tags";
import { ProgramEnrollmentSchema } from "./programs";
import { centsSchema, centsSchemaWithDefault, parseUrlSchema } from "./utils";
@@ -200,6 +201,12 @@ export const getPartnersQuerySchemaExtended = getPartnersQuerySchema.extend({
.union([z.string(), z.array(z.string())])
.transform((v) => (Array.isArray(v) ? v : v.split(",")))
.optional(),
+ partnerTagId: z
+ .union([z.string(), z.array(z.string())])
+ .transform((v) => (Array.isArray(v) ? v : v.split(",")))
+ .optional(),
+ groupId: z.union([z.string(), z.array(z.string())]).optional(),
+ country: z.union([z.string(), z.array(z.string())]).optional(),
includePartnerPlatforms: booleanQuerySchema.optional(),
// metric range query fields (TODO: Add to public API once we finalize the syntax)
totalClicksMin: z.coerce
@@ -281,7 +288,9 @@ export const partnersCountQuerySchema = getPartnersQuerySchemaExtended
pageSize: true,
})
.extend({
- groupBy: z.enum(["status", "country", "groupId"]).optional(),
+ groupBy: z
+ .enum(["status", "country", "groupId", "partnerTagId"])
+ .optional(),
});
export const partnerPlatformSchema = z.object({
@@ -496,6 +505,10 @@ export const EnrolledPartnerSchema = PartnerSchema.pick({
}).shape,
)
.extend({
+ tags: z
+ .array(PartnerTagSchema)
+ .optional()
+ .describe("The tags associated with the partner."),
totalClicks: z
.number()
.default(0)
diff --git a/apps/web/lib/zod/schemas/workspaces.ts b/apps/web/lib/zod/schemas/workspaces.ts
index 693eb619d0..3b60f890fd 100644
--- a/apps/web/lib/zod/schemas/workspaces.ts
+++ b/apps/web/lib/zod/schemas/workspaces.ts
@@ -36,8 +36,8 @@ export const WorkspaceSchema = z
plan: planSchema,
planTier: z
.number()
- .nullable()
- .describe("The tier of the workspace's plan."),
+ .describe("The tier of the workspace's plan.")
+ .default(1),
planPeriod: z
.enum(PlanPeriod)
.nullish()
@@ -110,6 +110,9 @@ export const WorkspaceSchema = z
),
domainsLimit: z.number().describe("The domains limit of the workspace."),
tagsLimit: z.number().describe("The tags limit of the workspace."),
+ partnerTagsLimit: z
+ .number()
+ .describe("The partner tags limit of the workspace."),
foldersUsage: z.number().describe("The folders usage of the workspace."),
foldersLimit: z.number().describe("The folders limit of the workspace."),
partnersUsage: z.number().describe("The partners usage of the workspace."),
diff --git a/apps/web/next.config.js b/apps/web/next.config.js
index 8b16d04e49..37a71b65ae 100644
--- a/apps/web/next.config.js
+++ b/apps/web/next.config.js
@@ -42,7 +42,8 @@ module.exports = withPlausibleProxy({
optimizePackageImports: [
"@dub/email",
"@dub/ui",
- "@dub/utils",
+ // Disabled: causes "Module not found: chunk-WKSJXYEU.mjs" on Vercel due to tsup's chunked output
+ // "@dub/utils",
"@team-plain/typescript-sdk",
],
serverActions: {
diff --git a/apps/web/scripts/migrations/backfill-partner-tags-limit.ts b/apps/web/scripts/migrations/backfill-partner-tags-limit.ts
new file mode 100644
index 0000000000..ae8346d579
--- /dev/null
+++ b/apps/web/scripts/migrations/backfill-partner-tags-limit.ts
@@ -0,0 +1,23 @@
+import { prisma } from "@dub/prisma";
+import { INFINITY_NUMBER } from "@dub/utils";
+import "dotenv-flow/config";
+
+async function main() {
+ const business = await prisma.project.updateMany({
+ where: {
+ plan: {
+ in: ["business", "business plus", "business extra", "business max"],
+ },
+ },
+ data: { partnerTagsLimit: 10 },
+ });
+
+ const advancedEnterprise = await prisma.project.updateMany({
+ where: { plan: { in: ["advanced", "enterprise"] } },
+ data: { partnerTagsLimit: INFINITY_NUMBER },
+ });
+
+ console.table({ business, advancedEnterprise });
+}
+
+main();
diff --git a/apps/web/tests/utils/integration.ts b/apps/web/tests/utils/integration.ts
index 0e86585bcf..e13a77a7fd 100644
--- a/apps/web/tests/utils/integration.ts
+++ b/apps/web/tests/utils/integration.ts
@@ -119,6 +119,7 @@ export class IntegrationHarness {
await this.http.delete({
path: `/campaigns/${id}`,
+ query: { workspaceId: E2E_WORKSPACE_ID },
});
}
}
diff --git a/apps/web/tests/utils/schema.ts b/apps/web/tests/utils/schema.ts
index bb5a2bce54..d39ab669af 100644
--- a/apps/web/tests/utils/schema.ts
+++ b/apps/web/tests/utils/schema.ts
@@ -89,6 +89,7 @@ export const expectedWorkspace: Partial<Project> = {
payoutsLimit: expect.any(Number),
domainsLimit: expect.any(Number),
tagsLimit: expect.any(Number),
+ partnerTagsLimit: expect.any(Number),
usersLimit: expect.any(Number),
createdAt: expect.any(String),
diff --git a/apps/web/tests/workflows/utils/delete-bounty-and-submissions.ts b/apps/web/tests/workflows/utils/delete-bounty-and-submissions.ts
index b943791e0c..c2655c2681 100644
--- a/apps/web/tests/workflows/utils/delete-bounty-and-submissions.ts
+++ b/apps/web/tests/workflows/utils/delete-bounty-and-submissions.ts
@@ -4,11 +4,14 @@ import { HttpClient } from "../../utils/http";
export const deleteBountyAndSubmissions = async ({
http,
bountyId,
+ query = {},
}: {
http: HttpClient;
bountyId: string;
+ query?: Record<string, string>;
}) => {
await http.delete({
path: `/e2e/bounties/${bountyId}`,
+ query,
});
};
diff --git a/apps/web/tests/workflows/utils/verify-bounty-submission.ts b/apps/web/tests/workflows/utils/verify-bounty-submission.ts
index 4812f4d05c..32bcdfc4c6 100644
--- a/apps/web/tests/workflows/utils/verify-bounty-submission.ts
+++ b/apps/web/tests/workflows/utils/verify-bounty-submission.ts
@@ -7,6 +7,7 @@ interface VerifyBountySubmissionProps {
partnerId: string;
expectedStatus?: "draft" | "submitted" | "approved" | "rejected";
minPerformanceCount?: number;
+ query?: Record<string, string>;
}
const POLL_INTERVAL_MS = 5000; // 5 seconds
@@ -18,6 +19,7 @@ export const verifyBountySubmission = async ({
partnerId,
expectedStatus = "submitted",
minPerformanceCount,
+ query: extraQuery = {},
}: VerifyBountySubmissionProps) => {
const startTime = Date.now();
@@ -26,7 +28,7 @@ export const verifyBountySubmission = async ({
while (Date.now() - startTime < TIMEOUT_MS) {
const { data: submissions } = await http.get<any[]>({
path: `/bounties/${bountyId}/submissions`,
- query: { partnerId },
+ query: { ...extraQuery, partnerId },
});
const submission = submissions?.[0];
diff --git a/apps/web/tests/workflows/utils/verify-partner-group-move.ts b/apps/web/tests/workflows/utils/verify-partner-group-move.ts
index 53ddffe2b9..29cfcd03ef 100644
--- a/apps/web/tests/workflows/utils/verify-partner-group-move.ts
+++ b/apps/web/tests/workflows/utils/verify-partner-group-move.ts
@@ -6,6 +6,7 @@ interface VerifyPartnerGroupMoveProps {
http: HttpClient;
partnerId: string;
expectedGroupId: string;
+ query?: Record<string, string>;
}
const POLL_INTERVAL_MS = 5000; // 5 seconds
@@ -15,6 +16,7 @@ export const verifyPartnerGroupMove = async ({
http,
partnerId,
expectedGroupId,
+ query = {},
}: VerifyPartnerGroupMoveProps) => {
const startTime = Date.now();
let lastGroupId: string | null = null;
@@ -22,6 +24,7 @@ export const verifyPartnerGroupMove = async ({
while (Date.now() - startTime < TIMEOUT_MS) {
const { data: partner } = await http.get<EnrolledPartnerProps>({
path: `/partners/${partnerId}`,
+ query,
});
lastGroupId = partner?.groupId ?? null;
diff --git a/apps/web/ui/analytics/partner-section.tsx b/apps/web/ui/analytics/partner-segments-section.tsx
similarity index 94%
rename from apps/web/ui/analytics/partner-section.tsx
rename to apps/web/ui/analytics/partner-segments-section.tsx
index 4451b437b7..038c4a36eb 100644
--- a/apps/web/ui/analytics/partner-section.tsx
+++ b/apps/web/ui/analytics/partner-segments-section.tsx
@@ -1,10 +1,9 @@
import { AnalyticsGroupByOptions } from "@/lib/analytics/types";
import { useWorkspacePreferences } from "@/lib/swr/use-workspace-preferences";
import { LinkLogo, useRouterStuff } from "@dub/ui";
-import { Hyperlink, Users6 } from "@dub/ui/icons";
+import { Hyperlink, Tag, Users6 } from "@dub/ui/icons";
import { getApexDomain } from "@dub/utils";
import { useCallback, useContext, useEffect, useMemo, useState } from "react";
-import TagBadge from "../links/tag-badge";
import { GroupColorCircle } from "../partners/groups/group-color-circle";
import { AnalyticsCard } from "./analytics-card";
import { AnalyticsLoadingSpinner } from "./analytics-loading-spinner";
@@ -37,7 +36,7 @@ const TAB_CONFIG: Record<
},
getGroupBy: (subtab): { groupBy: AnalyticsGroupByOptions } => {
if (subtab === "groups") return { groupBy: "top_groups" };
- return { groupBy: "top_link_tags" };
+ return { groupBy: "top_partner_tags" };
},
},
links: {
@@ -54,7 +53,7 @@ const TAB_CONFIG: Record<
},
};
-export function PartnerSection() {
+export function PartnerSegmentsSection() {
const { queryParams, searchParams } = useRouterStuff();
const { selectedTab, saleUnit, adminPage, partnerPage } =
@@ -77,7 +76,7 @@ export function PartnerSection() {
const isFilterActive = useMemo(() => {
if (subtab === "groups") return searchParams.has("groupId");
- if (subtab === "tags") return searchParams.has("tagId");
+ if (subtab === "tags") return searchParams.has("partnerTagId");
if (subtab === "short_links") return searchParams.has("linkId");
if (subtab === "destination_urls") return searchParams.has("url");
return false;
@@ -86,7 +85,8 @@ export function PartnerSection() {
const activeFilterValues = useMemo(() => {
if (subtab === "groups")
return searchParams.get("groupId")?.split(",") ?? [];
- if (subtab === "tags") return searchParams.get("tagId")?.split(",") ?? [];
+ if (subtab === "tags")
+ return searchParams.get("partnerTagId")?.split(",") ?? [];
if (subtab === "short_links")
return searchParams.get("linkId")?.split(",") ?? [];
if (subtab === "destination_urls")
@@ -96,7 +96,7 @@ export function PartnerSection() {
const filterParamKey = useMemo(() => {
if (subtab === "groups") return "groupId";
- if (subtab === "tags") return "tagId";
+ if (subtab === "tags") return "partnerTagId";
if (subtab === "short_links") return "linkId";
if (subtab === "destination_urls") return "url";
return null;
@@ -160,7 +160,7 @@ export function PartnerSection() {
return d.group?.name || "Unknown";
}
if (subtab === "tags") {
- return d.tag?.name || "Unknown";
+ return d.partnerTag?.name || d.tag?.name || "Unknown";
}
return "Unknown";
@@ -182,9 +182,7 @@ export function PartnerSection() {
if (isGroupsSubtab) {
icon = d.group ? <GroupColorCircle group={d.group} /> : null;
} else if (isTagsSubtab) {
- icon = d.tag ? (
- <TagBadge color={d.tag.color} withIcon className="sm:p-1" />
- ) : null;
+ icon = d.tag || d.partnerTag ? <Tag className="size-3.5" /> : null;
} else {
icon = (
<LinkLogo
@@ -196,7 +194,7 @@ export function PartnerSection() {
let filterValue: string | undefined;
if (isGroupsSubtab) filterValue = d.groupId;
- else if (isTagsSubtab) filterValue = d.tagId;
+ else if (isTagsSubtab) filterValue = d.partnerTagId ?? d.tagId;
else if (isShortLinksSubtab) filterValue = d.id;
else if (isDestinationUrlsSubtab) filterValue = d.url;
diff --git a/apps/web/ui/analytics/use-analytics-filters.tsx b/apps/web/ui/analytics/use-analytics-filters.tsx
index 01fb1d6aae..647aac30cb 100644
--- a/apps/web/ui/analytics/use-analytics-filters.tsx
+++ b/apps/web/ui/analytics/use-analytics-filters.tsx
@@ -3,6 +3,7 @@ import { VALID_ANALYTICS_FILTERS } from "@/lib/analytics/constants";
import useCustomer from "@/lib/swr/use-customer";
import usePartner from "@/lib/swr/use-partner";
import usePartnerCustomer from "@/lib/swr/use-partner-customer";
+import { usePartnerTags } from "@/lib/swr/use-partner-tags";
import { CustomerAvatar } from "@/ui/customers/customer-avatar";
import { PartnerAvatar } from "@/ui/partners/partner-avatar";
import { CountryFlag } from "@/ui/shared/country-flag";
@@ -100,6 +101,34 @@ export function useAnalyticsFilters({
const { queryParams, searchParamsObj } = useRouterStuff();
+ const tagIdParsed = useMemo(
+ () => parseFilterValue(searchParamsObj.tagId),
+ [searchParamsObj.tagId],
+ );
+
+ const selectedTagIds = useMemo(
+ () => tagIdParsed?.values ?? [],
+ [tagIdParsed],
+ );
+
+ const partnerTagIdParsed = useMemo(
+ () => parseFilterValue(searchParamsObj.partnerTagId),
+ [searchParamsObj.partnerTagId],
+ );
+
+ const { partnerTags: partnerTagsById } = usePartnerTags(
+ {
+ query: { ids: partnerTagIdParsed?.values },
+ enabled: !!partnerTagIdParsed?.values?.length && !!programPage,
+ },
+ { keepPreviousData: true },
+ );
+
+ const partnerTagIdToName = useMemo(
+ () => new Map((partnerTagsById ?? []).map((t) => [t.id, t.name])),
+ [partnerTagsById],
+ );
+
const selectedCustomerId = searchParamsObj.customerId;
const { data: selectedCustomerWorkspace } = useCustomer({
@@ -144,6 +173,35 @@ export function useAnalyticsFilters({
},
]
: []),
+ ...(tagIdParsed?.values?.length
+ ? [
+ {
+ key: "tagId",
+ operator: tagIdParsed.operator as FilterOperator,
+ values: tagIdParsed.values,
+ },
+ ]
+ : []),
+ // Handle partnerTagId special case
+ ...(partnerTagIdParsed?.values?.length
+ ? [
+ {
+ key: "partnerTagId",
+ operator: partnerTagIdParsed.operator as FilterOperator,
+ values: partnerTagIdParsed.values,
+ },
+ ]
+ : []),
+ // Handle root special case
+ ...(root
+ ? [
+ {
+ key: "root",
+ operator: "IS" as FilterOperator,
+ values: [root],
+ },
+ ]
+ : []),
// Handle customerId special case
...(selectedCustomer
? [
@@ -160,10 +218,20 @@ export function useAnalyticsFilters({
: []),
];
- // Handle all filters dynamically (including domain, tagId, folderId, root)
+ // Handle remaining filters via parseFilterValue (multi-value / negation). folderId included; tagId handled above.
VALID_ANALYTICS_FILTERS.forEach((filter) => {
// Skip special cases we handled above
- if (["key", "customerId"].includes(filter)) return;
+ if (
+ [
+ "domain",
+ "key",
+ "tagId",
+ "partnerTagId",
+ "root",
+ "customerId",
+ ].includes(filter)
+ )
+ return;
// Also skip date range filters and qr
if (["interval", "start", "end", "qr"].includes(filter)) return;
// Skip domain if we're showing a specific link (domain + key) without linkId
@@ -188,6 +256,8 @@ export function useAnalyticsFilters({
return filters;
}, [
searchParamsObj,
+ tagIdParsed,
+ partnerTagIdParsed,
partnerPage,
selectedCustomerId,
selectedCustomer,
@@ -231,6 +301,11 @@ export function useAnalyticsFilters({
omitGroupByFilterKey: true,
context,
});
+ const { data: partnerTags } = useAnalyticsFilterOption("top_partner_tags", {
+ disabled: !isRequested("partnerTagId"),
+ omitGroupByFilterKey: true,
+ context,
+ });
const { data: countries } = useAnalyticsFilterOption("countries", {
disabled: !isRequested("country"),
omitGroupByFilterKey: true,
@@ -435,6 +510,22 @@ export function useAnalyticsFilters({
: [DomainFilterItem, LinkFilterItem]
: programPage
? [
+ {
+ key: "partnerId",
+ icon: Users,
+ label: "Partner",
+ options:
+ partners?.map(({ partner, ...rest }) => {
+ return {
+ value: partner.id,
+ label: partner.name,
+ icon: (
+ <PartnerAvatar partner={partner} className="size-4" />
+ ),
+ right: getFilterOptionTotal(rest),
+ };
+ }) ?? null,
+ },
{
key: "groupId",
icon: Users6,
@@ -453,20 +544,18 @@ export function useAnalyticsFilters({
})) ?? null,
},
{
- key: "partnerId",
- icon: Users,
- label: "Partner",
+ key: "partnerTagId",
+ icon: Tag,
+ label: "Partner Tag",
+ multiple: true,
+ getOptionLabel: (value) =>
+ partnerTagIdToName.get(value) ?? null,
options:
- partners?.map(({ partner, ...rest }) => {
- return {
- value: partner.id,
- label: partner.name,
- icon: (
- <PartnerAvatar partner={partner} className="size-4" />
- ),
- right: getFilterOptionTotal(rest),
- };
- }) ?? null,
+ partnerTags?.map(({ partnerTag, ...rest }) => ({
+ value: partnerTag.id,
+ label: partnerTag.name,
+ right: getFilterOptionTotal(rest),
+ })) ?? null,
},
SaleTypeFilterItem,
]
@@ -803,6 +892,10 @@ export function useAnalyticsFilters({
linkTags,
folders,
groups,
+ partnerTags,
+ partnerTagIdToName,
+ selectedTagIds,
+ partnerTagIdParsed,
selectedCustomerId,
countries,
cities,
@@ -894,6 +987,17 @@ export function useAnalyticsFilters({
const onRemove = useCallback(
(key, value) => {
+ // Handle link filter when represented by domain+key (no linkId in URL)
+ if (
+ key === "linkId" &&
+ searchParamsObj.domain &&
+ searchParamsObj.key &&
+ !searchParamsObj.linkId
+ ) {
+ queryParams({ del: ["domain", "key"], scroll: false });
+ return;
+ }
+
const currentParam = searchParamsObj[key];
if (!currentParam) return;
diff --git a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
index 460a05c9f0..4a423991b6 100644
--- a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
+++ b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
@@ -12,7 +12,7 @@ import { usePayoutsCount } from "@/lib/swr/use-payouts-count";
import useProgram from "@/lib/swr/use-program";
import { useProgramReferralsCount } from "@/lib/swr/use-program-referrals-count";
import useWorkspace from "@/lib/swr/use-workspace";
-import { useRouterStuff } from "@dub/ui";
+import { type Icon, useRouterStuff } from "@dub/ui";
import {
Bell,
Brush,
@@ -209,7 +209,7 @@ const NAV_AREAS: SidebarNavAreas<SidebarNavData> = {
},
{
name: "Customers",
- icon: User,
+ icon: User as Icon,
href: `/${slug}/program/customers`,
badge: pendingReferralsCount
? pendingReferralsCount > 99
diff --git a/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx
index c696705c84..11afe2ae47 100644
--- a/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx
+++ b/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx
@@ -6,7 +6,7 @@ import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
import useProgramEnrollmentsCount from "@/lib/swr/use-program-enrollments-count";
import { useProgramMessagesCount } from "@/lib/swr/use-program-messages-count";
import { ProgramsPromoCard } from "@/ui/partners/program-marketplace/programs-promo-card";
-import { useRouterStuff } from "@dub/ui";
+import { type Icon, useRouterStuff } from "@dub/ui";
import {
Bell,
CircleDollar,
@@ -194,7 +194,7 @@ const NAV_AREAS: SidebarNavAreas<SidebarNavData> = {
},
{
name: "Links",
- icon: Hyperlink,
+ icon: Hyperlink as Icon,
href: `/programs/${programSlug}/links`,
locked: isUnapproved,
},
@@ -220,19 +220,19 @@ const NAV_AREAS: SidebarNavAreas<SidebarNavData> = {
? [
{
name: "Analytics",
- icon: LinesY,
+ icon: LinesY as Icon,
href: `/programs/${programSlug}/analytics` as `/${string}`,
locked: isUnapproved,
},
{
name: "Events",
- icon: CursorRays,
+ icon: CursorRays as Icon,
href: `/programs/${programSlug}/events` as `/${string}`,
locked: isUnapproved,
},
{
name: "Customers",
- icon: User,
+ icon: User as Icon,
href: `/programs/${programSlug}/customers` as `/${string}`,
locked: isUnapproved,
},
diff --git a/apps/web/ui/modals/start-paid-plan-modal.tsx b/apps/web/ui/modals/start-paid-plan-modal.tsx
index ce79040c8e..39254285fb 100644
--- a/apps/web/ui/modals/start-paid-plan-modal.tsx
+++ b/apps/web/ui/modals/start-paid-plan-modal.tsx
@@ -32,7 +32,7 @@ function StartPaidPlanModal({
const planDetails = useMemo(() => {
if (!plan || plan === "free" || plan === "enterprise") return null;
- return getPlanDetails({ plan, planTier });
+ return getPlanDetails({ plan, planTier: planTier ?? undefined });
}, [plan, planTier]);
const workspacePlanPeriod = planPeriod ?? "monthly";
diff --git a/apps/web/ui/modals/trial-limit-activate-modal.tsx b/apps/web/ui/modals/trial-limit-activate-modal.tsx
index 907803ea76..a7efa22f82 100644
--- a/apps/web/ui/modals/trial-limit-activate-modal.tsx
+++ b/apps/web/ui/modals/trial-limit-activate-modal.tsx
@@ -18,6 +18,7 @@ import { toast } from "sonner";
* - payouts → upgrade banner when payouts over limit
* - users → `invite-teammates-form` (API `exceeded_limit` on invites)
* - partnerEnrollments → partner approve / bulk approve (trial enrollment cap)
+ * - partnerTags → partner tag creation (`createPartnerTagAction` limit)
* - networkInvites → partner network invite sheet (weekly invite limit)
* - freeDotLinkDomain → use where domain actions are trial-gated (add at call site)
*/
@@ -93,7 +94,7 @@ function TrialLimitActivateModalInner({
<p className="text-sm text-neutral-600">
You&apos;ve hit a{" "}
<a
- href="hthttps://dub.co/help/article/free-trial#trial-limits"
+ href="https://dub.co/help/article/free-trial#trial-limits"
target="_blank"
className="cursor-help font-semibold text-neutral-800 underline decoration-dotted underline-offset-2"
>
diff --git a/apps/web/ui/partners/partner-info-cards.tsx b/apps/web/ui/partners/partner-info-cards.tsx
index 5821800b2d..e40fe20c18 100644
--- a/apps/web/ui/partners/partner-info-cards.tsx
+++ b/apps/web/ui/partners/partner-info-cards.tsx
@@ -41,12 +41,14 @@ import { PartnerAvatar } from "./partner-avatar";
import { PartnerInfoGroup } from "./partner-info-group";
import { PartnerStarButton } from "./partner-star-button";
import { PartnerStatusBadgeWithTooltip } from "./partner-status-badge-with-tooltip";
+import { PartnerTagsList } from "./partner-tags-list";
import {
getPayoutMethodIconConfig,
getPayoutMethodLabel,
} from "./payouts/payout-method-config";
import { ProgramRewardList } from "./program-reward-list";
import { TrustedPartnerBadge } from "./trusted-partner-badge";
+import { useUpdatePartnerTagsModal } from "./update-partner-tags-modal";
type PartnerInfoCardsProps = {
showFraudIndicator?: boolean;
@@ -319,6 +321,7 @@ export function PartnerInfoCards({
);
})}
</div>
+ {isEnrolled && partner && <TagsList partner={partner} />}
{partner && isEnrolled && showApplicationRiskAnalysis && (
<PartnerApplicationRiskSummary partner={partner} />
@@ -441,3 +444,35 @@ export function PartnerInfoCards({
</div>
);
}
+
+function TagsList({ partner }: { partner: EnrolledPartnerExtendedProps }) {
+ const { UpdatePartnerTagsModal, setShowUpdatePartnerTagsModal } =
+ useUpdatePartnerTagsModal({
+ partners: [partner],
+ });
+
+ return (
+ <div className="border-border-subtle flex flex-col border-t p-4">
+ <UpdatePartnerTagsModal />
+ <div className="mb-2 flex justify-between gap-2">
+ <span className="text-content-emphasis block text-xs font-semibold">
+ Tags
+ </span>
+
+ <button
+ type="button"
+ onClick={() => setShowUpdatePartnerTagsModal(true)}
+ className="text-content-subtle hover:text-content-default text-xs font-medium"
+ >
+ Manage
+ </button>
+ </div>
+ <PartnerTagsList
+ tags={partner?.tags}
+ wrap
+ onAddTag={() => setShowUpdatePartnerTagsModal(true)}
+ mode="link"
+ />
+ </div>
+ );
+}
diff --git a/apps/web/ui/partners/partner-tags-list.tsx b/apps/web/ui/partners/partner-tags-list.tsx
new file mode 100644
index 0000000000..ecc98193cd
--- /dev/null
+++ b/apps/web/ui/partners/partner-tags-list.tsx
@@ -0,0 +1,108 @@
+import useWorkspace from "@/lib/swr/use-workspace";
+import { PartnerTagProps } from "@/lib/types";
+import { Tag, Tooltip, TruncatedList, useRouterStuff } from "@dub/ui";
+import { cn } from "@dub/utils";
+import Link from "next/link";
+
+const tagPillClassName =
+ "bg-bg-inverted/5 text-content-default whitespace-nowrap min-w-0 select-none flex h-6 items-center rounded-md px-2 text-xs font-semibold hover:bg-bg-inverted/10";
+
+export function PartnerTagsList({
+ tags,
+ compact,
+ wrap,
+ onAddTag,
+ mode = "filter",
+}: {
+ tags?: PartnerTagProps[];
+ compact?: boolean;
+ wrap?: boolean;
+ onAddTag: () => void;
+ mode?: "filter" | "link";
+}) {
+ return tags?.length ? (
+ <TruncatedList
+ className={cn("flex items-center gap-2", wrap && "flex-wrap")}
+ overflowIndicator={({ visible, hidden }) => (
+ <Tooltip
+ content={
+ <div className="flex max-w-sm flex-wrap gap-1 p-2">
+ {tags.slice(visible).map((tag) => (
+ <TagButton key={tag.id} {...tag} mode={mode} />
+ ))}
+ </div>
+ }
+ >
+ <div className={cn(tagPillClassName, "cursor-default")}>
+ +{hidden}
+ </div>
+ </Tooltip>
+ )}
+ >
+ {tags.map((tag) => (
+ <TagButton key={tag.id} {...tag} mode={mode} />
+ ))}
+ </TruncatedList>
+ ) : (
+ <button
+ type="button"
+ onClick={() => onAddTag()}
+ aria-label="Add tag"
+ className={cn(
+ tagPillClassName,
+ "group/add-tag active:bg-bg-inverted/15 w-fit px-1.5 font-medium focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-400/50",
+ )}
+ >
+ <Tag className="size-3.5" />
+ <div
+ className={cn(
+ "overflow-hidden",
+ compact &&
+ "grid grid-cols-[0fr] transition-[grid-template-columns] group-hover/add-tag:grid-cols-[1fr] group-focus-visible/add-tag:grid-cols-[1fr]",
+ )}
+ >
+ <div
+ className={cn(
+ "min-w-0",
+ compact &&
+ "opacity-0 transition-opacity group-hover/add-tag:opacity-100 group-focus-visible/add-tag:opacity-100",
+ )}
+ >
+ <span className="pl-1 pr-0.5">Add tag</span>
+ </div>
+ </div>
+ </button>
+ );
+}
+
+function TagButton({
+ name,
+ id,
+ mode,
+}: PartnerTagProps & { mode?: "filter" | "link" }) {
+ const { slug: workspaceSlug } = useWorkspace();
+ const { queryParams } = useRouterStuff();
+
+ return mode === "filter" ? (
+ <button
+ type="button"
+ onClick={() => {
+ queryParams({
+ set: {
+ partnerTagId: id,
+ },
+ });
+ }}
+ className={cn(tagPillClassName, "active:bg-bg-inverted/15")}
+ >
+ <span className="min-w-0 truncate">{name}</span>
+ </button>
+ ) : (
+ <Link
+ href={`/${workspaceSlug}/program/partners?partnerTagId=${id}`}
+ className={cn(tagPillClassName, "active:bg-bg-inverted/15")}
+ >
+ <span className="min-w-0 truncate">{name}</span>
+ </Link>
+ );
+}
diff --git a/apps/web/ui/partners/update-partner-tags-modal.tsx b/apps/web/ui/partners/update-partner-tags-modal.tsx
new file mode 100644
index 0000000000..4c9cd44b04
--- /dev/null
+++ b/apps/web/ui/partners/update-partner-tags-modal.tsx
@@ -0,0 +1,579 @@
+import { parseActionError } from "@/lib/actions/parse-action-errors";
+import { createPartnerTagAction } from "@/lib/actions/partners/tags/create-partner-tag";
+import { deletePartnerTagAction } from "@/lib/actions/partners/tags/delete-partner-tag";
+import { updatePartnerTagAction } from "@/lib/actions/partners/tags/update-partner-tag";
+import { updateProgramPartnerTagsAction } from "@/lib/actions/partners/tags/update-program-partner-tags";
+import { mutatePrefix } from "@/lib/swr/mutate";
+import { usePartnerTags } from "@/lib/swr/use-partner-tags";
+import { usePartnerTagsCount } from "@/lib/swr/use-partner-tags-count";
+import usePartnersCount from "@/lib/swr/use-partners-count";
+import useWorkspace from "@/lib/swr/use-workspace";
+import { EnrolledPartnerProps, PartnerTagProps } from "@/lib/types";
+import { PARTNER_TAGS_MAX_PAGE_SIZE } from "@/lib/zod/schemas/partner-tags";
+import {
+ AnimatedSizeContainer,
+ Button,
+ Checkbox,
+ LoadingSpinner,
+ MenuItem,
+ Modal,
+ PenWriting,
+ Plus2,
+ Popover,
+ Tag,
+ Trash,
+ useMediaQuery,
+ Users,
+ useScrollProgress,
+} from "@dub/ui";
+import { cn, OG_AVATAR_URL } from "@dub/utils";
+import { Command } from "cmdk";
+import { useAction } from "next-safe-action/hooks";
+import {
+ Dispatch,
+ SetStateAction,
+ useCallback,
+ useEffect,
+ useMemo,
+ useRef,
+ useState,
+} from "react";
+import { toast } from "sonner";
+import { useDebounce } from "use-debounce";
+import { ThreeDots } from "../shared/icons";
+
+const itemClassName =
+ "group/button flex h-10 cursor-pointer items-center justify-between gap-4 rounded-lg px-2.5 data-[selected=true]:bg-black/[0.03]";
+
+type UpdatePartnerTagsModalProps = {
+ showUpdatePartnerTagsModal: boolean;
+ setShowUpdatePartnerTagsModal: Dispatch<SetStateAction<boolean>>;
+ partners: Pick<EnrolledPartnerProps, "id" | "name" | "image" | "tags">[];
+};
+
+function UpdatePartnerTagsModalContent({
+ setShowUpdatePartnerTagsModal,
+ partners,
+}: UpdatePartnerTagsModalProps) {
+ const { id: workspaceId } = useWorkspace();
+
+ const [search, setSearch] = useState("");
+ const [debouncedSearch] = useDebounce(search, 500);
+
+ const { partnerTagsCount } = usePartnerTagsCount();
+ const useAsync =
+ partnerTagsCount && partnerTagsCount > PARTNER_TAGS_MAX_PAGE_SIZE;
+
+ const { partnerTags: availableTags, isLoading: isLoadingTags } =
+ usePartnerTags({
+ query: useAsync
+ ? {
+ search: debouncedSearch,
+ }
+ : undefined,
+ });
+
+ const noTagsAdded = availableTags && availableTags.length === 0 && !search;
+
+ const { partnersCount: partnerCounts } = usePartnersCount<
+ | {
+ partnerTagId: string;
+ _count: number;
+ }[]
+ | undefined
+ >({
+ ignoreParams: true,
+ groupBy: "partnerTagId",
+ });
+
+ const [selectionState, setSelectionState] = useState<{
+ added: PartnerTagProps[];
+ removed: PartnerTagProps[];
+ }>({
+ added: [],
+ removed: [],
+ });
+
+ const tagOptions = useMemo(() => {
+ if (!availableTags) return undefined;
+
+ const { added: addedTags, removed: removedTags } = selectionState;
+ let tags = availableTags;
+
+ // Add any unloaded tags that were added/removed
+ tags = [
+ ...tags,
+ ...addedTags.filter((at) => !tags.find((t) => t.id === at.id)),
+ ];
+ tags = [
+ ...tags,
+ ...removedTags.filter((rt) => !tags.find((t) => t.id === rt.id)),
+ ];
+
+ const partnerTagIds = partners.flatMap(
+ (p) => p.tags?.map(({ id }) => id) ?? [],
+ );
+
+ const tagIndexMap = new Map<string, number>();
+ for (let i = 0; i < partnerTagIds.length; i++) {
+ const id = partnerTagIds[i]!;
+ if (!tagIndexMap.has(id)) {
+ tagIndexMap.set(id, i);
+ }
+ }
+
+ return tags
+ .sort(
+ (a, b) => (tagIndexMap.get(b.id) ?? -1) - (tagIndexMap.get(a.id) ?? -1),
+ )
+ .map((tag) => {
+ const existing = Boolean(partnerTagIds.includes(tag.id));
+ const allExisting = partners.every((p) =>
+ p.tags?.some((t) => t.id === tag.id),
+ );
+ const added = Boolean(addedTags.find((at) => at.id === tag.id));
+ const removed = Boolean(removedTags.find((rt) => rt.id === tag.id));
+
+ const checkedState: boolean | "indeterminate" = removed
+ ? false
+ : added || (allExisting && !removed)
+ ? true
+ : existing
+ ? "indeterminate"
+ : false;
+
+ return { ...tag, checkedState };
+ });
+ }, [partners, availableTags, selectionState]);
+
+ const { executeAsync: updatePartnerTags, isPending } = useAction(
+ updateProgramPartnerTagsAction,
+ {
+ onSuccess: () => {
+ toast.success("Partner tags updated successfully!");
+ setShowUpdatePartnerTagsModal(false);
+ mutatePrefix("/api/partners");
+ mutatePrefix("/api/partners/tags");
+ },
+ onError: ({ error }) => {
+ toast.error(parseActionError(error, "Failed to update partner tags"));
+ },
+ },
+ );
+
+ const handleSave = useCallback(async () => {
+ if (!workspaceId) return;
+
+ await updatePartnerTags({
+ workspaceId,
+ partnerIds: partners.map(({ id }) => id),
+ addTagIds: selectionState.added.map(({ id }) => id),
+ removeTagIds: selectionState.removed.map(({ id }) => id),
+ });
+ }, [workspaceId, partners, updatePartnerTags, selectionState]);
+
+ const { executeAsync: createPartnerTag, isPending: isCreatingPartnerTag } =
+ useAction(createPartnerTagAction, {
+ onSuccess: ({ data }) => {
+ toast.success("Partner tag created successfully!");
+ mutatePrefix("/api/partners/tags");
+
+ if (data?.partnerTag)
+ setSelectionState((state) => ({
+ ...state,
+ added: [...state.added, data.partnerTag],
+ }));
+ },
+ onError: ({ error }) => {
+ toast.error(parseActionError(error, "Failed to create partner tag"));
+ },
+ });
+
+ const { isMobile } = useMediaQuery();
+ const inputRef = useRef<HTMLInputElement>(null);
+
+ // Focus the input automatically, since autoFocus doesn't work here
+ useEffect(() => {
+ inputRef.current &&
+ !isMobile &&
+ setTimeout(() => inputRef.current?.focus(), 10);
+ }, []);
+
+ const scrollRef = useRef<HTMLDivElement>(null);
+ const { scrollProgress, updateScrollProgress } = useScrollProgress(scrollRef);
+
+ return (
+ <>
+ <div className="border-b border-neutral-200 p-4 sm:p-6">
+ <h3 className="text-lg font-medium leading-none">Partner tags</h3>
+ </div>
+
+ <div className="flex flex-col gap-6 p-4 sm:p-6">
+ <AnimatedSizeContainer
+ height
+ transition={{ ease: "easeOut", duration: 0.1 }}
+ className="pointer-events-auto -m-1 overflow-clip"
+ >
+ <Command loop shouldFilter={!useAsync} className="p-1 pb-2">
+ <Command.Input
+ ref={inputRef}
+ placeholder={
+ noTagsAdded ? "Add tags..." : "Search or add tags..."
+ }
+ onValueChange={setSearch}
+ className="border-border-default placeholder:text-content-muted w-full rounded-lg border px-2.5 py-2 focus:border-neutral-500 focus:outline-none focus:ring-1 focus:ring-neutral-500 sm:text-sm"
+ />
+ <div className="relative">
+ <div
+ ref={scrollRef}
+ onScroll={updateScrollProgress}
+ className="scrollbar-hide max-h-[calc(100dvh-250px)] overflow-y-auto"
+ >
+ <Command.List className="mt-4">
+ {tagOptions?.map((tag) => (
+ <TagOption
+ key={tag.id}
+ tag={tag}
+ partnerCount={
+ partnerCounts?.find((pc) => pc.partnerTagId === tag.id)
+ ?._count ?? 0
+ }
+ checked={tag.checkedState}
+ onCheckedChange={(checked) => {
+ setSelectionState(({ added, removed }) => ({
+ added: checked
+ ? [...added.filter((at) => at.id !== tag.id), tag]
+ : added.filter((at) => at.id !== tag.id),
+ removed: checked
+ ? removed.filter((rt) => rt.id !== tag.id)
+ : [
+ ...removed.filter((rt) => rt.id !== tag.id),
+ tag,
+ ],
+ }));
+ }}
+ />
+ ))}
+
+ {Boolean(search?.length) &&
+ !tagOptions?.some((t) => t.name === search) && (
+ <Command.Item
+ className={cn(
+ itemClassName,
+ "justify-start",
+ isCreatingPartnerTag && "bg-black/[0.03]",
+ )}
+ onSelect={() =>
+ createPartnerTag({
+ workspaceId: workspaceId!,
+ name: search,
+ })
+ }
+ value={`create::${search}`}
+ disabled={isCreatingPartnerTag}
+ forceMount
+ >
+ {isCreatingPartnerTag ? (
+ <LoadingSpinner className="size-3.5 shrink-0" />
+ ) : (
+ <Plus2 className="size-3.5 shrink-0" />
+ )}
+ <span className="min-w-0 truncate text-sm font-medium">
+ Create new tag "{search}"
+ </span>
+ </Command.Item>
+ )}
+ </Command.List>
+
+ <Command.Empty className="text-content-default flex select-none flex-col items-center justify-center gap-2 py-12">
+ <Tag className="size-4 shrink-0" />
+ <span className="text-sm font-medium">
+ No tags {noTagsAdded ? "added" : "found"}
+ </span>
+ </Command.Empty>
+ </div>
+ {isLoadingTags && (
+ <Command.Loading
+ className={cn(
+ "absolute inset-0 top-1 flex items-center justify-center bg-white py-4",
+ tagOptions?.length && "opacity-50",
+ )}
+ >
+ <LoadingSpinner className="size-4" />
+ </Command.Loading>
+ )}
+
+ <div
+ className="pointer-events-none absolute bottom-0 left-0 hidden h-16 w-full bg-gradient-to-t from-white sm:block"
+ style={{ opacity: 1 - Math.pow(scrollProgress, 2) }}
+ />
+ </div>
+ </Command>
+ </AnimatedSizeContainer>
+ </div>
+
+ <div className="border-border-subtle flex items-center justify-between gap-4 border-t px-4 py-4">
+ {partners.length === 1 ? (
+ <div className="flex min-w-0 items-center gap-2">
+ <img
+ src={partners[0].image || `${OG_AVATAR_URL}${partners[0].name}`}
+ alt={partners[0].name}
+ className="size-6 shrink-0 rounded-full bg-white"
+ />
+ <h4 className="min-w-0 truncate text-sm font-medium text-neutral-900">
+ {partners[0].name}
+ </h4>
+ </div>
+ ) : (
+ <div className="flex items-center gap-2">
+ <div className="flex shrink-0 items-center">
+ {partners.slice(0, 3).map((partner, index) => (
+ <img
+ key={partner.id}
+ src={partner.image || `${OG_AVATAR_URL}${partner.name}`}
+ alt={partner.name}
+ className={cn(
+ "inline-block size-6 rounded-full border-2 border-white bg-white",
+ index > 0 && "-ml-2.5",
+ )}
+ />
+ ))}
+ </div>
+ <span className="text-content-default min-w-0 truncate text-sm font-medium">
+ {partners.length} partners selected
+ </span>
+ </div>
+ )}
+ <div className="flex items-center gap-2">
+ <Button
+ onClick={() => setShowUpdatePartnerTagsModal(false)}
+ variant="secondary"
+ text="Cancel"
+ className="h-8 w-fit px-3"
+ />
+ <Button
+ onClick={handleSave}
+ loading={isPending}
+ text="Save"
+ disabled={
+ !selectionState.added.length && !selectionState.removed.length
+ }
+ className="h-8 w-fit px-3"
+ />
+ </div>
+ </div>
+ </>
+ );
+}
+
+function UpdatePartnerTagsModal(props: UpdatePartnerTagsModalProps) {
+ return (
+ <Modal
+ showModal={props.showUpdatePartnerTagsModal}
+ setShowModal={props.setShowUpdatePartnerTagsModal}
+ className="focus:outline-none"
+ >
+ <UpdatePartnerTagsModalContent {...props} />
+ </Modal>
+ );
+}
+
+function TagOption({
+ tag,
+ partnerCount,
+ checked,
+ onCheckedChange,
+}: {
+ tag: PartnerTagProps;
+ partnerCount: number;
+ checked: boolean | "indeterminate";
+ onCheckedChange: (checked: boolean | "indeterminate") => void;
+}) {
+ const { id: workspaceId } = useWorkspace();
+
+ const { executeAsync: deletePartnerTag, isPending: isDeletingPartnerTag } =
+ useAction(deletePartnerTagAction, {
+ onSuccess: () => {
+ toast.success("Partner tag deleted successfully!");
+ mutatePrefix("/api/partners");
+ mutatePrefix("/api/partners/tags");
+ },
+ onError: ({ error }) => {
+ toast.error(parseActionError(error, "Failed to delete partner tag"));
+ },
+ });
+
+ const checkboxRef = useRef<HTMLButtonElement>(null);
+
+ const [openPopover, setOpenPopover] = useState(false);
+
+ const [editedTagName, setEditedTagName] = useState(tag.name);
+ const [isEditing, setIsEditing] = useState(false);
+
+ const { executeAsync: updatePartnerTag, isPending: isUpdatingPartnerTag } =
+ useAction(updatePartnerTagAction, {
+ onSuccess: () => {
+ toast.success("Partner tag updated successfully!");
+ mutatePrefix("/api/partners");
+ mutatePrefix("/api/partners/tags");
+ },
+ onError: ({ error }) => {
+ toast.error(parseActionError(error, "Failed to update partner tag"));
+ },
+ });
+
+ const handleSave = () => {
+ setIsEditing(false);
+
+ if (!workspaceId || editedTagName === tag.name) return;
+
+ updatePartnerTag({
+ workspaceId,
+ partnerTagId: tag.id,
+ name: editedTagName,
+ });
+ };
+
+ return (
+ <Command.Item
+ key={tag.id}
+ className={itemClassName}
+ onSelect={() => {
+ if (isEditing) return;
+ checkboxRef.current?.click();
+ }}
+ value={tag.name}
+ >
+ <div className="flex min-w-0 items-center gap-2">
+ <label
+ className={cn(
+ "flex min-w-0 items-center gap-2",
+ !isEditing && "pointer-events-none",
+ )}
+ >
+ <Checkbox
+ ref={checkboxRef}
+ checked={checked}
+ onCheckedChange={onCheckedChange}
+ className={cn(
+ "border-border-default size-4 shrink-0 rounded data-[state=checked]:bg-black data-[state=indeterminate]:bg-black",
+ "transition-transform duration-100 active:scale-95 group-active/button:scale-95",
+ )}
+ tabIndex={-1}
+ />
+ {isEditing ? (
+ <input
+ value={editedTagName}
+ onChange={(e) => setEditedTagName(e.target.value)}
+ onClick={(e) => e.stopPropagation()}
+ onMouseDown={(e) => e.stopPropagation()}
+ onBlur={() => handleSave()}
+ onKeyDown={(e) => {
+ e.stopPropagation();
+ if (e.key === "Enter") handleSave();
+ }}
+ autoFocus
+ className="border-border-subtle focus:border-border-subtle h-7 rounded-lg border px-2 focus:ring-0 sm:text-sm"
+ />
+ ) : (
+ <div className="flex h-7 min-w-0 select-none items-center rounded-lg bg-black/5 px-2">
+ <span className="text-content-default min-w-0 truncate text-sm font-semibold">
+ {editedTagName}
+ </span>
+ </div>
+ )}
+ </label>
+ </div>
+ <div className="flex items-center gap-2">
+ {Boolean(partnerCount) && (
+ <div className="text-content-default flex items-center gap-1">
+ <Users className="size-3.5 shrink-0" />
+ <span className="text-sm font-medium tabular-nums">
+ {partnerCount}
+ </span>
+ </div>
+ )}
+
+ <Popover
+ content={
+ <div className="flex min-w-32 flex-col gap-1 p-1">
+ <MenuItem
+ onClick={(e) => {
+ e.stopPropagation();
+
+ setEditedTagName(tag.name);
+ setIsEditing(true);
+ setOpenPopover(false);
+ }}
+ icon={<PenWriting className="size-4" />}
+ >
+ Edit
+ </MenuItem>
+ <MenuItem
+ variant="danger"
+ onClick={(e) => {
+ e.stopPropagation();
+
+ if (
+ !window.confirm(
+ "Are you sure you want to delete this partner tag? This action cannot be undone.",
+ )
+ )
+ return;
+
+ deletePartnerTag({
+ workspaceId: workspaceId!,
+ partnerTagId: tag.id,
+ });
+
+ setOpenPopover(false);
+ }}
+ icon={<Trash className="size-4" />}
+ >
+ Delete
+ </MenuItem>
+ </div>
+ }
+ align="end"
+ openPopover={openPopover}
+ setOpenPopover={setOpenPopover}
+ >
+ <Button
+ variant="outline"
+ icon={<ThreeDots className="size-4" />}
+ className="size-7 rounded-lg p-0 hover:bg-black/5 active:bg-black/10 disabled:border-transparent disabled:bg-transparent"
+ loading={isUpdatingPartnerTag || isDeletingPartnerTag}
+ onClick={(e) => {
+ e.stopPropagation();
+ }}
+ />
+ </Popover>
+ </div>
+ </Command.Item>
+ );
+}
+
+export function useUpdatePartnerTagsModal({
+ partners,
+}: Pick<UpdatePartnerTagsModalProps, "partners">) {
+ const [showUpdatePartnerTagsModal, setShowUpdatePartnerTagsModal] =
+ useState(false);
+
+ const UpdatePartnerTagsModalCallback = useCallback(() => {
+ return (
+ <UpdatePartnerTagsModal
+ showUpdatePartnerTagsModal={showUpdatePartnerTagsModal}
+ setShowUpdatePartnerTagsModal={setShowUpdatePartnerTagsModal}
+ partners={partners}
+ />
+ );
+ }, [showUpdatePartnerTagsModal, setShowUpdatePartnerTagsModal, partners]);
+
+ return useMemo(
+ () => ({
+ setShowUpdatePartnerTagsModal,
+ UpdatePartnerTagsModal: UpdatePartnerTagsModalCallback,
+ }),
+ [setShowUpdatePartnerTagsModal, UpdatePartnerTagsModalCallback],
+ );
+}
diff --git a/packages/prisma/schema/partner.prisma b/packages/prisma/schema/partner.prisma
index 115975e159..5dac85ef84 100644
--- a/packages/prisma/schema/partner.prisma
+++ b/packages/prisma/schema/partner.prisma
@@ -91,6 +91,7 @@ model Partner {
preferredEarningStructures PartnerPreferredEarningStructure[]
salesChannels PartnerSalesChannel[]
discoveredByPrograms DiscoveredPartner[]
+ programPartnerTags ProgramPartnerTag[]
fraudEventGroups FraudEventGroup[]
fraudEvents FraudEvent[]
fraudAlerts FraudAlert[]
diff --git a/packages/prisma/schema/program.prisma b/packages/prisma/schema/program.prisma
index 6990f5fb6d..ec54fdebee 100644
--- a/packages/prisma/schema/program.prisma
+++ b/packages/prisma/schema/program.prisma
@@ -91,6 +91,9 @@ model Program {
fraudAlerts FraudAlert[]
referrals PartnerReferral[]
+ partnerTags PartnerTag[]
+ programPartnerTags ProgramPartnerTag[]
+
@@index(workspaceId)
@@index(addedToMarketplaceAt)
}
@@ -154,6 +157,7 @@ model ProgramEnrollment {
referrals PartnerReferral[]
fraudAlerts FraudAlert[]
discoveredPartner DiscoveredPartner?
+ programPartnerTags ProgramPartnerTag[]
// unique constraints
@@unique([partnerId, programId])
diff --git a/packages/prisma/schema/tag.prisma b/packages/prisma/schema/tag.prisma
index 5df048cf2a..403c7549a9 100644
--- a/packages/prisma/schema/tag.prisma
+++ b/packages/prisma/schema/tag.prisma
@@ -4,8 +4,8 @@ model Tag {
color String @default("blue")
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
- project Project @relation(fields: [projectId], references: [id], onUpdate: Cascade, onDelete: Cascade)
- projectId String
+ project Project? @relation(fields: [projectId], references: [id], onUpdate: Cascade, onDelete: Cascade)
+ projectId String?
links LinkTag[]
@@unique([name, projectId])
@@ -24,3 +24,34 @@ model LinkTag {
@@unique([linkId, tagId])
@@index(tagId)
}
+
+model PartnerTag {
+ id String @id @default(cuid())
+ programId String?
+ name String
+ createdAt DateTime @default(now())
+ updatedAt DateTime @updatedAt
+
+ program Program? @relation(fields: [programId], references: [id], onDelete: Cascade)
+ programPartnerTags ProgramPartnerTag[]
+
+ @@unique([programId, name])
+ @@index(programId)
+}
+
+model ProgramPartnerTag {
+ id String @id @default(cuid())
+ programId String
+ partnerId String
+ partnerTagId String
+
+ program Program @relation(fields: [programId], references: [id], onDelete: Cascade)
+ programEnrollment ProgramEnrollment @relation(fields: [programId, partnerId], references: [programId, partnerId], onDelete: Cascade, onUpdate: Cascade)
+ partnerTag PartnerTag @relation(fields: [partnerTagId], references: [id], onDelete: Cascade)
+ partner Partner @relation(fields: [partnerId], references: [id], onDelete: Cascade)
+
+ @@unique([partnerTagId, partnerId])
+ @@index(partnerId)
+ @@index([programId, partnerId])
+ @@index([partnerTagId, programId])
+}
\ No newline at end of file
diff --git a/packages/prisma/schema/workspace.prisma b/packages/prisma/schema/workspace.prisma
index 1ae7c1b7bf..46d8d1a354 100644
--- a/packages/prisma/schema/workspace.prisma
+++ b/packages/prisma/schema/workspace.prisma
@@ -42,6 +42,7 @@ model Project {
domainsLimit Int @default(3)
tagsLimit Int @default(5)
+ partnerTagsLimit Int @default(0)
foldersUsage Int @default(0)
foldersLimit Int @default(0)
partnersUsage Int @default(0)
diff --git a/packages/tinybird/datasources/dub_links_metadata.datasource b/packages/tinybird/datasources/dub_links_metadata.datasource
index 20f7f2ded2..b0b0bf1c2d 100644
--- a/packages/tinybird/datasources/dub_links_metadata.datasource
+++ b/packages/tinybird/datasources/dub_links_metadata.datasource
@@ -15,7 +15,8 @@ SCHEMA >
`tenant_id` String `json:$.tenant_id`,
`partner_id` String `json:$.partner_id`,
`folder_id` String `json:$.folder_id`,
- `partner_group_id` String `json:$.partner_group_id`
+ `partner_group_id` String `json:$.partner_group_id`,
+ `partner_tag_ids` Array(String) `json:$.partner_tag_ids[:]` DEFAULT []
ENGINE "MergeTree"
ENGINE_PARTITION_KEY "toYear(timestamp)"
diff --git a/packages/tinybird/datasources/dub_links_metadata_latest.datasource b/packages/tinybird/datasources/dub_links_metadata_latest.datasource
index 2cc97a83ca..603314625d 100644
--- a/packages/tinybird/datasources/dub_links_metadata_latest.datasource
+++ b/packages/tinybird/datasources/dub_links_metadata_latest.datasource
@@ -12,6 +12,7 @@ SCHEMA >
`partner_group_id` String,
`folder_id` String,
`tag_ids` Array(String),
+ `partner_tag_ids` Array(String) DEFAULT [],
`tenant_id` String,
`created_at` DateTime64(3),
`deleted` UInt8
diff --git a/packages/tinybird/pipes/v4_count.pipe b/packages/tinybird/pipes/v4_count.pipe
index 29b5717bd6..a386de10f8 100644
--- a/packages/tinybird/pipes/v4_count.pipe
+++ b/packages/tinybird/pipes/v4_count.pipe
@@ -7,73 +7,77 @@ TAGS "Dub Endpoints"
NODE workspace_links
SQL >
- %
- SELECT link_id
- FROM dub_links_metadata_latest FINAL
- WHERE
- workspace_id
- = {{
- String(
- workspaceId,
- 'cl7pj5kq4006835rbjlt2ofka',
- description="The unique ID for the workspace",
- required=True,
- )
- }}
- AND deleted == 0
- {% if defined(programId) %} AND program_id = {{ programId }} {% end %}
- {% if defined(partnerId) %}
- {% if defined(partnerIdOperator) and String(partnerIdOperator) == 'NOT IN' %}
- AND partner_id NOT IN {{ Array(partnerId, 'String') }}
- {% else %}
- AND partner_id IN {{ Array(partnerId, 'String') }}
- {% end %}
+%
+SELECT link_id
+FROM dub_links_metadata_latest FINAL
+WHERE
+ workspace_id
+ = {{
+ String(
+ workspaceId,
+ 'cl7pj5kq4006835rbjlt2ofka',
+ description="The unique ID for the workspace",
+ required=True,
+ )
+ }}
+ AND deleted == 0
+ {% if defined(programId) %} AND program_id = {{ programId }} {% end %}
+ {% if defined(partnerId) %}
+ {% if defined(partnerIdOperator) and String(partnerIdOperator) == 'NOT IN' %}
+ AND partner_id NOT IN {{ Array(partnerId, 'String') }}
+ {% else %} AND partner_id IN {{ Array(partnerId, 'String') }}
{% end %}
- {% if defined(groupId) %}
- {% if defined(groupIdOperator) and String(groupIdOperator) == 'NOT IN' %}
- AND partner_group_id NOT IN {{ Array(groupId, 'String') }}
- {% else %}
- AND partner_group_id IN {{ Array(groupId, 'String') }}
- {% end %}
+ {% end %}
+ {% if defined(groupId) %}
+ {% if defined(groupIdOperator) and String(groupIdOperator) == 'NOT IN' %}
+ AND partner_group_id NOT IN {{ Array(groupId, 'String') }}
+ {% else %} AND partner_group_id IN {{ Array(groupId, 'String') }}
{% end %}
- {% if defined(tenantId) %}
- {% if defined(tenantIdOperator) and String(tenantIdOperator) == 'NOT IN' %}
- AND tenant_id NOT IN {{ Array(tenantId, 'String') }}
- {% else %}
- AND tenant_id IN {{ Array(tenantId, 'String') }}
- {% end %}
+ {% end %}
+ {% if defined(partnerTagId) %}
+ {% if defined(partnerTagIdOperator) and String(partnerTagIdOperator) == 'NOT IN' %}
+ AND length(
+ arrayFilter(x -> x NOT IN {{ Array(partnerTagId, 'String') }}, partner_tag_ids)
+ )
+ = length(partner_tag_ids)
+ {% else %} AND arrayIntersect(partner_tag_ids, {{ Array(partnerTagId, 'String') }}) != []
{% end %}
- {% if defined(domain) %}
- {% if defined(domainOperator) and String(domainOperator) == 'NOT IN' %}
- AND domain NOT IN {{ Array(domain, 'String') }}
- {% else %}
- AND domain IN {{ Array(domain, 'String') }}
- {% end %}
+ {% end %}
+ {% if defined(tenantId) %}
+ {% if defined(tenantIdOperator) and String(tenantIdOperator) == 'NOT IN' %}
+ AND tenant_id NOT IN {{ Array(tenantId, 'String') }}
+ {% else %} AND tenant_id IN {{ Array(tenantId, 'String') }}
{% end %}
- {% if defined(tagId) %}
- {% if defined(tagIdOperator) and String(tagIdOperator) == 'NOT IN' %}
- AND length(arrayFilter(x -> x NOT IN {{ Array(tagId, 'String') }}, tag_ids)) = length(tag_ids)
- {% else %}
- AND arrayIntersect(tag_ids, {{ Array(tagId, 'String') }}) != []
- {% end %}
+ {% end %}
+ {% if defined(domain) %}
+ {% if defined(domainOperator) and String(domainOperator) == 'NOT IN' %}
+ AND domain NOT IN {{ Array(domain, 'String') }}
+ {% else %} AND domain IN {{ Array(domain, 'String') }}
{% end %}
- {% if defined(folderId) %}
- {% if defined(folderIdOperator) and String(folderIdOperator) == 'NOT IN' %}
- AND folder_id NOT IN {{ Array(folderId, 'String') }}
- {% else %}
- AND folder_id IN {{ Array(folderId, 'String') }}
- {% end %}
+ {% end %}
+ {% if defined(tagId) %}
+ {% if defined(tagIdOperator) and String(tagIdOperator) == 'NOT IN' %}
+ AND length(arrayFilter(x -> x NOT IN {{ Array(tagId, 'String') }}, tag_ids))
+ = length(tag_ids)
+ {% else %} AND arrayIntersect(tag_ids, {{ Array(tagId, 'String') }}) != []
{% end %}
- {% if defined(root) %}
- {% if Boolean(root) == 1 %} AND key = '_root' {% else %} AND key != '_root' {% end %}
+ {% end %}
+ {% if defined(folderId) %}
+ {% if defined(folderIdOperator) and String(folderIdOperator) == 'NOT IN' %}
+ AND folder_id NOT IN {{ Array(folderId, 'String') }}
+ {% else %} AND folder_id IN {{ Array(folderId, 'String') }}
{% end %}
+ {% end %}
+ {% if defined(root) %}
+ {% if Boolean(root) == 1 %} AND key = '_root' {% else %} AND key != '_root' {% end %}
+ {% end %}
NODE count_clicks
SQL >
- %
+%
SELECT 'count' as groupByField, COUNT(*) as clicks
FROM
{% if defined(customerId) %} dub_click_events_id
@@ -95,7 +99,7 @@ SQL >
{% else %}
AND link_id IN {{ Array(linkId, 'String') }}
{% end %}
- {% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
+ {% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(partnerTagId) or defined(
tenantId
) or defined(folderId) or defined(domain) or defined(
tagId
@@ -229,7 +233,7 @@ SQL >
NODE count_leads
SQL >
- %
+%
SELECT 'count' as groupByField, COUNT(*) as leads
FROM dub_lead_events_mv
WHERE
@@ -241,7 +245,7 @@ SQL >
{% else %}
AND link_id IN {{ Array(linkId, 'String') }}
{% end %}
- {% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
+ {% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(partnerTagId) or defined(
tenantId
) or defined(folderId) or defined(domain) or defined(
tagId
@@ -392,7 +396,7 @@ SQL >
NODE first_sale_by_link_customer
SQL >
- %
+%
SELECT workspace_id, link_id, customer_id, minMerge(first_sale_state) AS first_sale_ts
FROM dub_first_sale_mv
WHERE
@@ -412,7 +416,7 @@ SQL >
NODE count_sales
SQL >
- %
+%
SELECT 'count' as groupByField, sales, amount, amount AS saleAmount
FROM
(
@@ -444,7 +448,7 @@ SQL >
{% else %}
AND se.link_id IN {{ Array(linkId, 'String') }}
{% end %}
- {% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
+ {% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(partnerTagId) or defined(
tenantId
) or defined(folderId) or defined(domain) or defined(
tagId
@@ -600,7 +604,7 @@ SQL >
NODE count_composite
SQL >
- %
+%
SELECT 'count' as groupByField, clicks, leads, sales, amount, saleAmount
FROM count_clicks, count_leads, count_sales
@@ -609,7 +613,7 @@ SQL >
NODE endpoint
SQL >
- %
+%
SELECT *
FROM
{% if eventType == 'clicks' %} count_clicks
diff --git a/packages/tinybird/pipes/v4_events.pipe b/packages/tinybird/pipes/v4_events.pipe
index e017018671..29cc984f80 100644
--- a/packages/tinybird/pipes/v4_events.pipe
+++ b/packages/tinybird/pipes/v4_events.pipe
@@ -7,73 +7,77 @@ TAGS "Dub Endpoints"
NODE workspace_links
SQL >
- %
- SELECT link_id
- FROM dub_links_metadata_latest FINAL
- WHERE
- workspace_id
- = {{
- String(
- workspaceId,
- 'cl7pj5kq4006835rbjlt2ofka',
- description="The unique ID for the workspace",
- required=True,
- )
- }}
- AND deleted == 0
- {% if defined(programId) %} AND program_id = {{ programId }} {% end %}
- {% if defined(partnerId) %}
- {% if defined(partnerIdOperator) and String(partnerIdOperator) == 'NOT IN' %}
- AND partner_id NOT IN {{ Array(partnerId, 'String') }}
- {% else %}
- AND partner_id IN {{ Array(partnerId, 'String') }}
- {% end %}
+%
+SELECT link_id
+FROM dub_links_metadata_latest FINAL
+WHERE
+ workspace_id
+ = {{
+ String(
+ workspaceId,
+ 'cl7pj5kq4006835rbjlt2ofka',
+ description="The unique ID for the workspace",
+ required=True,
+ )
+ }}
+ AND deleted == 0
+ {% if defined(programId) %} AND program_id = {{ programId }} {% end %}
+ {% if defined(partnerId) %}
+ {% if defined(partnerIdOperator) and String(partnerIdOperator) == 'NOT IN' %}
+ AND partner_id NOT IN {{ Array(partnerId, 'String') }}
+ {% else %} AND partner_id IN {{ Array(partnerId, 'String') }}
{% end %}
- {% if defined(groupId) %}
- {% if defined(groupIdOperator) and String(groupIdOperator) == 'NOT IN' %}
- AND partner_group_id NOT IN {{ Array(groupId, 'String') }}
- {% else %}
- AND partner_group_id IN {{ Array(groupId, 'String') }}
- {% end %}
+ {% end %}
+ {% if defined(groupId) %}
+ {% if defined(groupIdOperator) and String(groupIdOperator) == 'NOT IN' %}
+ AND partner_group_id NOT IN {{ Array(groupId, 'String') }}
+ {% else %} AND partner_group_id IN {{ Array(groupId, 'String') }}
{% end %}
- {% if defined(tenantId) %}
- {% if defined(tenantIdOperator) and String(tenantIdOperator) == 'NOT IN' %}
- AND tenant_id NOT IN {{ Array(tenantId, 'String') }}
- {% else %}
- AND tenant_id IN {{ Array(tenantId, 'String') }}
- {% end %}
+ {% end %}
+ {% if defined(partnerTagId) %}
+ {% if defined(partnerTagIdOperator) and String(partnerTagIdOperator) == 'NOT IN' %}
+ AND length(
+ arrayFilter(x -> x NOT IN {{ Array(partnerTagId, 'String') }}, partner_tag_ids)
+ )
+ = length(partner_tag_ids)
+ {% else %} AND arrayIntersect(partner_tag_ids, {{ Array(partnerTagId, 'String') }}) != []
{% end %}
- {% if defined(domain) %}
- {% if defined(domainOperator) and String(domainOperator) == 'NOT IN' %}
- AND domain NOT IN {{ Array(domain, 'String') }}
- {% else %}
- AND domain IN {{ Array(domain, 'String') }}
- {% end %}
+ {% end %}
+ {% if defined(tenantId) %}
+ {% if defined(tenantIdOperator) and String(tenantIdOperator) == 'NOT IN' %}
+ AND tenant_id NOT IN {{ Array(tenantId, 'String') }}
+ {% else %} AND tenant_id IN {{ Array(tenantId, 'String') }}
{% end %}
- {% if defined(tagId) %}
- {% if defined(tagIdOperator) and String(tagIdOperator) == 'NOT IN' %}
- AND length(arrayFilter(x -> x NOT IN {{ Array(tagId, 'String') }}, tag_ids)) = length(tag_ids)
- {% else %}
- AND arrayIntersect(tag_ids, {{ Array(tagId, 'String') }}) != []
- {% end %}
+ {% end %}
+ {% if defined(domain) %}
+ {% if defined(domainOperator) and String(domainOperator) == 'NOT IN' %}
+ AND domain NOT IN {{ Array(domain, 'String') }}
+ {% else %} AND domain IN {{ Array(domain, 'String') }}
{% end %}
- {% if defined(folderId) %}
- {% if defined(folderIdOperator) and String(folderIdOperator) == 'NOT IN' %}
- AND folder_id NOT IN {{ Array(folderId, 'String') }}
- {% else %}
- AND folder_id IN {{ Array(folderId, 'String') }}
- {% end %}
+ {% end %}
+ {% if defined(tagId) %}
+ {% if defined(tagIdOperator) and String(tagIdOperator) == 'NOT IN' %}
+ AND length(arrayFilter(x -> x NOT IN {{ Array(tagId, 'String') }}, tag_ids))
+ = length(tag_ids)
+ {% else %} AND arrayIntersect(tag_ids, {{ Array(tagId, 'String') }}) != []
{% end %}
- {% if defined(root) %}
- {% if Boolean(root) == 1 %} AND key = '_root' {% else %} AND key != '_root' {% end %}
+ {% end %}
+ {% if defined(folderId) %}
+ {% if defined(folderIdOperator) and String(folderIdOperator) == 'NOT IN' %}
+ AND folder_id NOT IN {{ Array(folderId, 'String') }}
+ {% else %} AND folder_id IN {{ Array(folderId, 'String') }}
{% end %}
+ {% end %}
+ {% if defined(root) %}
+ {% if Boolean(root) == 1 %} AND key = '_root' {% else %} AND key != '_root' {% end %}
+ {% end %}
NODE click_events
SQL >
- %
+%
SELECT
*,
splitByString('?', referer_url)[1] as referer_url_processed,
@@ -247,7 +251,7 @@ SQL >
NODE lead_events
SQL >
- %
+%
SELECT
*,
splitByString('?', referer_url)[1] as referer_url_processed,
@@ -411,7 +415,7 @@ SQL >
NODE first_sale_by_link_customer
SQL >
- %
+%
SELECT workspace_id, link_id, customer_id, minMerge(first_sale_state) AS first_sale_ts
FROM dub_first_sale_mv
WHERE
@@ -431,7 +435,7 @@ SQL >
NODE sale_events
SQL >
- %
+%
SELECT
t.*,
t.amount AS saleAmount,
@@ -462,7 +466,7 @@ SQL >
{% else %}
AND se.link_id IN {{ Array(linkId, 'String') }}
{% end %}
- {% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
+ {% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(partnerTagId) or defined(
tenantId
) or defined(folderId) or defined(domain) or defined(
tagId
@@ -506,7 +510,6 @@ SQL >
{% if defined(url) %} AND splitByString('?', se.url)[1] = {{ url }} {% end %}
{% if defined(start) %} AND se.timestamp >= {{ DateTime(start) }} {% end %}
{% if defined(end) %} AND se.timestamp <= {{ DateTime(end) }} {% end %}
-
{% if defined(filters) %}
{% for item in JSON(filters, '[]') %}
{% if item.get('operand', '').startswith('metadata.') %}
@@ -610,7 +613,6 @@ SQL >
{% end %}
{% end %}
{% end %}
-
) AS t
WHERE true
{% if defined(saleType) %} AND t.sale_type = {{ String(saleType) }} {% end %}
@@ -623,7 +625,7 @@ SQL >
NODE endpoint
SQL >
- %
+%
SELECT *
FROM
{% if eventType == 'leads' %} lead_events
diff --git a/packages/tinybird/pipes/v4_group_by.pipe b/packages/tinybird/pipes/v4_group_by.pipe
index 790c1f8e63..6960773b70 100644
--- a/packages/tinybird/pipes/v4_group_by.pipe
+++ b/packages/tinybird/pipes/v4_group_by.pipe
@@ -7,73 +7,77 @@ TAGS "Dub Endpoints"
NODE workspace_links
SQL >
- %
- SELECT link_id
- FROM dub_links_metadata_latest FINAL
- WHERE
- workspace_id
- = {{
- String(
- workspaceId,
- 'cl7pj5kq4006835rbjlt2ofka',
- description="The unique ID for the workspace",
- required=True,
- )
- }}
- AND deleted == 0
- {% if defined(programId) %} AND program_id = {{ programId }} {% end %}
- {% if defined(partnerId) %}
- {% if defined(partnerIdOperator) and String(partnerIdOperator) == 'NOT IN' %}
- AND partner_id NOT IN {{ Array(partnerId, 'String') }}
- {% else %}
- AND partner_id IN {{ Array(partnerId, 'String') }}
- {% end %}
+%
+SELECT link_id
+FROM dub_links_metadata_latest FINAL
+WHERE
+ workspace_id
+ = {{
+ String(
+ workspaceId,
+ 'cl7pj5kq4006835rbjlt2ofka',
+ description="The unique ID for the workspace",
+ required=True,
+ )
+ }}
+ AND deleted == 0
+ {% if defined(programId) %} AND program_id = {{ programId }} {% end %}
+ {% if defined(partnerId) %}
+ {% if defined(partnerIdOperator) and String(partnerIdOperator) == 'NOT IN' %}
+ AND partner_id NOT IN {{ Array(partnerId, 'String') }}
+ {% else %} AND partner_id IN {{ Array(partnerId, 'String') }}
{% end %}
- {% if defined(groupId) %}
- {% if defined(groupIdOperator) and String(groupIdOperator) == 'NOT IN' %}
- AND partner_group_id NOT IN {{ Array(groupId, 'String') }}
- {% else %}
- AND partner_group_id IN {{ Array(groupId, 'String') }}
- {% end %}
+ {% end %}
+ {% if defined(groupId) %}
+ {% if defined(groupIdOperator) and String(groupIdOperator) == 'NOT IN' %}
+ AND partner_group_id NOT IN {{ Array(groupId, 'String') }}
+ {% else %} AND partner_group_id IN {{ Array(groupId, 'String') }}
{% end %}
- {% if defined(tenantId) %}
- {% if defined(tenantIdOperator) and String(tenantIdOperator) == 'NOT IN' %}
- AND tenant_id NOT IN {{ Array(tenantId, 'String') }}
- {% else %}
- AND tenant_id IN {{ Array(tenantId, 'String') }}
- {% end %}
+ {% end %}
+ {% if defined(partnerTagId) %}
+ {% if defined(partnerTagIdOperator) and String(partnerTagIdOperator) == 'NOT IN' %}
+ AND length(
+ arrayFilter(x -> x NOT IN {{ Array(partnerTagId, 'String') }}, partner_tag_ids)
+ )
+ = length(partner_tag_ids)
+ {% else %} AND arrayIntersect(partner_tag_ids, {{ Array(partnerTagId, 'String') }}) != []
{% end %}
- {% if defined(domain) %}
- {% if defined(domainOperator) and String(domainOperator) == 'NOT IN' %}
- AND domain NOT IN {{ Array(domain, 'String') }}
- {% else %}
- AND domain IN {{ Array(domain, 'String') }}
- {% end %}
+ {% end %}
+ {% if defined(tenantId) %}
+ {% if defined(tenantIdOperator) and String(tenantIdOperator) == 'NOT IN' %}
+ AND tenant_id NOT IN {{ Array(tenantId, 'String') }}
+ {% else %} AND tenant_id IN {{ Array(tenantId, 'String') }}
{% end %}
- {% if defined(tagId) %}
- {% if defined(tagIdOperator) and String(tagIdOperator) == 'NOT IN' %}
- AND length(arrayFilter(x -> x NOT IN {{ Array(tagId, 'String') }}, tag_ids)) = length(tag_ids)
- {% else %}
- AND arrayIntersect(tag_ids, {{ Array(tagId, 'String') }}) != []
- {% end %}
+ {% end %}
+ {% if defined(domain) %}
+ {% if defined(domainOperator) and String(domainOperator) == 'NOT IN' %}
+ AND domain NOT IN {{ Array(domain, 'String') }}
+ {% else %} AND domain IN {{ Array(domain, 'String') }}
{% end %}
- {% if defined(folderId) %}
- {% if defined(folderIdOperator) and String(folderIdOperator) == 'NOT IN' %}
- AND folder_id NOT IN {{ Array(folderId, 'String') }}
- {% else %}
- AND folder_id IN {{ Array(folderId, 'String') }}
- {% end %}
+ {% end %}
+ {% if defined(tagId) %}
+ {% if defined(tagIdOperator) and String(tagIdOperator) == 'NOT IN' %}
+ AND length(arrayFilter(x -> x NOT IN {{ Array(tagId, 'String') }}, tag_ids))
+ = length(tag_ids)
+ {% else %} AND arrayIntersect(tag_ids, {{ Array(tagId, 'String') }}) != []
{% end %}
- {% if defined(root) %}
- {% if Boolean(root) == 1 %} AND key = '_root' {% else %} AND key != '_root' {% end %}
+ {% end %}
+ {% if defined(folderId) %}
+ {% if defined(folderIdOperator) and String(folderIdOperator) == 'NOT IN' %}
+ AND folder_id NOT IN {{ Array(folderId, 'String') }}
+ {% else %} AND folder_id IN {{ Array(folderId, 'String') }}
{% end %}
+ {% end %}
+ {% if defined(root) %}
+ {% if Boolean(root) == 1 %} AND key = '_root' {% else %} AND key != '_root' {% end %}
+ {% end %}
NODE group_by_clicks
SQL >
- %
+%
SELECT
multiIf(
{{ String(groupBy) }} = 'top_links',
@@ -298,7 +302,7 @@ SQL >
NODE group_by_leads
SQL >
- %
+%
SELECT
multiIf(
{{ String(groupBy) }} = 'top_links',
@@ -513,7 +517,7 @@ SQL >
NODE first_sale_by_link_customer
SQL >
- %
+%
SELECT workspace_id, link_id, customer_id, minMerge(first_sale_state) AS first_sale_ts
FROM dub_first_sale_mv
WHERE
@@ -533,7 +537,7 @@ SQL >
NODE group_by_sales
SQL >
- %
+%
SELECT
multiIf(
{{ String(groupBy) }} = 'top_links',
@@ -606,7 +610,7 @@ SQL >
{% else %}
AND se.link_id IN {{ Array(linkId, 'String') }}
{% end %}
- {% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
+ {% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(partnerTagId) or defined(
tenantId
) or defined(folderId) or defined(domain) or defined(
tagId
@@ -768,7 +772,7 @@ SQL >
NODE group_by_composite
SQL >
- %
+%
SELECT
dce.groupByField as groupByField,
clicks,
@@ -808,7 +812,7 @@ SQL >
NODE endpoint
SQL >
- %
+%
SELECT *
FROM
{% if eventType == 'clicks' %} group_by_clicks
diff --git a/packages/tinybird/pipes/v4_group_by_link_metadata.pipe b/packages/tinybird/pipes/v4_group_by_link_metadata.pipe
index a5a0f5ecba..96f495612a 100644
--- a/packages/tinybird/pipes/v4_group_by_link_metadata.pipe
+++ b/packages/tinybird/pipes/v4_group_by_link_metadata.pipe
@@ -1,103 +1,110 @@
NODE workspace_links
SQL >
- %
- SELECT
- link_id,
- -- here we split tag_ids out of the multiIf because arrayJoin explodes rows
- if(
+%
+SELECT
+ link_id,
+ -- here we don't wrap tag_ids and partner_tag_ids in array()
+ -- because the parent arrayJoin explodes rows
+ arrayJoin(
+ multiIf(
{{ String(groupBy) }} = 'top_link_tags',
- arrayJoin(tag_ids),
- multiIf(
- {{ String(groupBy) }} = 'top_folders',
- folder_id,
- {{ String(groupBy) }} = 'top_domains',
- domain,
- {{ String(groupBy) }} = 'top_partners',
- partner_id,
- {{ String(groupBy) }} = 'top_groups',
- partner_group_id,
- partner_id
- )
- ) AS groupByField
- FROM dub_links_metadata_latest FINAL
- WHERE
- workspace_id
- = {{
- String(
- workspaceId,
- 'cl7pj5kq4006835rbjlt2ofka',
- description="The unique ID for the workspace",
- required=True,
- )
- }}
- AND deleted == 0
- AND multiIf(
+ tag_ids,
+ {{ String(groupBy) }} = 'top_partner_tags',
+ partner_tag_ids,
{{ String(groupBy) }} = 'top_folders',
- folder_id != '',
+ array(folder_id),
{{ String(groupBy) }} = 'top_domains',
- domain != '',
- {{ String(groupBy) }} = 'top_link_tags',
- length(tag_ids) > 0,
+ array(domain),
{{ String(groupBy) }} = 'top_partners',
- partner_id != '',
+ array(partner_id),
{{ String(groupBy) }} = 'top_groups',
- partner_group_id != '',
- partner_id != ''
+ array(partner_group_id),
+ array(partner_id)
)
- {% if defined(programId) %} AND program_id = {{ programId }} {% end %}
- {% if defined(partnerId) %}
- {% if defined(partnerIdOperator) and String(partnerIdOperator) == 'NOT IN' %}
- AND partner_id NOT IN {{ Array(partnerId, 'String') }}
- {% else %}
- AND partner_id IN {{ Array(partnerId, 'String') }}
- {% end %}
+ ) AS groupByField
+FROM dub_links_metadata_latest FINAL
+WHERE
+ workspace_id
+ = {{
+ String(
+ workspaceId,
+ 'cl7pj5kq4006835rbjlt2ofka',
+ description="The unique ID for the workspace",
+ required=True,
+ )
+ }}
+ AND deleted == 0
+ AND multiIf(
+ {{ String(groupBy) }} = 'top_folders',
+ folder_id != '',
+ {{ String(groupBy) }} = 'top_domains',
+ domain != '',
+ {{ String(groupBy) }} = 'top_link_tags',
+ length(tag_ids) > 0,
+ {{ String(groupBy) }} = 'top_partners',
+ partner_id != '',
+ {{ String(groupBy) }} = 'top_groups',
+ partner_group_id != '',
+ partner_id != ''
+ )
+ {% if defined(programId) %} AND program_id = {{ programId }} {% end %}
+ {% if defined(partnerId) %}
+ {% if defined(partnerIdOperator) and String(partnerIdOperator) == 'NOT IN' %}
+ AND partner_id NOT IN {{ Array(partnerId, 'String') }}
+ {% else %} AND partner_id IN {{ Array(partnerId, 'String') }}
{% end %}
- {% if defined(groupId) %}
- {% if defined(groupIdOperator) and String(groupIdOperator) == 'NOT IN' %}
- AND partner_group_id NOT IN {{ Array(groupId, 'String') }}
- {% else %}
- AND partner_group_id IN {{ Array(groupId, 'String') }}
- {% end %}
+ {% end %}
+ {% if defined(groupId) %}
+ {% if defined(groupIdOperator) and String(groupIdOperator) == 'NOT IN' %}
+ AND partner_group_id NOT IN {{ Array(groupId, 'String') }}
+ {% else %} AND partner_group_id IN {{ Array(groupId, 'String') }}
{% end %}
- {% if defined(tenantId) %}
- {% if defined(tenantIdOperator) and String(tenantIdOperator) == 'NOT IN' %}
- AND tenant_id NOT IN {{ Array(tenantId, 'String') }}
- {% else %}
- AND tenant_id IN {{ Array(tenantId, 'String') }}
- {% end %}
+ {% end %}
+ {% if defined(partnerTagId) %}
+ {% if defined(partnerTagIdOperator) and String(partnerTagIdOperator) == 'NOT IN' %}
+ AND length(
+ arrayFilter(x -> x NOT IN {{ Array(partnerTagId, 'String') }}, partner_tag_ids)
+ )
+ = length(partner_tag_ids)
+ {% else %} AND arrayIntersect(partner_tag_ids, {{ Array(partnerTagId, 'String') }}) != []
{% end %}
- {% if defined(domain) %}
- {% if defined(domainOperator) and String(domainOperator) == 'NOT IN' %}
- AND domain NOT IN {{ Array(domain, 'String') }}
- {% else %}
- AND domain IN {{ Array(domain, 'String') }}
- {% end %}
+ {% end %}
+ {% if defined(tenantId) %}
+ {% if defined(tenantIdOperator) and String(tenantIdOperator) == 'NOT IN' %}
+ AND tenant_id NOT IN {{ Array(tenantId, 'String') }}
+ {% else %} AND tenant_id IN {{ Array(tenantId, 'String') }}
{% end %}
- {% if defined(tagId) %}
- {% if defined(tagIdOperator) and String(tagIdOperator) == 'NOT IN' %}
- AND length(arrayFilter(x -> x NOT IN {{ Array(tagId, 'String') }}, tag_ids)) = length(tag_ids)
- {% else %}
- AND arrayIntersect(tag_ids, {{ Array(tagId, 'String') }}) != []
- {% end %}
+ {% end %}
+ {% if defined(domain) %}
+ {% if defined(domainOperator) and String(domainOperator) == 'NOT IN' %}
+ AND domain NOT IN {{ Array(domain, 'String') }}
+ {% else %} AND domain IN {{ Array(domain, 'String') }}
{% end %}
- {% if defined(folderId) %}
- {% if defined(folderIdOperator) and String(folderIdOperator) == 'NOT IN' %}
- AND folder_id NOT IN {{ Array(folderId, 'String') }}
- {% else %}
- AND folder_id IN {{ Array(folderId, 'String') }}
- {% end %}
+ {% end %}
+ {% if defined(tagId) %}
+ {% if defined(tagIdOperator) and String(tagIdOperator) == 'NOT IN' %}
+ AND length(arrayFilter(x -> x NOT IN {{ Array(tagId, 'String') }}, tag_ids))
+ = length(tag_ids)
+ {% else %} AND arrayIntersect(tag_ids, {{ Array(tagId, 'String') }}) != []
{% end %}
- {% if defined(root) %}
- {% if Boolean(root) == 1 %} AND key = '_root' {% else %} AND key != '_root' {% end %}
+ {% end %}
+ {% if defined(folderId) %}
+ {% if defined(folderIdOperator) and String(folderIdOperator) == 'NOT IN' %}
+ AND folder_id NOT IN {{ Array(folderId, 'String') }}
+ {% else %} AND folder_id IN {{ Array(folderId, 'String') }}
{% end %}
+ {% end %}
+ {% if defined(root) %}
+ {% if Boolean(root) == 1 %} AND key = '_root' {% else %} AND key != '_root' {% end %}
+ {% end %}
NODE group_by_link_metadata_clicks
SQL >
- %
+%
SELECT wl.groupByField as groupByField, COUNT(*) AS clicks
FROM dub_click_events_mv AS ce
JOIN workspace_links AS wl ON ce.link_id = wl.link_id
@@ -216,7 +223,7 @@ SQL >
NODE group_by_link_metadata_leads
SQL >
- %
+%
SELECT wl.groupByField as groupByField, COUNT(*) AS leads
FROM dub_lead_events_mv AS le
JOIN workspace_links AS wl ON le.link_id = wl.link_id
@@ -366,7 +373,7 @@ SQL >
NODE first_sale_by_link_customer
SQL >
- %
+%
SELECT workspace_id, link_id, customer_id, minMerge(first_sale_state) AS first_sale_ts
FROM dub_first_sale_mv
WHERE
@@ -386,7 +393,7 @@ SQL >
NODE group_by_link_metadata_sales
SQL >
- %
+%
SELECT
wl.groupByField AS groupByField,
COUNT(*) AS sales,
@@ -559,7 +566,7 @@ SQL >
NODE group_by_link_metadata_composite
SQL >
- %
+%
SELECT c.groupByField as groupByField, c.clicks as clicks, l.leads as leads, s.sales as sales, s.saleAmount as saleAmount
FROM group_by_link_metadata_clicks AS c
LEFT JOIN group_by_link_metadata_leads AS l ON c.groupByField = l.groupByField
@@ -571,7 +578,7 @@ SQL >
NODE endpoint
SQL >
- %
+%
SELECT *
FROM
{% if eventType == 'clicks' %} group_by_link_metadata_clicks
diff --git a/packages/tinybird/pipes/v4_timeseries.pipe b/packages/tinybird/pipes/v4_timeseries.pipe
index 06ad2a3e24..aac17a1a64 100644
--- a/packages/tinybird/pipes/v4_timeseries.pipe
+++ b/packages/tinybird/pipes/v4_timeseries.pipe
@@ -7,7 +7,7 @@ TAGS "Dub Endpoints"
NODE month_intervals
SQL >
- %
+%
WITH
toStartOfMonth(
toDateTime64({{ DateTime64(start, '2024-02-24 00:00:00.000') }}, 3),
@@ -32,7 +32,7 @@ SQL >
NODE day_intervals
SQL >
- %
+%
WITH
toStartOfDay(
toDateTime64({{ DateTime64(start, '2024-02-24 00:00:00.000') }}, 3),
@@ -58,7 +58,7 @@ SQL >
NODE hour_intervals
SQL >
- %
+%
WITH
toStartOfHour(
toDateTime64({{ DateTime64(start, '2024-05-22 00:00:00.000') }}, 3),
@@ -80,73 +80,77 @@ SQL >
NODE workspace_links
SQL >
- %
- SELECT link_id
- FROM dub_links_metadata_latest FINAL
- WHERE
- workspace_id
- = {{
- String(
- workspaceId,
- 'cl7pj5kq4006835rbjlt2ofka',
- description="The unique ID for the workspace",
- required=True,
- )
- }}
- AND deleted == 0
- {% if defined(programId) %} AND program_id = {{ programId }} {% end %}
- {% if defined(partnerId) %}
- {% if defined(partnerIdOperator) and String(partnerIdOperator) == 'NOT IN' %}
- AND partner_id NOT IN {{ Array(partnerId, 'String') }}
- {% else %}
- AND partner_id IN {{ Array(partnerId, 'String') }}
- {% end %}
+%
+SELECT link_id
+FROM dub_links_metadata_latest FINAL
+WHERE
+ workspace_id
+ = {{
+ String(
+ workspaceId,
+ 'cl7pj5kq4006835rbjlt2ofka',
+ description="The unique ID for the workspace",
+ required=True,
+ )
+ }}
+ AND deleted == 0
+ {% if defined(programId) %} AND program_id = {{ programId }} {% end %}
+ {% if defined(partnerId) %}
+ {% if defined(partnerIdOperator) and String(partnerIdOperator) == 'NOT IN' %}
+ AND partner_id NOT IN {{ Array(partnerId, 'String') }}
+ {% else %} AND partner_id IN {{ Array(partnerId, 'String') }}
{% end %}
- {% if defined(groupId) %}
- {% if defined(groupIdOperator) and String(groupIdOperator) == 'NOT IN' %}
- AND partner_group_id NOT IN {{ Array(groupId, 'String') }}
- {% else %}
- AND partner_group_id IN {{ Array(groupId, 'String') }}
- {% end %}
+ {% end %}
+ {% if defined(groupId) %}
+ {% if defined(groupIdOperator) and String(groupIdOperator) == 'NOT IN' %}
+ AND partner_group_id NOT IN {{ Array(groupId, 'String') }}
+ {% else %} AND partner_group_id IN {{ Array(groupId, 'String') }}
{% end %}
- {% if defined(tenantId) %}
- {% if defined(tenantIdOperator) and String(tenantIdOperator) == 'NOT IN' %}
- AND tenant_id NOT IN {{ Array(tenantId, 'String') }}
- {% else %}
- AND tenant_id IN {{ Array(tenantId, 'String') }}
- {% end %}
+ {% end %}
+ {% if defined(partnerTagId) %}
+ {% if defined(partnerTagIdOperator) and String(partnerTagIdOperator) == 'NOT IN' %}
+ AND length(
+ arrayFilter(x -> x NOT IN {{ Array(partnerTagId, 'String') }}, partner_tag_ids)
+ )
+ = length(partner_tag_ids)
+ {% else %} AND arrayIntersect(partner_tag_ids, {{ Array(partnerTagId, 'String') }}) != []
{% end %}
- {% if defined(domain) %}
- {% if defined(domainOperator) and String(domainOperator) == 'NOT IN' %}
- AND domain NOT IN {{ Array(domain, 'String') }}
- {% else %}
- AND domain IN {{ Array(domain, 'String') }}
- {% end %}
+ {% end %}
+ {% if defined(tenantId) %}
+ {% if defined(tenantIdOperator) and String(tenantIdOperator) == 'NOT IN' %}
+ AND tenant_id NOT IN {{ Array(tenantId, 'String') }}
+ {% else %} AND tenant_id IN {{ Array(tenantId, 'String') }}
{% end %}
- {% if defined(tagId) %}
- {% if defined(tagIdOperator) and String(tagIdOperator) == 'NOT IN' %}
- AND length(arrayFilter(x -> x NOT IN {{ Array(tagId, 'String') }}, tag_ids)) = length(tag_ids)
- {% else %}
- AND arrayIntersect(tag_ids, {{ Array(tagId, 'String') }}) != []
- {% end %}
+ {% end %}
+ {% if defined(domain) %}
+ {% if defined(domainOperator) and String(domainOperator) == 'NOT IN' %}
+ AND domain NOT IN {{ Array(domain, 'String') }}
+ {% else %} AND domain IN {{ Array(domain, 'String') }}
{% end %}
- {% if defined(folderId) %}
- {% if defined(folderIdOperator) and String(folderIdOperator) == 'NOT IN' %}
- AND folder_id NOT IN {{ Array(folderId, 'String') }}
- {% else %}
- AND folder_id IN {{ Array(folderId, 'String') }}
- {% end %}
+ {% end %}
+ {% if defined(tagId) %}
+ {% if defined(tagIdOperator) and String(tagIdOperator) == 'NOT IN' %}
+ AND length(arrayFilter(x -> x NOT IN {{ Array(tagId, 'String') }}, tag_ids))
+ = length(tag_ids)
+ {% else %} AND arrayIntersect(tag_ids, {{ Array(tagId, 'String') }}) != []
{% end %}
- {% if defined(root) %}
- {% if Boolean(root) == 1 %} AND key = '_root' {% else %} AND key != '_root' {% end %}
+ {% end %}
+ {% if defined(folderId) %}
+ {% if defined(folderIdOperator) and String(folderIdOperator) == 'NOT IN' %}
+ AND folder_id NOT IN {{ Array(folderId, 'String') }}
+ {% else %} AND folder_id IN {{ Array(folderId, 'String') }}
{% end %}
+ {% end %}
+ {% if defined(root) %}
+ {% if Boolean(root) == 1 %} AND key = '_root' {% else %} AND key != '_root' {% end %}
+ {% end %}
NODE timeseries_clicks_data
SQL >
- %
+%
SELECT
{% if granularity == "hour" %} toStartOfHour(timestamp, {{ String(timezone, 'UTC') }})
{% elif granularity == "month" %}
@@ -289,7 +293,7 @@ SQL >
NODE timeseries_clicks
SQL >
- %
+%
SELECT formatDateTime(interval, '%FT%T.000%z') as groupByField, clicks
FROM
{% if granularity == "minute" %} minute_intervals
@@ -304,7 +308,7 @@ SQL >
NODE timeseries_leads_data
SQL >
- %
+%
SELECT
{% if granularity == "hour" %} toStartOfHour(timestamp, {{ String(timezone, 'UTC') }})
{% elif granularity == "month" %}
@@ -479,7 +483,7 @@ SQL >
NODE timeseries_leads
SQL >
- %
+%
SELECT formatDateTime(interval, '%FT%T.000%z') as groupByField, leads
FROM
{% if granularity == "minute" %} minute_intervals
@@ -494,7 +498,7 @@ SQL >
NODE first_sale_by_link_customer
SQL >
- %
+%
SELECT workspace_id, link_id, customer_id, minMerge(first_sale_state) AS first_sale_ts
FROM dub_first_sale_mv
WHERE
@@ -514,7 +518,7 @@ SQL >
NODE timeseries_sales_data
SQL >
- %
+%
SELECT
{% if granularity == "hour" %}
toStartOfHour(timestamp, {{ String(timezone, 'UTC') }})
@@ -726,7 +730,7 @@ SQL >
NODE timeseries_sales
SQL >
- %
+%
SELECT formatDateTime(interval, '%FT%T.000%z') as groupByField, sales, amount, amount as saleAmount
FROM
{% if granularity == "minute" %} minute_intervals
@@ -751,7 +755,7 @@ SQL >
NODE endpoint
SQL >
- %
+%
SELECT *
FROM
{% if eventType == 'clicks' %} timeseries_clicks
diff --git a/packages/ui/src/index.tsx b/packages/ui/src/index.tsx
index 32f94f4db6..24d10994e3 100644
--- a/packages/ui/src/index.tsx
+++ b/packages/ui/src/index.tsx
@@ -45,6 +45,7 @@ export * from "./table";
export * from "./timestamp-tooltip";
export * from "./toggle-group";
export * from "./tooltip";
+export * from "./truncated-list";
export * from "./utm-builder";
// hooks
diff --git a/packages/ui/src/truncated-list.tsx b/packages/ui/src/truncated-list.tsx
new file mode 100644
index 0000000000..0b6a840ac2
--- /dev/null
+++ b/packages/ui/src/truncated-list.tsx
@@ -0,0 +1,171 @@
+import { cn } from "@dub/utils";
+import {
+ Children,
+ ComponentPropsWithoutRef,
+ ElementType,
+ PropsWithChildren,
+ ReactNode,
+ memo,
+ useCallback,
+ useLayoutEffect,
+ useRef,
+ useState,
+} from "react";
+
+type TruncatedListState = {
+ total: number;
+ visible: number;
+ hidden: number;
+};
+
+type TruncatedListProps<T extends ElementType> = PropsWithChildren<
+ ComponentPropsWithoutRef<T>
+> & {
+ as?: T;
+ overflowIndicator: (state: TruncatedListState) => ReactNode;
+ className?: string;
+ itemProps?: {
+ className?: string;
+ };
+};
+
+export const TruncatedList = memo(
+ <T extends ElementType>({
+ as,
+ overflowIndicator,
+ className,
+ itemProps = {},
+ children,
+ ...rest
+ }: TruncatedListProps<T>) => {
+ const As = as || "div";
+ const ItemAs = As === "ul" ? "li" : "div";
+
+ const [visible, setVisible] = useState<number>(0);
+
+ const containerRef = useRef<HTMLElement>(null);
+
+ const truncate = useCallback(() => {
+ if (!containerRef.current) return;
+
+ const childNodes = Array.from(
+ containerRef.current.children,
+ ) as HTMLElement[];
+
+ // Show all items except for the overflow indicator
+ childNodes.forEach((node) => {
+ node.hidden = Boolean(node.getAttribute("data-overflow-indicator"));
+ });
+
+ // No need to truncate if there's only one item
+ if (childNodes.length <= 2) {
+ setVisible(childNodes.length - 1);
+ return;
+ }
+
+ // Check if last item already fits
+ const lastElement = childNodes[childNodes.length - 2];
+ if (
+ contains(
+ containerRef.current.getBoundingClientRect(),
+ lastElement.getBoundingClientRect(),
+ )
+ ) {
+ setVisible(childNodes.length - 1);
+ return;
+ }
+
+ // Last item doesn't fit: show the overflow indicator
+ childNodes
+ .filter((node) => node.getAttribute("data-overflow-indicator"))
+ .forEach((node) => {
+ node.hidden = false;
+ });
+
+ // Find all non-overflow-indicator elements that don't fit
+ const elementsToHide = childNodes.filter(
+ (node) =>
+ containerRef.current &&
+ !node.getAttribute("data-overflow-indicator") &&
+ !contains(
+ containerRef.current.getBoundingClientRect(),
+ node.getBoundingClientRect(),
+ ),
+ );
+
+ // Hide the elements that don't fit
+ elementsToHide.forEach((node) => {
+ node.hidden = true;
+ });
+
+ setVisible(childNodes.length - 1 - elementsToHide.length);
+ }, []);
+
+ // Set up a resize observer
+ useLayoutEffect(() => {
+ if (!containerRef.current) {
+ console.error("Failed to get container element for TruncatedList");
+ return;
+ }
+
+ const resizeObserver = new ResizeObserver(() => truncate());
+
+ resizeObserver.observe(containerRef.current);
+
+ truncate();
+
+ return () => resizeObserver.disconnect();
+ }, [truncate, children]);
+
+ const childNodes = Children.toArray(children);
+
+ return (
+ <As
+ ref={containerRef as any}
+ className={cn("overflow-hidden", className)}
+ {...rest}
+ >
+ {childNodes.map((child, index) => (
+ <ItemAs key={index} {...itemProps}>
+ {child}
+ </ItemAs>
+ ))}
+
+ <ItemAs hidden data-overflow-indicator>
+ {overflowIndicator({
+ visible,
+ total: childNodes.length,
+ hidden: childNodes.length - visible,
+ })}
+ </ItemAs>
+ </As>
+ );
+ },
+ (prevProps, nextProps) => {
+ const prev = JSON.stringify(prevProps, circular());
+ const next = JSON.stringify(nextProps, circular());
+ return prev === next;
+ },
+);
+
+const contains = (parent: DOMRect, child: DOMRect) => {
+ return (
+ child.top >= parent.top &&
+ child.bottom <= parent.bottom &&
+ child.left >= parent.left &&
+ child.right <= parent.right
+ );
+};
+
+// https://github.com/facebook/react/issues/8669#issuecomment-531515508
+const circular = () => {
+ const seen = new WeakSet();
+ return (key: string, value: any) => {
+ if (key.startsWith("_")) return; // Don't compare React's internal props.
+ if (typeof value === "object" && value !== null) {
+ if (seen.has(value)) return;
+ seen.add(value);
+ }
+ return value;
+ };
+};
diff --git a/packages/utils/src/constants/pricing/pricing-plans.tsx b/packages/utils/src/constants/pricing/pricing-plans.tsx
index defc264154..7605a7a980 100644
--- a/packages/utils/src/constants/pricing/pricing-plans.tsx
+++ b/packages/utils/src/constants/pricing/pricing-plans.tsx
@@ -24,6 +24,7 @@ export type PlanDetails = {
payouts: number;
domains: number;
tags: number;
+ partnerTags: number;
folders: number;
groups: number;
networkInvites: number;
@@ -142,6 +143,7 @@ export const PLANS: PlanDetails[] = [
payouts: 0,
domains: 3,
tags: 5,
+ partnerTags: 0,
folders: 0,
groups: 0,
networkInvites: 0,
@@ -166,6 +168,7 @@ export const PLANS: PlanDetails[] = [
payouts: 0,
domains: 10,
tags: 25,
+ partnerTags: 0,
folders: 3,
groups: 0,
networkInvites: 0,
@@ -256,6 +259,7 @@ export const PLANS: PlanDetails[] = [
payouts: 2_500_00,
domains: 100,
tags: INFINITY_NUMBER,
+ partnerTags: 10,
folders: 20,
groups: 3,
networkInvites: 0,
@@ -365,6 +369,7 @@ export const PLANS: PlanDetails[] = [
payouts: 15_000_00,
domains: 250,
tags: INFINITY_NUMBER,
+ partnerTags: INFINITY_NUMBER,
folders: 50,
groups: INFINITY_NUMBER,
networkInvites: 0,
@@ -483,6 +488,7 @@ export const PLANS: PlanDetails[] = [
payouts: INFINITY_NUMBER,
domains: 250,
tags: INFINITY_NUMBER,
+ partnerTags: INFINITY_NUMBER,
folders: INFINITY_NUMBER,
groups: INFINITY_NUMBER,
networkInvites: 20,
diff --git a/packages/utils/src/constants/pricing/trial-limits.ts b/packages/utils/src/constants/pricing/trial-limits.ts
index f05af0646e..57cbe3912d 100644
--- a/packages/utils/src/constants/pricing/trial-limits.ts
+++ b/packages/utils/src/constants/pricing/trial-limits.ts
@@ -6,6 +6,7 @@ export const TRIAL_LIMITS = {
payouts: 500_00,
domains: 5,
tags: 5,
+ partnerTags: 5,
folders: 5,
groups: 5,
networkInvites: 0,
@@ -29,6 +30,7 @@ const TRIAL_LIMIT_FEATURE_PHRASES: Record<TrialLimitResource, string> = {
tags: "create more tags",
folders: "create more folders",
groups: "create more groups",
+ partnerTags: "create more partner tags",
networkInvites: "invite partners from the network",
users: "invite more teammates",
partnerEnrollments: "add more partners",
@@ -90,6 +92,7 @@ export function getWorkspaceLimitsForStripeSubscriptionStatus({
users: TRIAL_LIMITS.users,
domains: TRIAL_LIMITS.domains,
tags: TRIAL_LIMITS.tags,
+ partnerTags: TRIAL_LIMITS.partnerTags,
folders: TRIAL_LIMITS.folders,
groups: TRIAL_LIMITS.groups,
networkInvites: TRIAL_LIMITS.networkInvites,