From 79f34a4fc785683a1b182c48d410b97754e89fb2 Mon Sep 17 00:00:00 2001 From: Afzal Sayed <14029371+afzalsayed96@users.noreply.github.com> Date: Thu, 22 Jun 2023 12:16:34 +0400 Subject: [PATCH] perf: [CAL-1928] Deduplicate eventTypes.getByViewer query (#9700) Co-authored-by: alannnc Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> --- apps/web/pages/event-types/index.tsx | 2 +- packages/features/filters/lib/getTeamsFiltersFromQuery.ts | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/web/pages/event-types/index.tsx b/apps/web/pages/event-types/index.tsx index 8a34c3de2a..f20ee65e83 100644 --- a/apps/web/pages/event-types/index.tsx +++ b/apps/web/pages/event-types/index.tsx @@ -861,7 +861,7 @@ const EventTypesPage = () => { const filters = getTeamsFiltersFromQuery(router.query); // eslint-disable-next-line @typescript-eslint/no-explicit-any - const WithQuery = withQuery(trpc.viewer.eventTypes.getByViewer as any, { filters }); + const WithQuery = withQuery(trpc.viewer.eventTypes.getByViewer as any, filters && { filters }); return (
diff --git a/packages/features/filters/lib/getTeamsFiltersFromQuery.ts b/packages/features/filters/lib/getTeamsFiltersFromQuery.ts index dfc69ea896..14d71c9d78 100644 --- a/packages/features/filters/lib/getTeamsFiltersFromQuery.ts +++ b/packages/features/filters/lib/getTeamsFiltersFromQuery.ts @@ -24,5 +24,10 @@ export const getTeamsFiltersFromQuery = (query: ParsedUrlQuery) => { // [1,2] is equivalent to [2,1] when fetching filter data. filters.teamIds = filters.teamIds?.sort(); filters.userIds = filters.userIds?.sort(); + + if (!filters.teamIds?.length && !filters.userIds?.length) { + return undefined; + } + return filters; };