The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Enhance activity log handling for rewards by adding support for parent resource IDs and new reward event types. Update related components to utilize dynamic resource types for improved logging accuracy.
Kiran K71bf442076f4
diff --git a/apps/web/app/api/activity-logs/route.ts b/apps/web/app/api/activity-logs/route.tsindex 3c074eb8c8..4781b3e7be 100644--- a/apps/web/app/api/activity-logs/route.ts+++ b/apps/web/app/api/activity-logs/route.ts@@ -10,7 +10,7 @@ import * as z from "zod/v4";// GET /api/activity-logs – get activity logs for a resourceexport const GET = withWorkspace(async ({ workspace, searchParams }) => {- const { resourceType, resourceId, action } =+ const { resourceType, resourceId, parentResourceId, action } =getActivityLogsQuerySchema.parse(searchParams);const programId = getDefaultProgramIdOrThrow(workspace);@@ -20,6 +20,7 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {programId,resourceType,resourceId,+ parentResourceId,action,},orderBy: {diff --git a/apps/web/lib/api/activity-log/track-reward-activity-log.ts b/apps/web/lib/api/activity-log/track-reward-activity-log.tsindex fc5ef9cbb5..8c03fae79d 100644--- a/apps/web/lib/api/activity-log/track-reward-activity-log.ts+++ b/apps/web/lib/api/activity-log/track-reward-activity-log.ts@@ -1,5 +1,6 @@import { serializeReward } from "@/lib/api/partners/serialize-reward";import type { RewardConditions, RewardProps } from "@/lib/types";+import { REWARD_EVENT_TO_RESOURCE_TYPE } from "@/lib/zod/schemas/activity-log";import { rewardConditionsSchema } from "@/lib/zod/schemas/rewards";import type { Reward } from "@dub/prisma/client";import type { z } from "zod/v4";@@ -133,6 +134,16 @@ export function trackRewardActivityLog({new: newReward,...baseInput}: TrackRewardActivityLogParams) {+ const reward = oldReward || newReward;+ const resourceType = reward+ ? REWARD_EVENT_TO_RESOURCE_TYPE[reward.event]+ : null;++ // This should never happen+ if (!resourceType) {+ return;+ }+if (oldReward === null && newReward !== null) {const newSnapshot = toRewardActivitySnapshot(serializeReward(newReward as Reward),@@ -140,7 +151,7 @@ export function trackRewardActivityLog({return trackActivityLog({...baseInput,- resourceType: "reward",+ resourceType,action: "reward.created",changeSet: {reward: {@@ -215,7 +226,7 @@ export function trackRewardActivityLog({(log) => ({...baseInput,...log,- resourceType: "reward",+ resourceType,...(batchId && { batchId }),}),);diff --git a/apps/web/lib/swr/use-activity-logs.ts b/apps/web/lib/swr/use-activity-logs.tsindex 56f1e919c0..8319f776cc 100644--- a/apps/web/lib/swr/use-activity-logs.ts+++ b/apps/web/lib/swr/use-activity-logs.ts@@ -15,18 +15,18 @@ export function useActivityLogs({const searchParams = query? new URLSearchParams({workspaceId: workspaceId!,- resourceType: query.resourceType,- resourceId: query.resourceId,- ...(query.action && { action: query.action }),+ ...query,}).toString(): "";- const { data, error, isLoading, mutate } = useSWR<ActivityLog[]>(+ const requestEnabled =enabled &&- workspaceId &&- query?.resourceType &&- query?.resourceId &&- `/api/activity-logs?${searchParams}`,+ workspaceId &&+ query?.resourceType &&+ (query?.parentResourceId || query?.resourceId);++ const { data, error, isLoading, mutate } = useSWR<ActivityLog[]>(+ requestEnabled && `/api/activity-logs?${searchParams}`,fetcher,{keepPreviousData: true,diff --git a/apps/web/lib/zod/schemas/activity-log.ts b/apps/web/lib/zod/schemas/activity-log.tsindex ecd61089fa..aa775d7682 100644--- a/apps/web/lib/zod/schemas/activity-log.ts+++ b/apps/web/lib/zod/schemas/activity-log.ts@@ -4,7 +4,9 @@ import { UserSchema } from "./users";export const activityLogResourceTypeSchema = z.enum(["referral","partner",- "reward",+ "clickReward",+ "saleReward",+ "leadReward",]);export const activityLogActionSchema = z.enum([@@ -29,7 +31,8 @@ export const activityLogActionSchema = z.enum([export const getActivityLogsQuerySchema = z.object({resourceType: activityLogResourceTypeSchema,- resourceId: z.string(),+ resourceId: z.string().optional(),+ parentResourceId: z.string().optional(),action: activityLogActionSchema.optional(),});@@ -46,3 +49,9 @@ export const activityLogSchema = z.object({createdAt: z.date(),user: UserSchema.nullable().default(null),});++export const REWARD_EVENT_TO_RESOURCE_TYPE = {+ click: "clickReward",+ sale: "saleReward",+ lead: "leadReward",+} as const;diff --git a/apps/web/ui/activity-logs/activity-feed.tsx b/apps/web/ui/activity-logs/activity-feed.tsxindex ef469d2b18..56412f846e 100644--- a/apps/web/ui/activity-logs/activity-feed.tsx+++ b/apps/web/ui/activity-logs/activity-feed.tsx@@ -10,7 +10,9 @@ const ACTIVITY_ITEM_MAP: Record<> = {partner: PartnerGroupActivityItem,referral: ReferralActivityItem,- reward: RewardActivityItem,+ clickReward: RewardActivityItem,+ leadReward: RewardActivityItem,+ saleReward: RewardActivityItem,};interface ActivityFeedProps {diff --git a/apps/web/ui/activity-logs/activity-log-registry.tsx b/apps/web/ui/activity-logs/activity-log-registry.tsxindex 67eeb600b3..51b8ec67e5 100644--- a/apps/web/ui/activity-logs/activity-log-registry.tsx+++ b/apps/web/ui/activity-logs/activity-log-registry.tsx@@ -2,7 +2,6 @@ import { ActivityLog, ActivityLogAction } from "@/lib/types";import {CircleInfo,FileSend,- Minus,MoneyBill2,Pen2,UserArrowRight,@@ -38,7 +37,7 @@ const ACTIVITY_LOG_ICONS: Partial<"reward.created": MoneyBill2,"reward.updated": Pen2,- "reward.deleted": Minus,+ "reward.deleted": CircleMinus,"reward.conditionAdded": CirclePlusIcon,"reward.conditionRemoved": CircleMinus,"reward.conditionUpdated": Pen2,diff --git a/apps/web/ui/activity-logs/reward-activity-section.tsx b/apps/web/ui/activity-logs/reward-activity-section.tsxindex dde57ae794..ba1b4a5246 100644--- a/apps/web/ui/activity-logs/reward-activity-section.tsx+++ b/apps/web/ui/activity-logs/reward-activity-section.tsx@@ -1,18 +1,29 @@"use client";import { useActivityLogs } from "@/lib/swr/use-activity-logs";+import useGroup from "@/lib/swr/use-group";+import { RewardProps } from "@/lib/types";+import { REWARD_EVENT_TO_RESOURCE_TYPE } from "@/lib/zod/schemas/activity-log";import {ActivityFeed,ActivityFeedSkeleton,} from "@/ui/activity-logs/activity-feed";-export function RewardActivitySection({ rewardId }: { rewardId: string }) {+export function RewardActivitySection({+ reward,+}: {+ reward: Pick<RewardProps, "id" | "event">;+}) {+ const { group } = useGroup();++ const resourceType = REWARD_EVENT_TO_RESOURCE_TYPE[reward.event];+const { activityLogs, loading, error } = useActivityLogs({query: {- resourceType: "reward",- resourceId: rewardId,+ resourceType,+ parentResourceId: group?.id,},- enabled: !!rewardId,+ enabled: !!reward.id,});if (loading) {@@ -37,5 +48,5 @@ export function RewardActivitySection({ rewardId }: { rewardId: string }) {);}- return <ActivityFeed logs={activityLogs} resourceType="reward" />;+ return <ActivityFeed logs={activityLogs} resourceType={resourceType} />;}diff --git a/apps/web/ui/activity-logs/reward-history-sheet.tsx b/apps/web/ui/activity-logs/reward-history-sheet.tsxindex 75ac639b6f..ea0160ef5b 100644--- a/apps/web/ui/activity-logs/reward-history-sheet.tsx+++ b/apps/web/ui/activity-logs/reward-history-sheet.tsx@@ -1,7 +1,9 @@"use client";import { useActivityLogs } from "@/lib/swr/use-activity-logs";+import useGroup from "@/lib/swr/use-group";import { RewardProps } from "@/lib/types";+import { REWARD_EVENT_TO_RESOURCE_TYPE } from "@/lib/zod/schemas/activity-log";import { X } from "@/ui/shared/icons";import { Button, Sheet } from "@dub/ui";import { Dispatch, SetStateAction, useState } from "react";@@ -42,7 +44,7 @@ function RewardHistorySheetContent({</div><div className="scrollbar-hide flex min-h-0 flex-1 flex-col overflow-y-auto p-4 sm:p-6">- <RewardActivitySection rewardId={reward.id} />+ <RewardActivitySection reward={reward} /></div></div>);@@ -64,13 +66,15 @@ export function useRewardHistorySheet({}: {reward: Pick<RewardProps, "id" | "event"> | null;}) {+ const { group } = useGroup();+const [isOpen, setIsOpen] = useState(false);const { activityLogs } = useActivityLogs({query: reward? {- resourceType: "reward",- resourceId: reward.id,+ resourceType: REWARD_EVENT_TO_RESOURCE_TYPE[reward.event],+ parentResourceId: group?.id,}: undefined,enabled: !!reward?.id,