[pull] main from dubinc:main

apps/web/app/(ee)/api/bounties/[bountyId]/route.ts

@@ -361,6 +361,8 @@ export const PATCH = withWorkspace(
       archivedAt: data.archivedAt,
     });
 
+    revalidateProgramPublicPages(programId);
+
     waitUntil(
       Promise.allSettled([
         recordAuditLog({
@@ -394,8 +396,6 @@ export const PATCH = withWorkspace(
               notBefore: Math.floor(data.startsAt.getTime() / 1000),
             }),
           }),
-
-        revalidateProgramPublicPages(programId),
       ]),
     );
 
@@ -453,6 +453,8 @@ export const DELETE = withWorkspace(
 
     const deletedBounty = BountySchema.parse(transformBounty(bounty));
 
+    revalidateProgramPublicPages(programId);
+
     waitUntil(
       Promise.allSettled([
         recordAuditLog({
@@ -469,8 +471,6 @@ export const DELETE = withWorkspace(
             },
           ],
         }),
-
-        revalidateProgramPublicPages(programId),
       ]),
     );
 

apps/web/app/(ee)/api/bounties/route.ts

@@ -4,8 +4,8 @@ import { DubApiError } from "@/lib/api/errors";
 import { throwIfInvalidGroupIds } from "@/lib/api/groups/throw-if-invalid-group-ids";
 import { throwIfInvalidPartnerTagIds } from "@/lib/api/partner-tags/throw-if-invalid-partner-tag-ids";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
-import { revalidateProgramPublicPages } from "@/lib/api/programs/revalidate-program-public-pages";
 import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
+import { revalidateProgramPublicPages } from "@/lib/api/programs/revalidate-program-public-pages";
 import { parseRequestBody } from "@/lib/api/utils";
 import { WorkflowAction } from "@/lib/api/workflows/types";
 import { validateWorkflowConditions } from "@/lib/api/workflows/validate-workflow-conditions";
@@ -329,6 +329,8 @@ export const POST = withWorkspace(
       canSendEmailCampaigns &&
       bounty.startMode !== BountyStartMode.relative;
 
+    revalidateProgramPublicPages(programId);
+
     waitUntil(
       Promise.allSettled([
         recordAuditLog({
@@ -373,8 +375,6 @@ export const POST = withWorkspace(
               notBefore: Math.floor(bounty.startsAt.getTime() / 1000),
             }),
           }),
-
-        revalidateProgramPublicPages(programId),
       ]),
     );
 

apps/web/app/(ee)/api/cron/domains/update/route.ts

