Scheduling infrastructure for absolutely everyone.
perf: redundant query in eventsAppsTab (#24491)
Anik Dhabal Babu02fdc1361ce6
diff --git a/packages/features/eventtypes/components/tabs/apps/EventAppsTab.tsx b/packages/features/eventtypes/components/tabs/apps/EventAppsTab.tsxindex c9d0da8dad7..8d6ee1cb7de 100644--- a/packages/features/eventtypes/components/tabs/apps/EventAppsTab.tsx+++ b/packages/features/eventtypes/components/tabs/apps/EventAppsTab.tsx@@ -6,7 +6,7 @@ import type { EventTypeAppCardComponentProps } from "@calcom/app-store/types";import type { EventTypeAppsList } from "@calcom/app-store/utils";import useAppsData from "@calcom/features/apps/hooks/useAppsData";import useLockedFieldsManager from "@calcom/features/ee/managed-event-types/hooks/useLockedFieldsManager";-import type { FormValues, EventTypeSetupProps } from "@calcom/features/eventtypes/lib/types";+import type { FormValues, EventTypeSetupProps, EventTypeApps } from "@calcom/features/eventtypes/lib/types";import ServerTrans from "@calcom/lib/components/ServerTrans";import { useLocale } from "@calcom/lib/hooks/useLocale";import { trpc } from "@calcom/trpc/react";@@ -18,12 +18,16 @@ import { Section } from "@calcom/ui/components/section";export type EventType = Pick<EventTypeSetupProps, "eventType">["eventType"] &EventTypeAppCardComponentProps["eventType"];-export const EventAppsTab = ({ eventType }: { eventType: EventType }) => {+export const EventAppsTab = ({+ eventType,+ eventTypeApps,+ isPendingApps,+}: {+ eventType: EventType;+ eventTypeApps?: EventTypeApps;+ isPendingApps: boolean;+}) => {const { t } = useLocale();- const { data: eventTypeApps, isPending } = trpc.viewer.apps.integrations.useQuery({- extendsFeature: "EventType",- teamId: eventType.team?.id || eventType.parent?.teamId,- });const utils = trpc.useUtils();@@ -126,7 +130,7 @@ export const EventAppsTab = ({ eventType }: { eventType: EventType }) => {}/>)}- {!isPending && !installedApps?.length ? (+ {!isPendingApps && !installedApps?.length ? (<EmptyScreenIcon="grid-3x3"headline={t("empty_installed_apps_headline")}@@ -168,7 +172,7 @@ export const EventAppsTab = ({ eventType }: { eventType: EventType }) => {{/* TODO: Add back after salesforce v3 dev */}{!appsDisableProps.disabled && (<div className="bg-muted mt-4 rounded-2xl p-4">- {!isPending && notInstalledApps?.length ? (+ {!isPendingApps && notInstalledApps?.length ? (<div className="mb-4 flex flex-col"><Section.Title>{t("available_apps_lower_case")}</Section.Title><Section.Description>diff --git a/packages/platform/atoms/event-types/wrappers/EventTypeWebWrapper.tsx b/packages/platform/atoms/event-types/wrappers/EventTypeWebWrapper.tsxindex e8a7d125b0d..7ee712dd328 100644--- a/packages/platform/atoms/event-types/wrappers/EventTypeWebWrapper.tsx+++ b/packages/platform/atoms/event-types/wrappers/EventTypeWebWrapper.tsx@@ -169,7 +169,7 @@ const EventTypeWeb = ({const [pendingRoute, setPendingRoute] = useState("");const { eventType, locationOptions, team, teamMembers, destinationCalendar } = rest;const [slugExistsChildrenDialogOpen, setSlugExistsChildrenDialogOpen] = useState<ChildrenEventType[]>([]);- const { data: eventTypeApps } = trpc.viewer.apps.integrations.useQuery({+ const { data: eventTypeApps, isPending: isPendingApps } = trpc.viewer.apps.integrations.useQuery({extendsFeature: "EventType",teamId: eventType.team?.id || eventType.parent?.teamId,onlyInstalled: true,@@ -287,7 +287,13 @@ const EventTypeWeb = ({),instant: <EventInstantTab eventType={eventType} isTeamEvent={!!team} />,recurring: <EventRecurringTab eventType={eventType} />,- apps: <EventAppsTab eventType={{ ...eventType, URL: permalink }} />,+ apps: (+ <EventAppsTab+ eventType={{ ...eventType, URL: permalink }}+ eventTypeApps={eventTypeApps}+ isPendingApps={isPendingApps}+ />+ ),workflows:allActiveWorkflows && canReadWorkflows ? (<EventWorkflowsTab eventType={eventType} workflows={allActiveWorkflows} />