Scheduling infrastructure for absolutely everyone.
refactor: Remove `trpc/react` dependency from @calcom/atoms (#26694)
Benny Jooc826e9cea842
diff --git a/apps/web/modules/event-types/components/EditWeightsForAllTeamMembers.tsx b/apps/web/modules/event-types/components/EditWeightsForAllTeamMembers.tsxindex 89f9db882e1..c1d57dd896c 100644--- a/apps/web/modules/event-types/components/EditWeightsForAllTeamMembers.tsx+++ b/apps/web/modules/event-types/components/EditWeightsForAllTeamMembers.tsx@@ -26,9 +26,9 @@ import {import { showToast } from "@calcom/ui/components/toast";import {- useTeamMembersWithSegment,useTeamMembersWithSegmentPlatform,-} from "../../../../../packages/platform/atoms/event-types/hooks/useTeamMembersWithSegment";+} from "@calcom/atoms/event-types/hooks/useTeamMembersWithSegmentPlatform";+import { useTeamMembersWithSegment } from "@calcom/web/modules/event-types/hooks/useTeamMembersWithSegment";type TeamMemberItemProps = {member: Omit<TeamMember, "defaultScheduleId"> & { weight?: number };diff --git a/apps/web/modules/event-types/hooks/useTeamMembersWithSegment.tsx b/apps/web/modules/event-types/hooks/useTeamMembersWithSegment.tsxnew file mode 100644index 00000000000..d4492bdf93d--- /dev/null+++ b/apps/web/modules/event-types/hooks/useTeamMembersWithSegment.tsx@@ -0,0 +1,37 @@+import { useQuery } from "@tanstack/react-query";+import type { AttributesQueryValue } from "@calcom/lib/raqb/types";+import { trpc } from "@calcom/trpc/react";+import { type UseTeamMembersWithSegmentProps, useProcessTeamMembersData } from "@calcom/atoms/event-types/hooks/useTeamMembersWithSegmentPlatform";++export const useTeamMembersWithSegment = ({+ initialTeamMembers,+ assignRRMembersUsingSegment,+ teamId,+ queryValue,+ value,+}: UseTeamMembersWithSegmentProps) => {+ const { data: matchingTeamMembersWithResult, isPending } =+ trpc.viewer.attributes.findTeamMembersMatchingAttributeLogic.useQuery(+ {+ teamId: teamId || 0,+ attributesQueryValue: queryValue as AttributesQueryValue,+ _enablePerf: true,+ },+ {+ enabled: assignRRMembersUsingSegment && !!queryValue && !!teamId,+ }+ );++ const { teamMembers, localWeightsInitialValues } = useProcessTeamMembersData({+ initialTeamMembers,+ assignRRMembersUsingSegment,+ matchingTeamMembersWithResult,+ value,+ });++ return {+ teamMembers,+ localWeightsInitialValues,+ isPending,+ };+};diff --git a/biome.json b/biome.jsonindex d0993a5be4e..4d0682229da 100644--- a/biome.json+++ b/biome.json@@ -323,6 +323,38 @@}}}+ },+ {+ "includes": [+ "packages/platform/atoms/**/*.{ts,tsx,js,jsx,mts,mjs,cjs,cts}"+ ],+ "linter": {+ "rules": {+ "style": {+ "noRestrictedImports": {+ "level": "error",+ "options": {+ "patterns": [+ {+ "group": [+ "@calcom/trpc/react",+ "@calcom/trpc/react/**"+ ],+ "message": "atoms package should not import from @calcom/trpc/react."+ },+ {+ "group": [+ "../../trpc/react",+ "../../trpc/react/**"+ ],+ "message": "atoms package should not import from trpc/react."+ }+ ]+ }+ }+ }+ }+ }}]}diff --git a/packages/platform/atoms/availability/AvailabilitySettings.tsx b/packages/platform/atoms/availability/AvailabilitySettings.tsxindex d3b6abc0f11..44a92ae0716 100644--- a/packages/platform/atoms/availability/AvailabilitySettings.tsx+++ b/packages/platform/atoms/availability/AvailabilitySettings.tsx@@ -29,7 +29,7 @@ import WebSchedule, {import { availabilityAsString } from "@calcom/lib/availability";import { useLocale } from "@calcom/lib/hooks/useLocale";import { sortAvailabilityStrings } from "@calcom/lib/weekstart";-import type { RouterOutputs } from "@calcom/trpc/react";+import type { TravelScheduleRepository } from "@calcom/features/travelSchedule/repositories/TravelScheduleRepository";import type { TimeRange, WorkingHours } from "@calcom/types/schedule";import classNames from "@calcom/ui/classNames";import { Button } from "@calcom/ui/components/button";@@ -99,7 +99,7 @@ export type AvailabilitySettingsScheduleType = {type AvailabilitySettingsProps = {skeletonLabel?: string;schedule: AvailabilitySettingsScheduleType;- travelSchedules?: RouterOutputs["viewer"]["travelSchedules"]["get"];+ travelSchedules?: Awaited<ReturnType<typeof TravelScheduleRepository.findTravelSchedulesByUserId>>;handleDelete: () => void;allowDelete?: boolean;allowSetToDefault?: boolean;@@ -195,7 +195,7 @@ const DateOverride = ({}: {workingHours: WorkingHours[];userTimeFormat: number | null;- travelSchedules?: RouterOutputs["viewer"]["travelSchedules"]["get"];+ travelSchedules?: Awaited<ReturnType<typeof TravelScheduleRepository.findTravelSchedulesByUserId>>;weekStart: 0 | 1 | 2 | 3 | 4 | 5 | 6;overridesModalClassNames?: string;classNames?: {@@ -642,7 +642,7 @@ export const AvailabilitySettings = forwardRef<AvailabilitySettingsFormRef, Avaiform="availability-form"loading={isSaving}disabled={isLoading || !formHasChanges}- >+ >{t("save")}</Button><Buttondiff --git a/packages/platform/atoms/event-types/hooks/useTeamMembersWithSegment.tsx b/packages/platform/atoms/event-types/hooks/useTeamMembersWithSegmentPlatform.tsxsimilarity index 76%rename from packages/platform/atoms/event-types/hooks/useTeamMembersWithSegment.tsxrename to packages/platform/atoms/event-types/hooks/useTeamMembersWithSegmentPlatform.tsxindex da3a36b122e..eddaccbc205 100644--- a/packages/platform/atoms/event-types/hooks/useTeamMembersWithSegment.tsx+++ b/packages/platform/atoms/event-types/hooks/useTeamMembersWithSegmentPlatform.tsx@@ -10,12 +10,11 @@ import type {TeamMemberDto,FindTeamMembersMatchingAttributeOutputDto,} from "@calcom/platform-types";-import { trpc } from "@calcom/trpc/react";import { useAtomsContext } from "../../hooks/useAtomsContext";import http from "../../lib/http";-interface UseTeamMembersWithSegmentProps {+export interface UseTeamMembersWithSegmentProps {initialTeamMembers: TeamMember[];assignRRMembersUsingSegment: boolean;teamId?: number;@@ -24,7 +23,7 @@ interface UseTeamMembersWithSegmentProps {value: Host[];}-const useProcessTeamMembersData = ({+export const useProcessTeamMembersData = ({initialTeamMembers,assignRRMembersUsingSegment,matchingTeamMembersWithResult,@@ -105,37 +104,4 @@ export const useTeamMembersWithSegmentPlatform = ({localWeightsInitialValues,isPending,};-};--export const useTeamMembersWithSegment = ({- initialTeamMembers,- assignRRMembersUsingSegment,- teamId,- queryValue,- value,-}: UseTeamMembersWithSegmentProps) => {- const { data: matchingTeamMembersWithResult, isPending } =- trpc.viewer.attributes.findTeamMembersMatchingAttributeLogic.useQuery(- {- teamId: teamId || 0,- attributesQueryValue: queryValue as AttributesQueryValue,- _enablePerf: true,- },- {- enabled: assignRRMembersUsingSegment && !!queryValue && !!teamId,- }- );-- const { teamMembers, localWeightsInitialValues } = useProcessTeamMembersData({- initialTeamMembers,- assignRRMembersUsingSegment,- matchingTeamMembersWithResult,- value,- });-- return {- teamMembers,- localWeightsInitialValues,- isPending,- };-};+};\ No newline at end of filediff --git a/packages/platform/atoms/package.json b/packages/platform/atoms/package.jsonindex 30afb007a34..48fe012df14 100644--- a/packages/platform/atoms/package.json+++ b/packages/platform/atoms/package.json@@ -72,6 +72,7 @@"./event-types/hooks/useEventTypeForm": "./event-types/hooks/useEventTypeForm.ts","./event-types/hooks/useHandleRouteChange": "./event-types/hooks/useHandleRouteChange.ts","./event-types/hooks/useTabsNavigations": "./event-types/hooks/useTabsNavigations.tsx",+ "./event-types/hooks/useTeamMembersWithSegmentPlatform": "./event-types/hooks/useTeamMembersWithSegmentPlatform.tsx","./timezone": "./timezone/index.tsx"},"types": "./dist/index.d.ts",diff --git a/packages/platform/atoms/tsconfig.json b/packages/platform/atoms/tsconfig.jsonindex 2f5bd6c8c0b..c53c46f2069 100644--- a/packages/platform/atoms/tsconfig.json+++ b/packages/platform/atoms/tsconfig.json@@ -38,7 +38,6 @@"../../dayjs","../../prisma/zod-utils.ts","../../prisma/zod",- "../../trpc/react","../../trpc/server/routers/viewer/slots","../../trpc/server/types","../../features/eventtypes",