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.

Improve social metrics bounties visibility

Steven Tey9714aa782a9f
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/add-edit-bounty-sheet.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/add-edit-bounty-sheet.tsx
index 55dd321b9d..ba93ba3ec4 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/add-edit-bounty-sheet.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/add-edit-bounty-sheet.tsx
@@ -5,7 +5,7 @@ import {
import { getPlanCapabilities } from "@/lib/plan-capabilities";
import useProgram from "@/lib/swr/use-program";
import useWorkspace from "@/lib/swr/use-workspace";
-import { BountyProps, CreateBountyInput } from "@/lib/types";
+import { BountyProps } from "@/lib/types";
import { GroupsMultiSelect } from "@/ui/partners/groups/groups-multi-select";
import {
ProgramSheetAccordion,
@@ -42,9 +42,10 @@ import {
} from "@dub/ui";
import { cn } from "@dub/utils";
import { BountySubmissionFrequency } from "@prisma/client";
-import { Dispatch, SetStateAction, useState } from "react";
+import { Dispatch, SetStateAction, useMemo, useState } from "react";
import { Controller, FormProvider } from "react-hook-form";
import { BountyCriteria } from "./bounty-criteria";
+import { BountyTypeUI } from "./bounty-form-context";
import { useAddEditBountyForm } from "./use-add-edit-bounty-form";
interface BountySheetProps {
@@ -63,6 +64,11 @@ const BOUNTY_TYPES: CardSelectorOption[] = [
label: "Submission",
description: "Reward for task completion",
},
+ {
+ key: "socialMetrics",
+ label: "Social metrics",
+ description: "Reward based on social engagement",
+ },
];
function BountySheetContent({ setIsOpen, bounty }: BountySheetProps) {
@@ -88,6 +94,8 @@ function BountySheetContent({ setIsOpen, bounty }: BountySheetProps) {
handleSubmissionFrequencyToggle,
handleSubmissionFrequencyChange,
type,
+ bountyTypeUI,
+ handleBountyTypeUIChange,
name,
control,
register,
@@ -101,15 +109,23 @@ function BountySheetContent({ setIsOpen, bounty }: BountySheetProps) {
isSubmitting,
} = useAddEditBountyForm({ bounty, setIsOpen });
- const submissionRequirements = watch("submissionRequirements");
- const hasSocialMetrics =
- submissionRequirements &&
- typeof submissionRequirements === "object" &&
- "socialMetrics" in submissionRequirements;
const canUseBountySocialMetrics =
getPlanCapabilities(plan).canUseBountySocialMetrics;
const showBountySocialMetricsUpsell =
- hasSocialMetrics && !canUseBountySocialMetrics;
+ bountyTypeUI === "socialMetrics" && !canUseBountySocialMetrics;
+
+ const bountyTypeOptions = useMemo(
+ () =>
+ BOUNTY_TYPES.map((option) =>
+ option.key === "socialMetrics" && !canUseBountySocialMetrics
+ ? {
+ ...option,
+ description: `${option.description} (Advanced plan required)`,
+ }
+ : option,
+ ),
+ [canUseBountySocialMetrics],
+ );
return (
<form onSubmit={onSubmit} className="flex h-full flex-col">
@@ -145,15 +161,16 @@ function BountySheetContent({ setIsOpen, bounty }: BountySheetProps) {
<ProgramSheetAccordionContent>
<div className="space-y-4">
<p className="text-content-default text-sm">
- Set how the bounty will be completed
+ Choose the type of bounty you want to create
</p>
<CardSelector
- options={BOUNTY_TYPES}
- value={watch("type")}
- onChange={(value: CreateBountyInput["type"]) =>
- setValue("type", value)
+ options={bountyTypeOptions}
+ value={bountyTypeUI}
+ onChange={(value: BountyTypeUI) =>
+ handleBountyTypeUIChange(value)
}
name="bounty-type"
+ gridCols="3"
/>
</div>
</ProgramSheetAccordionContent>
@@ -618,6 +635,9 @@ export function BountySheet({
onOpenChange={rest.setIsOpen}
onClose={() => queryParams({ del: "bountyId" })}
nested={nested}
+ contentProps={{
+ className: "[--sheet-width:600px]",
+ }}
>
<BountySheetContent {...rest} />
</Sheet>
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/bounty-criteria.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/bounty-criteria.tsx
index 92e0701a14..df8f7babe6 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/bounty-criteria.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/bounty-criteria.tsx
@@ -1,8 +1,5 @@
"use client";
-import { getPlanCapabilities } from "@/lib/plan-capabilities";
-import useWorkspace from "@/lib/swr/use-workspace";
-import { usePartnersUpgradeModal } from "@/ui/partners/partners-upgrade-modal";
import {
ProgramSheetAccordionContent,
ProgramSheetAccordionItem,
@@ -10,132 +7,31 @@ import {
} from "@/ui/partners/program-sheet-accordion";
import { RewardIconSquare } from "@/ui/partners/rewards/reward-icon-square";
import { InlineBadgePopover } from "@/ui/shared/inline-badge-popover";
-import { MoneyBills2, ToggleGroup } from "@dub/ui";
-import { cn, currencyFormatter } from "@dub/utils";
-import { useMemo } from "react";
+import { MoneyBills2 } from "@dub/ui";
+import { currencyFormatter } from "@dub/utils";
import { BountyAmountInput } from "./bounty-amount-input";
import { BountyCriteriaManualSubmission } from "./bounty-criteria-manual-submission";
import { BountyCriteriaSocialMetrics } from "./bounty-criteria-social-metrics";
import { useBountyFormContext } from "./bounty-form-context";
import { BountyLogic } from "./bounty-logic";
-const BOUNTY_SUBMISSION_TYPES = [
- {
- value: "manualSubmission",
- label: "Manual submission",
- },
- {
- value: "socialMetrics",
- label: "Social metrics",
- },
-] as const;
-
-type BountySubmissionType = (typeof BOUNTY_SUBMISSION_TYPES)[number]["value"];
-
export function BountyCriteria() {
- const { plan } = useWorkspace();
- const { partnersUpgradeModal, setShowPartnersUpgradeModal } =
- usePartnersUpgradeModal();
-
- const canUseBountySocialMetrics =
- getPlanCapabilities(plan).canUseBountySocialMetrics;
-
- const { watch, setValue } = useBountyFormContext();
+ const { watch } = useBountyFormContext();
const [
- type,
+ bountyTypeUI = "performance",
rewardAmount,
- submissionRequirements,
rewardType = "flat",
- submissionCriteriaType = "manualSubmission",
- ] = watch([
- "type",
- "rewardAmount",
- "submissionRequirements",
- "rewardType",
- "submissionCriteriaType",
- ]);
-
- const requireImage = !!submissionRequirements?.image;
- const requireUrl = !!submissionRequirements?.url;
- const imageMax = submissionRequirements?.image?.max;
- const urlMax = submissionRequirements?.url?.max;
- const urlDomains = submissionRequirements?.url?.domains ?? [];
-
- const updateSubmissionRequirements = (
- imageRequired: boolean,
- urlRequired: boolean,
- imageMaxCount?: number,
- urlMaxCount?: number,
- urlDomainsList?: string[],
- ) => {
- const requirements: {
- image?: { max?: number };
- url?: { max?: number; domains?: string[] };
- } = {};
-
- if (imageRequired) {
- requirements.image = {};
-
- if (imageMaxCount !== undefined) {
- requirements.image.max = imageMaxCount;
- }
- }
-
- if (urlRequired) {
- requirements.url = {};
-
- if (urlMaxCount !== undefined) {
- requirements.url.max = urlMaxCount;
- }
-
- if (urlDomainsList && urlDomainsList.length > 0) {
- requirements.url.domains = urlDomainsList;
- }
- }
+ ] = watch(["bountyTypeUI", "rewardAmount", "rewardType"]);
- setValue(
- "submissionRequirements",
- Object.keys(requirements).length > 0 ? requirements : null,
- { shouldDirty: true },
- );
- };
-
- const showPerformanceContent = type === "performance";
- const showSubmissionContent = type === "submission";
+ const showPerformanceContent = bountyTypeUI === "performance";
+ const showSubmissionContent = bountyTypeUI === "submission";
+ const showSocialMetricsContent = bountyTypeUI === "socialMetrics";
const showWhenThenCards =
- (rewardType === "flat" || type === "performance") &&
- (type === "performance" ||
- (type === "submission" && rewardType === "flat"));
-
- const submissionTypeOptions = useMemo(
- () => [
- {
- value: "manualSubmission",
- label: "Manual submission",
- },
- {
- value: "socialMetrics",
- label: !canUseBountySocialMetrics ? (
- <span className="flex shrink-0 items-center gap-2 whitespace-nowrap">
- Social metrics
- <span
- className={cn(
- "rounded-sm px-1.5 py-1 text-[0.625rem] uppercase leading-none",
- "bg-violet-50 text-violet-600",
- )}
- >
- UPGRADE REQUIRED
- </span>
- </span>
- ) : (
- "Social metrics"
- ),
- },
- ],
- [canUseBountySocialMetrics],
- );
+ (rewardType === "flat" || bountyTypeUI === "performance") &&
+ (bountyTypeUI === "performance" ||
+ (bountyTypeUI === "submission" && rewardType === "flat"));
return (
<ProgramSheetAccordionItem value="bounty-criteria">
@@ -144,52 +40,16 @@ export function BountyCriteria() {
<div className="space-y-6">
{showSubmissionContent && (
<>
- {partnersUpgradeModal}
<p className="text-content-default text-sm leading-relaxed">
Set how partners claim bounties and how they&apos;re verified.
By default an open text field is provided.
</p>
- <ToggleGroup
- className="flex w-full items-center gap-1 rounded-md border border-neutral-200 bg-neutral-100 p-1"
- optionClassName="h-8 flex flex-1 items-center justify-center gap-2 rounded-md text-sm whitespace-nowrap"
- indicatorClassName="bg-white border border-neutral-200 rounded-md shadow-sm"
- options={submissionTypeOptions}
- selected={submissionCriteriaType}
- selectAction={(id: BountySubmissionType) => {
- setValue("submissionCriteriaType", id);
-
- if (id === "socialMetrics") {
- setValue(
- "submissionRequirements",
- {
- socialMetrics: submissionRequirements?.socialMetrics,
- },
- {
- shouldDirty: true,
- },
- );
- } else {
- updateSubmissionRequirements(
- requireImage,
- requireUrl,
- imageMax,
- urlMax,
- urlDomains,
- );
- }
- }}
- />
-
- {submissionCriteriaType === "manualSubmission" && (
- <BountyCriteriaManualSubmission />
- )}
-
- {submissionCriteriaType === "socialMetrics" && (
- <BountyCriteriaSocialMetrics />
- )}
+ <BountyCriteriaManualSubmission />
</>
)}
+ {showSocialMetricsContent && <BountyCriteriaSocialMetrics />}
+
{showPerformanceContent && showWhenThenCards && (
<div className="flex flex-col gap-0">
<div className="border-border-subtle rounded-xl border bg-white shadow-sm">
@@ -229,16 +89,14 @@ export function BountyCriteria() {
</div>
)}
- {rewardType === "custom" &&
- showSubmissionContent &&
- submissionCriteriaType === "manualSubmission" && (
- <div className="rounded-lg bg-orange-50 px-4 py-2 text-center">
- <span className="text-sm font-medium leading-5 text-orange-900">
- When reviewing these submissions, a custom reward amount will
- be required to approve.
- </span>
- </div>
- )}
+ {rewardType === "custom" && showSubmissionContent && (
+ <div className="rounded-lg bg-orange-50 px-4 py-2 text-center">
+ <span className="text-sm font-medium leading-5 text-orange-900">
+ When reviewing these submissions, a custom reward amount will be
+ required to approve.
+ </span>
+ </div>
+ )}
</div>
</ProgramSheetAccordionContent>
</ProgramSheetAccordionItem>
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/bounty-form-context.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/bounty-form-context.tsx
index 0472975d4f..22e6843cbc 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/bounty-form-context.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/bounty-form-context.tsx
@@ -3,9 +3,11 @@
import { CreateBountyInput } from "@/lib/types";
import { useFormContext } from "react-hook-form";
+export type BountyTypeUI = "performance" | "submission" | "socialMetrics";
+
export type CreateBountyInputExtended = CreateBountyInput & {
rewardType?: "flat" | "custom";
- submissionCriteriaType?: "manualSubmission" | "socialMetrics";
+ bountyTypeUI?: BountyTypeUI;
};
export const useBountyFormContext = () =>
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/use-add-edit-bounty-form.ts b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/use-add-edit-bounty-form.ts
index 7c246bacc1..386dc1d5c1 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/use-add-edit-bounty-form.ts
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/use-add-edit-bounty-form.ts
@@ -17,7 +17,10 @@ import { BountySubmissionFrequency } from "@prisma/client";
import { Dispatch, SetStateAction, useEffect, useMemo, useState } from "react";
import { useForm } from "react-hook-form";
import { toast } from "sonner";
-import { CreateBountyInputExtended } from "./bounty-form-context";
+import {
+ BountyTypeUI,
+ CreateBountyInputExtended,
+} from "./bounty-form-context";
import { useConfirmCreateBountyModal } from "./confirm-create-bounty-modal";
const ACCORDION_ITEMS = [
@@ -94,6 +97,16 @@ export function useAddEditBountyForm({
: undefined,
rewardDescription: bounty?.rewardDescription || undefined,
type: bounty?.type || "performance",
+ bountyTypeUI:
+ bounty?.type === "performance"
+ ? "performance"
+ : bounty?.submissionRequirements &&
+ typeof bounty.submissionRequirements === "object" &&
+ "socialMetrics" in bounty.submissionRequirements
+ ? "socialMetrics"
+ : bounty
+ ? "submission"
+ : "performance",
submissionRequirements: initialSubmissionRequirements,
groupIds: bounty?.groups?.map(({ id }) => id) || null,
performanceCondition: bounty?.performanceCondition
@@ -108,12 +121,6 @@ export function useAddEditBountyForm({
},
performanceScope: bounty?.performanceScope ?? "new",
rewardType: bounty ? (bounty.rewardAmount ? "flat" : "custom") : "flat",
- submissionCriteriaType:
- bounty?.submissionRequirements &&
- typeof bounty.submissionRequirements === "object" &&
- "socialMetrics" in bounty.submissionRequirements
- ? "socialMetrics"
- : "manualSubmission",
},
shouldUnregister: false,
});
@@ -133,6 +140,7 @@ export function useAddEditBountyForm({
rewardAmount,
rewardDescription,
type,
+ bountyTypeUI,
name,
description,
performanceCondition,
@@ -145,6 +153,7 @@ export function useAddEditBountyForm({
"rewardAmount",
"rewardDescription",
"type",
+ "bountyTypeUI",
"name",
"description",
"performanceCondition",
@@ -305,6 +314,53 @@ export function useAddEditBountyForm({
}
};
+ const handleBountyTypeUIChange = (bountyTypeUI: BountyTypeUI) => {
+ setValue("bountyTypeUI", bountyTypeUI, { shouldDirty: true });
+
+ if (bountyTypeUI === "performance") {
+ setValue("type", "performance", { shouldDirty: true });
+ setValue("submissionRequirements", null, { shouldDirty: true });
+ return;
+ }
+
+ setValue("type", "submission", { shouldDirty: true });
+
+ const currentSubmissionRequirements = form.getValues(
+ "submissionRequirements",
+ );
+
+ if (bountyTypeUI === "socialMetrics") {
+ setValue(
+ "submissionRequirements",
+ {
+ socialMetrics:
+ currentSubmissionRequirements &&
+ typeof currentSubmissionRequirements === "object" &&
+ "socialMetrics" in currentSubmissionRequirements
+ ? currentSubmissionRequirements.socialMetrics
+ : undefined,
+ },
+ { shouldDirty: true },
+ );
+ return;
+ }
+
+ if (
+ currentSubmissionRequirements &&
+ typeof currentSubmissionRequirements === "object" &&
+ "socialMetrics" in currentSubmissionRequirements
+ ) {
+ const { socialMetrics: _socialMetrics, ...rest } =
+ currentSubmissionRequirements;
+
+ setValue(
+ "submissionRequirements",
+ Object.keys(rest).length > 0 ? rest : null,
+ { shouldDirty: true },
+ );
+ }
+ };
+
const validationError = useMemo(() => {
const now = new Date();
@@ -424,6 +480,7 @@ export function useAddEditBountyForm({
rewardDescription,
rewardType,
type,
+ bountyTypeUI,
name,
description,
performanceCondition?.attribute,
@@ -439,7 +496,7 @@ export function useAddEditBountyForm({
const {
rewardType: formRewardType,
- submissionCriteriaType: _submissionCriteriaType,
+ bountyTypeUI: _bountyTypeUI,
...data
} = form.getValues();
@@ -560,6 +617,7 @@ export function useAddEditBountyForm({
openAccordions,
setOpenAccordions,
type,
+ bountyTypeUI,
name,
control,
register,
@@ -578,6 +636,7 @@ export function useAddEditBountyForm({
submissionWindow,
handleSubmissionWindowToggle,
handleSubmissionWindowChange,
+ handleBountyTypeUIChange,
validationError,
confirmCreateBountyModal,
setShowConfirmCreateBountyModal,
diff --git a/apps/web/scripts/domains/sync-expires-at-from-dynadot.ts b/apps/web/scripts/domains/sync-expires-at-from-dynadot.ts
deleted file mode 100644
index 62c87dc943..0000000000
--- a/apps/web/scripts/domains/sync-expires-at-from-dynadot.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import "dotenv-flow/config";
-
-import { parseRegisteredDomainSlugs } from "@/lib/api/domains/is-domain-registration-invoice";
-import { setRenewOption } from "@/lib/dynadot/set-renew-option";
-import { prisma } from "@/lib/prisma";
-import { chunk } from "@dub/utils";
-
-const invoiceId = "inv_1KXANFCDJ9MEYVQ94EM0VM84N";
-
-async function main() {
- const invoice = await prisma.invoice.findUniqueOrThrow({
- where: {
- id: invoiceId,
- },
- select: {
- id: true,
- type: true,
- registeredDomains: true,
- },
- });
-
- const domains = parseRegisteredDomainSlugs(invoice.registeredDomains);
-
- if (domains.length === 0) {
- console.error("No domains found for invoice", invoiceId);
- return;
- }
-
- console.log(`Found ${domains.length} domains for invoice`, invoiceId);
-
- const registeredDomains = await prisma.registeredDomain.findMany({
- where: {
- slug: {
- in: domains,
- },
- },
- select: {
- slug: true,
- autoRenewalDisabledAt: true,
- },
- });
-
- if (registeredDomains.length === 0) {
- console.error("No registered domains found for invoice", invoiceId);
- return;
- }
-
- const domainChunks = chunk(registeredDomains, 10);
-
- for (const domainChunk of domainChunks) {
- await Promise.all(
- domainChunk.map(async (domain) => {
- const success = await setRenewOption({
- domain: domain.slug,
- autoRenew: domain.autoRenewalDisabledAt === null,
- });
-
- if (success) {
- console.log(`✓ ${domain}`);
- } else {
- console.error(`✗ ${domain}`);
- }
- }),
- );
-
- await new Promise((resolve) => setTimeout(resolve, 2000));
- }
-}
-
-main()
- .catch((error) => {
- console.error(error);
- process.exit(1);
- })
- .finally(async () => {
- await prisma.$disconnect();
- });