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.

Use Combobox for bulk commission status selection (#3672)

Kiran K8d483031d483
diff --git a/apps/web/ui/partners/bulk-edit-commissions-modal.tsx b/apps/web/ui/partners/bulk-edit-commissions-modal.tsx
index 132329609f..869f343c82 100644
--- a/apps/web/ui/partners/bulk-edit-commissions-modal.tsx
+++ b/apps/web/ui/partners/bulk-edit-commissions-modal.tsx
@@ -2,17 +2,18 @@ import { mutatePrefix } from "@/lib/swr/mutate";
import { useApiMutation } from "@/lib/swr/use-api-mutation";
import { CommissionResponse } from "@/lib/types";
import { commissionPatchStatusSchema } from "@/lib/zod/schemas/commissions";
-import { Button, Modal } from "@dub/ui";
+import { Button, Combobox, Modal } from "@dub/ui";
import { InvoiceDollar } from "@dub/ui/icons";
import { pluralize } from "@dub/utils";
import { useCallback, useEffect, useMemo, useState } from "react";
import { Controller, useForm } from "react-hook-form";
import { toast } from "sonner";
+import * as z from "zod/v4";
import { CommissionStatusBadges } from "./commission-status-badges";
import { PartnerAvatar } from "./partner-avatar";
type FormData = {
- status: string;
+ status: z.infer<typeof commissionPatchStatusSchema>;
};
interface BulkEditCommissionsModalProps {
@@ -44,21 +45,54 @@ function BulkEditCommissionsModal({
control,
handleSubmit,
reset,
+ watch,
formState: { isDirty },
} = useForm<FormData>({
defaultValues: {
- status: commissions[0]?.status ?? "pending",
+ status: (commissions[0]?.status ?? "pending") as FormData["status"],
},
});
+ const selectedStatus = watch("status");
+
useEffect(() => {
if (showModal) {
reset({
- status: commissions[0]?.status ?? "pending",
+ status: (commissions[0]?.status ?? "pending") as FormData["status"],
});
}
}, [showModal, commissions, reset]);
+ const statusOptions = commissionPatchStatusSchema.options;
+ const statusComboboxOptions = useMemo(
+ () =>
+ statusOptions.map((status) => {
+ const badge = CommissionStatusBadges[status];
+ const StatusIcon = badge?.icon;
+ const statusTextClass = badge?.className
+ ?.split(" ")
+ .find((className) => className.startsWith("text-"));
+
+ return {
+ value: status,
+ label: badge?.label ?? status,
+ variant: badge?.variant ?? "neutral",
+ icon: StatusIcon ? (
+ <StatusIcon
+ className={`size-4 ${statusTextClass ?? "text-neutral-500"}`}
+ />
+ ) : undefined,
+ };
+ }),
+ [statusOptions],
+ );
+
+ const selectedStatusOption = useMemo(
+ () =>
+ statusComboboxOptions.find((option) => option.value === selectedStatus),
+ [statusComboboxOptions, selectedStatus],
+ );
+
const onSubmit = async (data: FormData) => {
await makeRequest("/api/commissions/bulk", {
method: "PATCH",
@@ -76,8 +110,6 @@ function BulkEditCommissionsModal({
});
};
- const statusOptions = commissionPatchStatusSchema.options;
-
return (
<Modal showModal={showModal} setShowModal={setShowModal}>
<div className="space-y-2 border-b border-neutral-200 px-4 py-4 sm:px-6">
@@ -116,26 +148,38 @@ function BulkEditCommissionsModal({
<div>
<label className="text-content-emphasis text-sm font-normal">
- Status
+ New status
</label>
<Controller
name="status"
control={control}
render={({ field }) => (
- <select
- className="mt-2 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"
- value={field.value}
- onChange={field.onChange}
- >
- {statusOptions.map((status) => {
- const badge = CommissionStatusBadges[status];
- return (
- <option key={status} value={status}>
- {badge?.label ?? status}
- </option>
- );
- })}
- </select>
+ <div className="mt-2">
+ <Combobox
+ options={statusComboboxOptions}
+ selected={selectedStatusOption ?? null}
+ setSelected={(option) => {
+ if (!option) return;
+ field.onChange(option.value);
+ }}
+ placeholder="Select status"
+ searchPlaceholder="Search status..."
+ matchTriggerWidth
+ buttonProps={{
+ className:
+ "w-full justify-start border-neutral-300 px-3 data-[state=open]:ring-1 data-[state=open]:ring-neutral-500 data-[state=open]:border-neutral-500 focus:ring-1 focus:ring-neutral-500 focus:border-neutral-500 transition-none",
+ }}
+ >
+ {selectedStatusOption ? (
+ <span className="flex items-center gap-2">
+ {selectedStatusOption.icon}
+ <span>{selectedStatusOption.label}</span>
+ </span>
+ ) : (
+ "Select status"
+ )}
+ </Combobox>
+ </div>
)}
/>
</div>