* fix(availability): validate schedule title input to block invalid characters * fix: add english translation for invalid_characters_in_name * fix(schedule): allow Unicode characters in schedule name validation * fix(schedule): update validation message to match regex * fix: tsconfig target * fix(schedule): add required validation in NewScheduleButton using translation * fix(schedule): allow ASCII apostrophe in schedule name validation * Update ScheduleListItem.tsx * fix: remove unused @ts-expect-error directives * fix: remove tsconfig target change * Revert "fix: remove tsconfig target change" This reverts commit d4992caf9b71cdfe32ac9db9a509128548097a30. * Revert "fix: remove unused @ts-expect-error directives" This reverts commit 913eda500aeccdd67b15cf1898f6db376bf3dda9. * fix: update validation regex to support unicode characters * fix: remove es6 from tsconfig * Update NewScheduleButton.tsx --------- Co-authored-by: Deepanshu Verma <deepanshuverma186@email.com> Co-authored-by: Sahitya Chandra <sahityajb@gmail.com>
103 lines
3.3 KiB
TypeScript
103 lines
3.3 KiB
TypeScript
import { revalidateAvailabilityList } from "app/(use-page-wrapper)/(main-nav)/availability/actions";
|
|
import { useRouter } from "next/navigation";
|
|
import { useForm } from "react-hook-form";
|
|
|
|
import { Dialog } from "@calcom/features/components/controlled-dialog";
|
|
import { useLocale } from "@calcom/lib/hooks/useLocale";
|
|
import { HttpError } from "@calcom/lib/http-error";
|
|
import { trpc } from "@calcom/trpc/react";
|
|
import { Button } from "@calcom/ui/components/button";
|
|
import { DialogContent, DialogFooter, DialogTrigger, DialogClose } from "@calcom/ui/components/dialog";
|
|
import { Form } from "@calcom/ui/components/form";
|
|
import { InputField } from "@calcom/ui/components/form";
|
|
import { showToast } from "@calcom/ui/components/toast";
|
|
|
|
export function NewScheduleButton({
|
|
name = "new-schedule",
|
|
fromEventType,
|
|
}: {
|
|
name?: string;
|
|
fromEventType?: boolean;
|
|
}) {
|
|
const router = useRouter();
|
|
const { t } = useLocale();
|
|
|
|
const form = useForm<{
|
|
name: string;
|
|
}>();
|
|
const { register } = form;
|
|
const utils = trpc.useUtils();
|
|
|
|
const createMutation = trpc.viewer.availability.schedule.create.useMutation({
|
|
onSuccess: async ({ schedule }) => {
|
|
await router.push(`/availability/${schedule.id}${fromEventType ? "?fromEventType=true" : ""}`);
|
|
showToast(t("schedule_created_successfully", { scheduleName: schedule.name }), "success");
|
|
revalidateAvailabilityList();
|
|
utils.viewer.availability.list.setData(undefined, (data) => {
|
|
const newSchedule = { ...schedule, isDefault: false, availability: [] };
|
|
if (!data)
|
|
return {
|
|
schedules: [newSchedule],
|
|
};
|
|
return {
|
|
...data,
|
|
schedules: [...data.schedules, newSchedule],
|
|
};
|
|
});
|
|
},
|
|
onError: (err) => {
|
|
if (err instanceof HttpError) {
|
|
const message = `${err.statusCode}: ${err.message}`;
|
|
showToast(message, "error");
|
|
}
|
|
|
|
if (err.data?.code === "UNAUTHORIZED") {
|
|
const message = `${err.data.code}: ${t("error_schedule_unauthorized_create")}`;
|
|
showToast(message, "error");
|
|
}
|
|
},
|
|
});
|
|
|
|
return (
|
|
<Dialog name={name} clearQueryParamsOnClose={["copy-schedule-id"]}>
|
|
<DialogTrigger asChild>
|
|
<Button variant="fab" data-testid={name} StartIcon="plus" size="sm">
|
|
{t("new")}
|
|
</Button>
|
|
</DialogTrigger>
|
|
<DialogContent title={t("add_new_schedule")}>
|
|
<Form
|
|
form={form}
|
|
handleSubmit={(values) => {
|
|
createMutation.mutate(values);
|
|
}}>
|
|
<InputField
|
|
label={t("name")}
|
|
type="text"
|
|
id="name"
|
|
required
|
|
placeholder={t("default_schedule_name")}
|
|
{...register("name", {
|
|
setValueAs: (v) => (!v || v.trim() === "" ? null : v),
|
|
required:t('required'),
|
|
pattern:{
|
|
value: new RegExp(
|
|
"^[\\p{L}\\p{M}\\p{N}\\s&\\-_'\\u2018\\u2019@.:,/]+$",
|
|
"u"
|
|
),
|
|
message:t("invalid_characters_in_name"),
|
|
}
|
|
})}
|
|
/>
|
|
<DialogFooter>
|
|
<DialogClose />
|
|
<Button type="submit" loading={createMutation.isPending}>
|
|
{t("continue")}
|
|
</Button>
|
|
</DialogFooter>
|
|
</Form>
|
|
</DialogContent>
|
|
</Dialog>
|
|
);
|
|
}
|