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 Partially approved to partners for partiallyApproved submissions

Rafiffa43009e056
diff --git a/apps/web/app/(ee)/app.dub.co/embed/referrals/bounties/submission-detail.tsx b/apps/web/app/(ee)/app.dub.co/embed/referrals/bounties/submission-detail.tsx
index afa4270b3a..22fc4d2ddb 100644
--- a/apps/web/app/(ee)/app.dub.co/embed/referrals/bounties/submission-detail.tsx
+++ b/apps/web/app/(ee)/app.dub.co/embed/referrals/bounties/submission-detail.tsx
@@ -1,6 +1,6 @@
"use client";
-import { getPartnerSubmissionStatusBadge } from "@/lib/bounty/bounty-submission-status-badges";
+import { BountySubmissionStatusBadges } from "@/lib/bounty/bounty-submission-status-badges";
import { REJECT_BOUNTY_SUBMISSION_REASONS } from "@/lib/bounty/constants";
import { getPeriodLabel } from "@/lib/bounty/periods";
import { resolveBountyDetails } from "@/lib/bounty/utils";
@@ -193,7 +193,7 @@ function SubmissionRightColumn({
submission: PartnerBountySubmission;
}) {
const bountyInfo = resolveBountyDetails(bounty);
- const statusBadge = getPartnerSubmissionStatusBadge(submission.status);
+ const statusBadge = BountySubmissionStatusBadges[submission.status];
const submittedDate = submission.completedAt ?? submission.createdAt;
const textValue = (text: string) => (
@@ -211,7 +211,9 @@ function SubmissionRightColumn({
icon={statusBadge.icon}
className="w-fit rounded-lg py-1"
>
- {statusBadge.label}
+ {submission.status === "submitted"
+ ? "Pending review"
+ : statusBadge.label}
</StatusBadge>
),
});
diff --git a/apps/web/app/(ee)/app.dub.co/embed/referrals/bounties/submissions-table.tsx b/apps/web/app/(ee)/app.dub.co/embed/referrals/bounties/submissions-table.tsx
index 56105d6f3a..2ae845320a 100644
--- a/apps/web/app/(ee)/app.dub.co/embed/referrals/bounties/submissions-table.tsx
+++ b/apps/web/app/(ee)/app.dub.co/embed/referrals/bounties/submissions-table.tsx
@@ -1,6 +1,6 @@
"use client";
-import { getPartnerSubmissionStatusBadge } from "@/lib/bounty/bounty-submission-status-badges";
+import { BountySubmissionStatusBadges } from "@/lib/bounty/bounty-submission-status-badges";
import {
type SubmissionPeriod,
getSubmissionPeriods,
@@ -47,7 +47,11 @@ export function EmbedBountySubmissionsTable({
original: SubmissionPeriod<PartnerBountySubmission>;
};
}) => {
- const config = getPartnerSubmissionStatusBadge(original.status);
+ const config = BountySubmissionStatusBadges[original.status];
+ const label =
+ original.status === "submitted"
+ ? "Pending review"
+ : config?.label;
return (
<div className="flex items-center gap-3">
<span className="text-content-subtle min-w-[52px] text-sm font-medium leading-5 tracking-[-0.28px]">
@@ -59,7 +63,7 @@ export function EmbedBountySubmissionsTable({
variant={config.variant}
icon={config.icon}
>
- {config.label}
+ {label}
</StatusBadge>
</span>
)}
@@ -75,11 +79,13 @@ export function EmbedBountySubmissionsTable({
minSize: 120,
size: 160,
cell: ({ row: { original } }) => {
- const config = getPartnerSubmissionStatusBadge(original.status);
+ const config = BountySubmissionStatusBadges[original.status];
if (!config) return null;
+ const label =
+ original.status === "submitted" ? "Pending review" : config.label;
return (
<StatusBadge variant={config.variant} icon={config.icon}>
- {config.label}
+ {label}
</StatusBadge>
);
},
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/bounties/[bountyId]/bounty-submissions-table.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/bounties/[bountyId]/bounty-submissions-table.tsx
index 3e1e4d7264..eae29e419d 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/bounties/[bountyId]/bounty-submissions-table.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/bounties/[bountyId]/bounty-submissions-table.tsx
@@ -1,6 +1,6 @@
"use client";
-import { getPartnerSubmissionStatusBadge } from "@/lib/bounty/bounty-submission-status-badges";
+import { BountySubmissionStatusBadges } from "@/lib/bounty/bounty-submission-status-badges";
import {
type SubmissionPeriod,
getSubmissionPeriods,
@@ -56,7 +56,11 @@ export function BountySubmissionsTable({
}: {
row: { original: SubmissionPeriod<PartnerBountySubmission> };
}) => {
- const config = getPartnerSubmissionStatusBadge(original.status);
+ const config = BountySubmissionStatusBadges[original.status];
+ const label =
+ original.status === "submitted"
+ ? "Pending review"
+ : config?.label;
return (
<div className="flex items-center gap-3">
@@ -69,7 +73,7 @@ export function BountySubmissionsTable({
variant={config.variant}
icon={config.icon}
>
- {config.label}
+ {label}
</StatusBadge>
</span>
)}
@@ -85,11 +89,13 @@ export function BountySubmissionsTable({
minSize: 120,
size: 160,
cell: ({ row: { original } }) => {
- const config = getPartnerSubmissionStatusBadge(original.status);
+ const config = BountySubmissionStatusBadges[original.status];
if (!config) return null;
+ const label =
+ original.status === "submitted" ? "Pending review" : config.label;
return (
<StatusBadge variant={config.variant} icon={config.icon}>
- {config.label}
+ {label}
</StatusBadge>
);
},
diff --git a/apps/web/lib/bounty/bounty-submission-status-badges.ts b/apps/web/lib/bounty/bounty-submission-status-badges.ts
index dc0cb29416..3f01215cbc 100644
--- a/apps/web/lib/bounty/bounty-submission-status-badges.ts
+++ b/apps/web/lib/bounty/bounty-submission-status-badges.ts
@@ -6,7 +6,6 @@ import {
CircleXmark,
Lock,
} from "@dub/ui/icons";
-import { BountySubmissionStatus } from "@prisma/client";
export const BountySubmissionStatusBadges = {
notSubmitted: {
@@ -52,20 +51,3 @@ export const BountySubmissionStatusBadges = {
iconClassName: "text-red-600",
},
} as const;
-
-// Partners see partially approved submissions the same as submitted ones, as "Pending review"
-export function getPartnerSubmissionStatusBadge(
- status: keyof typeof BountySubmissionStatusBadges,
-) {
- if (
- status === BountySubmissionStatus.submitted ||
- status === BountySubmissionStatus.partiallyApproved
- ) {
- return {
- ...BountySubmissionStatusBadges.submitted,
- label: "Pending review",
- };
- }
-
- return BountySubmissionStatusBadges[status];
-}
diff --git a/apps/web/ui/partners/bounties/bounty-submission-details-sheet.tsx b/apps/web/ui/partners/bounties/bounty-submission-details-sheet.tsx
index 4788a9c99d..f8029a2bde 100644
--- a/apps/web/ui/partners/bounties/bounty-submission-details-sheet.tsx
+++ b/apps/web/ui/partners/bounties/bounty-submission-details-sheet.tsx
@@ -1,6 +1,6 @@
"use client";
-import { getPartnerSubmissionStatusBadge } from "@/lib/bounty/bounty-submission-status-badges";
+import { BountySubmissionStatusBadges } from "@/lib/bounty/bounty-submission-status-badges";
import { REJECT_BOUNTY_SUBMISSION_REASONS } from "@/lib/bounty/constants";
import { getPeriodLabel } from "@/lib/bounty/periods";
import { resolveBountyDetails } from "@/lib/bounty/utils";
@@ -125,7 +125,7 @@ function SubmissionDetailsView({
submission: PartnerBountySubmission;
}) {
const bountyInfo = resolveBountyDetails(bounty);
- const statusBadge = getPartnerSubmissionStatusBadge(submission.status);
+ const statusBadge = BountySubmissionStatusBadges[submission.status];
const submittedDate = submission.completedAt ?? submission.createdAt;
const textValue = (text: string) => (
@@ -143,7 +143,9 @@ function SubmissionDetailsView({
icon={statusBadge.icon}
className="w-fit rounded-lg py-1"
>
- {statusBadge.label}
+ {submission.status === "submitted"
+ ? "Pending review"
+ : statusBadge.label}
</StatusBadge>
),
});