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.

Display referral and group moves changelog (#3427)

Steven Teye88e89c73075
diff --git a/apps/web/app/(ee)/api/cron/groups/remap-default-links/route.ts b/apps/web/app/(ee)/api/cron/groups/remap-default-links/route.ts
index fe46461041..4524756207 100644
--- a/apps/web/app/(ee)/api/cron/groups/remap-default-links/route.ts
+++ b/apps/web/app/(ee)/api/cron/groups/remap-default-links/route.ts
@@ -21,7 +21,7 @@ const schema = z.object({
programId: z.string(),
groupId: z.string(),
partnerIds: z.array(z.string()).min(1),
- userId: z.string(),
+ userId: z.string().nullish(),
isGroupDeleted: z.boolean().optional(),
});
@@ -158,7 +158,7 @@ export async function POST(req: Request) {
tenantId: programEnrollment?.tenantId ?? undefined,
partnerGroupDefaultLinkId: link.partnerGroupDefaultLinkId,
},
- userId,
+ userId: userId ?? undefined,
});
}),
)
diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/checkout-session-completed.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/checkout-session-completed.ts
index 171816e9db..2a9b17e824 100644
--- a/apps/web/app/(ee)/api/stripe/integration/webhook/checkout-session-completed.ts
+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/checkout-session-completed.ts
@@ -479,6 +479,7 @@ export async function checkoutSessionCompleted(
trigger: "partnerMetricsUpdated",
reason: "sale",
identity: {
+ workspaceId: workspace.id,
programId: link.programId,
partnerId: link.partnerId,
},
@@ -664,6 +665,7 @@ async function attributeViaPromoCode({
trigger: "partnerMetricsUpdated",
reason: "lead",
identity: {
+ workspaceId: workspace.id,
programId: link.programId,
partnerId: link.partnerId,
},
diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/invoice-paid.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/invoice-paid.ts
index 50f2a5546c..2de879db5f 100644
--- a/apps/web/app/(ee)/api/stripe/integration/webhook/invoice-paid.ts
+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/invoice-paid.ts
@@ -248,6 +248,7 @@ export async function invoicePaid(event: Stripe.Event, mode: StripeMode) {
trigger: "partnerMetricsUpdated",
reason: "sale",
identity: {
+ workspaceId: workspace.id,
programId: link.programId,
partnerId: link.partnerId,
},
diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/utils/create-new-customer.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/utils/create-new-customer.ts
index 4db0a27362..0a6e35d9d4 100644
--- a/apps/web/app/(ee)/api/stripe/integration/webhook/utils/create-new-customer.ts
+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/utils/create-new-customer.ts
@@ -109,6 +109,7 @@ export async function createNewCustomer(event: Stripe.Event) {
trigger: "partnerMetricsUpdated",
reason: "lead",
identity: {
+ workspaceId: workspace.id,
programId: link.programId,
partnerId: link.partnerId,
},
diff --git a/apps/web/app/(ee)/api/workflows/partner-approved/route.ts b/apps/web/app/(ee)/api/workflows/partner-approved/route.ts
index 7280bb655e..a7a9778b65 100644
--- a/apps/web/app/(ee)/api/workflows/partner-approved/route.ts
+++ b/apps/web/app/(ee)/api/workflows/partner-approved/route.ts
@@ -390,6 +390,7 @@ export const { POST } = serve<Payload>(
await executeWorkflows({
trigger: "partnerEnrolled",
identity: {
+ workspaceId: program.workspaceId,
programId,
partnerId,
},
diff --git a/apps/web/app/api/activity-logs/route.ts b/apps/web/app/api/activity-logs/route.ts
index a3b5e45466..3c074eb8c8 100644
--- a/apps/web/app/api/activity-logs/route.ts
+++ b/apps/web/app/api/activity-logs/route.ts
@@ -1,3 +1,4 @@
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { withWorkspace } from "@/lib/auth";
import {
activityLogSchema,
@@ -7,16 +8,19 @@ import { prisma } from "@dub/prisma";
import { NextResponse } from "next/server";
import * as z from "zod/v4";
-// GET /api/activity-logs - get activity logs for a resource
+// GET /api/activity-logs – get activity logs for a resource
export const GET = withWorkspace(async ({ workspace, searchParams }) => {
- const { resourceType, resourceId } =
+ const { resourceType, resourceId, action } =
getActivityLogsQuerySchema.parse(searchParams);
+ const programId = getDefaultProgramIdOrThrow(workspace);
+
const activityLogs = await prisma.activityLog.findMany({
where: {
- workspaceId: workspace.id,
+ programId,
resourceType,
resourceId,
+ action,
},
orderBy: {
createdAt: "desc",
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/use-commission-filters.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/use-commission-filters.tsx
index 2e272d6f8e..e96dc6a9c6 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/use-commission-filters.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/use-commission-filters.tsx
@@ -123,7 +123,8 @@ export function useCommissionFilters() {
})
: undefined,
};
- }),
+ },
+ ),
},
],
[commissionsCount, partners, customers, groups],
diff --git a/apps/web/lib/actions/partners/create-manual-commission.ts b/apps/web/lib/actions/partners/create-manual-commission.ts
index d697f10db9..59ec4ee631 100644
--- a/apps/web/lib/actions/partners/create-manual-commission.ts
+++ b/apps/web/lib/actions/partners/create-manual-commission.ts
@@ -575,6 +575,7 @@ export const createManualCommissionAction = authActionClient
trigger: "partnerMetricsUpdated",
reason: "commission",
identity: {
+ workspaceId: workspace.id,
programId,
partnerId,
},
diff --git a/apps/web/lib/actions/referrals/update-referral-status.ts b/apps/web/lib/actions/referrals/update-referral-status.ts
index 95a313bbcc..3741d3d83f 100644
--- a/apps/web/lib/actions/referrals/update-referral-status.ts
+++ b/apps/web/lib/actions/referrals/update-referral-status.ts
@@ -7,7 +7,10 @@ import { getReferralOrThrow } from "@/lib/api/referrals/get-referral-or-throw";
import { markReferralClosedWon } from "@/lib/api/referrals/mark-referral-closed-won";
import { markReferralQualified } from "@/lib/api/referrals/mark-referral-qualified";
import { notifyReferralStatusUpdate } from "@/lib/api/referrals/notify-referral-status-update";
-import { REFERRAL_STATUS_TRANSITIONS } from "@/lib/referrals/constants";
+import {
+ REFERRAL_STATUS_TO_ACTIVITY_ACTION,
+ REFERRAL_STATUS_TRANSITIONS,
+} from "@/lib/referrals/constants";
import { ReferralWithCustomer } from "@/lib/types";
import { updateReferralStatusSchema } from "@/lib/zod/schemas/referrals";
import { prisma } from "@dub/prisma";
@@ -16,16 +19,6 @@ import { waitUntil } from "@vercel/functions";
import { authActionClient } from "../safe-action";
import { throwIfNoPermission } from "../throw-if-no-permission";
-const REFERRAL_EVENT_TYPES = {
- [ReferralStatus.pending]: "referral.created",
- [ReferralStatus.qualified]: "referral.qualified",
- [ReferralStatus.meeting]: "referral.meeting",
- [ReferralStatus.negotiation]: "referral.negotiation",
- [ReferralStatus.unqualified]: "referral.unqualified",
- [ReferralStatus.closedWon]: "referral.closedWon",
- [ReferralStatus.closedLost]: "referral.closedLost",
-} as const;
-
export const updateReferralStatusAction = authActionClient
.inputSchema(updateReferralStatusSchema)
.action(async ({ parsedInput, ctx }) => {
@@ -92,7 +85,7 @@ export const updateReferralStatusAction = authActionClient
resourceType: "referral",
resourceId: referral.id,
userId: user.id,
- action: REFERRAL_EVENT_TYPES[status],
+ action: REFERRAL_STATUS_TO_ACTIVITY_ACTION[status],
description: notes,
changeSet: {
status: {
diff --git a/apps/web/lib/api/activity-log/build-change-set.ts b/apps/web/lib/api/activity-log/build-change-set.ts
index 644ae7a85a..c9bd6248f1 100644
--- a/apps/web/lib/api/activity-log/build-change-set.ts
+++ b/apps/web/lib/api/activity-log/build-change-set.ts
@@ -1,12 +1,6 @@
+import type { ChangeSet } from "@/lib/types";
import { PartnerGroup } from "@dub/prisma/client";
-export type FieldDiff<T = unknown> = {
- old: T | null;
- new: T | null;
-};
-
-export type ChangeSet = Record<string, FieldDiff>;
-
interface BuildProgramEnrollmentChangeSetInput {
oldEnrollment:
| { partnerGroup: Pick<PartnerGroup, "id" | "name"> | null | undefined }
diff --git a/apps/web/lib/api/activity-log/track-activity-log.ts b/apps/web/lib/api/activity-log/track-activity-log.ts
index 5df79dd5a5..2d3a6bde17 100644
--- a/apps/web/lib/api/activity-log/track-activity-log.ts
+++ b/apps/web/lib/api/activity-log/track-activity-log.ts
@@ -2,11 +2,11 @@ import { logger } from "@/lib/axiom/server";
import {
ActivityLogAction,
ActivityLogResourceType,
-} from "@/lib/zod/schemas/activity-log";
+ ChangeSet,
+} from "@/lib/types";
import { prisma } from "@dub/prisma";
import { Prisma } from "@dub/prisma/client";
import { prettyPrint } from "@dub/utils";
-import { ChangeSet } from "./build-change-set";
export interface TrackActivityLogInput
extends Pick<
@@ -24,7 +24,9 @@ export const trackActivityLog = async (
let inputs = Array.isArray(input) ? input : [input];
inputs = inputs.filter(
- (i) => i.changeSet && Object.keys(i.changeSet).length > 0,
+ (i) =>
+ i.action === "referral.created" ||
+ (i.changeSet && Object.keys(i.changeSet).length > 0),
);
if (inputs.length === 0) {
diff --git a/apps/web/lib/api/conversions/track-lead.ts b/apps/web/lib/api/conversions/track-lead.ts
index c5203e9a49..c3c9e005ec 100644
--- a/apps/web/lib/api/conversions/track-lead.ts
+++ b/apps/web/lib/api/conversions/track-lead.ts
@@ -327,6 +327,7 @@ export const trackLead = async ({
trigger: "partnerMetricsUpdated",
reason: "lead",
identity: {
+ workspaceId: workspace.id,
programId: link.programId,
partnerId: link.partnerId,
},
diff --git a/apps/web/lib/api/conversions/track-sale.ts b/apps/web/lib/api/conversions/track-sale.ts
index 9e124abe0a..f2c4e8c855 100644
--- a/apps/web/lib/api/conversions/track-sale.ts
+++ b/apps/web/lib/api/conversions/track-sale.ts
@@ -374,6 +374,7 @@ const _trackLead = async ({
trigger: "partnerMetricsUpdated",
reason: "lead",
identity: {
+ workspaceId: workspace.id,
programId: link.programId,
partnerId: link.partnerId,
},
@@ -567,6 +568,7 @@ const _trackSale = async ({
trigger: "partnerMetricsUpdated",
reason: "sale",
identity: {
+ workspaceId: workspace.id,
programId: link.programId,
partnerId: link.partnerId,
},
diff --git a/apps/web/lib/api/groups/move-partners-to-group.ts b/apps/web/lib/api/groups/move-partners-to-group.ts
index 4f902a5e19..c3a8590a6a 100644
--- a/apps/web/lib/api/groups/move-partners-to-group.ts
+++ b/apps/web/lib/api/groups/move-partners-to-group.ts
@@ -1,7 +1,7 @@
import { qstash } from "@/lib/cron";
import { recordLink } from "@/lib/tinybird";
import { prisma } from "@dub/prisma";
-import { PartnerGroup } from "@dub/prisma/client";
+import { PartnerGroup, WorkspaceRole } from "@dub/prisma/client";
import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
import { waitUntil } from "@vercel/functions";
import { buildProgramEnrollmentChangeSet } from "../activity-log/build-change-set";
@@ -10,6 +10,7 @@ import {
TrackActivityLogInput,
} from "../activity-log/track-activity-log";
import { triggerDraftBountySubmissionCreation } from "../bounties/trigger-draft-bounty-submissions";
+import { getWorkspaceUsers } from "../get-workspace-users";
import { includeProgramEnrollment } from "../links/include-program-enrollment";
import { includeTags } from "../links/include-tags";
import { notifyPartnerGroupChange } from "../partners/notify-partner-group-change";
@@ -18,7 +19,7 @@ interface MovePartnersToGroupParams {
workspaceId: string;
programId: string;
partnerIds: string[];
- userId: string;
+ userId: string | null;
group: Pick<
PartnerGroup,
| "id"
@@ -143,6 +144,21 @@ export async function movePartnersToGroup({
};
});
+ // If the userId is not provided, get the workspace user id from the workspace users
+ // userId will be null for workflow-initiated actions
+ let workspaceUserId = userId;
+
+ if (!workspaceUserId) {
+ const { users } = await getWorkspaceUsers({
+ programId,
+ role: WorkspaceRole.owner,
+ });
+
+ if (users.length > 0) {
+ workspaceUserId = users[0].id;
+ }
+ }
+
await Promise.allSettled([
qstash.publishJSON({
url: `${APP_DOMAIN_WITH_NGROK}/api/cron/groups/remap-default-links`,
@@ -150,7 +166,7 @@ export async function movePartnersToGroup({
programId,
groupId: group.id,
partnerIds,
- userId,
+ userId: workspaceUserId,
},
}),
diff --git a/apps/web/lib/api/partners/generate-partner-link.ts b/apps/web/lib/api/partners/generate-partner-link.ts
index df9441767f..0ec10eb21f 100644
--- a/apps/web/lib/api/partners/generate-partner-link.ts
+++ b/apps/web/lib/api/partners/generate-partner-link.ts
@@ -20,7 +20,7 @@ interface GeneratePartnerLinkInput {
key?: string;
partnerGroupDefaultLinkId?: string | null;
};
- userId: string;
+ userId?: string;
}
// Generates and processes a partner link without creating it
diff --git a/apps/web/lib/api/workflows/execute-move-group-workflow.ts b/apps/web/lib/api/workflows/execute-move-group-workflow.ts
index a5ecfd569e..ca7b2c9a86 100644
--- a/apps/web/lib/api/workflows/execute-move-group-workflow.ts
+++ b/apps/web/lib/api/workflows/execute-move-group-workflow.ts
@@ -2,8 +2,7 @@ import { WorkflowConditionAttribute, WorkflowContext } from "@/lib/types";
import { redis } from "@/lib/upstash/redis";
import { WORKFLOW_ACTION_TYPES } from "@/lib/zod/schemas/workflows";
import { prisma } from "@dub/prisma";
-import { Workflow, WorkspaceRole } from "@dub/prisma/client";
-import { getWorkspaceUsers } from "../get-workspace-users";
+import { Workflow } from "@dub/prisma/client";
import { movePartnersToGroup } from "../groups/move-partners-to-group";
import { evaluateWorkflowConditions } from "./evaluate-workflow-conditions";
import { parseWorkflowConfig } from "./parse-workflow-config";
@@ -25,7 +24,7 @@ export const executeMoveGroupWorkflow = async ({
}
const { identity, metrics } = context;
- const { programId, partnerId, groupId } = identity;
+ const { workspaceId, programId, partnerId, groupId } = identity;
if (!groupId) {
console.error("Partner groupId not set in the context. Skipping..");
@@ -97,16 +96,6 @@ export const executeMoveGroupWorkflow = async ({
return;
}
- const { id: workspaceId, users } = await getWorkspaceUsers({
- programId,
- role: WorkspaceRole.owner,
- });
-
- if (users.length === 0) {
- console.log("No owners found for the program. Skipping..");
- return;
- }
-
// Prevents duplicate moves when a workflow with matching conditions
// are triggered by the same partnerMetricsUpdated event.
const lockKey = `workflow:moveGroup:${programId}:${newGroupId}:${partnerId}`;
@@ -122,7 +111,7 @@ export const executeMoveGroupWorkflow = async ({
workspaceId,
programId,
partnerIds: [partnerId],
- userId: users[0].id,
+ userId: null,
group: newGroup,
});
} finally {
diff --git a/apps/web/lib/integrations/shopify/create-sale.ts b/apps/web/lib/integrations/shopify/create-sale.ts
index 3124f592b7..b06d39ad95 100644
--- a/apps/web/lib/integrations/shopify/create-sale.ts
+++ b/apps/web/lib/integrations/shopify/create-sale.ts
@@ -165,6 +165,7 @@ export async function createShopifySale({
trigger: "partnerMetricsUpdated",
reason: "sale",
identity: {
+ workspaceId: workspaceId,
programId: link.programId,
partnerId: link.partnerId,
},
diff --git a/apps/web/lib/partners/create-partner-commission.ts b/apps/web/lib/partners/create-partner-commission.ts
index 7c7f8c6e9c..573b0e7be8 100644
--- a/apps/web/lib/partners/create-partner-commission.ts
+++ b/apps/web/lib/partners/create-partner-commission.ts
@@ -380,6 +380,7 @@ export const createPartnerCommission = async ({
trigger: "partnerMetricsUpdated",
reason: "commission",
identity: {
+ workspaceId: workspace.id,
programId,
partnerId,
},
diff --git a/apps/web/lib/referrals/constants.ts b/apps/web/lib/referrals/constants.ts
index 771d32bdd0..78be10c5b5 100644
--- a/apps/web/lib/referrals/constants.ts
+++ b/apps/web/lib/referrals/constants.ts
@@ -1,3 +1,4 @@
+import { ActivityLogAction } from "@/lib/types";
import { textFieldSchema } from "@/lib/zod/schemas/referral-form";
import { ReferralStatus } from "@dub/prisma/client";
import { ACME_PROGRAM_ID } from "@dub/utils";
@@ -53,6 +54,19 @@ export const REFERRAL_ENABLED_PROGRAM_IDS = [
"prog_1KFZQJZRDRV62C037FQZSY0Y8", // FFG
];
+export const REFERRAL_STATUS_TO_ACTIVITY_ACTION: Record<
+ ReferralStatus,
+ ActivityLogAction
+> = {
+ [ReferralStatus.pending]: "referral.created",
+ [ReferralStatus.qualified]: "referral.qualified",
+ [ReferralStatus.meeting]: "referral.meeting",
+ [ReferralStatus.negotiation]: "referral.negotiation",
+ [ReferralStatus.unqualified]: "referral.unqualified",
+ [ReferralStatus.closedWon]: "referral.closedWon",
+ [ReferralStatus.closedLost]: "referral.closedLost",
+};
+
export const REFERRAL_STATUS_TRANSITIONS: Record<
ReferralStatus,
readonly ReferralStatus[]
diff --git a/apps/web/lib/swr/use-activity-logs.ts b/apps/web/lib/swr/use-activity-logs.ts
new file mode 100644
index 0000000000..56f1e919c0
--- /dev/null
+++ b/apps/web/lib/swr/use-activity-logs.ts
@@ -0,0 +1,42 @@
+import useWorkspace from "@/lib/swr/use-workspace";
+import { ActivityLog, GetActivityLogsQuery } from "@/lib/types";
+import { fetcher } from "@dub/utils";
+import useSWR from "swr";
+
+export function useActivityLogs({
+ query,
+ enabled = true,
+}: {
+ query?: GetActivityLogsQuery;
+ enabled?: boolean;
+} = {}) {
+ const { id: workspaceId } = useWorkspace();
+
+ const searchParams = query
+ ? new URLSearchParams({
+ workspaceId: workspaceId!,
+ resourceType: query.resourceType,
+ resourceId: query.resourceId,
+ ...(query.action && { action: query.action }),
+ }).toString()
+ : "";
+
+ const { data, error, isLoading, mutate } = useSWR<ActivityLog[]>(
+ enabled &&
+ workspaceId &&
+ query?.resourceType &&
+ query?.resourceId &&
+ `/api/activity-logs?${searchParams}`,
+ fetcher,
+ {
+ keepPreviousData: true,
+ },
+ );
+
+ return {
+ activityLogs: data,
+ error,
+ loading: isLoading,
+ mutate,
+ };
+}
diff --git a/apps/web/lib/types.ts b/apps/web/lib/types.ts
index 6f7e59098d..111364a344 100644
--- a/apps/web/lib/types.ts
+++ b/apps/web/lib/types.ts
@@ -36,6 +36,13 @@ import {
FOLDER_WORKSPACE_ACCESS,
} from "./folder/constants";
import { WEBHOOK_TRIGGER_DESCRIPTIONS } from "./webhook/constants";
+import {
+ activityLogActionSchema,
+ activityLogResourceTypeSchema,
+ activityLogSchema,
+ fieldDiffSchema,
+ getActivityLogsQuerySchema,
+} from "./zod/schemas/activity-log";
import {
BountyListSchema,
bountyPerformanceConditionSchema,
@@ -768,6 +775,7 @@ export type CreateFraudEventInput = Pick<
};
interface WorkflowIdentity {
+ workspaceId: string;
programId: string;
partnerId: string;
groupId?: string;
@@ -803,3 +811,22 @@ export type CustomerSource = (typeof CUSTOMER_SOURCES)[number];
export type ReferralWithCustomer = PartnerReferral & {
customer: Customer | null;
};
+
+export type GetActivityLogsQuery = z.infer<typeof getActivityLogsQuerySchema>;
+
+export type ActivityLogResourceType = z.infer<
+ typeof activityLogResourceTypeSchema
+>;
+
+export type ActivityLogAction = z.infer<typeof activityLogActionSchema>;
+
+export type FieldDiff = z.infer<typeof fieldDiffSchema>;
+
+export type ChangeSet = Record<string, FieldDiff>;
+
+export type ActivityLog = z.infer<typeof activityLogSchema>;
+
+export type ActivityLogResourceTypeWithFeed = Extract<
+ ActivityLogResourceType,
+ "partner" | "referral"
+>;
diff --git a/apps/web/lib/zod/schemas/activity-log.ts b/apps/web/lib/zod/schemas/activity-log.ts
index 6155934263..18d0897aa6 100644
--- a/apps/web/lib/zod/schemas/activity-log.ts
+++ b/apps/web/lib/zod/schemas/activity-log.ts
@@ -1,9 +1,13 @@
import * as z from "zod/v4";
import { UserSchema } from "./users";
-const activityLogResourceTypeSchema = z.enum(["referral", "partner", "reward"]);
+export const activityLogResourceTypeSchema = z.enum([
+ "referral",
+ "partner",
+ "reward",
+]);
-const activityLogActionSchema = z.enum([
+export const activityLogActionSchema = z.enum([
"referral.created",
"referral.updated",
"referral.qualified",
@@ -18,18 +22,13 @@ const activityLogActionSchema = z.enum([
"reward.deleted",
]);
-export type ActivityLogResourceType = z.infer<
- typeof activityLogResourceTypeSchema
->;
-
-export type ActivityLogAction = z.infer<typeof activityLogActionSchema>;
-
export const getActivityLogsQuerySchema = z.object({
resourceType: activityLogResourceTypeSchema,
resourceId: z.string(),
+ action: activityLogActionSchema.optional(),
});
-const fieldDiffSchema = z.object({
+export const fieldDiffSchema = z.object({
old: z.unknown().nullable(),
new: z.unknown().nullable(),
});
@@ -38,7 +37,7 @@ export const activityLogSchema = z.object({
id: z.string(),
action: activityLogActionSchema,
description: z.string().nullable(),
- changeSet: z.record(z.string(), fieldDiffSchema),
+ changeSet: z.record(z.string(), fieldDiffSchema).nullable(),
createdAt: z.date(),
- user: UserSchema,
+ user: UserSchema.nullable(),
});
diff --git a/apps/web/ui/activity-logs/action-renderers/partner-group-changed-renderer.tsx b/apps/web/ui/activity-logs/action-renderers/partner-group-changed-renderer.tsx
new file mode 100644
index 0000000000..422e822a0f
--- /dev/null
+++ b/apps/web/ui/activity-logs/action-renderers/partner-group-changed-renderer.tsx
@@ -0,0 +1,48 @@
+import useGroups from "@/lib/swr/use-groups";
+import { ActivityLog, GroupProps } from "@/lib/types";
+import { Bolt } from "@dub/ui";
+import { ReactNode } from "react";
+import { GroupPill, SourcePill, UserChip } from "../activity-entry-chips";
+
+interface GroupChangeSet {
+ old: Pick<GroupProps, "id" | "name">;
+ new: Pick<GroupProps, "id" | "name">;
+}
+
+function Label({ children }: { children: ReactNode }) {
+ return (
+ <span className="text-sm font-medium text-neutral-800">{children}</span>
+ );
+}
+
+export function PartnerGroupChangedRenderer({ log }: { log: ActivityLog }) {
+ const { groups } = useGroups();
+
+ const groupChange = log.changeSet?.group as GroupChangeSet | undefined;
+
+ if (!groupChange?.new) {
+ return <span>Group changed</span>;
+ }
+
+ const newGroup = groupChange.new;
+ const newGroupColor =
+ groups?.find((g) => g.id === newGroup.id)?.color ?? null;
+
+ return (
+ <>
+ <Label>Moved to</Label>
+ <GroupPill name={newGroup.name} color={newGroupColor} />
+ {log.user ? (
+ <>
+ <Label>by</Label>
+ <UserChip user={log.user} />
+ </>
+ ) : (
+ <>
+ <Label>automatically by</Label>
+ <SourcePill icon={<Bolt className="size-3" />} label="Group move" />
+ </>
+ )}
+ </>
+ );
+}
diff --git a/apps/web/ui/activity-logs/action-renderers/referral-created-renderer.tsx b/apps/web/ui/activity-logs/action-renderers/referral-created-renderer.tsx
new file mode 100644
index 0000000000..a0590cb44c
--- /dev/null
+++ b/apps/web/ui/activity-logs/action-renderers/referral-created-renderer.tsx
@@ -0,0 +1,26 @@
+"use client";
+
+import { ActivityLog } from "@/lib/types";
+import { FilePen } from "@dub/ui";
+import { ReactNode } from "react";
+import { ActorChip, SourcePill } from "../activity-entry-chips";
+
+function Label({ children }: { children: ReactNode }) {
+ return (
+ <span className="text-sm font-medium text-neutral-800">{children}</span>
+ );
+}
+
+export function ReferralCreatedRenderer({ log }: { log: ActivityLog }) {
+ return (
+ <>
+ <Label>Submitted by</Label>
+ <ActorChip log={log} />
+ <Label>via</Label>
+ <SourcePill
+ icon={<FilePen className="size-4 text-black" />}
+ label="Submission form"
+ />
+ </>
+ );
+}
diff --git a/apps/web/ui/activity-logs/action-renderers/referral-status-changed-renderer.tsx b/apps/web/ui/activity-logs/action-renderers/referral-status-changed-renderer.tsx
new file mode 100644
index 0000000000..ae21fd3591
--- /dev/null
+++ b/apps/web/ui/activity-logs/action-renderers/referral-status-changed-renderer.tsx
@@ -0,0 +1,35 @@
+"use client";
+
+import { ActivityLog } from "@/lib/types";
+import { ReferralStatus } from "@dub/prisma/client";
+import { ReactNode } from "react";
+import { ActorChip, ReferralStatusPill } from "../activity-entry-chips";
+
+interface StatusChangeSet {
+ old: ReferralStatus | null;
+ new: ReferralStatus | null;
+}
+
+function Label({ children }: { children: ReactNode }) {
+ return (
+ <span className="text-sm font-medium text-neutral-800">{children}</span>
+ );
+}
+
+export function ReferralStatusChangedRenderer({ log }: { log: ActivityLog }) {
+ const statusChange = log.changeSet?.status as StatusChangeSet | undefined;
+ const status = statusChange?.new ?? null;
+
+ if (!status) {
+ return <span>Lead status updated</span>;
+ }
+
+ return (
+ <>
+ <Label>Lead</Label>
+ <ReferralStatusPill status={status} />
+ <Label>by</Label>
+ <ActorChip log={log} />
+ </>
+ );
+}
diff --git a/apps/web/ui/activity-logs/activity-entry-chips.tsx b/apps/web/ui/activity-logs/activity-entry-chips.tsx
new file mode 100644
index 0000000000..a2aa2f66c6
--- /dev/null
+++ b/apps/web/ui/activity-logs/activity-entry-chips.tsx
@@ -0,0 +1,109 @@
+import { ActivityLog, GroupProps } from "@/lib/types";
+import { getResourceColorData, RAINBOW_CONIC_GRADIENT } from "@/ui/colors";
+import { ReferralStatusBadges } from "@/ui/referrals/referral-status-badges";
+import { ReferralStatus } from "@dub/prisma/client";
+import { Bolt } from "@dub/ui";
+import { cn, OG_AVATAR_URL } from "@dub/utils";
+import { ReactNode } from "react";
+import { getActorType } from "./activity-log-registry";
+interface ActivityChipProps {
+ children: ReactNode;
+ className?: string;
+}
+
+interface GroupPillProps extends Pick<GroupProps, "name" | "color"> {}
+
+interface SourcePillProps {
+ icon?: ReactNode;
+ label: string;
+}
+
+interface UserChipProps {
+ user: NonNullable<ActivityLog["user"]>;
+}
+
+interface ActorChipProps {
+ log: ActivityLog;
+}
+
+function ActivityChip({ children, className }: ActivityChipProps) {
+ return (
+ <span
+ className={cn(
+ "inline-flex items-center gap-2 rounded-lg bg-neutral-100 px-2 py-1 text-sm font-medium text-neutral-700",
+ className,
+ )}
+ >
+ {children}
+ </span>
+ );
+}
+
+export function GroupPill({ name, color }: GroupPillProps) {
+ const colorClassName = color
+ ? getResourceColorData(color)?.groupVariants
+ : undefined;
+
+ return (
+ <ActivityChip>
+ <span
+ className={cn("size-2.5 shrink-0 rounded-full", colorClassName)}
+ {...(!colorClassName && {
+ style: {
+ background: RAINBOW_CONIC_GRADIENT,
+ },
+ })}
+ />
+ {name}
+ </ActivityChip>
+ );
+}
+
+export function SourcePill({ icon, label }: SourcePillProps) {
+ return (
+ <ActivityChip>
+ {icon}
+ {label}
+ </ActivityChip>
+ );
+}
+
+export function UserChip({ user }: UserChipProps) {
+ return (
+ <ActivityChip>
+ <img
+ src={user.image || `${OG_AVATAR_URL}${user.id}`}
+ alt={`${user.name || user.email || "User"}`}
+ className="size-4 shrink-0 rounded-full"
+ />
+ {user.name || user.email || "Unknown user"}
+ </ActivityChip>
+ );
+}
+
+export function SystemChip() {
+ return (
+ <ActivityChip>
+ <Bolt className="size-3 text-neutral-500" />
+ System
+ </ActivityChip>
+ );
+}
+
+export function ActorChip({ log }: ActorChipProps) {
+ const actorType = getActorType(log);
+
+ if (actorType === "USER" && log.user) {
+ return <UserChip user={log.user} />;
+ }
+
+ return <SystemChip />;
+}
+
+export function ReferralStatusPill({ status }: { status: ReferralStatus }) {
+ const badge = ReferralStatusBadges[status];
+
+ if (!badge) return null;
+
+ return <ActivityChip className={badge.className}>{badge.label}</ActivityChip>;
+}
diff --git a/apps/web/ui/activity-logs/activity-feed.tsx b/apps/web/ui/activity-logs/activity-feed.tsx
new file mode 100644
index 0000000000..ee7429c44c
--- /dev/null
+++ b/apps/web/ui/activity-logs/activity-feed.tsx
@@ -0,0 +1,61 @@
+import { ActivityLog, ActivityLogResourceTypeWithFeed } from "@/lib/types";
+import { PartnerGroupActivityItem } from "@/ui/activity-logs/partner-group-activity-item";
+import { ReferralActivityItem } from "@/ui/activity-logs/referral-activity-item";
+import { ComponentType } from "react";
+
+const ACTIVITY_ITEM_MAP: Record<
+ ActivityLogResourceTypeWithFeed,
+ ComponentType<{ log: ActivityLog; isLast?: boolean }>
+> = {
+ partner: PartnerGroupActivityItem,
+ referral: ReferralActivityItem,
+};
+
+interface ActivityFeedProps {
+ logs: ActivityLog[];
+ resourceType: ActivityLogResourceTypeWithFeed;
+}
+
+export function ActivityFeed({ logs, resourceType }: ActivityFeedProps) {
+ if (!logs || logs.length === 0) {
+ return null;
+ }
+
+ const ActivityItemComponent = ACTIVITY_ITEM_MAP[resourceType];
+
+ return (
+ <ul className="flex min-w-0 flex-col" role="list">
+ {logs.map((log, index) => (
+ <ActivityItemComponent
+ key={log.id}
+ log={log}
+ isLast={index === logs.length - 1}
+ />
+ ))}
+ </ul>
+ );
+}
+
+export function ActivityFeedSkeleton({ count = 3 }: { count?: number }) {
+ return (
+ <ul className="flex min-w-0 flex-col" role="list">
+ {Array.from({ length: count }).map((_, i) => (
+ <li key={i} className="relative flex min-w-0 gap-3">
+ {i < count - 1 && (
+ <div
+ className="absolute left-[11px] top-6 h-[calc(100%-8px)] w-px bg-neutral-200"
+ aria-hidden="true"
+ />
+ )}
+ <div className="flex size-6 shrink-0 items-center justify-center">
+ <div className="size-5 animate-pulse rounded-full bg-neutral-200" />
+ </div>
+ <div className="flex min-w-0 flex-1 flex-col gap-1 pb-6">
+ <div className="h-5 w-3/4 animate-pulse rounded bg-neutral-200" />
+ <div className="h-4 w-24 animate-pulse rounded bg-neutral-200" />
+ </div>
+ </li>
+ ))}
+ </ul>
+ );
+}
diff --git a/apps/web/ui/activity-logs/activity-log-description.tsx b/apps/web/ui/activity-logs/activity-log-description.tsx
new file mode 100644
index 0000000000..1d1e301b9d
--- /dev/null
+++ b/apps/web/ui/activity-logs/activity-log-description.tsx
@@ -0,0 +1,36 @@
+import { ActivityLog } from "@/lib/types";
+import { OG_AVATAR_URL, timeAgo } from "@dub/utils";
+
+interface ActivityLogDescriptionProps {
+ log: ActivityLog;
+}
+
+export function ActivityLogDescription({ log }: ActivityLogDescriptionProps) {
+ const { user, description, createdAt } = log;
+
+ return (
+ <div className="mt-2 rounded-xl border border-neutral-200 px-4 py-3">
+ <div className="flex items-center gap-1.5 text-xs">
+ {user && (
+ <>
+ <img
+ src={user.image || `${OG_AVATAR_URL}${user.id}`}
+ alt={user.name || ""}
+ className="size-4 shrink-0 rounded-full"
+ />
+ <span className="text-content-default font-semibold">
+ {user.name || user.email || "Unknown user"}
+ </span>
+ <span className="text-content-muted">·</span>
+ </>
+ )}
+ <span className="text-content-subtle font-normal">
+ {timeAgo(createdAt, { withAgo: true })}
+ </span>
+ </div>
+ {description && (
+ <p className="text-content-subtle mt-2 text-sm">{description}</p>
+ )}
+ </div>
+ );
+}
diff --git a/apps/web/ui/activity-logs/activity-log-registry.tsx b/apps/web/ui/activity-logs/activity-log-registry.tsx
new file mode 100644
index 0000000000..98cf80e90a
--- /dev/null
+++ b/apps/web/ui/activity-logs/activity-log-registry.tsx
@@ -0,0 +1,74 @@
+import { ActivityLog, ActivityLogAction } from "@/lib/types";
+import { CircleInfo, FileSend, UserArrowRight, UserClock } from "@dub/ui";
+import { ComponentType, ReactNode } from "react";
+import { PartnerGroupChangedRenderer } from "./action-renderers/partner-group-changed-renderer";
+import { ReferralCreatedRenderer } from "./action-renderers/referral-created-renderer";
+import { ReferralStatusChangedRenderer } from "./action-renderers/referral-status-changed-renderer";
+
+export type ActorType = "USER" | "SYSTEM";
+
+type ActivityLogRenderer = (props: { log: ActivityLog }) => ReactNode;
+
+export function getActorType(log: ActivityLog): ActorType {
+ return log.user ? "USER" : "SYSTEM";
+}
+
+const ACTIVITY_LOG_ICONS: Partial<
+ Record<ActivityLogAction, ComponentType<{ className?: string }>>
+> = {
+ "partner.groupChanged": UserArrowRight,
+ "referral.created": FileSend,
+ "referral.qualified": UserClock,
+ "referral.meeting": UserClock,
+ "referral.negotiation": UserClock,
+ "referral.unqualified": UserClock,
+ "referral.closedWon": UserClock,
+ "referral.closedLost": UserClock,
+};
+
+const ACTIVITY_LOG_REGISTRY: Array<{
+ action: ActivityLogAction;
+ renderer: ActivityLogRenderer;
+}> = [
+ {
+ action: "partner.groupChanged",
+ renderer: PartnerGroupChangedRenderer,
+ },
+ {
+ action: "referral.created",
+ renderer: ReferralCreatedRenderer,
+ },
+ ...(
+ [
+ "referral.qualified",
+ "referral.meeting",
+ "referral.negotiation",
+ "referral.unqualified",
+ "referral.closedWon",
+ "referral.closedLost",
+ ] as const
+ ).map((action) => ({
+ action,
+ renderer: ReferralStatusChangedRenderer,
+ })),
+];
+
+const renderers = new Map(
+ ACTIVITY_LOG_REGISTRY.map(({ action, renderer }) => [action, renderer]),
+);
+
+export function getActivityLogRenderer(
+ action: ActivityLogAction,
+): ActivityLogRenderer | null {
+ return renderers.get(action) ?? null;
+}
+
+export function getActivityLogIcon(log: ActivityLog): ReactNode {
+ const Icon = ACTIVITY_LOG_ICONS[log.action];
+
+ if (Icon) {
+ return <Icon className="size-4 text-neutral-600" />;
+ }
+
+ return <CircleInfo className="size-4 text-neutral-400" />;
+}
diff --git a/apps/web/ui/activity-logs/partner-group-activity-item.tsx b/apps/web/ui/activity-logs/partner-group-activity-item.tsx
new file mode 100644
index 0000000000..d27300be71
--- /dev/null
+++ b/apps/web/ui/activity-logs/partner-group-activity-item.tsx
@@ -0,0 +1,55 @@
+import { ActivityLog } from "@/lib/types";
+import { formatDate } from "@dub/utils";
+import {
+ getActivityLogIcon,
+ getActivityLogRenderer,
+} from "./activity-log-registry";
+
+interface PartnerGroupActivityItemProps {
+ log: ActivityLog;
+ isLast?: boolean;
+}
+
+export function PartnerGroupActivityItem({
+ log,
+ isLast = false,
+}: PartnerGroupActivityItemProps) {
+ const icon = getActivityLogIcon(log);
+ const Renderer = getActivityLogRenderer(log.action);
+
+ if (!Renderer) {
+ return null;
+ }
+
+ return (
+ <li className="relative flex min-w-0 gap-3">
+ {!isLast && (
+ <div
+ className="absolute left-[11px] top-6 h-[calc(100%-8px)] w-px bg-neutral-200"
+ aria-hidden="true"
+ />
+ )}
+
+ <div
+ className="flex size-6 shrink-0 items-center justify-center text-neutral-500"
+ aria-hidden="true"
+ >
+ {icon}
+ </div>
+
+ <div className="flex min-w-0 flex-1 flex-col gap-1 overflow-hidden pb-6">
+ <div className="flex min-w-0 flex-wrap items-center gap-1.5 text-sm text-neutral-700">
+ <Renderer log={log} />
+ </div>
+ <time className="text-xs text-neutral-500">
+ {formatDate(log.createdAt, {
+ month: "short",
+ year: "numeric",
+ hour: "numeric",
+ minute: "2-digit",
+ })}
+ </time>
+ </div>
+ </li>
+ );
+}
diff --git a/apps/web/ui/activity-logs/partner-group-activity-section.tsx b/apps/web/ui/activity-logs/partner-group-activity-section.tsx
new file mode 100644
index 0000000000..83bebab1ec
--- /dev/null
+++ b/apps/web/ui/activity-logs/partner-group-activity-section.tsx
@@ -0,0 +1,46 @@
+"use client";
+
+import { useActivityLogs } from "@/lib/swr/use-activity-logs";
+import {
+ ActivityFeed,
+ ActivityFeedSkeleton,
+} from "@/ui/activity-logs/activity-feed";
+
+export function PartnerGroupActivitySection({
+ partnerId,
+}: {
+ partnerId: string;
+}) {
+ const { activityLogs, loading, error } = useActivityLogs({
+ query: {
+ resourceType: "partner",
+ resourceId: partnerId,
+ action: "partner.groupChanged",
+ },
+ enabled: !!partnerId,
+ });
+
+ if (loading) {
+ return <ActivityFeedSkeleton count={3} />;
+ }
+
+ if (error) {
+ return (
+ <div className="flex flex-col items-center justify-center py-8 text-center">
+ <p className="text-sm text-neutral-500">
+ Failed to load history. Please try again.
+ </p>
+ </div>
+ );
+ }
+
+ if (!activityLogs || activityLogs.length === 0) {
+ return (
+ <div className="flex flex-col items-center justify-center py-8 text-center">
+ <p className="text-sm text-neutral-500">No group history yet</p>
+ </div>
+ );
+ }
+
+ return <ActivityFeed logs={activityLogs} resourceType="partner" />;
+}
diff --git a/apps/web/ui/activity-logs/partner-group-history-sheet.tsx b/apps/web/ui/activity-logs/partner-group-history-sheet.tsx
new file mode 100644
index 0000000000..c3c3dfbee1
--- /dev/null
+++ b/apps/web/ui/activity-logs/partner-group-history-sheet.tsx
@@ -0,0 +1,81 @@
+"use client";
+
+import { useActivityLogs } from "@/lib/swr/use-activity-logs";
+import { EnrolledPartnerExtendedProps } from "@/lib/types";
+import { PartnerGroupActivitySection } from "@/ui/activity-logs/partner-group-activity-section";
+import { X } from "@/ui/shared/icons";
+import { Button, Sheet } from "@dub/ui";
+import { Dispatch, SetStateAction, useState } from "react";
+
+interface PartnerGroupHistorySheetProps {
+ partner: Pick<EnrolledPartnerExtendedProps, "id">;
+ isOpen: boolean;
+ setIsOpen: Dispatch<SetStateAction<boolean>>;
+}
+
+function PartnerGroupHistorySheetContent({
+ partner,
+}: Omit<PartnerGroupHistorySheetProps, "isOpen">) {
+ return (
+ <div className="flex size-full flex-col">
+ <div className="flex h-16 shrink-0 items-center justify-between border-b border-neutral-200 px-6 py-4">
+ <Sheet.Title className="text-lg font-semibold">
+ Partner group history
+ </Sheet.Title>
+ <Sheet.Close asChild>
+ <Button
+ variant="outline"
+ icon={<X className="size-5" />}
+ className="h-auto w-fit p-1"
+ />
+ </Sheet.Close>
+ </div>
+
+ <div className="scrollbar-hide flex min-h-0 flex-1 flex-col overflow-y-auto p-4 sm:p-6">
+ <PartnerGroupActivitySection partnerId={partner.id} />
+ </div>
+ </div>
+ );
+}
+
+export function PartnerGroupHistorySheet({
+ isOpen,
+ ...rest
+}: PartnerGroupHistorySheetProps) {
+ return (
+ <Sheet open={isOpen} onOpenChange={rest.setIsOpen}>
+ <PartnerGroupHistorySheetContent {...rest} />
+ </Sheet>
+ );
+}
+
+export function usePartnerGroupHistorySheet({
+ partner,
+}: {
+ partner: Pick<EnrolledPartnerExtendedProps, "id"> | null;
+}) {
+ const [isOpen, setIsOpen] = useState(false);
+
+ const { activityLogs } = useActivityLogs({
+ query: partner
+ ? {
+ resourceType: "partner",
+ resourceId: partner.id,
+ action: "partner.groupChanged",
+ }
+ : undefined,
+ enabled: !!partner?.id,
+ });
+
+ return {
+ hasActivityLogs: (activityLogs?.length ?? 0) > 0,
+ partnerGroupHistorySheet: partner ? (
+ <PartnerGroupHistorySheet
+ partner={partner}
+ isOpen={isOpen}
+ setIsOpen={setIsOpen}
+ />
+ ) : null,
+ setIsOpen,
+ };
+}
diff --git a/apps/web/ui/activity-logs/referral-activity-item.tsx b/apps/web/ui/activity-logs/referral-activity-item.tsx
new file mode 100644
index 0000000000..a0b4340696
--- /dev/null
+++ b/apps/web/ui/activity-logs/referral-activity-item.tsx
@@ -0,0 +1,59 @@
+import { ActivityLog } from "@/lib/types";
+import { formatDate } from "@dub/utils";
+import { ActivityLogDescription } from "./activity-log-description";
+import {
+ getActivityLogIcon,
+ getActivityLogRenderer,
+} from "./activity-log-registry";
+
+interface ReferralActivityItemProps {
+ log: ActivityLog;
+ isLast?: boolean;
+}
+
+export function ReferralActivityItem({
+ log,
+ isLast = false,
+}: ReferralActivityItemProps) {
+ const icon = getActivityLogIcon(log);
+ const Renderer = getActivityLogRenderer(log.action);
+
+ if (!Renderer) {
+ return null;
+ }
+
+ return (
+ <li className="relative flex min-w-0 gap-3">
+ {!isLast && (
+ <div
+ className="absolute left-[11px] top-6 h-[calc(100%-8px)] w-px bg-neutral-200"
+ aria-hidden="true"
+ />
+ )}
+
+ <div
+ className="flex size-6 shrink-0 items-center justify-center text-neutral-500"
+ aria-hidden="true"
+ >
+ {icon}
+ </div>
+
+ <div className="flex min-w-0 flex-1 flex-col gap-2 overflow-hidden pb-6">
+ <div className="flex min-w-0 items-center justify-between gap-3 text-sm text-neutral-700">
+ <span className="flex min-w-0 flex-1 flex-wrap items-center gap-2 overflow-hidden">
+ <Renderer log={log} />
+ </span>
+ <time className="hidden shrink-0 text-xs text-neutral-500 sm:block">
+ {formatDate(log.createdAt, {
+ month: "short",
+ year: "numeric",
+ hour: "numeric",
+ minute: "2-digit",
+ })}
+ </time>
+ </div>
+ {log.description && <ActivityLogDescription log={log} />}
+ </div>
+ </li>
+ );
+}
diff --git a/apps/web/ui/activity-logs/referral-activity-section.tsx b/apps/web/ui/activity-logs/referral-activity-section.tsx
new file mode 100644
index 0000000000..c7c3f56f04
--- /dev/null
+++ b/apps/web/ui/activity-logs/referral-activity-section.tsx
@@ -0,0 +1,47 @@
+"use client";
+
+import { useActivityLogs } from "@/lib/swr/use-activity-logs";
+import {
+ ActivityFeed,
+ ActivityFeedSkeleton,
+} from "@/ui/activity-logs/activity-feed";
+
+export function ReferralActivitySection({
+ referralId,
+}: {
+ referralId: string;
+}) {
+ const { activityLogs, loading, error } = useActivityLogs({
+ query: {
+ resourceType: "referral",
+ resourceId: referralId,
+ },
+ enabled: !!referralId,
+ });
+
+ const logs = activityLogs ?? [];
+
+ if (logs.length === 0 && !loading && !error) {
+ return null;
+ }
+
+ return (
+ <section className="order-3 col-span-full flex flex-col gap-3 px-1">
+ {!loading && (
+ <h3 className="text-content-emphasis text-base font-semibold">
+ Activity
+ </h3>
+ )}
+
+ {loading ? (
+ <ActivityFeedSkeleton count={3} />
+ ) : error ? (
+ <p className="text-sm text-neutral-500">
+ Failed to load activity. Please try again.
+ </p>
+ ) : (
+ <ActivityFeed logs={logs} resourceType="referral" />
+ )}
+ </section>
+ );
+}
diff --git a/apps/web/ui/modals/confirm-referral-status-change-modal.tsx b/apps/web/ui/modals/confirm-referral-status-change-modal.tsx
index d310395196..4545778aa9 100644
--- a/apps/web/ui/modals/confirm-referral-status-change-modal.tsx
+++ b/apps/web/ui/modals/confirm-referral-status-change-modal.tsx
@@ -94,7 +94,10 @@ function ConfirmReferralStatusChangeModal({
onSuccess: async () => {
setShowModal(false);
toast.success("Referral status updated successfully!");
- await mutatePrefix(`/api/programs/${defaultProgramId}/referrals`);
+ await mutatePrefix([
+ `/api/programs/${defaultProgramId}/referrals`,
+ "/api/activity-logs",
+ ]);
},
onError({ error }) {
toast.error(error.serverError || "Failed to update referral status");
diff --git a/apps/web/ui/partners/groups/design/lander/modals/earnings-calculator-block-modal.tsx b/apps/web/ui/partners/groups/design/lander/modals/earnings-calculator-block-modal.tsx
index 6fa12ff8ad..85d85c73b9 100644
--- a/apps/web/ui/partners/groups/design/lander/modals/earnings-calculator-block-modal.tsx
+++ b/apps/web/ui/partners/groups/design/lander/modals/earnings-calculator-block-modal.tsx
@@ -13,8 +13,8 @@ import {
import { cn } from "@dub/utils";
import Link from "next/link";
import { Dispatch, SetStateAction, useId, useRef } from "react";
-import { Controller, useForm, useWatch } from "react-hook-form";
import type { Control } from "react-hook-form";
+import { Controller, useForm, useWatch } from "react-hook-form";
import * as z from "zod/v4";
import { EarningsCalculatorBlock } from "../../../../lander/blocks/earnings-calculator-block";
diff --git a/apps/web/ui/partners/partner-info-cards.tsx b/apps/web/ui/partners/partner-info-cards.tsx
index 8045e4fdce..d8203e5993 100644
--- a/apps/web/ui/partners/partner-info-cards.tsx
+++ b/apps/web/ui/partners/partner-info-cards.tsx
@@ -8,7 +8,9 @@ import {
} from "@/lib/types";
import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
import { INACTIVE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";
+import { usePartnerGroupHistorySheet } from "@/ui/activity-logs/partner-group-history-sheet";
import {
+ Button,
CalendarIcon,
ChartActivity2,
CopyButton,
@@ -80,6 +82,12 @@ export function PartnerInfoCards({
const isEnrolled = type === "enrolled" || type === undefined;
const isNetwork = type === "network";
+ const {
+ partnerGroupHistorySheet,
+ setIsOpen: setGroupHistoryOpen,
+ hasActivityLogs,
+ } = usePartnerGroupHistorySheet({ partner: partner || null });
+
const { group } = useGroup(
{
groupIdOrSlug: partner
@@ -295,10 +303,23 @@ export function PartnerInfoCards({
{/* Group */}
<div className="flex flex-col gap-2">
{isEnrolled && (
- <h3 className="text-content-emphasis text-sm font-semibold">
- Group
- </h3>
+ <div className="flex min-h-7 items-center justify-between">
+ <h3 className="text-content-emphasis text-sm font-semibold">
+ Group
+ </h3>
+
+ {hasActivityLogs && (
+ <Button
+ variant="outline"
+ text="View history"
+ className="h-7 w-fit rounded-lg px-1.5 text-xs font-medium text-neutral-400"
+ onClick={() => setGroupHistoryOpen(true)}
+ />
+ )}
+ </div>
)}
+
+ {partnerGroupHistorySheet}
{partner ? (
<PartnerInfoGroup
partner={partner}
diff --git a/apps/web/ui/referrals/partner-referral-sheet.tsx b/apps/web/ui/referrals/partner-referral-sheet.tsx
index ed376390f0..e5c12e31ca 100644
--- a/apps/web/ui/referrals/partner-referral-sheet.tsx
+++ b/apps/web/ui/referrals/partner-referral-sheet.tsx
@@ -11,6 +11,7 @@ import {
useRouterStuff,
} from "@dub/ui";
import { Dispatch, SetStateAction, useState } from "react";
+import { ReferralActivitySection } from "../activity-logs/referral-activity-section";
import { ReferralDetails } from "./referral-details";
import { ReferralLeadDetails } from "./referral-lead-details";
import { ReferralPartnerDetails } from "./referral-partner-details";
@@ -122,7 +123,10 @@ function ReferralSheetContent({
<div className="@3xl/sheet:grid-cols-[minmax(440px,1fr)_minmax(0,360px)] scrollbar-hide grid min-h-0 grow grid-cols-1 gap-x-6 gap-y-4 overflow-y-auto p-4 sm:p-6">
{/* Left side - Referral details */}
- <ReferralDetails referral={{ formData: referral.formData }} />
+ <div className="flex flex-col gap-6">
+ <ReferralDetails referral={{ formData: referral.formData }} />
+ <ReferralActivitySection referralId={referral.id} />
+ </div>
{/* Right side - Two cards */}
<div className="@3xl/sheet:order-2 flex flex-col gap-4">
diff --git a/packages/prisma/schema/activity.prisma b/packages/prisma/schema/activity.prisma
index 445ab03ae0..c0637d9a24 100644
--- a/packages/prisma/schema/activity.prisma
+++ b/packages/prisma/schema/activity.prisma
@@ -4,13 +4,13 @@ model ActivityLog {
programId String
resourceType String
resourceId String
- userId String
+ userId String?
action String
description String? @db.Text
changeSet Json?
createdAt DateTime @default(now())
- user User @relation(fields: [userId], references: [id])
+ user User? @relation(fields: [userId], references: [id])
@@index([resourceType, resourceId])
}
diff --git a/packages/ui/src/icons/file-pen.tsx b/packages/ui/src/icons/file-pen.tsx
new file mode 100644
index 0000000000..a76710489a
--- /dev/null
+++ b/packages/ui/src/icons/file-pen.tsx
@@ -0,0 +1,28 @@
+import { SVGProps } from "react";
+
+export function FilePen(props: SVGProps<SVGSVGElement>) {
+ return (
+ <svg
+ fill="none"
+ viewBox="0 0 16 16"
+ stroke="currentColor"
+ strokeLinecap="round"
+ strokeLinejoin="round"
+ strokeWidth="1.5"
+ {...props}
+ >
+ <g clipPath="url(#clip0_file_pen)">
+ <path d="M5.11133 6H6.88911" />
+ <path d="M5.11133 8.66602H9.11133" />
+ <path d="M13.4757 5.55386H10.4446C9.95389 5.55386 9.55566 5.15563 9.55566 4.66497V1.64453" />
+ <path d="M13.5554 7.14634V5.92279C13.5554 5.68714 13.4621 5.46056 13.295 5.29434L9.81589 1.81513C9.64878 1.64802 9.423 1.55469 9.18745 1.55469H4.22211C3.23989 1.55469 2.44434 2.35113 2.44434 3.33247V12.6658C2.44434 13.6471 3.23989 14.4436 4.22211 14.4436H7.2582" />
+ <path d="M12.2625 14.6254L15.0725 11.8155C15.4196 11.4683 15.4196 10.9055 15.0725 10.5584L14.5517 10.0377C14.2046 9.69057 13.6418 9.69057 13.2947 10.0377L10.4847 12.8476L9.77734 15.3329L12.2625 14.6254Z" />
+ </g>
+ <defs>
+ <clipPath id="clip0_file_pen">
+ <rect width="16" height="16" fill="white" />
+ </clipPath>
+ </defs>
+ </svg>
+ );
+}
diff --git a/packages/ui/src/icons/file-send.tsx b/packages/ui/src/icons/file-send.tsx
new file mode 100644
index 0000000000..b84ee425f2
--- /dev/null
+++ b/packages/ui/src/icons/file-send.tsx
@@ -0,0 +1,22 @@
+import { SVGProps } from "react";
+
+export function FileSend(props: SVGProps<SVGSVGElement>) {
+ return (
+ <svg
+ fill="none"
+ viewBox="0 0 18 18"
+ stroke="currentColor"
+ strokeLinecap="round"
+ strokeLinejoin="round"
+ strokeWidth="1.5"
+ {...props}
+ >
+ <path d="M5.75 6.75H7.75" />
+ <path d="M5.75 9.75H10.25" />
+ <path d="M15.16 6.24955H11.75C11.198 6.24955 10.75 5.80155 10.75 5.24955V1.85156" />
+ <path d="M14.75 11.25L17.25 13.75L14.75 16.25" />
+ <path d="M15.25 8.2979V6.66409C15.25 6.39899 15.145 6.14411 14.957 5.95711L11.043 2.043C10.855 1.855 10.601 1.75 10.336 1.75H4.75C3.645 1.75 2.75 2.646 2.75 3.75V14.25C2.75 15.354 3.645 16.25 4.75 16.25H10.6262" />
+ <path d="M17 13.75H12.25" />
+ </svg>
+ );
+}
diff --git a/packages/ui/src/icons/index.tsx b/packages/ui/src/icons/index.tsx
index 5fd69d723d..2f8357b569 100644
--- a/packages/ui/src/icons/index.tsx
+++ b/packages/ui/src/icons/index.tsx
@@ -14,6 +14,8 @@ export * from "./dub-links";
export * from "./dub-partners";
export * from "./dub-product-icon";
export * from "./expanding-arrow";
+export * from "./file-pen";
+export * from "./file-send";
export * from "./ios-app-store";
export * from "./lock-small";
export * from "./magic";
@@ -23,6 +25,7 @@ export * from "./photo";
export * from "./sort-order";
export * from "./success";
export * from "./tick";
+export * from "./user-clock";
// loaders
export * from "./loading-circle";
diff --git a/packages/ui/src/icons/user-clock.tsx b/packages/ui/src/icons/user-clock.tsx
new file mode 100644
index 0000000000..04742aa1e0
--- /dev/null
+++ b/packages/ui/src/icons/user-clock.tsx
@@ -0,0 +1,33 @@
+import { SVGProps } from "react";
+
+export function UserClock(props: SVGProps<SVGSVGElement>) {
+ return (
+ <svg
+ width={18}
+ height={18}
+ viewBox="0 0 18 18"
+ fill="none"
+ xmlns="http://www.w3.org/2000/svg"
+ {...props}
+ >
+ <path
+ d="M9 7.25C10.519 7.25 11.75 6.019 11.75 4.5C11.75 2.981 10.519 1.75 9 1.75C7.481 1.75 6.25 2.981 6.25 4.5C6.25 6.019 7.481 7.25 9 7.25Z"
+ stroke="#525252"
+ strokeWidth={1.5}
+ strokeLinecap="round"
+ strokeLinejoin="round"
+ />
+ <path
+ d="M9.39805 9.7856C9.26475 9.7758 9.13625 9.75 9.00035 9.75C6.44935 9.75 4.26135 11.28 3.29135 13.47C2.92635 14.295 3.37835 15.2439 4.23835 15.5149C5.27485 15.8423 6.61564 16.1218 8.15934 16.2041"
+ stroke="#525252"
+ strokeWidth={1.5}
+ strokeLinecap="round"
+ strokeLinejoin="round"
+ />
+ <path
+ d="M14 10C11.7939 10 10 11.7944 10 14C10 16.2056 11.7939 18 14 18C16.2061 18 18 16.2056 18 14C18 11.7944 16.2061 10 14 10ZM16.3125 14.9502C16.1934 15.2398 15.9141 15.415 15.6191 15.415C15.5234 15.415 15.4277 15.3969 15.3339 15.3588L13.7148 14.6938C13.4336 14.5781 13.25 14.3042 13.25 14V12.25C13.25 11.8359 13.5859 11.5 14 11.5C14.4141 11.5 14.75 11.8359 14.75 12.25V13.4971L15.9043 13.9712C16.2871 14.1284 16.4707 14.5669 16.3125 14.9502Z"
+ fill="#525252"
+ />
+ </svg>
+ );
+}