Skip to content

Commit c7d0575

Browse files
committed
fix wrongn conflict merge
1 parent 699c37d commit c7d0575

1 file changed

Lines changed: 2 additions & 13 deletions

File tree

packages/lib/server/service/InsightsRoutingBaseService.ts

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -750,19 +750,8 @@ export class InsightsRoutingBaseService {
750750
}
751751
}
752752

753-
// Extract form field filters (exclude the system filters we already processed)
754-
const alreadyHandledFilters = [
755-
"bookingStatusOrder",
756-
"bookingAssignmentReason",
757-
"bookingUid",
758-
"attendeeName",
759-
"attendeeEmail",
760-
"attendeePhone",
761-
"bookingUserId",
762-
"formId",
763-
];
764-
765-
const fieldFilters = columnFilters.filter((filter) => !alreadyHandledFilters.includes(filter.id));
753+
const fieldIdSchema = z.string().uuid();
754+
const fieldFilters = (columnFilters || []).filter((filter) => fieldIdSchema.safeParse(filter.id).success);
766755

767756
if (fieldFilters.length > 0) {
768757
const fieldConditions = fieldFilters

0 commit comments

Comments
 (0)