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.

Add the Allow multiple selections switch to the lead form builder

Raficed069334c20
diff --git a/apps/web/tests/misc/submitted-lead-form-builder.test.ts b/apps/web/tests/misc/submitted-lead-form-builder.test.ts
index 7158a5063b..b907d9b8d5 100644
--- a/apps/web/tests/misc/submitted-lead-form-builder.test.ts
+++ b/apps/web/tests/misc/submitted-lead-form-builder.test.ts
@@ -56,6 +56,7 @@ const STORED_FIELDS: FormField[] = [
{ value: "links", label: "Links" },
{ value: "partners", label: "Partners" },
],
+ multiple: true,
},
{
...common,
@@ -117,6 +118,31 @@ describe("lead form builder fields", () => {
});
});
+ it("allows multiple selections for older multiple choice fields", () => {
+ const field = toLeadFormBuilderField({
+ ...common,
+ key: "products",
+ label: "Products",
+ type: "multiSelect",
+ position: 0,
+ options: [
+ { value: "links", label: "Links" },
+ { value: "partners", label: "Partners" },
+ ],
+ });
+
+ expect(field.multiple).toBe(true);
+ });
+
+ it("starts new multiple choice fields with a single choice", () => {
+ const changed = changeLeadFormBuilderFieldType(
+ builderField(),
+ "multiSelect",
+ );
+
+ expect(changed.multiple).toBe(false);
+ });
+
it("sets the position from the order and unlocks custom fields", () => {
const result = parseLeadFormBuilderFields([
builderField({ key: "b", label: "B" }),
diff --git a/apps/web/ui/submitted-leads/form-builder/lead-form-builder-fields.ts b/apps/web/ui/submitted-leads/form-builder/lead-form-builder-fields.ts
index 64a04d3af2..fd80d71860 100644
--- a/apps/web/ui/submitted-leads/form-builder/lead-form-builder-fields.ts
+++ b/apps/web/ui/submitted-leads/form-builder/lead-form-builder-fields.ts
@@ -18,6 +18,8 @@ export type LeadFormBuilderField = {
label: string;
required: boolean;
options: LeadFormBuilderOption[];
+ // Multiple choice only. New fields start with a single choice.
+ multiple: boolean;
maxLength: number | null;
min: number | null;
max: number | null;
@@ -31,6 +33,7 @@ export function createLeadFormBuilderField(): LeadFormBuilderField {
label: "",
required: false,
options: [],
+ multiple: false,
maxLength: null,
min: null,
max: null,
@@ -69,6 +72,8 @@ export function toLeadFormBuilderField(field: FormField): LeadFormBuilderField {
field.type === "select" || field.type === "multiSelect"
? field.options
: [],
+ // Older multiple choice fields have no value and allow multiple selections
+ multiple: field.type === "multiSelect" ? field.multiple ?? true : false,
maxLength:
field.type === "text" || field.type === "textarea"
? field.constraints?.maxLength ?? null
@@ -79,6 +84,9 @@ export function toLeadFormBuilderField(field: FormField): LeadFormBuilderField {
};
}
+const trimOptionLabels = (options: LeadFormBuilderOption[]) =>
+ options.map(({ value, label }) => ({ value, label: label.trim() }));
+
export function fromLeadFormBuilderField(
field: LeadFormBuilderField & { type: LeadFormFieldType },
position: number,
@@ -112,14 +120,17 @@ export function fromLeadFormBuilderField(
}),
};
case "select":
+ return {
+ ...common,
+ type: "select",
+ options: trimOptionLabels(field.options),
+ };
case "multiSelect":
return {
...common,
- type: field.type,
- options: field.options.map(({ value, label }) => ({
- value,
- label: label.trim(),
- })),
+ type: "multiSelect",
+ options: trimOptionLabels(field.options),
+ multiple: field.multiple,
};
case "number":
return {
diff --git a/apps/web/ui/submitted-leads/form-builder/lead-form-field-card.tsx b/apps/web/ui/submitted-leads/form-builder/lead-form-field-card.tsx
index 4411a7d6b6..1670950947 100644
--- a/apps/web/ui/submitted-leads/form-builder/lead-form-field-card.tsx
+++ b/apps/web/ui/submitted-leads/form-builder/lead-form-field-card.tsx
@@ -193,6 +193,14 @@ function LeadFormFieldSettings({
onChange={(required) => onChange({ ...field, required })}
/>
+ {field.type === "multiSelect" && (
+ <SettingSwitch
+ label="Allow multiple selections"
+ checked={field.multiple}
+ onChange={(multiple) => onChange({ ...field, multiple })}
+ />
+ )}
+
{(field.type === "text" || field.type === "textarea") && (
<OptionalNumberSetting
label="Max characters"