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.

Replace bounty submission approve/reject server actions with APIs (#4456)

Kiran Ka3f695b14932
diff --git a/apps/web/lib/actions/partners/approve-bounty-submission.ts b/apps/web/lib/actions/partners/approve-bounty-submission.ts
deleted file mode 100644
index 207064a629..0000000000
--- a/apps/web/lib/actions/partners/approve-bounty-submission.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-"use server";
-
-import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
-import { approveBountySubmission } from "@/lib/bounty/api/approve-bounty-submission";
-import { approveBountySubmissionBodySchema } from "@/lib/zod/schemas/bounties";
-import * as z from "zod/v4";
-import { authActionClient } from "../safe-action";
-import { throwIfNoPermission } from "../throw-if-no-permission";
-
-const inputSchema = approveBountySubmissionBodySchema.extend({
- workspaceId: z.string(),
- submissionId: z.string(),
-});
-
-// Approve a submission for a bounty
-export const approveBountySubmissionAction = authActionClient
- .inputSchema(inputSchema)
- .action(async ({ parsedInput, ctx }) => {
- const { workspace, user } = ctx;
- const { submissionId, rewardAmount } = parsedInput;
-
- throwIfNoPermission({
- role: workspace.role,
- requiredRoles: ["owner", "member"],
- });
-
- const programId = getDefaultProgramIdOrThrow(workspace);
-
- await approveBountySubmission({
- programId,
- submissionId,
- rewardAmount,
- user,
- });
- });
diff --git a/apps/web/lib/actions/partners/reject-bounty-submission.ts b/apps/web/lib/actions/partners/reject-bounty-submission.ts
deleted file mode 100644
index fe5665ed01..0000000000
--- a/apps/web/lib/actions/partners/reject-bounty-submission.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-"use server";
-
-import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
-import { rejectBountySubmission } from "@/lib/bounty/api/reject-bounty-submission";
-import { rejectBountySubmissionBodySchema } from "@/lib/zod/schemas/bounties";
-import * as z from "zod/v4";
-import { authActionClient } from "../safe-action";
-import { throwIfNoPermission } from "../throw-if-no-permission";
-
-const inputSchema = rejectBountySubmissionBodySchema.extend({
- workspaceId: z.string(),
- submissionId: z.string(),
-});
-
-// Reject a bounty submission
-export const rejectBountySubmissionAction = authActionClient
- .inputSchema(inputSchema)
- .action(async ({ parsedInput, ctx }) => {
- const { workspace, user } = ctx;
- const { submissionId, rejectionReason, rejectionNote } = parsedInput;
-
- throwIfNoPermission({
- role: workspace.role,
- requiredRoles: ["owner", "member"],
- });
-
- const programId = getDefaultProgramIdOrThrow(workspace);
-
- await rejectBountySubmission({
- programId,
- submissionId,
- rejectionReason,
- rejectionNote,
- user,
- });
- });
diff --git a/apps/web/ui/modals/confirm-approve-bounty-submission-modal.tsx b/apps/web/ui/modals/confirm-approve-bounty-submission-modal.tsx
index 2d7cb9c5bf..ac988fec09 100644
--- a/apps/web/ui/modals/confirm-approve-bounty-submission-modal.tsx
+++ b/apps/web/ui/modals/confirm-approve-bounty-submission-modal.tsx
@@ -1,15 +1,13 @@
"use client";
-import { approveBountySubmissionAction } from "@/lib/actions/partners/approve-bounty-submission";
import { calculateSocialMetricsRewardAmount } from "@/lib/bounty/rewards";
import { resolveBountyDetails } from "@/lib/bounty/utils";
import { mutatePrefix } from "@/lib/swr/mutate";
-import useWorkspace from "@/lib/swr/use-workspace";
+import { useApiMutation } from "@/lib/swr/use-api-mutation";
import { BountyProps, BountySubmissionProps } from "@/lib/types";
import { PartnerAvatar } from "@/ui/partners/partner-avatar";
import { Button, Modal } from "@dub/ui";
import { currencyFormatter } from "@dub/utils";
-import { useAction } from "next-safe-action/hooks";
import { useMemo, useState } from "react";
import { toast } from "sonner";
@@ -30,24 +28,8 @@ function ConfirmApproveBountySubmissionModal({
rewardAmount,
onApproveSuccess,
}: ConfirmApproveBountySubmissionModalProps) {
- const { id: workspaceId } = useWorkspace();
-
- const { executeAsync: approveBountySubmission, isPending } = useAction(
- approveBountySubmissionAction,
- {
- onSuccess: async () => {
- setShowModal(false);
- toast.success("Bounty submission approved successfully!");
- if (bounty?.id) {
- await mutatePrefix(`/api/bounties/${bounty.id}/submissions`);
- }
- onApproveSuccess?.();
- },
- onError({ error }) {
- toast.error(error.serverError);
- },
- },
- );
+ const { makeRequest: approveBountySubmission, isSubmitting } =
+ useApiMutation();
const commissionAmountCents = useMemo(() => {
const bountyInfo = bounty ? resolveBountyDetails(bounty) : null;
@@ -64,12 +46,23 @@ function ConfirmApproveBountySubmissionModal({
}, [bounty, submission, rewardAmount]);
const handleApprove = async () => {
- if (!workspaceId || !submission?.id) return;
- await approveBountySubmission({
- workspaceId,
- submissionId: submission.id,
- rewardAmount: rewardAmount != null ? rewardAmount * 100 : null,
- });
+ if (!submission?.id || !submission.bountyId) return;
+
+ await approveBountySubmission(
+ `/api/bounties/${submission.bountyId}/submissions/${submission.id}/approve`,
+ {
+ method: "POST",
+ body: {
+ rewardAmount: rewardAmount != null ? rewardAmount * 100 : null,
+ },
+ onSuccess: async () => {
+ setShowModal(false);
+ toast.success("Bounty submission approved successfully!");
+ await mutatePrefix(`/api/bounties/${submission.bountyId}/submissions`);
+ onApproveSuccess?.();
+ },
+ },
+ );
};
return (
@@ -136,14 +129,14 @@ function ConfirmApproveBountySubmissionModal({
text="Cancel"
className="h-8 w-fit"
onClick={() => setShowModal(false)}
- disabled={isPending}
+ disabled={isSubmitting}
/>
<Button
type="button"
variant="primary"
text="Approve"
className="h-8 w-fit"
- loading={isPending}
+ loading={isSubmitting}
onClick={handleApprove}
/>
</div>
diff --git a/apps/web/ui/partners/bounties/reject-bounty-submission-modal.tsx b/apps/web/ui/partners/bounties/reject-bounty-submission-modal.tsx
index 258d9f3b22..b5bfe9dc15 100644
--- a/apps/web/ui/partners/bounties/reject-bounty-submission-modal.tsx
+++ b/apps/web/ui/partners/bounties/reject-bounty-submission-modal.tsx
@@ -1,17 +1,14 @@
-import { rejectBountySubmissionAction } from "@/lib/actions/partners/reject-bounty-submission";
import {
BOUNTY_MAX_SUBMISSION_REJECTION_NOTE_LENGTH,
REJECT_BOUNTY_SUBMISSION_REASONS,
} from "@/lib/bounty/constants";
import { mutatePrefix } from "@/lib/swr/mutate";
-import useBounty from "@/lib/swr/use-bounty";
-import useWorkspace from "@/lib/swr/use-workspace";
+import { useApiMutation } from "@/lib/swr/use-api-mutation";
import { BountySubmissionProps } from "@/lib/types";
import { rejectBountySubmissionBodySchema } from "@/lib/zod/schemas/bounties";
import { MaxCharactersCounter } from "@/ui/shared/max-characters-counter";
import { Button, Modal, useKeyboardShortcut } from "@dub/ui";
import { cn } from "@dub/utils";
-import { useAction } from "next-safe-action/hooks";
import { useCallback, useState } from "react";
import { useForm } from "react-hook-form";
import { toast } from "sonner";
@@ -30,12 +27,11 @@ const RejectBountySubmissionModal = ({
setShowModal,
onReject,
}: RejectBountySubmissionModalProps) => {
- const { bounty } = useBounty();
- const workspace = useWorkspace();
+ const { makeRequest: rejectBountySubmission, isSubmitting } =
+ useApiMutation();
const {
register,
- watch,
getValues,
control,
formState: { errors },
@@ -46,35 +42,39 @@ const RejectBountySubmissionModal = ({
},
});
- const { executeAsync: rejectBountySubmission, isPending } = useAction(
- rejectBountySubmissionAction,
- {
- onSuccess: () => {
- toast.success("Bounty submission rejected successfully!");
- setShowModal(false);
- onReject ? onReject() : null;
- mutatePrefix(`/api/bounties/${bounty?.id}/submissions`);
- },
- onError({ error }) {
- toast.error(error.serverError);
- },
- },
- );
-
const handleReject = useCallback(async () => {
- if (!workspace.id || !submission?.id) {
+ if (!submission?.id || !submission.bountyId) {
return;
}
const formData = getValues();
- await rejectBountySubmission({
- ...formData,
- rejectionReason: formData.rejectionReason,
- workspaceId: workspace.id,
- submissionId: submission.id,
- });
- }, [workspace.id, submission?.id, getValues, rejectBountySubmission]);
+ await rejectBountySubmission(
+ `/api/bounties/${submission.bountyId}/submissions/${submission.id}/reject`,
+ {
+ method: "POST",
+ body: {
+ rejectionReason: formData.rejectionReason || undefined,
+ rejectionNote: formData.rejectionNote,
+ },
+ onSuccess: async () => {
+ toast.success("Bounty submission rejected successfully!");
+ setShowModal(false);
+ onReject?.();
+ await mutatePrefix(
+ `/api/bounties/${submission.bountyId}/submissions`,
+ );
+ },
+ },
+ );
+ }, [
+ submission?.id,
+ submission.bountyId,
+ getValues,
+ rejectBountySubmission,
+ setShowModal,
+ onReject,
+ ]);
// Handle keyboard shortcut for Reject button
useKeyboardShortcut("r", handleReject, {
@@ -105,7 +105,7 @@ const RejectBountySubmissionModal = ({
<select
id="rejectionReason"
{...register("rejectionReason")}
- disabled={isPending}
+ disabled={isSubmitting}
className={cn(
"block w-full rounded-md border-neutral-300 text-neutral-900 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
errors.rejectionReason &&
@@ -174,7 +174,7 @@ const RejectBountySubmissionModal = ({
text="Cancel"
className="h-9 w-fit"
onClick={() => setShowModal(false)}
- disabled={isPending}
+ disabled={isSubmitting}
/>
<Button
type="button"
@@ -182,7 +182,7 @@ const RejectBountySubmissionModal = ({
variant="danger"
shortcut="R"
className="h-9 w-fit"
- loading={isPending}
+ loading={isSubmitting}
onClick={handleReject}
/>
</div>