Skip to content

Scheduling infrastructure for absolutely everyone.

feat: support attendee name and email filter on /bookings (#19565)

Eunjae Lee7a797490c855
diff --git a/apps/web/modules/bookings/views/bookings-listing-view.tsx b/apps/web/modules/bookings/views/bookings-listing-view.tsx
index 8db8d40f1c4..09df18a107f 100644
--- a/apps/web/modules/bookings/views/bookings-listing-view.tsx
+++ b/apps/web/modules/bookings/views/bookings-listing-view.tsx
@@ -19,6 +19,7 @@ import {
useFilterValue,
ZMultiSelectFilterValue,
ZDateRangeFilterValue,
+ ZTextFilterValue,
} from "@calcom/features/data-table";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc/react";
@@ -114,6 +115,8 @@ function BookingsContent({ status }: BookingsProps) {
const teamIds = useFilterValue("teamId", ZMultiSelectFilterValue)?.data as number[] | undefined;
const userIds = useFilterValue("userId", ZMultiSelectFilterValue)?.data as number[] | undefined;
const dateRange = useFilterValue("dateRange", ZDateRangeFilterValue)?.data;
+ const attendeeName = useFilterValue("attendeeName", ZTextFilterValue);
+ const attendeeEmail = useFilterValue("attendeeEmail", ZTextFilterValue);
const query = trpc.viewer.bookings.get.useInfiniteQuery(
{
@@ -123,6 +126,8 @@ function BookingsContent({ status }: BookingsProps) {
eventTypeIds,
teamIds,
userIds,
+ attendeeName,
+ attendeeEmail,
afterStartDate: dateRange?.startDate ?? undefined,
beforeEndDate: dateRange?.endDate ?? undefined,
},
@@ -164,7 +169,7 @@ function BookingsContent({ status }: BookingsProps) {
}),
columnHelper.accessor((row) => row.type === "data" && row.booking.user?.id, {
id: "userId",
- header: t("people"),
+ header: t("member"),
enableColumnFilter: true,
enableSorting: false,
cell: () => null,
@@ -175,6 +180,32 @@ function BookingsContent({ status }: BookingsProps) {
},
},
}),
+ columnHelper.accessor((row) => row, {
+ id: "attendeeName",
+ header: t("attendee_name"),
+ enableColumnFilter: true,
+ enableSorting: false,
+ cell: () => null,
+ filterFn: () => true,
+ meta: {
+ filter: {
+ type: ColumnFilterType.TEXT,
+ },
+ },
+ }),
+ columnHelper.accessor((row) => row, {
+ id: "attendeeEmail",
+ header: t("attendee_email_variable"),
+ enableColumnFilter: true,
+ enableSorting: false,
+ cell: () => null,
+ filterFn: () => true,
+ meta: {
+ filter: {
+ type: ColumnFilterType.TEXT,
+ },
+ },
+ }),
columnHelper.accessor((row) => row, {
id: "dateRange",
header: t("date_range"),
@@ -314,6 +345,8 @@ function BookingsContent({ status }: BookingsProps) {
eventTypeId: false,
teamId: false,
userId: false,
+ attendeeName: false,
+ attendeeEmail: false,
dateRange: false,
},
},
diff --git a/packages/features/data-table/components/filters/TextFilterOptions.tsx b/packages/features/data-table/components/filters/TextFilterOptions.tsx
index 70ba4f3311c..cfe25f9c222 100644
--- a/packages/features/data-table/components/filters/TextFilterOptions.tsx
+++ b/packages/features/data-table/components/filters/TextFilterOptions.tsx
@@ -65,7 +65,7 @@ export function TextFilterOptions({ column }: TextFilterOptionsProps) {
)}
/>
- <div className="bg-subtle -mx-3 mb-2 h-px" role="separator" />
+ <div className="bg-subtle -mx-3 my-2 h-px" role="separator" />
<div className="flex items-center justify-between">
<Button
diff --git a/packages/features/insights/hooks/useInsightsColumns.tsx b/packages/features/insights/hooks/useInsightsColumns.tsx
index c519660d675..2c22741c66f 100644
--- a/packages/features/insights/hooks/useInsightsColumns.tsx
+++ b/packages/features/insights/hooks/useInsightsColumns.tsx
@@ -54,7 +54,7 @@ export const useInsightsColumns = ({
}),
columnHelper.accessor("bookingUserId", {
id: "bookingUserId",
- header: t("user"),
+ header: t("member"),
enableColumnFilter: true,
enableSorting: false,
meta: {
diff --git a/packages/lib/bookings/getAllUserBookings.ts b/packages/lib/bookings/getAllUserBookings.ts
index c91efa63c8f..30ce9392845 100644
--- a/packages/lib/bookings/getAllUserBookings.ts
+++ b/packages/lib/bookings/getAllUserBookings.ts
@@ -1,3 +1,4 @@
+import type { TextFilterValue } from "@calcom/features/data-table/lib/types";
import type { PrismaClient } from "@calcom/prisma";
import type { Prisma } from "@calcom/prisma/client";
import { BookingStatus } from "@calcom/prisma/enums";
@@ -23,8 +24,8 @@ type GetOptions = {
teamIds?: number[] | undefined;
userIds?: number[] | undefined;
eventTypeIds?: number[] | undefined;
- attendeeEmail?: string;
- attendeeName?: string;
+ attendeeEmail?: string | TextFilterValue;
+ attendeeName?: string | TextFilterValue;
};
sort?: SortOptions;
};
diff --git a/packages/trpc/server/routers/viewer/bookings/get.handler.ts b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
index c665e4c4e55..235b9961749 100644
--- a/packages/trpc/server/routers/viewer/bookings/get.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
@@ -1,6 +1,8 @@
import { Prisma as PrismaClientType } from "@prisma/client";
import dayjs from "@calcom/dayjs";
+import { makeWhereClause } from "@calcom/features/data-table/lib/server";
+import { isTextFilterValue } from "@calcom/features/data-table/lib/utils";
import { parseRecurringEvent, parseEventTypeColor } from "@calcom/lib";
import getAllUserBookings from "@calcom/lib/bookings/getAllUserBookings";
import logger from "@calcom/lib/logger";
@@ -266,20 +268,47 @@ export async function getBookings({
},
]
: []),
- ...(filters?.attendeeEmail
+
+ ...(typeof filters?.attendeeEmail === "string"
? [
{
attendees: { some: { email: filters.attendeeEmail.trim() } },
},
]
: []),
- ...(filters?.attendeeName
+ ...(isTextFilterValue(filters?.attendeeEmail)
+ ? [
+ {
+ attendees: {
+ some: makeWhereClause({
+ columnName: "email",
+ filterValue: filters.attendeeEmail,
+ }),
+ },
+ },
+ ]
+ : []),
+
+ ...(typeof filters?.attendeeName === "string"
? [
{
attendees: { some: { name: filters.attendeeName.trim() } },
},
]
: []),
+ ...(isTextFilterValue(filters?.attendeeName)
+ ? [
+ {
+ attendees: {
+ some: makeWhereClause({
+ columnName: "name",
+ filterValue: filters.attendeeName,
+ }),
+ },
+ },
+ ]
+ : []),
+
...(filters?.afterStartDate
? [
{
diff --git a/packages/trpc/server/routers/viewer/bookings/get.schema.ts b/packages/trpc/server/routers/viewer/bookings/get.schema.ts
index 24f286f8386..d282ec8043a 100644
--- a/packages/trpc/server/routers/viewer/bookings/get.schema.ts
+++ b/packages/trpc/server/routers/viewer/bookings/get.schema.ts
@@ -1,13 +1,15 @@
import { z } from "zod";
+import { ZTextFilterValue } from "@calcom/features/data-table/lib/types";
+
export const ZGetInputSchema = z.object({
filters: z.object({
teamIds: z.number().array().optional(),
userIds: z.number().array().optional(),
status: z.enum(["upcoming", "recurring", "past", "cancelled", "unconfirmed"]).optional(),
eventTypeIds: z.number().array().optional(),
- attendeeEmail: z.string().optional(),
- attendeeName: z.string().optional(),
+ attendeeEmail: z.union([z.string(), ZTextFilterValue]).optional(),
+ attendeeName: z.union([z.string(), ZTextFilterValue]).optional(),
afterStartDate: z.string().optional(),
beforeEndDate: z.string().optional(),
afterUpdatedDate: z.string().optional(),