From e4ab8d87c45762b99eb2a9d19fd6efcf1113e753 Mon Sep 17 00:00:00 2001 From: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Date: Wed, 26 Feb 2025 06:09:46 +0530 Subject: [PATCH] fix: Attempted to call ZFormsInputSchema() from the server (#19540) * fix: Attempted to call ZFormsInputSchema() from the server * chore: type optimisation --------- Co-authored-by: Alex van Andel --- packages/app-store/routing-forms/trpc/forms.schema.ts | 2 -- packages/features/bookings/components/EventTypeFilter.tsx | 5 +---- packages/features/filters/components/FilterResults.tsx | 5 ----- packages/features/filters/components/TeamsFilter.tsx | 4 ---- packages/features/filters/lib/getTeamsFiltersFromQuery.ts | 5 ----- packages/features/filters/types/filter.d.ts | 5 +++++ 6 files changed, 6 insertions(+), 20 deletions(-) create mode 100644 packages/features/filters/types/filter.d.ts diff --git a/packages/app-store/routing-forms/trpc/forms.schema.ts b/packages/app-store/routing-forms/trpc/forms.schema.ts index 343097874f..787d6e2be7 100644 --- a/packages/app-store/routing-forms/trpc/forms.schema.ts +++ b/packages/app-store/routing-forms/trpc/forms.schema.ts @@ -1,5 +1,3 @@ -"use client"; - import { z } from "zod"; import { filterQuerySchemaStrict } from "@calcom/features/filters/lib/getTeamsFiltersFromQuery"; diff --git a/packages/features/bookings/components/EventTypeFilter.tsx b/packages/features/bookings/components/EventTypeFilter.tsx index cf86eb8d5f..105450ed1c 100644 --- a/packages/features/bookings/components/EventTypeFilter.tsx +++ b/packages/features/bookings/components/EventTypeFilter.tsx @@ -5,8 +5,8 @@ import { FilterCheckboxField, FilterCheckboxFieldsContainer, } from "@calcom/features/filters/components/TeamsFilter"; +import type { IEventTypeFilter } from "@calcom/features/filters/types/filter"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import type { RouterOutputs } from "@calcom/trpc/react"; import { trpc } from "@calcom/trpc/react"; import { FilterSearchField } from "@calcom/ui"; import { AnimatedPopover, Divider, Icon } from "@calcom/ui"; @@ -14,9 +14,6 @@ import { AnimatedPopover, Divider, Icon } from "@calcom/ui"; import { groupBy } from "../groupBy"; import { useFilterQuery } from "../lib/useFilterQuery"; -export type IEventTypesFilters = RouterOutputs["viewer"]["eventTypes"]["listWithTeam"]; -export type IEventTypeFilter = IEventTypesFilters[0]; - type GroupedEventTypeState = Record< string, { diff --git a/packages/features/filters/components/FilterResults.tsx b/packages/features/filters/components/FilterResults.tsx index 7fc9adfa8c..4319a44a3e 100644 --- a/packages/features/filters/components/FilterResults.tsx +++ b/packages/features/filters/components/FilterResults.tsx @@ -1,8 +1,3 @@ -import type { RouterOutputs } from "@calcom/trpc/react"; - -export type IEventTypesFilters = RouterOutputs["viewer"]["eventTypes"]["listWithTeam"]; -export type IEventTypeFilter = IEventTypesFilters[0]; - export function FilterResults({ queryRes, SkeletonLoader, diff --git a/packages/features/filters/components/TeamsFilter.tsx b/packages/features/filters/components/TeamsFilter.tsx index 438bd9f5ad..c3714d6722 100644 --- a/packages/features/filters/components/TeamsFilter.tsx +++ b/packages/features/filters/components/TeamsFilter.tsx @@ -6,7 +6,6 @@ import { classNames } from "@calcom/lib"; import { getOrgOrTeamAvatar } from "@calcom/lib/defaultAvatarImage"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { useTypedQuery } from "@calcom/lib/hooks/useTypedQuery"; -import type { RouterOutputs } from "@calcom/trpc/react"; import { trpc } from "@calcom/trpc/react"; import { FilterSearchField, @@ -20,9 +19,6 @@ import { import { filterQuerySchema } from "../lib/getTeamsFiltersFromQuery"; -export type IEventTypesFilters = RouterOutputs["viewer"]["eventTypes"]["listWithTeam"]; -export type IEventTypeFilter = IEventTypesFilters[0]; - function useFilterQuery() { // passthrough allows additional params to not be removed return useTypedQuery(filterQuerySchema.passthrough()); diff --git a/packages/features/filters/lib/getTeamsFiltersFromQuery.ts b/packages/features/filters/lib/getTeamsFiltersFromQuery.ts index 368a230ea4..bdc1b5cd9a 100644 --- a/packages/features/filters/lib/getTeamsFiltersFromQuery.ts +++ b/packages/features/filters/lib/getTeamsFiltersFromQuery.ts @@ -1,11 +1,6 @@ import type { ParsedUrlQuery } from "querystring"; import { z } from "zod"; -import type { RouterOutputs } from "@calcom/trpc/react"; - -export type IEventTypesFilters = RouterOutputs["viewer"]["eventTypes"]["listWithTeam"]; -export type IEventTypeFilter = IEventTypesFilters[0]; - // Take array as a string and return zod array const queryStringArray = z .string() diff --git a/packages/features/filters/types/filter.d.ts b/packages/features/filters/types/filter.d.ts new file mode 100644 index 0000000000..af196344da --- /dev/null +++ b/packages/features/filters/types/filter.d.ts @@ -0,0 +1,5 @@ +import type { EventType, Team } from "@calcom/prisma/client"; + +export type IEventTypeFilter = Pick & { + team: Pick | null; +};