commonscomputer/cal.diy
4
0
Fork 0
Code Issues Pull Requests Actions 2.2k Packages Projects Releases Wiki Activity

fix: Correct import of markdownToSafeHtml on the client (#18195)

Browse Source 
* chore: markdowntosafeHtml refactor

* update

* Update
This commit is contained in:
Anik Dhabal Babu
2025-04-02 14:41:33 +05:30
committed by GitHub
parent 8f2cb0522d
commit f5750f3933
11 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/web/components/apps/installation/EventTypesStepCard.tsx
+2 -2
View File
@@ -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<EventTypeCardProps> = ({
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),
}}
/>
)}
apps/web/components/team/screens/Team.tsx
+2 -2
View File
@@ -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
<div
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(member.bio) }}
dangerouslySetInnerHTML={{ __html: markdownToSafeHTMLClient(member.bio) }}
/>
</>
) : (
apps/web/modules/apps/[slug]/slug-view.tsx
+2 -2
View File
@@ -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 */}
<div dangerouslySetInnerHTML={{ __html: markdownToSafeHTML(source.content) }} />
<div dangerouslySetInnerHTML={{ __html: markdownToSafeHTMLClient(source.content) }} />
</>
}
/>
apps/web/modules/bookings/views/bookings-single-view.tsx
+2 -2
View File
@@ -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),
}}
/>
<p
apps/web/modules/videos/views/videos-single-view.tsx
+2 -2
View File
@@ -10,7 +10,7 @@ import { WEBSITE_URL } from "@calcom/lib/constants";
import { TRANSCRIPTION_STOPPED_ICON, RECORDING_DEFAULT_ICON } from "@calcom/lib/constants";
import { formatToLocalizedDate, formatToLocalizedTime } from "@calcom/lib/date-fns";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
import { markdownToSafeHTMLClient } from "@calcom/lib/markdownToSafeHTMLClient";
import type { inferSSRProps } from "@calcom/types/inferSSRProps";
import { Icon } from "@calcom/ui/components/icon";
import classNames from "@calcom/ui/classNames";
@@ -244,7 +244,7 @@ export function VideoMeetingInfo(props: VideoMeetingInfo) {
<div
className="prose-sm prose prose-invert"
// eslint-disable-next-line react/no-danger
dangerouslySetInnerHTML={{ __html: markdownToSafeHTML(booking.description) }}
dangerouslySetInnerHTML={{ __html: markdownToSafeHTMLClient(booking.description) }}
/>
</>
)}
packages/features/ee/organizations/pages/settings/other-team-profile-view.tsx
+2 -2
View File
@@ -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 = () => {
<div
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(team.bio) }}
dangerouslySetInnerHTML={{ __html: markdownToSafeHTMLClient(team.bio) }}
/>
</>
)}
packages/features/ee/organizations/pages/settings/profile.tsx
+2 -2
View File
@@ -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 || ""),
}}
/>
</>
packages/features/ee/teams/pages/team-profile-view.tsx
+2 -2
View File
@@ -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 = () => {
<div
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(team.bio ?? null) }}
dangerouslySetInnerHTML={{ __html: markdownToSafeHTMLClient(team.bio ?? null) }}
/>
</>
)}
packages/features/eventtypes/components/EventTypeDescription.tsx
+2 -2
View File
@@ -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 || ""),
}}
/>
)}
packages/features/mintlify-chat/MintlifyChat.tsx
+2 -2
View File
@@ -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
</SkeletonContainer>
) : (
<>
<div dangerouslySetInnerHTML={{ __html: markdownToSafeHTML(answer) }} />
<div dangerouslySetInnerHTML={{ __html: markdownToSafeHTMLClient(answer) }} />
<div className="my-1 flex flex-wrap gap-2">
{baseUrl &&
citations.map((citation) => {
packages/ui/components/form/checkbox/Checkbox.tsx
+2 -2
View File
@@ -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<HTMLInputElement, Props>(
)}
// eslint-disable-next-line react/no-danger
dangerouslySetInnerHTML={{
__html: markdownToSafeHTML(descriptionAsSafeHtml),
__html: markdownToSafeHTMLClient(descriptionAsSafeHtml),
}}
/>
) : (