Merge pull request #3442 from dubinc/reward-activity-log

Reward activity log

Author: steven-tey

apps/web/app/(ee)/app.dub.co/(new-program)/[slug]/program/new/overview/page-client.tsx

@@ -53,7 +53,7 @@ export function PageClient() {
     return true;
   }, [data]);
 
-  const reward: Omit<RewardProps, "id"> = {
+  const reward: Omit<RewardProps, "id" | "updatedAt"> = {
     type: (data.type ?? "flat") as RewardStructure,
     amountInCents: data.amountInCents != null ? data.amountInCents * 100 : null,
     amountInPercentage: data.amountInPercentage,

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 resource
 export 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: {

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/rewards/group-rewards.tsx

@@ -3,6 +3,7 @@
 import useGroup from "@/lib/swr/use-group";
 import type { GroupProps, RewardProps } from "@/lib/types";
 import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
+import { useRewardHistorySheet } from "@/ui/activity-logs/reward-history-sheet";
 import { REWARD_EVENTS } from "@/ui/partners/constants";
 import { ProgramRewardDescription } from "@/ui/partners/program-reward-description";
 import {
@@ -11,7 +12,7 @@ import {
 } from "@/ui/partners/rewards/add-edit-reward-sheet";
 import { EventType } from "@dub/prisma/client";
 import { Button, useRouterStuff } from "@dub/ui";
-import { cn } from "@dub/utils";
+import { cn, formatDate } from "@dub/utils";
 import Link from "next/link";
 import { useParams } from "next/navigation";
 import { useEffect, useState } from "react";
@@ -139,12 +140,21 @@ const RewardItem = ({
     reward: reward || undefined,
   });
 
+  const {
+    hasActivityLogs,
+    rewardHistorySheet,
+    setIsOpen: setHistoryOpen,
+  } = useRewardHistorySheet({
+    reward: reward ?? null,
+  });
+
   const Icon = REWARD_EVENTS[event].icon;
   const As = reward ? Link : "div";
 
   return (
     <>
       {RewardSheet}
+      {rewardHistorySheet}
       <As
         href={
           reward
@@ -163,14 +173,45 @@ const RewardItem = ({
           <Icon className="size-4 text-neutral-600" />
         </div>
         <div className="flex flex-1 flex-col justify-between gap-y-4 md:flex-row md:items-center">
-          <div className="flex items-center gap-2">
+          <div className="flex w-full items-center gap-2">
             {reward ? (
-              <span className="text-sm font-normal">
-                <ProgramRewardDescription
-                  reward={reward}
-                  amountClassName="text-blue-600"
-                />
-              </span>
+              <div className="flex min-w-0 flex-1 flex-col gap-1">
+                <div className="text-sm font-normal">
+                  <ProgramRewardDescription
+                    reward={reward}
+                    amountClassName="text-blue-600"
+                  />
+                </div>
+
+                <div className="flex items-center gap-1 text-xs font-medium text-neutral-500">
+                  <span>
+                    {`Updated ${formatDate(reward.updatedAt, {
+                      month: "short",
+                      day: "numeric",
+                      year: "numeric",
+                    })}`}
+                  </span>
+
+                  {hasActivityLogs && (
+                    <>
+                      <span
+                        className="ml-1 size-1 shrink-0 rounded-full bg-neutral-400"
+                        aria-hidden
+                      />
+                      <Button
+                        variant="outline"
+                        text="View history"
+                        className="h-4 w-fit px-1 py-0.5 text-xs font-medium text-neutral-500"
+                        onClick={(e) => {
+                          e.preventDefault();
+                          e.stopPropagation();
+                          setHistoryOpen(true);
+                        }}
+                      />
+                    </>
+                  )}
+                </div>
+              </div>
             ) : (
               <div className="flex flex-col">
                 <span className="text-sm font-medium text-neutral-900">

apps/web/lib/actions/partners/create-reward.ts

@@ -1,5 +1,6 @@
 "use server";
 
+import { trackRewardActivityLog } from "@/lib/api/activity-log/track-reward-activity-log";
 import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
 import { createId } from "@/lib/api/create-id";
 import { getGroupOrThrow } from "@/lib/api/groups/get-group-or-throw";
@@ -107,19 +108,32 @@ export const createRewardAction = authActionClient
     });
 
     waitUntil(
-      recordAuditLog({
-        workspaceId: workspace.id,
-        programId,
-        action: "reward.created",
-        description: `Reward ${reward.id} created`,
-        actor: user,
-        targets: [
-          {
-            type: "reward",
-            id: reward.id,
-            metadata: serializeReward(reward),
-          },
-        ],
-      }),
+      Promise.allSettled([
+        recordAuditLog({
+          workspaceId: workspace.id,
+          programId,
+          action: "reward.created",
+          description: `Reward ${reward.id} created`,
+          actor: user,
+          targets: [
+            {
+              type: "reward",
+              id: reward.id,
+              metadata: serializeReward(reward),
+            },
+          ],
+        }),
+
+        trackRewardActivityLog({
+          workspaceId: workspace.id,
+          programId,
+          userId: user.id,
+          resourceId: reward.id,
+          parentResourceType: "group",
+          parentResourceId: groupId,
+          old: null,
+          new: reward,
+        }),
+      ]),
     );
   });

apps/web/lib/actions/partners/delete-reward.ts

@@ -1,5 +1,6 @@
 "use server";
 
+import { trackRewardActivityLog } from "@/lib/api/activity-log/track-reward-activity-log";
 import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
 import { getRewardOrThrow } from "@/lib/api/partners/get-reward-or-throw";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
@@ -35,8 +36,8 @@ export const deleteRewardAction = authActionClient
 
     const rewardIdColumn = REWARD_EVENT_COLUMN_MAPPING[reward.event];
 
-    await prisma.$transaction(async (tx) => {
-      await tx.partnerGroup.update({
+    const partnerGroup = await prisma.$transaction(async (tx) => {
+      const group = await tx.partnerGroup.update({
         // @ts-ignore
         where: {
           [rewardIdColumn]: reward.id,
@@ -60,22 +61,37 @@ export const deleteRewardAction = authActionClient
           id: reward.id,
         },
       });
+
+      return group;
     });
 
     waitUntil(
-      recordAuditLog({
-        workspaceId: workspace.id,
-        programId,
-        action: "reward.deleted",
-        description: `Reward ${rewardId} deleted`,
-        actor: user,
-        targets: [
-          {
-            type: "reward",
-            id: rewardId,
-            metadata: reward,
-          },
-        ],
-      }),
+      Promise.allSettled([
+        recordAuditLog({
+          workspaceId: workspace.id,
+          programId,
+          action: "reward.deleted",
+          description: `Reward ${rewardId} deleted`,
+          actor: user,
+          targets: [
+            {
+              type: "reward",
+              id: rewardId,
+              metadata: reward,
+            },
+          ],
+        }),
+
+        trackRewardActivityLog({
+          workspaceId: workspace.id,
+          programId,
+          userId: user.id,
+          resourceId: reward.id,
+          parentResourceType: "group",
+          parentResourceId: partnerGroup?.id,
+          old: reward,
+          new: null,
+        }),
+      ]),
     );
   });

apps/web/lib/actions/partners/update-reward.ts

@@ -1,5 +1,6 @@
 "use server";
 
+import { trackRewardActivityLog } from "@/lib/api/activity-log/track-reward-activity-log";
 import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
 import { getRewardOrThrow } from "@/lib/api/partners/get-reward-or-throw";
 import { serializeReward } from "@/lib/api/partners/serialize-reward";
@@ -96,6 +97,10 @@ export const updateRewardAction = authActionClient
       salePartnerGroup,
     ].some((group) => group?.slug === "default");
 
+    // Determine the groupId from the partner group relation
+    const partnerGroup =
+      clickPartnerGroup || leadPartnerGroup || salePartnerGroup;
+
     waitUntil(
       Promise.allSettled([
         recordAuditLog({
@@ -113,6 +118,17 @@ export const updateRewardAction = authActionClient
           ],
         }),
 
+        trackRewardActivityLog({
+          workspaceId: workspace.id,
+          programId,
+          userId: user.id,
+          resourceId: rewardMetadata.id,
+          parentResourceType: "group",
+          parentResourceId: partnerGroup?.id,
+          old: reward,
+          new: updatedReward,
+        }),
+
         // we only cache default group pages for now so we need to invalidate them
         ...(isDefaultGroup
           ? [

…lib/api/activity-log/build-change-set.ts …g/build-program-enrollment-change-set.tsapps/web/lib/api/activity-log/build-change-set.ts renamed to apps/web/lib/api/activity-log/build-program-enrollment-change-set.ts apps/web/lib/api/activity-log/build-change-set.ts renamed to apps/web/lib/api/activity-log/build-program-enrollment-change-set.ts

@@ -8,10 +8,23 @@ import { prisma } from "@dub/prisma";
 import { Prisma } from "@dub/prisma/client";
 import { prettyPrint } from "@dub/utils";
 
+const ACTIONS_WITHOUT_CHANGE_SET: ActivityLogAction[] = [
+  "referral.created",
+  "reward.created",
+  "reward.deleted",
+];
+
 export interface TrackActivityLogInput
   extends Pick<
     Prisma.ActivityLogUncheckedCreateInput,
-    "workspaceId" | "programId" | "resourceId" | "userId" | "description"
+    | "workspaceId"
+    | "programId"
+    | "resourceId"
+    | "userId"
+    | "description"
+    | "parentResourceType"
+    | "parentResourceId"
+    | "batchId"
   > {
   resourceType: ActivityLogResourceType;
   action: ActivityLogAction;
@@ -25,7 +38,7 @@ export const trackActivityLog = async (
 
   inputs = inputs.filter(
     (i) =>
-      i.action === "referral.created" ||
+      ACTIONS_WITHOUT_CHANGE_SET.includes(i.action) ||
       (i.changeSet && Object.keys(i.changeSet).length > 0),
   );