maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:calcom/cal.com into refactor-event-types-type-id-10419-cal-2264-cal-2296

This commit is contained in:
Alan 2023-08-30 23:56:48 -07:00
parent 0ae4604a6b 3c508568da
commit 35502c0784
5 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/features/ee/organizations/pages/settings/other-team-profile-view.tsx
View File

@ -13,6 +13,7 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { md } from "@calcom/lib/markdownIt"; import { md } from "@calcom/lib/markdownIt";
import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML"; import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
import objectKeys from "@calcom/lib/objectKeys"; import objectKeys from "@calcom/lib/objectKeys";
import slugify from "@calcom/lib/slugify";
import turndown from "@calcom/lib/turndownService"; import turndown from "@calcom/lib/turndownService";
import type { RouterOutputs } from "@calcom/trpc/react"; import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react"; import { trpc } from "@calcom/trpc/react";
@ -229,7 +230,7 @@ const OtherTeamProfileView = () => {
} }
onChange={(e) => { onChange={(e) => {
form.clearErrors("slug"); form.clearErrors("slug");
form.setValue("slug", e?.target.value); form.setValue("slug", slugify(e?.target.value, true));
}} }}
/> />
</div> </div>

3
packages/features/ee/teams/components/CreateANewTeamForm.tsx
View File

@ -115,9 +115,10 @@ export const CreateANewTeamForm = () => {
? orgBranding.fullDomain.replace("https://", "").replace("http://", "") + "/" ? orgBranding.fullDomain.replace("https://", "").replace("http://", "") + "/"
: `${extractDomainFromWebsiteUrl}/team/` : `${extractDomainFromWebsiteUrl}/team/`
}`} }`}
value={value}
defaultValue={value} defaultValue={value}
onChange={(e) => { onChange={(e) => {
newTeamFormMethods.setValue("slug", slugify(e?.target.value), { newTeamFormMethods.setValue("slug", slugify(e?.target.value, true), {
shouldTouch: true, shouldTouch: true,
}); });
newTeamFormMethods.clearErrors("slug"); newTeamFormMethods.clearErrors("slug");

3
packages/features/ee/teams/pages/team-profile-view.tsx
View File

@ -16,6 +16,7 @@ import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback";
import { md } from "@calcom/lib/markdownIt"; import { md } from "@calcom/lib/markdownIt";
import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML"; import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
import objectKeys from "@calcom/lib/objectKeys"; import objectKeys from "@calcom/lib/objectKeys";
import slugify from "@calcom/lib/slugify";
import turndown from "@calcom/lib/turndownService"; import turndown from "@calcom/lib/turndownService";
import { MembershipRole } from "@calcom/prisma/enums"; import { MembershipRole } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react"; import { trpc } from "@calcom/trpc/react";
@ -232,7 +233,7 @@ const ProfileView = () => {
} }
onChange={(e) => { onChange={(e) => {
form.clearErrors("slug"); form.clearErrors("slug");
form.setValue("slug", e?.target.value); form.setValue("slug", slugify(e?.target.value, true));
}} }}
/> />
</div> </div>

12
packages/lib/slugify.ts
View File

@ -1,13 +1,17 @@
export const slugify = (str: string) => { // forDisplayingInput is used to allow user to type "-" at the end and not replace with empty space.
return str // For eg:- "test-slug" is the slug user wants to set but while typing "test-" would get replace to "test" becauser of replace(/-+$/, "")
export const slugify = (str: string, forDisplayingInput?: boolean) => {
const s = str
.toLowerCase() // Convert to lowercase .toLowerCase() // Convert to lowercase
.trim() // Remove whitespace from both sides .trim() // Remove whitespace from both sides
.normalize("NFD") // Normalize to decomposed form for handling accents .normalize("NFD") // Normalize to decomposed form for handling accents
.replace(/\p{Diacritic}/gu, "") // Remove any diacritics (accents) from characters .replace(/\p{Diacritic}/gu, "") // Remove any diacritics (accents) from characters
.replace(/[^\p{L}\p{N}\p{Zs}\p{Emoji}]+/gu, "-") // Replace any non-alphanumeric characters (including Unicode) with a dash .replace(/[^\p{L}\p{N}\p{Zs}\p{Emoji}]+/gu, "-") // Replace any non-alphanumeric characters (including Unicode) with a dash
.replace(/[\s_#]+/g, "-") // Replace whitespace, # and underscores with a single dash .replace(/[\s_#]+/g, "-") // Replace whitespace, # and underscores with a single dash
.replace(/^-+/, "") // Remove dashes from start .replace(/^-+/, ""); // Remove dashes from start
.replace(/-+$/, ""); // Remove dashes from end
return forDisplayingInput ? s : s.replace(/-+$/, ""); // Remove dashes from end
}; };
export default slugify; export default slugify;

7
packages/trpc/server/routers/viewer/teams/update.schema.ts
View File

@ -1,11 +1,16 @@
import { z } from "zod"; import { z } from "zod";
import slugify from "@calcom/lib/slugify";
export const ZUpdateInputSchema = z.object({ export const ZUpdateInputSchema = z.object({
id: z.number(), id: z.number(),
bio: z.string().optional(), bio: z.string().optional(),
name: z.string().optional(), name: z.string().optional(),
logo: z.string().optional(), logo: z.string().optional(),
slug: z.string().optional(), slug: z
.string()
.transform((val) => slugify(val.trim()))
.optional(),
hideBranding: z.boolean().optional(), hideBranding: z.boolean().optional(),
hideBookATeamMember: z.boolean().optional(), hideBookATeamMember: z.boolean().optional(),
isPrivate: z.boolean().optional(), isPrivate: z.boolean().optional(),