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.

Set more fine-grained submissionRequirements for bounties (#3278)

Steven Teyed4bbc8742f9
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty-sheet.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty-sheet.tsx
index 92f78c619e..7984b557e0 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty-sheet.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty-sheet.tsx
@@ -1,12 +1,23 @@
import { generatePerformanceBountyName } from "@/lib/api/bounties/generate-performance-bounty-name";
import { isCurrencyAttribute } from "@/lib/api/workflows/utils";
-import { BOUNTY_DESCRIPTION_MAX_LENGTH } from "@/lib/constants/bounties";
+import {
+ BOUNTY_DEFAULT_SUBMISSION_URLS,
+ BOUNTY_DESCRIPTION_MAX_LENGTH,
+ BOUNTY_MAX_SUBMISSION_FILES,
+ BOUNTY_MAX_SUBMISSION_URLS,
+} from "@/lib/constants/bounties";
import { mutatePrefix } from "@/lib/swr/mutate";
import { useApiMutation } from "@/lib/swr/use-api-mutation";
import useProgram from "@/lib/swr/use-program";
import useWorkspace from "@/lib/swr/use-workspace";
import { BountyProps, BountySubmissionRequirement } from "@/lib/types";
-import { createBountySchema } from "@/lib/zod/schemas/bounties";
+import {
+ createBountySchema,
+ getImageRequirement,
+ getUrlRequirement,
+ hasImageRequirement,
+ hasUrlRequirement,
+} from "@/lib/zod/schemas/bounties";
import { workflowConditionSchema } from "@/lib/zod/schemas/workflows";
import { BountyLogic } from "@/ui/partners/bounties/bounty-logic";
import { GroupsMultiSelect } from "@/ui/partners/groups/groups-multi-select";
@@ -114,14 +125,29 @@ function BountySheetContent({ setIsOpen, bounty }: BountySheetProps) {
originalSubmissionWindow,
);
- const [requireImage, setRequireImage] = useState(
- bounty?.submissionRequirements?.includes("image") || false,
+ const [requireImage, setRequireImage] = useState(() =>
+ hasImageRequirement(bounty?.submissionRequirements),
);
- const [requireUrl, setRequireUrl] = useState(
- bounty?.submissionRequirements?.includes("url") || false,
+ const [requireUrl, setRequireUrl] = useState(() =>
+ hasUrlRequirement(bounty?.submissionRequirements),
);
+ const [imageMax, setImageMax] = useState<number | undefined>(() => {
+ const imageReq = getImageRequirement(bounty?.submissionRequirements);
+ return imageReq?.max;
+ });
+
+ const [urlMax, setUrlMax] = useState<number | undefined>(() => {
+ const urlReq = getUrlRequirement(bounty?.submissionRequirements);
+ return urlReq?.max;
+ });
+
+ const [urlDomains, setUrlDomains] = useState<string[]>(() => {
+ const urlReq = getUrlRequirement(bounty?.submissionRequirements);
+ return urlReq?.domains || [];
+ });
+
const [rewardType, setRewardType] = useState<RewardType>(
bounty ? (bounty.rewardAmount ? "flat" : "custom") : "flat",
);
@@ -239,26 +265,133 @@ function BountySheetContent({ setIsOpen, bounty }: BountySheetProps) {
const updateSubmissionRequirements = (
imageRequired: boolean,
urlRequired: boolean,
+ imageMaxCount?: number,
+ urlMaxCount?: number,
+ urlDomainsList?: string[],
) => {
- const requirements: BountySubmissionRequirement[] = [];
- if (imageRequired) requirements.push("image");
- if (urlRequired) requirements.push("url");
-
- setValue(
- "submissionRequirements",
- requirements.length > 0 ? requirements : null,
- { shouldDirty: true },
- );
+ // Use new object format if any advanced settings are configured
+ if (
+ imageMaxCount !== undefined ||
+ urlMaxCount !== undefined ||
+ (urlDomainsList && urlDomainsList.length > 0)
+ ) {
+ 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;
+ }
+ }
+
+ setValue(
+ "submissionRequirements",
+ Object.keys(requirements).length > 0 ? requirements : null,
+ { shouldDirty: true },
+ );
+ } else {
+ // Use legacy array format for backwards compatibility
+ const requirements: BountySubmissionRequirement[] = [];
+ if (imageRequired) requirements.push("image");
+ if (urlRequired) requirements.push("url");
+
+ setValue(
+ "submissionRequirements",
+ requirements.length > 0 ? requirements : null,
+ { shouldDirty: true },
+ );
+ }
};
const handleRequireImageToggle = (checked: boolean) => {
setRequireImage(checked);
- updateSubmissionRequirements(checked, requireUrl);
+ if (!checked) {
+ setImageMax(undefined);
+ }
+ updateSubmissionRequirements(
+ checked,
+ requireUrl,
+ checked ? imageMax : undefined,
+ urlMax,
+ urlDomains,
+ );
};
const handleRequireUrlToggle = (checked: boolean) => {
setRequireUrl(checked);
- updateSubmissionRequirements(requireImage, checked);
+ if (!checked) {
+ setUrlMax(undefined);
+ setUrlDomains([]);
+ }
+ updateSubmissionRequirements(
+ requireImage,
+ checked,
+ imageMax,
+ checked ? urlMax : undefined,
+ checked ? urlDomains : undefined,
+ );
+ };
+
+ const handleImageMaxChange = (value: number) => {
+ setImageMax(value);
+ updateSubmissionRequirements(
+ requireImage,
+ requireUrl,
+ value,
+ urlMax,
+ urlDomains,
+ );
+ };
+
+ const handleUrlMaxChange = (value: number) => {
+ setUrlMax(value);
+ updateSubmissionRequirements(
+ requireImage,
+ requireUrl,
+ imageMax,
+ value,
+ urlDomains,
+ );
+ };
+
+ const handleAddDomain = (domain: string) => {
+ const trimmedDomain = domain.trim().toLowerCase();
+ if (trimmedDomain && !urlDomains.includes(trimmedDomain)) {
+ const newDomains = [...urlDomains, trimmedDomain];
+ setUrlDomains(newDomains);
+ updateSubmissionRequirements(
+ requireImage,
+ requireUrl,
+ imageMax,
+ urlMax,
+ newDomains,
+ );
+ }
+ };
+
+ const handleRemoveDomain = (domain: string) => {
+ const newDomains = urlDomains.filter((d) => d !== domain);
+ setUrlDomains(newDomains);
+ updateSubmissionRequirements(
+ requireImage,
+ requireUrl,
+ imageMax,
+ urlMax,
+ newDomains,
+ );
};
// Comprehensive validation logic
@@ -838,7 +971,7 @@ function BountySheetContent({ setIsOpen, bounty }: BountySheetProps) {
>
<div
className={cn(
- "border-border-subtle overflow-hidden rounded-md border border-neutral-300 focus-within:border-neutral-500 focus-within:ring-1 focus-within:ring-neutral-500",
+ "overflow-hidden rounded-md border border-neutral-300 focus-within:border-neutral-500 focus-within:ring-1 focus-within:ring-neutral-500",
errors.description &&
"border-red-600 focus-within:border-red-500 focus-within:ring-red-600",
)}
@@ -888,35 +1021,153 @@ function BountySheetContent({ setIsOpen, bounty }: BountySheetProps) {
default an open text field is provided.
</p>
- <div className="space-y-4">
- <div className="flex items-center gap-4">
- <Switch
- fn={handleRequireImageToggle}
- checked={requireImage}
- trackDimensions="w-8 h-4"
- thumbDimensions="w-3 h-3"
- thumbTranslate="translate-x-4"
- />
- <div className="flex flex-col gap-1">
- <h3 className="text-sm font-medium text-neutral-700">
- Require at least one image
- </h3>
+ <div className="space-y-6">
+ <div className="space-y-4">
+ <div className="flex items-center gap-4">
+ <Switch
+ fn={handleRequireImageToggle}
+ checked={requireImage}
+ trackDimensions="w-8 h-4"
+ thumbDimensions="w-3 h-3"
+ thumbTranslate="translate-x-4"
+ />
+ <div className="flex flex-col gap-1">
+ <h3 className="text-sm font-medium text-neutral-700">
+ Require at least one image
+ </h3>
+ </div>
</div>
- </div>
- <div className="flex items-center gap-4">
- <Switch
- fn={handleRequireUrlToggle}
- checked={requireUrl}
- trackDimensions="w-8 h-4"
- thumbDimensions="w-3 h-3"
- thumbTranslate="translate-x-4"
- />
- <div className="flex flex-col gap-1">
- <h3 className="text-sm font-medium text-neutral-700">
- Require at least one URL
- </h3>
+ {requireImage && (
+ <div className="space-y-3 rounded-lg border border-neutral-200 bg-neutral-50/50 p-4">
+ <label className="text-sm font-medium text-neutral-700">
+ Maximum images
+ <span className="ml-1 font-normal text-neutral-500">
+ (optional)
+ </span>
+ </label>
+ <NumberStepper
+ value={imageMax ?? BOUNTY_MAX_SUBMISSION_FILES}
+ onChange={handleImageMaxChange}
+ min={1}
+ max={BOUNTY_MAX_SUBMISSION_FILES}
+ step={1}
+ className="h-9 w-full [&>div]:h-9"
+ />
+ <p className="text-xs text-neutral-500">
+ Set a maximum number of images partners can
+ submit
+ </p>
+ </div>
+ )}
+
+ <div className="flex items-center gap-4">
+ <Switch
+ fn={handleRequireUrlToggle}
+ checked={requireUrl}
+ trackDimensions="w-8 h-4"
+ thumbDimensions="w-3 h-3"
+ thumbTranslate="translate-x-4"
+ />
+ <div className="flex flex-col gap-1">
+ <h3 className="text-sm font-medium text-neutral-700">
+ Require at least one URL
+ </h3>
+ </div>
</div>
+
+ {requireUrl && (
+ <div className="space-y-4">
+ <div className="space-y-3 rounded-lg border border-neutral-200 bg-neutral-50/50 p-4">
+ <label className="text-sm font-medium text-neutral-700">
+ Maximum URLs
+ <span className="ml-1 font-normal text-neutral-500">
+ (optional)
+ </span>
+ </label>
+ <NumberStepper
+ value={
+ urlMax ?? BOUNTY_DEFAULT_SUBMISSION_URLS
+ }
+ onChange={handleUrlMaxChange}
+ min={1}
+ max={BOUNTY_MAX_SUBMISSION_URLS}
+ step={1}
+ className="h-9 w-full [&>div]:h-9"
+ />
+ <p className="text-xs text-neutral-500">
+ Set a maximum number of URLs partners can
+ submit
+ </p>
+ </div>
+
+ <div className="space-y-3 rounded-lg border border-neutral-200 bg-neutral-50/50 p-4">
+ <label className="text-sm font-medium text-neutral-700">
+ Allowed domains
+ <span className="ml-1 font-normal text-neutral-500">
+ (optional)
+ </span>
+ </label>
+ <div className="flex gap-2">
+ <input
+ type="text"
+ placeholder="e.g. x.com"
+ className={cn(
+ "block h-9 flex-1 rounded-md border-neutral-300 px-3 py-1.5 text-sm text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500",
+ )}
+ onKeyDown={(e) => {
+ if (e.key === "Enter") {
+ e.preventDefault();
+ const input = e.currentTarget;
+ handleAddDomain(input.value);
+ input.value = "";
+ }
+ }}
+ />
+ <Button
+ type="button"
+ variant="secondary"
+ text="Add"
+ className="h-9 w-fit px-3"
+ onClick={(e) => {
+ const input = e.currentTarget
+ .previousElementSibling as HTMLInputElement;
+ if (input) {
+ handleAddDomain(input.value);
+ input.value = "";
+ }
+ }}
+ />
+ </div>
+ {urlDomains.length > 0 && (
+ <div className="mt-2 flex flex-wrap gap-2">
+ {urlDomains.map((domain) => (
+ <div
+ key={domain}
+ className="flex items-center gap-1.5 rounded-md bg-neutral-100 px-2.5 py-1.5 text-sm text-neutral-700"
+ >
+ <span>{domain}</span>
+ <button
+ type="button"
+ onClick={() =>
+ handleRemoveDomain(domain)
+ }
+ className="text-neutral-400 hover:text-neutral-600"
+ >
+ <X className="size-3.5" />
+ </button>
+ </div>
+ ))}
+ </div>
+ )}
+ <p className="text-xs text-neutral-500">
+ Restrict URLs to specific domains. Partners
+ can submit URLs from these domains or their
+ subdomains.
+ </p>
+ </div>
+ </div>
+ )}
</div>
</div>
</div>
diff --git a/apps/web/lib/actions/partners/create-bounty-submission.ts b/apps/web/lib/actions/partners/create-bounty-submission.ts
index a8ef38063c..9a06c69c3d 100644
--- a/apps/web/lib/actions/partners/create-bounty-submission.ts
+++ b/apps/web/lib/actions/partners/create-bounty-submission.ts
@@ -10,6 +10,10 @@ import {
} from "@/lib/constants/bounties";
import {
BountySubmissionFileSchema,
+ getImageRequirement,
+ getUrlRequirement,
+ hasImageRequirement,
+ hasUrlRequirement,
submissionRequirementsSchema,
} from "@/lib/zod/schemas/bounties";
import { sendBatchEmail, sendEmail } from "@dub/email";
@@ -17,6 +21,7 @@ import NewBountySubmission from "@dub/email/templates/bounty-new-submission";
import BountySubmitted from "@dub/email/templates/bounty-submitted";
import { prisma } from "@dub/prisma";
import { BountySubmission, WorkspaceRole } from "@dub/prisma/client";
+import { getDomainWithoutWWW } from "@dub/utils";
import { waitUntil } from "@vercel/functions";
import { formatDistanceToNow } from "date-fns";
import { z } from "zod";
@@ -141,8 +146,10 @@ export const createBountySubmissionAction = authPartnerActionClient
bounty.submissionRequirements || [],
);
- const requireImage = submissionRequirements.includes("image");
- const requireUrl = submissionRequirements.includes("url");
+ const requireImage = hasImageRequirement(submissionRequirements);
+ const requireUrl = hasUrlRequirement(submissionRequirements);
+ const urlRequirement = getUrlRequirement(submissionRequirements);
+ const imageRequirement = getImageRequirement(submissionRequirements);
if (!isDraft) {
if (requireImage && files.length === 0) {
@@ -152,6 +159,51 @@ export const createBountySubmissionAction = authPartnerActionClient
if (requireUrl && urls.length === 0) {
throw new Error("You must submit a URL.");
}
+
+ // Validate URL domain restrictions
+ if (
+ urlRequirement?.domains &&
+ urlRequirement.domains.length > 0 &&
+ urls.length > 0
+ ) {
+ const allowedDomains = urlRequirement.domains
+ .map((domain) => getDomainWithoutWWW(domain)?.toLowerCase())
+ .filter((domain): domain is string => !!domain);
+
+ if (allowedDomains.length > 0) {
+ const invalidUrls = urls.filter((url) => {
+ const urlDomain = getDomainWithoutWWW(url)?.toLowerCase();
+ if (!urlDomain) return true;
+ // Check if URL domain matches any allowed domain or is a subdomain
+ return !allowedDomains.some(
+ (allowedDomain) =>
+ urlDomain === allowedDomain ||
+ urlDomain.endsWith(`.${allowedDomain}`),
+ );
+ });
+
+ if (invalidUrls.length > 0) {
+ const domainsList = allowedDomains.join(", ");
+ throw new Error(
+ `All URLs must be from one of the following domains: ${domainsList}. Please check your submission.`,
+ );
+ }
+ }
+ }
+
+ // Validate max count for URLs
+ if (urlRequirement?.max && urls.length > urlRequirement.max) {
+ throw new Error(
+ `You can submit at most ${urlRequirement.max} URL${urlRequirement.max === 1 ? "" : "s"}.`,
+ );
+ }
+
+ // Validate max count for images
+ if (imageRequirement?.max && files.length > imageRequirement.max) {
+ throw new Error(
+ `You can submit at most ${imageRequirement.max} image${imageRequirement.max === 1 ? "" : "s"}.`,
+ );
+ }
}
// If there is an existing submission, update it
diff --git a/apps/web/lib/actions/partners/upload-bounty-submission-file.ts b/apps/web/lib/actions/partners/upload-bounty-submission-file.ts
index c3c50ad152..518ba5791e 100644
--- a/apps/web/lib/actions/partners/upload-bounty-submission-file.ts
+++ b/apps/web/lib/actions/partners/upload-bounty-submission-file.ts
@@ -3,7 +3,10 @@
import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
import { storage } from "@/lib/storage";
import { ratelimit } from "@/lib/upstash";
-import { submissionRequirementsSchema } from "@/lib/zod/schemas/bounties";
+import {
+ submissionRequirementsSchema,
+ hasImageRequirement,
+} from "@/lib/zod/schemas/bounties";
import { prisma } from "@dub/prisma";
import { nanoid, R2_URL } from "@dub/utils";
import { z } from "zod";
@@ -110,7 +113,7 @@ export const uploadBountySubmissionFileAction = authPartnerActionClient
bounty.submissionRequirements,
);
- const requireImage = submissionRequirements.includes("image");
+ const requireImage = hasImageRequirement(submissionRequirements);
if (!requireImage) {
throw new Error(
diff --git a/apps/web/lib/constants/bounties.ts b/apps/web/lib/constants/bounties.ts
index e14b058540..4b4c6dc7ab 100644
--- a/apps/web/lib/constants/bounties.ts
+++ b/apps/web/lib/constants/bounties.ts
@@ -2,6 +2,7 @@ export const BOUNTY_DESCRIPTION_MAX_LENGTH = 5000;
export const BOUNTY_MAX_SUBMISSION_FILES = 4;
+export const BOUNTY_DEFAULT_SUBMISSION_URLS = 10;
export const BOUNTY_MAX_SUBMISSION_URLS = 100;
export const BOUNTY_MAX_SUBMISSION_DESCRIPTION_LENGTH = 1000;
diff --git a/apps/web/lib/zod/schemas/bounties.ts b/apps/web/lib/zod/schemas/bounties.ts
index 61926ec798..77c2d9497c 100644
--- a/apps/web/lib/zod/schemas/bounties.ts
+++ b/apps/web/lib/zod/schemas/bounties.ts
@@ -18,10 +18,93 @@ import { UserSchema } from "./users";
import { parseDateSchema } from "./utils";
import { workflowConditionSchema } from "./workflows";
-export const submissionRequirementsSchema = z
- .array(z.enum(BOUNTY_SUBMISSION_REQUIREMENTS))
- .min(0)
- .max(2);
+// New format: object with image and url keys
+const submissionRequirementsObjectSchema = z.object({
+ image: z
+ .object({
+ max: z.number().int().positive().optional(),
+ })
+ .optional(),
+ url: z
+ .object({
+ max: z.number().int().positive().optional(),
+ domains: z.array(z.string()).optional(),
+ })
+ .optional(),
+});
+
+// Legacy format: array of strings (backwards compatible)
+const legacySubmissionRequirementsSchema = z.array(
+ z.enum(BOUNTY_SUBMISSION_REQUIREMENTS),
+);
+
+// Union schema supporting both old and new formats
+export const submissionRequirementsSchema = z.union([
+ submissionRequirementsObjectSchema,
+ legacySubmissionRequirementsSchema,
+]);
+
+// Type exports for TypeScript
+export type SubmissionRequirements =
+ | z.infer<typeof submissionRequirementsObjectSchema>
+ | z.infer<typeof legacySubmissionRequirementsSchema>;
+
+// Helper functions for backwards-compatible requirement checking
+export function hasImageRequirement(
+ requirements: SubmissionRequirements | null | undefined,
+): boolean {
+ if (!requirements) return false;
+ // New format: object with image key
+ if (typeof requirements === "object" && !Array.isArray(requirements)) {
+ return !!requirements.image;
+ }
+ // Legacy format: array of strings
+ if (Array.isArray(requirements)) {
+ return requirements.includes("image");
+ }
+ return false;
+}
+
+// Helper to get image requirement details
+export function getImageRequirement(
+ requirements: SubmissionRequirements | null | undefined,
+): { max?: number } | null {
+ if (!requirements) return null;
+ // New format: object with image key
+ if (typeof requirements === "object" && !Array.isArray(requirements)) {
+ return requirements.image || null;
+ }
+ // Legacy format: no constraints
+ return null;
+}
+
+export function hasUrlRequirement(
+ requirements: SubmissionRequirements | null | undefined,
+): boolean {
+ if (!requirements) return false;
+ // New format: object with url key
+ if (typeof requirements === "object" && !Array.isArray(requirements)) {
+ return !!requirements.url;
+ }
+ // Legacy format: array of strings
+ if (Array.isArray(requirements)) {
+ return requirements.includes("url");
+ }
+ return false;
+}
+
+// Helper to get URL requirement details
+export function getUrlRequirement(
+ requirements: SubmissionRequirements | null | undefined,
+): { max?: number; domains?: string[] } | null {
+ if (!requirements) return null;
+ // New format: object with url key
+ if (typeof requirements === "object" && !Array.isArray(requirements)) {
+ return requirements.url || null;
+ }
+ // Legacy format: no constraints
+ return null;
+}
export const createBountySchema = z.object({
name: z
diff --git a/apps/web/tests/bounties/index.test.ts b/apps/web/tests/bounties/index.test.ts
index ca4fdfc73e..d6d336a30d 100644
--- a/apps/web/tests/bounties/index.test.ts
+++ b/apps/web/tests/bounties/index.test.ts
@@ -25,7 +25,14 @@ const submissionBounty = {
endsAt: null,
submissionsOpenAt: null,
rewardAmount: 1000,
- submissionRequirements: ["image", "url"],
+ submissionRequirements: {
+ image: {
+ max: 4,
+ },
+ url: {
+ max: 10,
+ },
+ },
};
describe.sequential("/bounties/**", async () => {
@@ -201,7 +208,6 @@ describe.sequential("/bounties/**", async () => {
name: "Submission Bounty Updated",
endsAt: endsAt.toISOString(),
rewardAmount: 2000,
- submissionRequirements: ["image"],
};
const { status, data: bounty } = await http.patch<Bounty>({
diff --git a/apps/web/ui/partners/bounties/claim-bounty-modal.tsx b/apps/web/ui/partners/bounties/claim-bounty-modal.tsx
index eb1b5a61d9..dab821a219 100644
--- a/apps/web/ui/partners/bounties/claim-bounty-modal.tsx
+++ b/apps/web/ui/partners/bounties/claim-bounty-modal.tsx
@@ -10,6 +10,12 @@ import { getBountyRewardDescription } from "@/lib/partners/get-bounty-reward-des
import { mutatePrefix } from "@/lib/swr/mutate";
import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
import { PartnerBountyProps } from "@/lib/types";
+import {
+ getImageRequirement,
+ getUrlRequirement,
+ hasImageRequirement,
+ hasUrlRequirement,
+} from "@/lib/zod/schemas/bounties";
import { useConfirmModal } from "@/ui/modals/confirm-modal";
import { X } from "@/ui/shared/icons";
import { Markdown } from "@/ui/shared/markdown";
@@ -139,10 +145,23 @@ function ClaimBountyModalContent({ bounty }: ClaimBountyModalProps) {
createBountySubmissionAction,
);
- const imageRequired = bounty.submissionRequirements?.includes("image");
- const urlRequired = bounty.submissionRequirements?.includes("url");
+ const imageRequired = hasImageRequirement(bounty.submissionRequirements);
+ const urlRequired = hasUrlRequirement(bounty.submissionRequirements);
const fileUploading = files.some(({ uploading }) => uploading);
+ // Get max values from bounty submission requirements, fallback to constants
+ const imageRequirement = getImageRequirement(bounty.submissionRequirements);
+ const urlRequirement = getUrlRequirement(bounty.submissionRequirements);
+ const maxFiles = imageRequirement?.max ?? BOUNTY_MAX_SUBMISSION_FILES;
+ const maxUrls = urlRequirement?.max ?? BOUNTY_MAX_SUBMISSION_URLS;
+
+ // Get placeholder URL from domain if available
+ const placeholderUrl = (() => {
+ const firstDomain = urlRequirement?.domains?.[0];
+ if (!firstDomain) return "https://";
+ return `https://${firstDomain}`;
+ })();
+
const hasSubmissionsOpen = bounty.submissionsOpenAt
? isBefore(bounty.submissionsOpenAt, new Date())
: true;
@@ -220,6 +239,7 @@ function ClaimBountyModalContent({ bounty }: ClaimBountyModalProps) {
? error.message
: "Failed to create submission. Please try again.",
);
+ setIsDraft(null); // reset submit state on error
}
};
@@ -503,9 +523,7 @@ function ClaimBountyModalContent({ bounty }: ClaimBountyModalProps) {
onChange={async ({ file }) =>
await handleUpload(file)
}
- disabled={
- files.length >= BOUNTY_MAX_SUBMISSION_FILES
- }
+ disabled={files.length >= maxFiles}
maxFileSizeMB={5}
/>
</div>
@@ -524,8 +542,7 @@ function ClaimBountyModalContent({ bounty }: ClaimBountyModalProps) {
{urlRequired && " (at least 1 required)"}
</h2>
<span className="text-xs font-medium text-neutral-500">
- {urls.filter((u) => u.url).length} /{" "}
- {BOUNTY_MAX_SUBMISSION_URLS}
+ {urls.filter((u) => u.url).length} / {maxUrls}
</span>
</label>
<div className={cn("mt-2 flex flex-col gap-2")}>
@@ -533,7 +550,7 @@ function ClaimBountyModalContent({ bounty }: ClaimBountyModalProps) {
<div key={id} className="flex items-center gap-2">
<input
type="url"
- placeholder="https://"
+ placeholder={placeholderUrl}
value={url}
onChange={(e) =>
setUrls((prev) =>
@@ -560,7 +577,7 @@ function ClaimBountyModalContent({ bounty }: ClaimBountyModalProps) {
)}
</div>
))}
- {urls.length < BOUNTY_MAX_SUBMISSION_URLS && (
+ {urls.length < maxUrls && (
<Button
variant="secondary"
text="Add URL"
diff --git a/packages/ui/src/number-stepper.tsx b/packages/ui/src/number-stepper.tsx
index dffb506950..47f6311565 100644
--- a/packages/ui/src/number-stepper.tsx
+++ b/packages/ui/src/number-stepper.tsx
@@ -1,5 +1,13 @@
import { cn } from "@dub/utils";
-import { HTMLAttributes, ReactNode, useCallback } from "react";
+import {
+ HTMLAttributes,
+ ReactNode,
+ useCallback,
+ useEffect,
+ useLayoutEffect,
+ useRef,
+ useState,
+} from "react";
import { Minus, Plus } from "./icons";
export type NumberStepperProps = {
@@ -30,9 +38,28 @@ export function NumberStepper({
incrementAriaLabel = "Increase",
...rest
}: NumberStepperProps) {
+ const [inputValue, setInputValue] = useState<string>(String(value));
+ const [isEditing, setIsEditing] = useState(false);
+ const inputRef = useRef<HTMLInputElement>(null);
+
const canDecrement = typeof min === "number" ? value > min : true;
const canIncrement = typeof max === "number" ? value < max : true;
+ // Focus and select input when entering edit mode
+ useLayoutEffect(() => {
+ if (isEditing && inputRef.current && !disabled) {
+ inputRef.current.focus();
+ inputRef.current.select();
+ }
+ }, [isEditing, disabled]);
+
+ // Update input value when prop value changes (but not while editing)
+ useEffect(() => {
+ if (!isEditing && inputValue !== String(value)) {
+ setInputValue(String(value));
+ }
+ }, [value, isEditing, inputValue]);
+
const constrainToRange = useCallback(
(next: number) => {
let nextValue = next;
@@ -59,7 +86,9 @@ export function NumberStepper({
return;
}
- onChange(constrainToRange(value - step));
+ const newValue = constrainToRange(value - step);
+ onChange(newValue);
+ setInputValue(String(newValue));
}, [disabled, canDecrement, constrainToRange, onChange, step, value]);
const handleIncrement = useCallback(() => {
@@ -71,9 +100,75 @@ export function NumberStepper({
return;
}
- onChange(constrainToRange(value + step));
+ const newValue = constrainToRange(value + step);
+ onChange(newValue);
+ setInputValue(String(newValue));
}, [disabled, canIncrement, constrainToRange, onChange, step, value]);
+ const handleInputChange = useCallback(
+ (e: React.ChangeEvent<HTMLInputElement>) => {
+ const newInputValue = e.target.value;
+ setInputValue(newInputValue);
+
+ // Allow empty input while typing
+ if (newInputValue === "" || newInputValue === "-") {
+ return;
+ }
+
+ const numValue = Number(newInputValue);
+ if (!isNaN(numValue)) {
+ const constrainedValue = constrainToRange(numValue);
+ onChange(constrainedValue);
+ }
+ },
+ [constrainToRange, onChange],
+ );
+
+ const handleInputBlur = useCallback(() => {
+ setIsEditing(false);
+ const numValue = Number(inputValue);
+
+ // If invalid or empty, reset to current value
+ if (isNaN(numValue) || inputValue === "" || inputValue === "-") {
+ setInputValue(String(value));
+ return;
+ }
+
+ // Constrain and update
+ const constrainedValue = constrainToRange(numValue);
+ onChange(constrainedValue);
+ setInputValue(String(constrainedValue));
+ }, [inputValue, value, constrainToRange, onChange]);
+
+ const handleInputFocus = useCallback(() => {
+ setIsEditing(true);
+ }, []);
+
+ const handleInputKeyDown = useCallback(
+ (e: React.KeyboardEvent<HTMLInputElement>) => {
+ if (disabled) {
+ return;
+ }
+
+ if (e.key === "ArrowLeft" || e.key === "ArrowDown") {
+ e.preventDefault();
+ handleDecrement();
+ } else if (e.key === "ArrowRight" || e.key === "ArrowUp") {
+ e.preventDefault();
+ handleIncrement();
+ } else if (e.key === "Enter") {
+ e.preventDefault();
+ handleInputBlur();
+ e.currentTarget.blur();
+ } else if (e.key === "Escape") {
+ e.preventDefault();
+ setInputValue(String(value));
+ e.currentTarget.blur();
+ }
+ },
+ [disabled, handleDecrement, handleIncrement, handleInputBlur, value],
+ );
+
return (
<div
id={id}
@@ -99,32 +194,62 @@ export function NumberStepper({
<Minus className="block size-4" />
</button>
- <div
- role="spinbutton"
- aria-valuenow={value}
- aria-valuemin={min}
- aria-valuemax={max}
- tabIndex={0}
- onKeyDown={(e) => {
- if (disabled) {
- return;
- }
-
- if (e.key === "ArrowLeft" || e.key === "ArrowDown") {
- e.preventDefault();
- handleDecrement();
- }
- if (e.key === "ArrowRight" || e.key === "ArrowUp") {
- e.preventDefault();
- handleIncrement();
- }
- }}
- className={cn(
- "flex min-w-0 flex-1 items-center justify-center px-3 text-sm text-neutral-900",
+ <div className="relative flex min-w-0 flex-1 items-center justify-center">
+ <input
+ ref={inputRef}
+ type="text"
+ inputMode="numeric"
+ role="spinbutton"
+ aria-valuenow={value}
+ aria-valuemin={min}
+ aria-valuemax={max}
+ value={isEditing ? inputValue : String(value)}
+ onChange={handleInputChange}
+ onBlur={handleInputBlur}
+ onFocus={handleInputFocus}
+ onKeyDown={handleInputKeyDown}
+ disabled={disabled}
+ className={cn(
+ "w-full border-0 bg-transparent px-3 text-center text-sm text-neutral-900 outline-none transition-colors focus:ring-0",
+ disabled && "cursor-not-allowed",
+ !disabled && "cursor-text focus:bg-neutral-50",
+ !isEditing && formatValue && "pointer-events-none opacity-0",
+ )}
+ />
+ {!isEditing && formatValue && (
+ <div
+ role="spinbutton"
+ aria-valuenow={value}
+ aria-valuemin={min}
+ aria-valuemax={max}
+ tabIndex={0}
+ onKeyDown={(e) => {
+ if (e.key === "Enter" || e.key === " ") {
+ e.preventDefault();
+ if (!disabled) {
+ setIsEditing(true);
+ setInputValue(String(value));
+ }
+ } else {
+ handleInputKeyDown(
+ e as Parameters<typeof handleInputKeyDown>[0],
+ );
+ }
+ }}
+ onClick={() => {
+ if (!disabled) {
+ setIsEditing(true);
+ setInputValue(String(value));
+ }
+ }}
+ className={cn(
+ "absolute inset-0 flex items-center justify-center px-3 text-sm text-neutral-900 outline-none focus:ring-0",
+ !disabled && "cursor-text hover:bg-neutral-50",
+ )}
+ >
+ {formatValue(value)}
+ </div>
)}
- prefix=""
- >
- {formatValue ? formatValue(value) : value}
</div>
<button