@@ -43,7 +43,12 @@ export async function POST(req: Request) {
     const linksToUpdate = await prisma.link.findMany({
       where: {
         domain: oldDomain,
-        ...(programId && { programId }),
+        ...(programId && {
+          programId,
+          key: {
+            not: "_root", // edge case, but don't update the root link (since there's already a link for it)
+          },
+        }),
       },
       take: LINK_BATCH_SIZE,
       ...(startingAfter && {
@@ -65,20 +70,18 @@ export async function POST(req: Request) {
 
     const linkIdsToUpdate = linksToUpdate.map((link) => link.id);
 
-    try {
-      await prisma.link.updateMany({
-        where: {
-          id: {
-            in: linkIdsToUpdate,
-          },
-        },
-        data: {
-          domain: newDomain,
+    const { count } = await prisma.link.updateMany({
+      where: {
+        id: {
+          in: linkIdsToUpdate,
         },
-      });
-    } catch (error) {
-      console.error(error);
-    }
+      },
+      data: {
+        domain: newDomain,
+      },
+    });
+
+    console.log(`Updated ${count} links for domain ${oldDomain}`);
 
     const updatedLinks = await prisma.link.findMany({
       where: {

apps/web/app/(ee)/api/customers/[id]/route.ts

@@ -50,7 +50,7 @@ export const PATCH = withWorkspace(
     const { includeExpandedFields } =
       getCustomersQuerySchema.parse(searchParams);
 
-    const { name, email, avatar, externalId, stripeCustomerId } =
+    const { name, email, avatar, externalId, stripeCustomerId, country } =
       updateCustomerBodySchema.parse(await parseRequestBody(req));
 
     const customer = await getCustomerOrThrow(
@@ -84,6 +84,7 @@ export const PATCH = withWorkspace(
           avatar: finalCustomerAvatar,
           externalId,
           stripeCustomerId,
+          country,
         },
       });
 

apps/web/app/(ee)/api/groups/[groupIdOrSlug]/default/route.ts

@@ -7,7 +7,6 @@ import { DEFAULT_PARTNER_GROUP, GroupSchema } from "@/lib/zod/schemas/groups";
 import { RESOURCE_COLORS } from "@/ui/colors";
 import { nanoid, randomValue } from "@dub/utils";
 import slugify from "@sindresorhus/slugify";
-import { waitUntil } from "@vercel/functions";
 import { NextResponse } from "next/server";
 
 // POST /api/groups/[groupIdOrSlug]/default – set a group as default
@@ -85,7 +84,7 @@ export const POST = withWorkspace(
       });
     });
 
-    waitUntil(revalidateProgramPublicPages(programId));
+    revalidateProgramPublicPages(programId);
 
     return NextResponse.json(GroupSchema.parse(updatedGroup));
   },

apps/web/app/(ee)/api/stripe/webhook/customer-subscription-deleted.ts

@@ -172,7 +172,7 @@ export async function customerSubscriptionDeleted(
           "`* deleted their *`" +
           capitalize(workspace.plan) +
           "`* subscription",
-        type: "cron",
+        type: "alerts",
         mention: true,
       }),
 

apps/web/app/api/links/sync/route.ts

@@ -27,6 +27,7 @@ export const POST = withWorkspace(
               domain: link.domain,
               key: link.key,
             },
+            projectId: null,
             userId: null,
           },
         });

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/add-hostname-modal.tsx

@@ -3,7 +3,7 @@
 import { X } from "@/ui/shared/icons";
 import { Button, Modal, useMediaQuery } from "@dub/ui";
 import { cn, validDomainRegex } from "@dub/utils";
-import { useCallback, useMemo, useState } from "react";
+import { useState } from "react";
 import { toast } from "sonner";
 
 const isValidHostname = (hostname: string) => {
@@ -14,87 +14,54 @@ const isValidHostname = (hostname: string) => {
   );
 };
 
-const AddHostnameForm = ({
+const AddHostnameModal = ({
+  showModal,
+  setShowModal,
   existingHostnames,
   onAdd,
-  onCancel,
 }: {
+  showModal: boolean;
+  setShowModal: (showModal: boolean) => void;
   existingHostnames: string[];
-  onAdd: (hostname: string) => void;
-  onCancel?: () => void;
+  onAdd: (hostname: string) => void | Promise<void>;
 }) => {
   const [hostname, setHostname] = useState("");
+  const [isLoading, setIsLoading] = useState(false);
   const { isMobile } = useMediaQuery();
 
-  return (
-    <form
-      className="bg-neutral-50"
-      onSubmit={(e) => {
-        e.preventDefault();
-        e.stopPropagation();
+  const close = () => {
+    if (isLoading) {
+      return;
+    }
 
-        if (existingHostnames.includes(hostname)) {
-          toast.error("Hostname already exists.");
-          return;
-        }
+    setShowModal(false);
+  };
 
-        if (!isValidHostname(hostname)) {
-          toast.error("Enter a valid domain.");
-          return;
-        }
+  const handleAdd = async () => {
+    if (isLoading) {
+      return;
+    }
 
-        onAdd(hostname);
-        setHostname("");
-      }}
-    >
-      <div className="relative flex-1 rounded-md px-6 py-5">
-        <input
-          type="text"
-          required
-          value={hostname}
-          onChange={(e) => setHostname(e.target.value)}
-          autoComplete="off"
-          autoFocus={!isMobile}
-          placeholder="example.com or *.example.com"
-          className={cn(
-            "block w-full rounded-md border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
-          )}
-        />
-      </div>
+    if (existingHostnames.includes(hostname)) {
+      toast.error("Hostname already exists.");
+      return;
+    }
 
-      <div className="flex items-center justify-end gap-2 border-t border-neutral-200 px-6 py-5">
-        <Button
-          onClick={() => onCancel?.()}
-          variant="secondary"
-          text="Cancel"
-          className="h-8 w-fit px-3"
-        />
-        <Button
-          type="submit"
-          variant="primary"
-          text="Add hostname"
-          className="h-8 w-fit px-3"
-          disabled={!isValidHostname(hostname)}
-        />
-      </div>
-    </form>
-  );
-};
+    if (!isValidHostname(hostname)) {
+      toast.error("Enter a valid domain.");
+      return;
+    }
 
-interface AddHostnameModalProps {
-  showModal: boolean;
-  setShowModal: (showModal: boolean) => void;
-  existingHostnames: string[];
-  onAdd: (hostname: string) => void;
-}
+    setIsLoading(true);
+    try {
+      await onAdd(hostname);
+      setHostname("");
+      setShowModal(false);
+    } finally {
+      setIsLoading(false);
+    }
+  };
 
-const AddHostnameModal = ({
-  showModal,
-  setShowModal,
-  existingHostnames,
-  onAdd,
-}: AddHostnameModalProps) => {
-  const close = () => setShowModal(false);
   return (
     <Modal showModal={showModal} setShowModal={setShowModal}>
       <div className="flex items-center justify-between border-b border-neutral-200 p-4">
@@ -108,16 +75,48 @@ const AddHostnameModal = ({
         </button>
       </div>
 
-      <div className="bg-neutral-50">
-        <AddHostnameForm
-          existingHostnames={existingHostnames}
-          onCancel={close}
-          onAdd={(hostname) => {
-            onAdd(hostname);
-            close();
-          }}
-        />
-      </div>
+      <form
+        className="bg-neutral-50"
+        onSubmit={(e) => {
+          e.preventDefault();
+          e.stopPropagation();
+          void handleAdd();
+        }}
+      >
+        <div className="relative flex-1 rounded-md px-6 py-5">
+          <input
+            type="text"
+            required
+            value={hostname}
+            onChange={(e) => setHostname(e.target.value)}
+            autoComplete="off"
+            autoFocus={!isMobile}
+            placeholder="example.com or *.example.com"
+            className={cn(
+              "block w-full rounded-md border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
+            )}
+          />
+        </div>
+
+        <div className="flex items-center justify-end gap-2 border-t border-neutral-200 px-6 py-5">
+          <Button
+            type="button"
+            onClick={close}
+            variant="secondary"
+            text="Cancel"
+            className="h-8 w-fit px-3"
+            disabled={isLoading}
+          />
+          <Button
+            type="submit"
+            variant="primary"
+            text="Add hostname"
+            className="h-8 w-fit px-3"
+            disabled={!isValidHostname(hostname)}
+            loading={isLoading}
+          />
+        </div>
+      </form>
     </Modal>
   );
 };
@@ -127,26 +126,19 @@ export function useAddHostnameModal({
   onAdd,
 }: {
   existingHostnames: string[];
-  onAdd: (hostname: string) => void;
+  onAdd: (hostname: string) => void | Promise<void>;
 }) {
   const [showAddHostnameModal, setShowAddHostnameModal] = useState(false);
 
-  const AddHostnameModalCallback = useCallback(() => {
-    return (
+  return {
+    setShowAddHostnameModal,
+    addHostnameModal: (
       <AddHostnameModal
         showModal={showAddHostnameModal}
         setShowModal={setShowAddHostnameModal}
         existingHostnames={existingHostnames}
         onAdd={onAdd}
       />
-    );
-  }, [showAddHostnameModal, existingHostnames, onAdd]);
-
-  return useMemo(
-    () => ({
-      setShowAddHostnameModal,
-      AddHostnameModal: AddHostnameModalCallback,
-    }),
-    [AddHostnameModalCallback],
-  );
+    ),
+  };
 }

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/configure-tracking-section.tsx

@@ -267,6 +267,11 @@ export function ConfigureTrackingSection() {
                 <HostnameField
                   hostnames={field.value}
                   onChange={field.onChange}
+                  onSave={(allowedHostnames) =>
+                    handleSubmit((data) =>
+                      onSubmit({ ...data, allowedHostnames }),
+                    )()
+                  }
                   disabled={disabled}
                   disabledTooltip={disabledTooltip}
                 />