From f5750f39330f9ecf1f039169e487f59e109b3107 Mon Sep 17 00:00:00 2001 From: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Date: Wed, 2 Apr 2025 14:41:33 +0530 Subject: [PATCH] fix: Correct import of markdownToSafeHtml on the client (#18195) * chore: markdowntosafeHtml refactor * update * Update --- apps/web/components/apps/installation/EventTypesStepCard.tsx | 4 ++-- apps/web/components/team/screens/Team.tsx | 4 ++-- apps/web/modules/apps/[slug]/slug-view.tsx | 4 ++-- apps/web/modules/bookings/views/bookings-single-view.tsx | 4 ++-- apps/web/modules/videos/views/videos-single-view.tsx | 4 ++-- .../organizations/pages/settings/other-team-profile-view.tsx | 4 ++-- packages/features/ee/organizations/pages/settings/profile.tsx | 4 ++-- packages/features/ee/teams/pages/team-profile-view.tsx | 4 ++-- .../features/eventtypes/components/EventTypeDescription.tsx | 4 ++-- packages/features/mintlify-chat/MintlifyChat.tsx | 4 ++-- packages/ui/components/form/checkbox/Checkbox.tsx | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/apps/web/components/apps/installation/EventTypesStepCard.tsx b/apps/web/components/apps/installation/EventTypesStepCard.tsx index 39824a47c7..073e16a043 100644 --- a/apps/web/components/apps/installation/EventTypesStepCard.tsx +++ b/apps/web/components/apps/installation/EventTypesStepCard.tsx @@ -4,7 +4,7 @@ import React from "react"; import { useFieldArray, useFormContext } from "react-hook-form"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML"; +import { markdownToSafeHTMLClient } from "@calcom/lib/markdownToSafeHTMLClient"; import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils"; import { Avatar } from "@calcom/ui/components/avatar"; import { Badge } from "@calcom/ui/components/badge"; @@ -66,7 +66,7 @@ const EventTypeCard: FC = ({ className="text-subtle line-clamp-4 break-words text-sm sm:max-w-[650px] [&>*:not(:first-child)]:hidden [&_a]:text-blue-500 [&_a]:underline [&_a]:hover:text-blue-600" // eslint-disable-next-line react/no-danger dangerouslySetInnerHTML={{ - __html: markdownToSafeHTML(description), + __html: markdownToSafeHTMLClient(description), }} /> )} diff --git a/apps/web/components/team/screens/Team.tsx b/apps/web/components/team/screens/Team.tsx index 78b00ffc72..a964bab6be 100644 --- a/apps/web/components/team/screens/Team.tsx +++ b/apps/web/components/team/screens/Team.tsx @@ -2,7 +2,7 @@ import Link from "next/link"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery"; -import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML"; +import { markdownToSafeHTMLClient } from "@calcom/lib/markdownToSafeHTMLClient"; import type { TeamWithMembers } from "@calcom/lib/server/queries/teams"; import type { UserProfile } from "@calcom/types/UserProfile"; import { UserAvatar } from "@calcom/ui/components/avatar"; @@ -40,7 +40,7 @@ const Member = ({ member, teamName }: { member: MemberType; teamName: string | n
) : ( diff --git a/apps/web/modules/apps/[slug]/slug-view.tsx b/apps/web/modules/apps/[slug]/slug-view.tsx index 3de5c44d33..cc6bb5b0c3 100644 --- a/apps/web/modules/apps/[slug]/slug-view.tsx +++ b/apps/web/modules/apps/[slug]/slug-view.tsx @@ -4,7 +4,7 @@ import Link from "next/link"; import { IS_PRODUCTION } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML"; +import { markdownToSafeHTMLClient } from "@calcom/lib/markdownToSafeHTMLClient"; import { showToast } from "@calcom/ui/components/toast"; import type { AppDataProps } from "@lib/apps/[slug]/getStaticProps"; @@ -67,7 +67,7 @@ function SingleAppPage(props: AppDataProps) { body={ <> {/* eslint-disable-next-line react/no-danger */} -
+
} /> diff --git a/apps/web/modules/bookings/views/bookings-single-view.tsx b/apps/web/modules/bookings/views/bookings-single-view.tsx index b09c600592..75c3104a23 100644 --- a/apps/web/modules/bookings/views/bookings-single-view.tsx +++ b/apps/web/modules/bookings/views/bookings-single-view.tsx @@ -41,7 +41,7 @@ import { useLocale } from "@calcom/lib/hooks/useLocale"; import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery"; import useTheme from "@calcom/lib/hooks/useTheme"; import isSmsCalEmail from "@calcom/lib/isSmsCalEmail"; -import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML"; +import { markdownToSafeHTMLClient } from "@calcom/lib/markdownToSafeHTMLClient"; import { getEveryFreqFor } from "@calcom/lib/recurringStrings"; import { getIs24hClockFromLocalStorage, isBrowserLocale24h } from "@calcom/lib/timeFormat"; import { CURRENT_TIMEZONE } from "@calcom/lib/timezoneConstants"; @@ -664,7 +664,7 @@ export default function Success(props: PageProps) { className="text-emphasis mt-4 font-medium" // eslint-disable-next-line react/no-danger dangerouslySetInnerHTML={{ - __html: markdownToSafeHTML(label), + __html: markdownToSafeHTMLClient(label), }} />

)} diff --git a/packages/features/ee/organizations/pages/settings/other-team-profile-view.tsx b/packages/features/ee/organizations/pages/settings/other-team-profile-view.tsx index 6a778f0f57..08d02c983d 100644 --- a/packages/features/ee/organizations/pages/settings/other-team-profile-view.tsx +++ b/packages/features/ee/organizations/pages/settings/other-team-profile-view.tsx @@ -16,7 +16,7 @@ import { trackFormbricksAction } from "@calcom/lib/formbricks-client"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback"; import { md } from "@calcom/lib/markdownIt"; -import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML"; +import { markdownToSafeHTMLClient } from "@calcom/lib/markdownToSafeHTMLClient"; import objectKeys from "@calcom/lib/objectKeys"; import slugify from "@calcom/lib/slugify"; import turndown from "@calcom/lib/turndownService"; @@ -282,7 +282,7 @@ const OtherTeamProfileView = () => {

)} diff --git a/packages/features/ee/organizations/pages/settings/profile.tsx b/packages/features/ee/organizations/pages/settings/profile.tsx index a8201bc06a..d90b819fe1 100644 --- a/packages/features/ee/organizations/pages/settings/profile.tsx +++ b/packages/features/ee/organizations/pages/settings/profile.tsx @@ -15,7 +15,7 @@ import SectionBottomActions from "@calcom/features/settings/SectionBottomActions import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { md } from "@calcom/lib/markdownIt"; -import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML"; +import { markdownToSafeHTMLClient } from "@calcom/lib/markdownToSafeHTMLClient"; import turndown from "@calcom/lib/turndownService"; import { trpc } from "@calcom/trpc/react"; import { Avatar } from "@calcom/ui/components/avatar"; @@ -144,7 +144,7 @@ const OrgProfileView = () => { className=" text-subtle break-words text-sm [&_a]:text-blue-500 [&_a]:underline [&_a]:hover:text-blue-600" // eslint-disable-next-line react/no-danger dangerouslySetInnerHTML={{ - __html: markdownToSafeHTML(currentOrganisation.bio || ""), + __html: markdownToSafeHTMLClient(currentOrganisation.bio || ""), }} /> diff --git a/packages/features/ee/teams/pages/team-profile-view.tsx b/packages/features/ee/teams/pages/team-profile-view.tsx index 5738992de0..56c4cf50ef 100644 --- a/packages/features/ee/teams/pages/team-profile-view.tsx +++ b/packages/features/ee/teams/pages/team-profile-view.tsx @@ -19,7 +19,7 @@ import { getTeamUrlSync } from "@calcom/lib/getBookerUrl/client"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback"; import { md } from "@calcom/lib/markdownIt"; -import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML"; +import { markdownToSafeHTMLClient } from "@calcom/lib/markdownToSafeHTMLClient"; import objectKeys from "@calcom/lib/objectKeys"; import slugify from "@calcom/lib/slugify"; import turndown from "@calcom/lib/turndownService"; @@ -176,7 +176,7 @@ const ProfileView = () => {
)} diff --git a/packages/features/eventtypes/components/EventTypeDescription.tsx b/packages/features/eventtypes/components/EventTypeDescription.tsx index 22b285a90b..8e3a3f8a4f 100644 --- a/packages/features/eventtypes/components/EventTypeDescription.tsx +++ b/packages/features/eventtypes/components/EventTypeDescription.tsx @@ -7,7 +7,7 @@ import { PriceIcon } from "@calcom/features/bookings/components/event-meta/Price import { parseRecurringEvent } from "@calcom/lib"; import { getPaymentAppData } from "@calcom/lib/getPaymentAppData"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML"; +import { markdownToSafeHTMLClient } from "@calcom/lib/markdownToSafeHTMLClient"; import type { baseEventTypeSelect } from "@calcom/prisma"; import { SchedulingType } from "@calcom/prisma/enums"; import type { EventTypeModel } from "@calcom/prisma/zod"; @@ -57,7 +57,7 @@ export const EventTypeDescription = ({ )} // eslint-disable-next-line react/no-danger dangerouslySetInnerHTML={{ - __html: markdownToSafeHTML(eventType.descriptionAsSafeHTML || ""), + __html: markdownToSafeHTMLClient(eventType.descriptionAsSafeHTML || ""), }} /> )} diff --git a/packages/features/mintlify-chat/MintlifyChat.tsx b/packages/features/mintlify-chat/MintlifyChat.tsx index ff54bff1d9..101abe0d6f 100644 --- a/packages/features/mintlify-chat/MintlifyChat.tsx +++ b/packages/features/mintlify-chat/MintlifyChat.tsx @@ -3,7 +3,7 @@ import type { Dispatch, SetStateAction } from "react"; import { useState } from "react"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML"; +import { markdownToSafeHTMLClient } from "@calcom/lib/markdownToSafeHTMLClient"; import classNames from "@calcom/ui/classNames"; import { Icon } from "@calcom/ui/components/icon"; import { SkeletonText, SkeletonContainer } from "@calcom/ui/components/skeleton"; @@ -76,7 +76,7 @@ export const MintlifyChat = ({ searchText, aiResponse, setAiResponse }: Mintlify ) : ( <> -
+
{baseUrl && citations.map((citation) => { diff --git a/packages/ui/components/form/checkbox/Checkbox.tsx b/packages/ui/components/form/checkbox/Checkbox.tsx index f45c194d59..c98d3125e8 100644 --- a/packages/ui/components/form/checkbox/Checkbox.tsx +++ b/packages/ui/components/form/checkbox/Checkbox.tsx @@ -3,7 +3,7 @@ import { useId } from "@radix-ui/react-id"; import type { InputHTMLAttributes } from "react"; import React, { forwardRef } from "react"; -import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML"; +import { markdownToSafeHTMLClient } from "@calcom/lib/markdownToSafeHTMLClient"; import classNames from "@calcom/ui/classNames"; import { Icon } from "../../icon"; @@ -101,7 +101,7 @@ const CheckboxField = forwardRef( )} // eslint-disable-next-line react/no-danger dangerouslySetInnerHTML={{ - __html: markdownToSafeHTML(descriptionAsSafeHtml), + __html: markdownToSafeHTMLClient(descriptionAsSafeHtml), }} /> ) : (