vynte-infra/calendar
2
0
Fork 0
Code Issues Pull Requests Actions 1.2k Packages Projects Releases Wiki Activity

feat: multi Select for "Event Type" in Insights (#23173)

Browse Source 
* Multi select event type in insights

* Fixing multi select query generation

* Added null check for eventType filters

* Updated test to support multiselect

* Type fix

---------

Co-authored-by: Devanshu Sharma <devanshusharma658@gmail.com>
This commit is contained in:
沙什瓦特
2025-08-21 13:30:21 +00:00
committed by GitHub
co-authored by Devanshu Sharma
parent 0ea673e507
commit cafecad8ae
3 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/features/insights/hooks/useInsightsBookings.ts
+1 -1
View File
@@ -35,7 +35,7 @@ export const useInsightsBookings = () => {
size: 200,
meta: {
filter: {
type: ColumnFilterType.SINGLE_SELECT,
type: ColumnFilterType.MULTI_SELECT,
},
},
enableColumnFilter: true,
packages/lib/server/service/InsightsBookingBaseService.ts
+10 -2
View File
@@ -298,8 +298,16 @@ export class InsightsBookingBaseService {
return null;
}
if (id === "eventTypeId" && isSingleSelectFilterValue(value) && typeof value.data === "number") {
return Prisma.sql`("eventTypeId" = ${value.data}) OR ("eventParentId" = ${value.data})`;
if (id === "eventTypeId" && isMultiSelectFilterValue(value)) {
const eventTypeIds = value.data.map((id) => Number(id));
if (eventTypeIds.length === 0) {
return null;
}
return Prisma.sql`("eventTypeId" IN (${Prisma.join(eventTypeIds)}) OR "eventParentId" IN (${Prisma.join(
eventTypeIds
)}))`;
}
if (id === "userId" && isSingleSelectFilterValue(value) && typeof value.data === "number") {
packages/lib/server/service/__tests__/InsightsBookingService.integration-test.ts
+14 -8
View File
@@ -381,8 +381,8 @@ describe("InsightsBookingService Integration Tests", () => {
{
id: "eventTypeId",
value: {
type: ColumnFilterType.SINGLE_SELECT,
data: testData.eventType.id,
type: ColumnFilterType.MULTI_SELECT,
data: [testData.eventType.id],
},
},
],
@@ -391,7 +391,9 @@ describe("InsightsBookingService Integration Tests", () => {
const conditions = await service.getFilterConditions();
expect(conditions).toEqual(
Prisma.sql`("eventTypeId" = ${testData.eventType.id}) OR ("eventParentId" = ${testData.eventType.id})`
Prisma.sql`("eventTypeId" IN (${Prisma.join([
testData.eventType.id,
])}) OR "eventParentId" IN (${Prisma.join([testData.eventType.id])}))`
);
await testData.cleanup();
@@ -441,8 +443,8 @@ describe("InsightsBookingService Integration Tests", () => {
{
id: "eventTypeId",
value: {
type: ColumnFilterType.SINGLE_SELECT,
data: testData.eventType.id,
type: ColumnFilterType.MULTI_SELECT,
data: [testData.eventType.id],
},
},
{
@@ -458,7 +460,11 @@ describe("InsightsBookingService Integration Tests", () => {
const conditions = await service.getFilterConditions();
expect(conditions).toEqual(
Prisma.sql`(("eventTypeId" = ${testData.eventType.id}) OR ("eventParentId" = ${testData.eventType.id})) AND ("userId" = ${testData.user.id})`
Prisma.sql`(("eventTypeId" IN (${Prisma.join([
testData.eventType.id,
])}) OR "eventParentId" IN (${Prisma.join([testData.eventType.id])}))) AND ("userId" = ${
testData.user.id
})`
);
await testData.cleanup();
@@ -542,8 +548,8 @@ describe("InsightsBookingService Integration Tests", () => {
{
id: "eventTypeId",
value: {
type: ColumnFilterType.SINGLE_SELECT,
data: userEventType.id,
type: ColumnFilterType.MULTI_SELECT,
data: [userEventType.id],
},
},
],