From adc4272545668e339bdc063d0b43c8f4d831f9ff Mon Sep 17 00:00:00 2001 From: Rajiv Sahal Date: Mon, 19 Jan 2026 13:39:57 +0530 Subject: [PATCH] fix: atoms issues (#26983) * fix: missiing imports * chore: add popover components for atoms * chore: keep openapi spec up to date --- docs/api-reference/v2/openapi.json | 66 ++++++++++++++++++- .../schedules/useEnsureDefaultSchedule.ts | 5 +- packages/platform/atoms/package.json | 1 + .../atoms/src/components/ui/popover.tsx | 31 +++++++++ 4 files changed, 97 insertions(+), 6 deletions(-) create mode 100644 packages/platform/atoms/src/components/ui/popover.tsx diff --git a/docs/api-reference/v2/openapi.json b/docs/api-reference/v2/openapi.json index 95451c7002..3146e65b54 100644 --- a/docs/api-reference/v2/openapi.json +++ b/docs/api-reference/v2/openapi.json @@ -11482,6 +11482,7 @@ "get": { "operationId": "OAuthClientUsersController_getManagedUsers", "summary": "Get all managed users", + "description": "These endpoints are deprecated and will be removed in the future.", "parameters": [ { "name": "x-cal-secret-key", @@ -11553,6 +11554,7 @@ "post": { "operationId": "OAuthClientUsersController_createUser", "summary": "Create a managed user", + "description": "These endpoints are deprecated and will be removed in the future.", "parameters": [ { "name": "x-cal-secret-key", @@ -11603,6 +11605,7 @@ "get": { "operationId": "OAuthClientUsersController_getUserById", "summary": "Get a managed user", + "description": "These endpoints are deprecated and will be removed in the future.", "parameters": [ { "name": "x-cal-secret-key", @@ -11649,6 +11652,7 @@ "patch": { "operationId": "OAuthClientUsersController_updateUser", "summary": "Update a managed user", + "description": "These endpoints are deprecated and will be removed in the future.", "parameters": [ { "name": "x-cal-secret-key", @@ -11705,6 +11709,7 @@ "delete": { "operationId": "OAuthClientUsersController_deleteUser", "summary": "Delete a managed user", + "description": "These endpoints are deprecated and will be removed in the future.", "parameters": [ { "name": "x-cal-secret-key", @@ -11753,7 +11758,7 @@ "post": { "operationId": "OAuthClientUsersController_forceRefresh", "summary": "Force refresh tokens", - "description": "If you have lost managed user access or refresh token, then you can get new ones by using OAuth credentials. Access token is valid for 60 minutes and refresh token for 1 year. Make sure to store them in your database, for example, in your User database model `calAccessToken` and `calRefreshToken` fields.\nResponse also contains `accessTokenExpiresAt` and `refreshTokenExpiresAt` fields, but if you decode the jwt token the payload will contain `clientId` (OAuth client ID), `ownerId` (user to whom token belongs ID), `iat` (issued at time) and `expiresAt` (when does the token expire) fields.", + "description": "These endpoints are deprecated and will be removed in the future. If you have lost managed user access or refresh token, then you can get new ones by using OAuth credentials. Access token is valid for 60 minutes and refresh token for 1 year. Make sure to store them in your database, for example, in your User database model `calAccessToken` and `calRefreshToken` fields.\nResponse also contains `accessTokenExpiresAt` and `refreshTokenExpiresAt` fields, but if you decode the jwt token the payload will contain `clientId` (OAuth client ID), `ownerId` (user to whom token belongs ID), `iat` (issued at time) and `expiresAt` (when does the token expire) fields.", "parameters": [ { "name": "x-cal-secret-key", @@ -11802,7 +11807,7 @@ "post": { "operationId": "OAuthFlowController_refreshTokens", "summary": "Refresh managed user tokens", - "description": "If managed user access token is expired then get a new one using this endpoint - it will also refresh the refresh token, because we use\n \"refresh token rotation\" mechanism. Access token is valid for 60 minutes and refresh token for 1 year. Make sure to store them in your database, for example, in your User database model `calAccessToken` and `calRefreshToken` fields.\nResponse also contains `accessTokenExpiresAt` and `refreshTokenExpiresAt` fields, but if you decode the jwt token the payload will contain `clientId` (OAuth client ID), `ownerId` (user to whom token belongs ID), `iat` (issued at time) and `expiresAt` (when does the token expire) fields.", + "description": "These endpoints are deprecated and will be removed in the future. If managed user access token is expired then get a new one using this endpoint - it will also refresh the refresh token, because we use\n \"refresh token rotation\" mechanism. Access token is valid for 60 minutes and refresh token for 1 year. Make sure to store them in your database, for example, in your User database model `calAccessToken` and `calRefreshToken` fields.\nResponse also contains `accessTokenExpiresAt` and `refreshTokenExpiresAt` fields, but if you decode the jwt token the payload will contain `clientId` (OAuth client ID), `ownerId` (user to whom token belongs ID), `iat` (issued at time) and `expiresAt` (when does the token expire) fields.", "parameters": [ { "name": "clientId", @@ -11853,6 +11858,7 @@ "post": { "operationId": "OAuthClientWebhooksController_createOAuthClientWebhook", "summary": "Create a webhook", + "description": "These endpoints are deprecated and will be removed in the future.", "parameters": [ { "name": "x-cal-secret-key", @@ -11901,6 +11907,7 @@ "get": { "operationId": "OAuthClientWebhooksController_getOAuthClientWebhooks", "summary": "Get all webhooks", + "description": "These endpoints are deprecated and will be removed in the future.", "parameters": [ { "name": "x-cal-secret-key", @@ -11964,6 +11971,7 @@ "delete": { "operationId": "OAuthClientWebhooksController_deleteAllOAuthClientWebhooks", "summary": "Delete all webhooks", + "description": "These endpoints are deprecated and will be removed in the future.", "parameters": [ { "name": "x-cal-secret-key", @@ -12004,6 +12012,7 @@ "patch": { "operationId": "OAuthClientWebhooksController_updateOAuthClientWebhook", "summary": "Update a webhook", + "description": "These endpoints are deprecated and will be removed in the future.", "parameters": [ { "name": "x-cal-secret-key", @@ -12052,6 +12061,7 @@ "get": { "operationId": "OAuthClientWebhooksController_getOAuthClientWebhook", "summary": "Get a webhook", + "description": "These endpoints are deprecated and will be removed in the future.", "parameters": [ { "name": "x-cal-secret-key", @@ -12082,6 +12092,7 @@ "delete": { "operationId": "OAuthClientWebhooksController_deleteOAuthClientWebhook", "summary": "Delete a webhook", + "description": "These endpoints are deprecated and will be removed in the future.", "parameters": [ { "name": "x-cal-secret-key", @@ -12114,6 +12125,7 @@ "post": { "operationId": "OAuthClientsController_createOAuthClient", "summary": "Create an OAuth client", + "description": "These endpoints are deprecated and will be removed in the future.", "parameters": [ { "name": "Authorization", @@ -12154,6 +12166,7 @@ "get": { "operationId": "OAuthClientsController_getOAuthClients", "summary": "Get all OAuth clients", + "description": "These endpoints are deprecated and will be removed in the future.", "parameters": [ { "name": "Authorization", @@ -12186,6 +12199,7 @@ "get": { "operationId": "OAuthClientsController_getOAuthClientById", "summary": "Get an OAuth client", + "description": "These endpoints are deprecated and will be removed in the future.", "parameters": [ { "name": "Authorization", @@ -12224,6 +12238,7 @@ "patch": { "operationId": "OAuthClientsController_updateOAuthClient", "summary": "Update an OAuth client", + "description": "These endpoints are deprecated and will be removed in the future.", "parameters": [ { "name": "Authorization", @@ -12272,6 +12287,7 @@ "delete": { "operationId": "OAuthClientsController_deleteOAuthClient", "summary": "Delete an OAuth client", + "description": "These endpoints are deprecated and will be removed in the future.", "parameters": [ { "name": "Authorization", @@ -15746,6 +15762,46 @@ ] } }, + "/v2/teams/{teamId}/invite": { + "post": { + "operationId": "TeamsInviteController_createInvite", + "summary": "Create team invite link", + "parameters": [ + { + "name": "Authorization", + "in": "header", + "description": "value must be `Bearer ` where `` is api key prefixed with cal_", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "teamId", + "required": true, + "in": "path", + "schema": { + "type": "number" + } + } + ], + "responses": { + "200": { + "description": "", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CreateInviteOutputDto" + } + } + } + } + }, + "tags": [ + "Teams / Invite" + ] + } + }, "/v2/teams/{teamId}/memberships": { "post": { "operationId": "TeamsMembershipsController_createTeamMembership", @@ -24734,7 +24790,11 @@ "properties": { "status": { "type": "string", - "example": "success" + "example": "success", + "enum": [ + "success", + "error" + ] }, "data": { "$ref": "#/components/schemas/InviteDataDto" diff --git a/packages/platform/atoms/hooks/schedules/useEnsureDefaultSchedule.ts b/packages/platform/atoms/hooks/schedules/useEnsureDefaultSchedule.ts index ae323785ec..988d1a1434 100644 --- a/packages/platform/atoms/hooks/schedules/useEnsureDefaultSchedule.ts +++ b/packages/platform/atoms/hooks/schedules/useEnsureDefaultSchedule.ts @@ -1,11 +1,10 @@ +import type { Schedule } from "@calcom/lib/schedules/transformers/getScheduleListItemData"; import { useEffect, useRef } from "react"; -import { Schedule } from "@calcom/lib/schedules/transformers/getTransformedSchedles"; - export function useEnsureDefaultSchedule( schedules: Schedule[], onUpdateSchedule: (scheduleId: number) => void | Promise -) { +): void { const onUpdateRef = useRef(onUpdateSchedule); useEffect(() => { diff --git a/packages/platform/atoms/package.json b/packages/platform/atoms/package.json index 891daa8ed2..6dbd8dba71 100644 --- a/packages/platform/atoms/package.json +++ b/packages/platform/atoms/package.json @@ -78,6 +78,7 @@ "types": "./dist/index.d.ts", "dependencies": { "@radix-ui/react-dialog-atoms": "npm:@radix-ui/react-dialog@1.0.4", + "@radix-ui/react-popover-atoms": "npm:@radix-ui/react-popover@1.0.6", "@radix-ui/react-slot": "1.1.2", "@radix-ui/react-switch": "1.1.0", "@radix-ui/react-toast": "1.1.5", diff --git a/packages/platform/atoms/src/components/ui/popover.tsx b/packages/platform/atoms/src/components/ui/popover.tsx new file mode 100644 index 0000000000..daeb45a3c2 --- /dev/null +++ b/packages/platform/atoms/src/components/ui/popover.tsx @@ -0,0 +1,31 @@ +/* +In this file we can edit all the Primitives from radix-ui/react-popover +when building atoms package this will automatically replace the PopoverPrimitives used in components from all over the monorepo +ensuring that we don't have issues with atoms. +*/ +import * as PopoverPrimitives from "@radix-ui/react-popover-atoms"; + +const Popover: typeof PopoverPrimitives.Root = PopoverPrimitives.Root; +const PopoverTrigger: typeof PopoverPrimitives.Trigger = PopoverPrimitives.Trigger; +const PopoverAnchor: typeof PopoverPrimitives.Anchor = PopoverPrimitives.Anchor; +const PopoverClose: typeof PopoverPrimitives.Close = PopoverPrimitives.Close; +const PopoverContent: typeof PopoverPrimitives.Content = PopoverPrimitives.Content; +const PopoverArrow: typeof PopoverPrimitives.Arrow = PopoverPrimitives.Arrow; + +const PopoverPortal = ({ children, ...props }: PopoverPrimitives.PopoverPortalProps): JSX.Element => { + return ( + +
{children}
+ + ); +}; + +export const Root: typeof PopoverPrimitives.Root = Popover; +export const Trigger: typeof PopoverPrimitives.Trigger = PopoverTrigger; +export const Anchor: typeof PopoverPrimitives.Anchor = PopoverAnchor; +export const Close: typeof PopoverPrimitives.Close = PopoverClose; +export const Portal: typeof PopoverPortal = PopoverPortal; +export const Content: typeof PopoverPrimitives.Content = PopoverContent; +export const Arrow: typeof PopoverPrimitives.Arrow = PopoverArrow; + +export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor, PopoverClose, PopoverPortal, PopoverArrow };