) {
+ if (!listValues) {
+ return null;
+ }
+
+ const currentValues = value || [];
+
+ const handleChange = useCallback(
+ (itemValue: string, checked: boolean) => {
+ const newValues = checked
+ ? [...currentValues, itemValue]
+ : currentValues.filter((v) => v !== itemValue);
+ setValue(newValues);
+ },
+ [currentValues, setValue]
+ );
+
+ return (
+
+ {listValues.map((item) => (
+
+ ))}
+
+ );
+}
+
+function RadioGroupWidget({ listValues, setValue, value, ...remainingProps }: SelectLikeComponentPropsRAQB) {
+ if (!listValues) {
+ return null;
+ }
+
+ return (
+
+ {listValues.map((item) => (
+
+ ))}
+
+ );
+}
+
+function BooleanWidget({ value, setValue, readOnly }: TextLikeComponentPropsRAQB) {
+ // Store as "true"/"false" strings for compatibility with routing logic
+ const isChecked = value === "true";
+
+ return (
+
+
+
+ );
+}
+
function Button({ config, type, label, onClick, readonly }: ButtonProps) {
const { t } = useLocale();
if (type === "delRule" || type == "delGroup") {
@@ -376,6 +527,12 @@ const widgets = {
SelectWidget,
NumberWidget,
MultiSelectWidget,
+ AddressWidget,
+ URLWidget,
+ MultiEmailWidget,
+ CheckboxGroupWidget,
+ RadioGroupWidget,
+ BooleanWidget,
FieldSelect,
Button,
ButtonGroup,
diff --git a/packages/app-store/routing-forms/lib/FieldTypes.ts b/packages/app-store/routing-forms/lib/FieldTypes.ts
index 456f77617cc98e..0acf1cd5b6f14a 100644
--- a/packages/app-store/routing-forms/lib/FieldTypes.ts
+++ b/packages/app-store/routing-forms/lib/FieldTypes.ts
@@ -1,4 +1,4 @@
-export const enum RoutingFormFieldType {
+export enum RoutingFormFieldType {
TEXT = "text",
NUMBER = "number",
TEXTAREA = "textarea",
@@ -6,6 +6,12 @@ export const enum RoutingFormFieldType {
MULTI_SELECT = "multiselect",
PHONE = "phone",
EMAIL = "email",
+ ADDRESS = "address",
+ MULTIEMAIL = "multiemail",
+ CHECKBOX = "checkbox",
+ RADIO = "radio",
+ BOOLEAN = "boolean",
+ URL = "url",
}
export const isValidRoutingFormFieldType = (type: string): type is RoutingFormFieldType => {
@@ -17,6 +23,12 @@ export const isValidRoutingFormFieldType = (type: string): type is RoutingFormFi
RoutingFormFieldType.MULTI_SELECT,
RoutingFormFieldType.PHONE,
RoutingFormFieldType.EMAIL,
+ RoutingFormFieldType.ADDRESS,
+ RoutingFormFieldType.MULTIEMAIL,
+ RoutingFormFieldType.CHECKBOX,
+ RoutingFormFieldType.RADIO,
+ RoutingFormFieldType.BOOLEAN,
+ RoutingFormFieldType.URL,
].includes(type as RoutingFormFieldType);
};
@@ -49,4 +61,28 @@ export const FieldTypes = [
label: "Email",
value: RoutingFormFieldType.EMAIL,
},
+ {
+ label: "Address",
+ value: RoutingFormFieldType.ADDRESS,
+ },
+ {
+ label: "Multiple Emails",
+ value: RoutingFormFieldType.MULTIEMAIL,
+ },
+ {
+ label: "Checkbox Group",
+ value: RoutingFormFieldType.CHECKBOX,
+ },
+ {
+ label: "Radio Group",
+ value: RoutingFormFieldType.RADIO,
+ },
+ {
+ label: "Checkbox",
+ value: RoutingFormFieldType.BOOLEAN,
+ },
+ {
+ label: "URL",
+ value: RoutingFormFieldType.URL,
+ },
] as const;
diff --git a/packages/app-store/routing-forms/lib/__tests__/getQueryBuilderConfig.test.ts b/packages/app-store/routing-forms/lib/__tests__/getQueryBuilderConfig.test.ts
index c14c6e81f84b33..ca4278722e77d9 100644
--- a/packages/app-store/routing-forms/lib/__tests__/getQueryBuilderConfig.test.ts
+++ b/packages/app-store/routing-forms/lib/__tests__/getQueryBuilderConfig.test.ts
@@ -1,9 +1,7 @@
-import { describe, it, expect } from "vitest";
-import { vi } from "vitest";
-
+import { describe, expect, it, vi } from "vitest";
import type { RoutingForm } from "../../types/types";
-import { FormFieldsInitialConfig } from "../InitialConfig";
import { getQueryBuilderConfigForFormFields } from "../getQueryBuilderConfig";
+import { FormFieldsInitialConfig } from "../InitialConfig";
type MockedForm = Pick;
vi.mock("../InitialConfig", () => ({
@@ -12,6 +10,16 @@ vi.mock("../InitialConfig", () => ({
text: { type: "text" },
select: { type: "select" },
multiselect: { type: "multiselect" },
+ phone: { type: "text" },
+ email: { type: "text" },
+ address: { type: "text" },
+ url: { type: "text" },
+ multiemail: { type: "text" },
+ checkbox: { type: "multiselect" },
+ radio: { type: "select" },
+ boolean: { type: "boolean" },
+ textarea: { type: "text" },
+ number: { type: "number" },
},
operators: {
is_empty: {},
diff --git a/packages/app-store/routing-forms/lib/formSubmissionUtils.ts b/packages/app-store/routing-forms/lib/formSubmissionUtils.ts
index 31b8a77de2ed23..2d5f4e12794490 100644
--- a/packages/app-store/routing-forms/lib/formSubmissionUtils.ts
+++ b/packages/app-store/routing-forms/lib/formSubmissionUtils.ts
@@ -9,13 +9,11 @@ import { HttpError } from "@calcom/lib/http-error";
import logger from "@calcom/lib/logger";
import { withReporting } from "@calcom/lib/sentryWrapper";
import { prisma } from "@calcom/prisma";
-import type { Prisma } from "@calcom/prisma/client";
-import type { App_RoutingForms_Form, User } from "@calcom/prisma/client";
+import type { App_RoutingForms_Form, Prisma, User } from "@calcom/prisma/client";
import { WebhookTriggerEvents } from "@calcom/prisma/enums";
import { RoutingFormSettings } from "@calcom/prisma/zod-utils";
import type { Ensure } from "@calcom/types/utils";
-
-import type { FormResponse, SerializableForm, SerializableField, OrderedResponses } from "../types/types";
+import type { FormResponse, OrderedResponses, SerializableField, SerializableForm } from "../types/types";
import getFieldIdentifier from "./getFieldIdentifier";
const moduleLogger = logger.getSubLogger({ prefix: ["routing-forms/lib/formSubmissionUtils"] });
@@ -45,7 +43,13 @@ export type FORM_SUBMITTED_WEBHOOK_RESPONSES = Record<
>;
function isOptionsField(field: Pick) {
- return (field.type === "select" || field.type === "multiselect") && field.options;
+ return (
+ (field.type === "select" ||
+ field.type === "multiselect" ||
+ field.type === "checkbox" ||
+ field.type === "radio") &&
+ field.options
+ );
}
export function getFieldResponse({
@@ -192,11 +196,14 @@ export async function _onFormSubmission(
},
rootData: {
// Send responses unwrapped at root level for backwards compatibility
- ...Object.entries(fieldResponsesByIdentifier).reduce((acc, [key, value]) => {
- const normalizedKey = normalizeIdentifierForHandlebars(key);
- acc[normalizedKey] = value.value;
- return acc;
- }, {} as Record),
+ ...Object.entries(fieldResponsesByIdentifier).reduce(
+ (acc, [key, value]) => {
+ const normalizedKey = normalizeIdentifierForHandlebars(key);
+ acc[normalizedKey] = value.value;
+ return acc;
+ },
+ {} as Record
+ ),
},
}).catch((e) => {
console.error(`Error executing routing form webhook`, webhook, e);
diff --git a/packages/app-store/routing-forms/lib/getQueryBuilderConfig.ts b/packages/app-store/routing-forms/lib/getQueryBuilderConfig.ts
index 000ece889a1d5a..3f8e629f2e723c 100644
--- a/packages/app-store/routing-forms/lib/getQueryBuilderConfig.ts
+++ b/packages/app-store/routing-forms/lib/getQueryBuilderConfig.ts
@@ -1,6 +1,5 @@
import { AttributeType } from "@calcom/prisma/enums";
-
-import type { RoutingForm, Attribute } from "../types/types";
+import type { Attribute, RoutingForm } from "../types/types";
import { FieldTypes, RoutingFormFieldType } from "./FieldTypes";
import { AttributesInitialConfig, FormFieldsInitialConfig } from "./InitialConfig";
import { getUIOptionsForSelect } from "./selectOptions";
@@ -58,13 +57,19 @@ export function getQueryBuilderConfigForFormFields(form: Pick f.fields).flat());
+ const fields = routingFormFieldsSchema.parse(routingForms.flatMap((f) => f.fields));
return fields;
}
@@ -249,7 +248,7 @@ class RoutingEventsInsights {
organizationId,
routingFormId,
}: RoutingFormInsightsTeamFilter) {
- const formsWhereCondition = await this.getWhereForTeamOrAllTeams({
+ const formsWhereCondition = await RoutingEventsInsights.getWhereForTeamOrAllTeams({
userId,
teamId,
isAll,
@@ -266,7 +265,7 @@ class RoutingEventsInsights {
},
});
- const fields = routingFormFieldsSchema.parse(routingForms.map((f) => f.fields).flat());
+ const fields = routingFormFieldsSchema.parse(routingForms.flatMap((f) => f.fields));
const ids = new Set();
const headers = (fields || [])
.filter((f) => !f.deleted)
@@ -284,7 +283,9 @@ class RoutingEventsInsights {
}
if (
field.type === RoutingFormFieldType.SINGLE_SELECT ||
- field.type === RoutingFormFieldType.MULTI_SELECT
+ field.type === RoutingFormFieldType.MULTI_SELECT ||
+ field.type === RoutingFormFieldType.CHECKBOX ||
+ field.type === RoutingFormFieldType.RADIO
) {
return field.options && field.options.length > 0;
}