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.

show partner.rewardChanged/discountChanged in history sheet

Steven Teyeb34f6ccd330
diff --git a/apps/web/scripts/partners/delete-program.ts b/apps/web/scripts/partners/delete-program.ts
index 52949deb21..6f508f8181 100644
--- a/apps/web/scripts/partners/delete-program.ts
+++ b/apps/web/scripts/partners/delete-program.ts
@@ -99,6 +99,15 @@ async function main() {
console.log("Deleted logo", deletedLogo);
}
+
+ await prisma.project.update({
+ where: {
+ id: program.workspaceId,
+ },
+ data: {
+ programId: null,
+ },
+ });
}
main();
diff --git a/apps/web/ui/activity-logs/action-renderers/partner-reward-changed-renderer.tsx b/apps/web/ui/activity-logs/action-renderers/partner-reward-changed-renderer.tsx
new file mode 100644
index 0000000000..b5cd61b9f7
--- /dev/null
+++ b/apps/web/ui/activity-logs/action-renderers/partner-reward-changed-renderer.tsx
@@ -0,0 +1,170 @@
+import { ActivityLog, DiscountProps, RewardProps } from "@/lib/types";
+import { formatDiscountDescription } from "@/ui/partners/format-discount-description";
+import { ProgramRewardDescription } from "@/ui/partners/program-reward-description";
+import { Fragment, ReactNode } from "react";
+import { ActivityValueChip, UserChip } from "../activity-entry-chips";
+
+type RewardSnapshot = Pick<
+ RewardProps,
+ | "id"
+ | "event"
+ | "type"
+ | "amountInCents"
+ | "amountInPercentage"
+ | "maxDuration"
+ | "description"
+ | "tooltipDescription"
+ | "modifiers"
+ | "config"
+ | "spendLimitAmount"
+ | "spendLimitInterval"
+>;
+
+type DiscountSnapshot = Pick<
+ DiscountProps,
+ "id" | "amount" | "type" | "maxDuration" | "description"
+>;
+
+type FieldDiff<T> = {
+ old: T | { id: string } | null;
+ new: T | { id: string } | null;
+};
+
+const REWARD_FIELDS = [
+ { key: "clickReward", label: "Click reward" },
+ { key: "leadReward", label: "Lead reward" },
+ { key: "saleReward", label: "Sale reward" },
+] as const;
+
+function Label({ children }: { children: ReactNode }) {
+ return (
+ <span className="text-sm font-medium text-neutral-800">{children}</span>
+ );
+}
+
+function getChangeVerb(oldValue: unknown, newValue: unknown) {
+ if (!newValue) {
+ return "removed";
+ }
+
+ if (!oldValue) {
+ return "set to";
+ }
+
+ return "updated to";
+}
+
+function isRewardSnapshot(value: unknown): value is RewardSnapshot {
+ return (
+ typeof value === "object" &&
+ value !== null &&
+ "event" in value &&
+ typeof value.event === "string"
+ );
+}
+
+function isDiscountSnapshot(value: unknown): value is DiscountSnapshot {
+ return (
+ typeof value === "object" &&
+ value !== null &&
+ "amount" in value &&
+ "type" in value
+ );
+}
+
+function RewardValueChip({ value }: { value: unknown }) {
+ return (
+ <ActivityValueChip>
+ {isRewardSnapshot(value) ? (
+ <ProgramRewardDescription reward={value} showModifiersTooltip={false} />
+ ) : (
+ "Deleted reward"
+ )}
+ </ActivityValueChip>
+ );
+}
+
+function DiscountValueChip({ value }: { value: unknown }) {
+ return (
+ <ActivityValueChip>
+ {isDiscountSnapshot(value)
+ ? formatDiscountDescription(value)
+ : "Deleted discount"}
+ </ActivityValueChip>
+ );
+}
+
+function ByUser({ user }: { user: ActivityLog["user"] }) {
+ if (!user) {
+ return null;
+ }
+
+ return (
+ <>
+ <Label>by</Label>
+ <UserChip user={user} />
+ </>
+ );
+}
+
+export function PartnerRewardChangedRenderer({ log }: { log: ActivityLog }) {
+ const changes = REWARD_FIELDS.flatMap(({ key, label }) => {
+ const diff = log.changeSet?.[key] as FieldDiff<RewardSnapshot> | undefined;
+
+ if (!diff) {
+ return [];
+ }
+
+ const verb = getChangeVerb(diff.old, diff.new);
+
+ return [
+ {
+ key,
+ label,
+ verb,
+ value: verb === "removed" ? null : diff.new,
+ },
+ ];
+ });
+
+ if (changes.length === 0) {
+ return <span>Reward updated</span>;
+ }
+
+ return (
+ <>
+ {changes.map((change, index) => (
+ <Fragment key={change.key}>
+ {index > 0 ? <Label>and</Label> : null}
+ <Label>
+ {change.label} {change.verb}
+ </Label>
+ {change.value ? <RewardValueChip value={change.value} /> : null}
+ </Fragment>
+ ))}
+ <ByUser user={log.user} />
+ </>
+ );
+}
+
+export function PartnerDiscountChangedRenderer({ log }: { log: ActivityLog }) {
+ const discountChange = log.changeSet?.discount as
+ | FieldDiff<DiscountSnapshot>
+ | undefined;
+
+ if (!discountChange) {
+ return <span>Discount updated</span>;
+ }
+
+ const verb = getChangeVerb(discountChange.old, discountChange.new);
+
+ return (
+ <>
+ <Label>Discount {verb}</Label>
+ {verb !== "removed" ? (
+ <DiscountValueChip value={discountChange.new} />
+ ) : null}
+ <ByUser user={log.user} />
+ </>
+ );
+}
diff --git a/apps/web/ui/activity-logs/activity-entry-chips.tsx b/apps/web/ui/activity-logs/activity-entry-chips.tsx
index 1b007ac91b..454de90b1c 100644
--- a/apps/web/ui/activity-logs/activity-entry-chips.tsx
+++ b/apps/web/ui/activity-logs/activity-entry-chips.tsx
@@ -47,6 +47,19 @@ function ActivityChip({ children, className }: ActivityChipProps) {
);
}
+export function ActivityValueChip({ children, className }: ActivityChipProps) {
+ return (
+ <ActivityChip
+ className={cn(
+ "max-w-full whitespace-normal text-left font-normal leading-5",
+ className,
+ )}
+ >
+ {children}
+ </ActivityChip>
+ );
+}
+
export function GroupPill({ name, color }: GroupPillProps) {
const colorClassName = color
? getResourceColorData(color)?.groupVariants
diff --git a/apps/web/ui/activity-logs/activity-log-registry.tsx b/apps/web/ui/activity-logs/activity-log-registry.tsx
index 0c971ccd15..250b9c0a16 100644
--- a/apps/web/ui/activity-logs/activity-log-registry.tsx
+++ b/apps/web/ui/activity-logs/activity-log-registry.tsx
@@ -3,6 +3,7 @@ import {
CircleDotted,
CircleInfo,
FileSend,
+ Gift,
MoneyBill2,
Pen2,
UserArrowRight,
@@ -11,6 +12,10 @@ import {
import { CircleMinus, CirclePlusIcon } from "lucide-react";
import { ComponentType, ReactNode } from "react";
import { PartnerGroupChangedRenderer } from "./action-renderers/partner-group-changed-renderer";
+import {
+ PartnerDiscountChangedRenderer,
+ PartnerRewardChangedRenderer,
+} from "./action-renderers/partner-reward-changed-renderer";
import { PartnerStatusChangedRenderer } from "./action-renderers/partner-status-changed-renderer";
import { RewardActivityRenderer } from "./action-renderers/reward-activity-renderer";
import { SubmittedLeadCreatedRenderer } from "./action-renderers/submitted-lead-created-renderer";
@@ -39,6 +44,8 @@ const ACTIVITY_LOG_ICONS: Partial<
Record<ActivityLogAction, ComponentType<{ className?: string }>>
> = {
"partner.groupChanged": UserArrowRight,
+ "partner.rewardChanged": MoneyBill2,
+ "partner.discountChanged": Gift,
...Object.fromEntries(
PARTNER_STATUS_ACTIONS.map((action) => [action, CircleDotted]),
),
@@ -67,6 +74,14 @@ const ACTIVITY_LOG_REGISTRY: Array<{
action: "partner.groupChanged",
renderer: PartnerGroupChangedRenderer,
},
+ {
+ action: "partner.rewardChanged",
+ renderer: PartnerRewardChangedRenderer,
+ },
+ {
+ action: "partner.discountChanged",
+ renderer: PartnerDiscountChangedRenderer,
+ },
...PARTNER_STATUS_ACTIONS.map((action) => ({
action,
renderer: PartnerStatusChangedRenderer,
diff --git a/apps/web/ui/partners/discounts/add-edit-discount-sheet.tsx b/apps/web/ui/partners/discounts/add-edit-discount-sheet.tsx
index a6c78ac636..e8279d301b 100644
--- a/apps/web/ui/partners/discounts/add-edit-discount-sheet.tsx
+++ b/apps/web/ui/partners/discounts/add-edit-discount-sheet.tsx
@@ -100,7 +100,13 @@ function DiscountSheetContent({
defaultProgramId,
slug: workspaceSlug,
plan,
- } = useWorkspace();
+ } = useWorkspace({
+ // lower dedupingInterval + revalidateOnFocus in case user upgrades their plan in another tab
+ swrOpts: {
+ dedupingInterval: 2000,
+ revalidateOnFocus: true,
+ },
+ });
const { canUseAdvancedRewardLogic } = getPlanCapabilities(plan);
// Infer when omitted (create via useDiscountSheet defaults true). Group pages
diff --git a/apps/web/ui/partners/groups/design/lander/modals/image-block-modal.tsx b/apps/web/ui/partners/groups/design/lander/modals/image-block-modal.tsx
index 98943cd713..b0bdd19153 100644
--- a/apps/web/ui/partners/groups/design/lander/modals/image-block-modal.tsx
+++ b/apps/web/ui/partners/groups/design/lander/modals/image-block-modal.tsx
@@ -33,7 +33,7 @@ function ImageBlockModalInner({
}: ImageBlockModalProps) {
const id = useId();
- const { id: workspaceId, defaultProgramId } = useWorkspace();
+ const { id: workspaceId } = useWorkspace();
const {
handleSubmit,