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.

inAppApplication, remove discoverableAt toggle

Steven Tey5cf0dfddd53b
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/page-client.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/page-client.tsx
index 7ae20f9b5e..c882dc2774 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/page-client.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/page-client.tsx
@@ -1,26 +1,14 @@
"use client";
-import { updatePartnerProfileAction } from "@/lib/actions/partners/update-partner-profile";
import { hasPermission } from "@/lib/auth/partner-users/partner-user-permissions";
import usePartnerProfile from "@/lib/swr/use-partner-profile";
-import { PartnerProps } from "@/lib/types";
import { PageContent } from "@/ui/layout/page-content";
import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
import { useMergePartnerAccountsModal } from "@/ui/partners/merge-accounts/merge-partner-accounts-modal";
import { ThreeDots } from "@/ui/shared/icons";
-import {
- Button,
- Popover,
- Switch,
- Tooltip,
- useOptimisticUpdate,
- Users2,
- UserSearch,
-} from "@dub/ui";
-import { cn } from "@dub/utils/src";
-import { useAction } from "next-safe-action/hooks";
+import { Button, Popover, Users2 } from "@dub/ui";
+import { cn } from "@dub/utils";
import { useMemo, useState } from "react";
-import { toast } from "sonner";
import { AboutYouForm } from "./about-you-form";
import { HowYouWorkForm } from "./how-you-work-form";
import { ProfileDetailsForm } from "./profile-details-form";
@@ -44,13 +32,7 @@ export function ProfileSettingsPageClient() {
"Build a stronger partner profile and increase trust by adding and verifying your website and social accounts.",
href: "https://dub.co/help/article/partner-profile",
}}
- controls={
- <Controls
- showDiscoverableToggle={Boolean(
- allTasksCompleted || partner?.discoverableAt,
- )}
- />
- }
+ controls={<Controls />}
>
<PageWidthWrapper className="mb-20 flex flex-col gap-6">
{partner && !allTasksCompleted && <ProfileDiscoveryGuide />}
@@ -62,20 +44,8 @@ export function ProfileSettingsPageClient() {
);
}
-function Controls({
- showDiscoverableToggle,
-}: {
- showDiscoverableToggle: boolean;
-}) {
- const { data: partner, update } = useOptimisticUpdate<PartnerProps>(
- "/api/partner-profile",
- {
- loading: "Updating profile...",
- success: "Profile updated",
- error: "Failed to update profile",
- },
- );
-
+function Controls() {
+ const { partner } = usePartnerProfile();
const disabled = partner
? !hasPermission(partner.role, "partner_profile.update")
: true;
@@ -85,77 +55,10 @@ function Controls({
const { MergePartnerAccountsModal, setShowMergePartnerAccountsModal } =
useMergePartnerAccountsModal();
- const { executeAsync } = useAction(updatePartnerProfileAction, {
- onError({ error }) {
- toast.error(error.serverError);
- },
- });
-
- const handleDiscoverableUpdate = async ({
- checked,
- currentPartner,
- }: {
- checked: boolean;
- currentPartner: PartnerProps;
- }) => {
- await executeAsync({
- discoverable: checked,
- });
-
- return {
- ...currentPartner,
- discoverableAt: checked ? new Date() : null,
- };
- };
-
return (
<>
- {showDiscoverableToggle && partner && (
- <Tooltip
- content={
- <p className="text-content-default max-w-xs p-3 text-xs">
- <strong className="font-semibold">
- Discoverable is {partner.discoverableAt ? "on" : "off"}
- </strong>{" "}
- - Programs {partner.discoverableAt ? "will" : "won't"} be able to
- discover your profile and send invites.
- </p>
- }
- >
- <label
- className={cn(
- "bg-bg-subtle text-content-default border-border-subtle flex h-9 cursor-pointer items-center gap-2 rounded-lg border px-3",
- "transition-colors duration-100 ease-out",
- !!partner.discoverableAt &&
- "bg-bg-inverted text-content-inverted border-bg-inverted",
- )}
- >
- <UserSearch className="size-4 shrink-0" />
- <span className="text-sm font-medium">Discoverable</span>
- <Switch
- checked={!!partner.discoverableAt}
- disabled={disabled}
- fn={(checked: boolean) => {
- if (!partner || disabled) return;
-
- update(
- () =>
- handleDiscoverableUpdate({
- checked,
- currentPartner: partner,
- }),
- {
- ...partner,
- discoverableAt: checked ? new Date() : null,
- },
- );
- }}
- trackDimensions="radix-state-checked:bg-neutral-600 focus-visible:ring-black/20"
- />
- </label>
- </Tooltip>
- )}
<MergePartnerAccountsModal />
+
<Popover
openPopover={isOpen}
setOpenPopover={setIsOpen}
@@ -190,6 +93,7 @@ function Controls({
className="h-9 whitespace-nowrap px-2"
variant="secondary"
icon={<ThreeDots className="size-4 shrink-0" />}
+ onClick={() => setIsOpen(!isOpen)}
/>
</Popover>
</>
diff --git a/apps/web/lib/actions/partners/create-program-application.ts b/apps/web/lib/actions/partners/create-program-application.ts
index 5423193278..6730cc4291 100644
--- a/apps/web/lib/actions/partners/create-program-application.ts
+++ b/apps/web/lib/actions/partners/create-program-application.ts
@@ -114,7 +114,7 @@ function sanitizeData(rawData: ProgramApplicationData, group: PartnerGroup) {
export const createProgramApplicationAction = actionClient
.inputSchema(createProgramApplicationSchema)
.action(async ({ parsedInput }): Promise<Response> => {
- const { programId, groupId } = parsedInput;
+ const { programId, groupId, inAppApplication } = parsedInput;
// Limit to 3 requests per minute per program per IP
const { success } = await ratelimit(3, "1 m").limit(
@@ -176,15 +176,18 @@ export const createProgramApplicationAction = actionClient
throw new Error("This program is no longer accepting applications.");
}
- if (existingPartner) {
- // if an existing partner has an incomplete profile, prompt them to complete it
+ // for in-app applications from existing partners, we need to check
+ // if the partner has an incomplete profile, if so we prompt them to complete it
+ if (inAppApplication && existingPartner) {
const { isComplete } = getPartnerProfileChecklistProgress({
partner: existingPartner,
programEnrollments: existingPartner.programs,
});
if (!isComplete) {
- throw new Error("Complete your partner profile to apply.");
+ throw new Error(
+ "Please complete your partner profile to submit your application: https://partners.dub.co/profile",
+ );
}
return createApplicationAndEnrollment({
diff --git a/apps/web/lib/actions/partners/update-partner-profile.ts b/apps/web/lib/actions/partners/update-partner-profile.ts
index 609371bf55..044a6f9881 100644
--- a/apps/web/lib/actions/partners/update-partner-profile.ts
+++ b/apps/web/lib/actions/partners/update-partner-profile.ts
@@ -3,7 +3,6 @@
import { confirmEmailChange } from "@/lib/auth/confirm-email-change";
import { throwIfNoPermission } from "@/lib/auth/partner-users/throw-if-no-permission";
import { qstash } from "@/lib/cron";
-import { getDiscoverabilityRequirements } from "@/lib/network/get-discoverability-requirements";
import { storage } from "@/lib/storage";
import { stripe } from "@/lib/stripe";
import { partnerProfileChangeHistoryLogSchema } from "@/lib/zod/schemas/partner-profile";
@@ -34,7 +33,6 @@ const updatePartnerProfileSchema = z
country: z.enum(Object.keys(COUNTRIES) as [string, ...string[]]).nullish(),
profileType: z.enum(PartnerProfileType).optional(),
companyName: z.string().nullish(),
- discoverable: z.boolean().optional(),
})
.extend(PartnerProfileSchema.partial().shape)
.transform((data) => ({
@@ -65,7 +63,6 @@ export const updatePartnerProfileAction = authPartnerActionClient
industryInterests,
preferredEarningStructures,
salesChannels,
- discoverable,
} = parsedInput;
if (
@@ -105,12 +102,6 @@ export const updatePartnerProfileAction = authPartnerActionClient
profileType,
companyName,
monthlyTraffic,
- discoverableAt: discoverable
- ? new Date()
- : discoverable === false
- ? null
- : undefined,
-
...(industryInterests && {
industryInterests: {
deleteMany: {},
@@ -174,45 +165,6 @@ export const updatePartnerProfileAction = authPartnerActionClient
waitUntil(
Promise.allSettled([
(async () => {
- // double check that the partner is still eligible for discovery
- if (updatedPartner.discoverableAt) {
- const partnerDiscoveryRequirements =
- getDiscoverabilityRequirements({
- partner: {
- ...updatedPartner,
- preferredEarningStructures:
- updatedPartner.preferredEarningStructures?.map(
- (structure) => structure.preferredEarningStructure,
- ),
- salesChannels: updatedPartner.salesChannels?.map(
- (channel) => channel.salesChannel,
- ),
- },
- programEnrollments: updatedPartner.programs,
- });
-
- if (
- !partnerDiscoveryRequirements.every(
- (requirement) => requirement.completed,
- )
- ) {
- console.log(
- `Partner ${partner.id} is no longer eligible for discovery due to missing requirements: ${partnerDiscoveryRequirements
- .filter((requirement) => !requirement.completed)
- .map((requirement) => requirement.label)
- .join(", ")}`,
- );
- await prisma.partner.update({
- where: {
- id: partner.id,
- },
- data: {
- discoverableAt: null,
- },
- });
- }
- }
-
const shouldExpireCache = !deepEqual(
{
name: partner.name,
diff --git a/apps/web/lib/network/get-discoverability-requirements.ts b/apps/web/lib/network/get-discoverability-requirements.ts
index 4dac5f23bc..f36df8f258 100644
--- a/apps/web/lib/network/get-discoverability-requirements.ts
+++ b/apps/web/lib/network/get-discoverability-requirements.ts
@@ -1,4 +1,3 @@
-import { currencyFormatter } from "@dub/utils";
import {
EXCLUDED_PROGRAM_IDS,
PARTNER_NETWORK_MIN_COMMISSIONS_CENTS,
@@ -45,11 +44,7 @@ export function getDiscoverabilityRequirements({
EnrolledPartnerProps,
"programId" | "status" | "totalCommissions"
>[];
-}): {
- label: string;
- href?: string;
- completed: boolean;
-}[] {
+}) {
return [
{
label: "Upload your logo",
@@ -84,10 +79,6 @@ export function getDiscoverabilityRequirements({
href: "#channels",
completed: Boolean(partner.salesChannels?.length),
},
- {
- label: `Earn ${currencyFormatter(PARTNER_NETWORK_MIN_COMMISSIONS_CENTS, { trailingZeroDisplay: "stripIfInteger" })} in commissions`,
- completed: partnerHasEarnedCommissions(programEnrollments),
- },
{
label: "Maintain a healthy partner profile",
completed: partnerIsNotBanned(programEnrollments),
diff --git a/apps/web/lib/zod/schemas/programs.ts b/apps/web/lib/zod/schemas/programs.ts
index 2080db533f..56f0c42c59 100644
--- a/apps/web/lib/zod/schemas/programs.ts
+++ b/apps/web/lib/zod/schemas/programs.ts
@@ -186,6 +186,7 @@ export const createProgramApplicationSchema = z.object({
email: z.email().trim().min(1).max(100),
country: z.enum(COUNTRY_CODES),
formData: programApplicationFormDataWithValuesSchema,
+ inAppApplication: z.boolean().optional(),
});
export const PartnerCommentSchema = z.object({
diff --git a/apps/web/ui/partners/program-application-sheet.tsx b/apps/web/ui/partners/program-application-sheet.tsx
index 567e02ef51..2e0da6acb5 100644
--- a/apps/web/ui/partners/program-application-sheet.tsx
+++ b/apps/web/ui/partners/program-application-sheet.tsx
@@ -136,6 +136,7 @@ function ProgramApplicationSheetForm({
country: partner.country,
programId: program.id,
groupId: group.id,
+ inAppApplication: true,
});
if (result?.serverError || result?.validationErrors) {