From 357a42b5129feb0a8788f6f6628be34bf20ac3e3 Mon Sep 17 00:00:00 2001 From: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Date: Tue, 11 Jun 2024 16:38:39 +0300 Subject: [PATCH] fix: atoms useCheck and bump atoms version (#15390) --- packages/platform/atoms/connect/OAuthConnect.tsx | 5 +---- packages/platform/atoms/hooks/connect/useCheck.ts | 7 ++++--- packages/platform/atoms/package.json | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/platform/atoms/connect/OAuthConnect.tsx b/packages/platform/atoms/connect/OAuthConnect.tsx index eae542717f..cca0e56f60 100644 --- a/packages/platform/atoms/connect/OAuthConnect.tsx +++ b/packages/platform/atoms/connect/OAuthConnect.tsx @@ -6,7 +6,6 @@ import { Button } from "@calcom/ui"; import type { OnCheckErrorType } from "../hooks/connect/useCheck"; import { useCheck } from "../hooks/connect/useCheck"; import { useConnect } from "../hooks/connect/useConnect"; -import { useAtomsContext } from "../hooks/useAtomsContext"; import { AtomsWrapper } from "../src/components/atoms-wrapper"; import { cn } from "../src/lib/utils"; @@ -28,16 +27,14 @@ export const OAuthConnect: FC { - const { isAuth } = useAtomsContext(); const { connect } = useConnect(calendar, redir); const { allowConnect, checked } = useCheck({ - isAuth, onCheckError, calendar: calendar, }); - const isChecking = !isAuth || !checked; + const isChecking = !checked; const isDisabled = isChecking || !allowConnect; let displayedLabel = label; diff --git a/packages/platform/atoms/hooks/connect/useCheck.ts b/packages/platform/atoms/hooks/connect/useCheck.ts index f587a0b6a8..73333b6ad1 100644 --- a/packages/platform/atoms/hooks/connect/useCheck.ts +++ b/packages/platform/atoms/hooks/connect/useCheck.ts @@ -5,20 +5,21 @@ import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants"; import type { ApiResponse, ApiErrorResponse } from "@calcom/platform-types"; import http from "../../lib/http"; +import { useAtomsContext } from "../useAtomsContext"; export interface UseCheckProps { - isAuth: boolean; onCheckError?: OnCheckErrorType; calendar: (typeof CALENDARS)[number]; } export type OnCheckErrorType = (err: ApiErrorResponse) => void; export const getQueryKey = (calendar: (typeof CALENDARS)[number]) => [`get-${calendar}-check`]; -export const useCheck = ({ isAuth, onCheckError, calendar }: UseCheckProps) => { +export const useCheck = ({ onCheckError, calendar }: UseCheckProps) => { + const { isInit } = useAtomsContext(); const { data: check } = useQuery({ queryKey: getQueryKey(calendar), staleTime: 6000, - enabled: isAuth, + enabled: isInit, queryFn: () => { return http ?.get>(`/calendars/${calendar}/check`) diff --git a/packages/platform/atoms/package.json b/packages/platform/atoms/package.json index 937591be78..86b486383b 100644 --- a/packages/platform/atoms/package.json +++ b/packages/platform/atoms/package.json @@ -4,7 +4,7 @@ "type": "module", "description": "Customizable UI components to integrate scheduling into your product.", "authors": "Cal.com, Inc.", - "version": "1.0.40", + "version": "1.0.52", "scripts": { "dev": "yarn vite build --watch & npx tailwindcss -i ./globals.css -o ./globals.min.css --postcss --minify --watch", "build": "yarn vite build && npx tailwindcss -i ./globals.css -o ./globals.min.css --postcss --minify && mkdir ./dist/packages/prisma-client && cp -rf ../../../node_modules/.prisma/client/*.d.ts ./dist/packages/prisma-client",