Merge branch 'main' into e2e-limits

This commit is contained in:
nicktrn 2023-10-15 15:13:54 +00:00
commit 49b8b312f4
11 changed files with 25 additions and 15 deletions

View File

@ -8,7 +8,7 @@
"@t3-oss/env-nextjs": "^0.6.1", "@t3-oss/env-nextjs": "^0.6.1",
"langchain": "^0.0.131", "langchain": "^0.0.131",
"mailparser": "^3.6.5", "mailparser": "^3.6.5",
"next": "^13.4.7", "next": "^13.5.4",
"supports-color": "8.1.1", "supports-color": "8.1.1",
"zod": "^3.22.2" "zod": "^3.22.2"
}, },

View File

@ -20,7 +20,7 @@ export default function AddToHomescreen() {
<div className="flex w-0 flex-1 items-center"> <div className="flex w-0 flex-1 items-center">
<span className="bg-brand text-brandcontrast dark:bg-darkmodebrand dark:text-darkmodebrandcontrast flex rounded-lg bg-opacity-30 p-2"> <span className="bg-brand text-brandcontrast dark:bg-darkmodebrand dark:text-darkmodebrandcontrast flex rounded-lg bg-opacity-30 p-2">
<svg <svg
className="h-7 w-7 fill-current text-indigo-500" className="h-7 w-7 fill-current text-[#5B93F9]"
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 50 50" viewBox="0 0 50 50"
enableBackground="new 0 0 50 50"> enableBackground="new 0 0 50 50">
@ -29,7 +29,7 @@ export default function AddToHomescreen() {
<path d="M35 40H15c-1.7 0-3-1.3-3-3V19c0-1.7 1.3-3 3-3h7v2h-7c-.6 0-1 .4-1 1v18c0 .6.4 1 1 1h20c.6 0 1-.4 1-1V19c0-.6-.4-1-1-1h-7v-2h7c1.7 0 3 1.3 3 3v18c0 1.7-1.3 3-3 3z" /> <path d="M35 40H15c-1.7 0-3-1.3-3-3V19c0-1.7 1.3-3 3-3h7v2h-7c-.6 0-1 .4-1 1v18c0 .6.4 1 1 1h20c.6 0 1-.4 1-1V19c0-.6-.4-1-1-1h-7v-2h7c1.7 0 3 1.3 3 3v18c0 1.7-1.3 3-3 3z" />
</svg> </svg>
</span> </span>
<p className="text-inverted ms-3 text-xs font-medium"> <p className="text-inverted ms-3 text-xs font-medium dark:text-white">
<span className="inline">{t("add_to_homescreen")}</span> <span className="inline">{t("add_to_homescreen")}</span>
</p> </p>
</div> </div>
@ -40,7 +40,7 @@ export default function AddToHomescreen() {
type="button" type="button"
className="-mr-1 flex rounded-md p-2 hover:bg-gray-800 focus:outline-none focus:ring-2 focus:ring-white"> className="-mr-1 flex rounded-md p-2 hover:bg-gray-800 focus:outline-none focus:ring-2 focus:ring-white">
<span className="sr-only">{t("dismiss")}</span> <span className="sr-only">{t("dismiss")}</span>
<X className="text-inverted h-6 w-6" aria-hidden="true" /> <X className="text-inverted h-6 w-6 dark:text-white" aria-hidden="true" />
</button> </button>
</div> </div>
</div> </div>

View File

@ -1,6 +1,6 @@
{ {
"name": "@calcom/web", "name": "@calcom/web",
"version": "3.3.7", "version": "3.4.0",
"private": true, "private": true,
"scripts": { "scripts": {
"analyze": "ANALYZE=true next build", "analyze": "ANALYZE=true next build",

View File

@ -184,7 +184,7 @@ const EventTypePage = (props: EventTypeSetupProps) => {
created: true, created: true,
})) }))
); );
showToast(t("event_type_updated_successfully"), "success"); showToast(t("event_type_updated_successfully", { eventTypeTitle: eventType.title }), "success");
}, },
async onSettled() { async onSettled() {
await utils.viewer.eventTypes.get.invalidate(); await utils.viewer.eventTypes.get.invalidate();

View File

@ -688,8 +688,8 @@
"new_event_type_btn": "New event type", "new_event_type_btn": "New event type",
"new_event_type_heading": "Create your first event type", "new_event_type_heading": "Create your first event type",
"new_event_type_description": "Event types enable you to share links that show available times on your calendar and allow people to make bookings with you.", "new_event_type_description": "Event types enable you to share links that show available times on your calendar and allow people to make bookings with you.",
"event_type_created_successfully": "Event type created successfully", "event_type_created_successfully": "{{eventTypeTitle}} event type created successfully",
"event_type_updated_successfully": "Event type updated successfully", "event_type_updated_successfully": "{{eventTypeTitle}} event type updated successfully",
"event_type_deleted_successfully": "Event type deleted successfully", "event_type_deleted_successfully": "Event type deleted successfully",
"hours": "Hours", "hours": "Hours",
"people": "People", "people": "People",

View File

@ -681,8 +681,8 @@
"new_event_type_btn": "Nouveau type d'événement", "new_event_type_btn": "Nouveau type d'événement",
"new_event_type_heading": "Créez votre premier type d'événement", "new_event_type_heading": "Créez votre premier type d'événement",
"new_event_type_description": "Les types d'événements vous permettent de partager des liens qui affichent vos disponibilités sur votre calendrier et permettent aux personnes de réserver des créneaux.", "new_event_type_description": "Les types d'événements vous permettent de partager des liens qui affichent vos disponibilités sur votre calendrier et permettent aux personnes de réserver des créneaux.",
"event_type_created_successfully": "Type d'événement créé avec succès", "event_type_created_successfully": "{{eventTypeTitle}} type d'événement créé avec succès",
"event_type_updated_successfully": "Type d'événement mis à jour avec succès", "event_type_updated_successfully": "{{eventTypeTitle}} type d'événement mis à jour avec succès",
"event_type_deleted_successfully": "Type d'événement supprimé avec succès", "event_type_deleted_successfully": "Type d'événement supprimé avec succès",
"hours": "heures", "hours": "heures",
"people": "Personnes", "people": "Personnes",

View File

@ -682,7 +682,7 @@
"new_event_type_heading": "Crie seu primeiro evento", "new_event_type_heading": "Crie seu primeiro evento",
"new_event_type_description": "Os eventos permitem que você compartilhe links que mostram os horários disponíveis no seu calendário para que os usuários façam agendamentos com você.", "new_event_type_description": "Os eventos permitem que você compartilhe links que mostram os horários disponíveis no seu calendário para que os usuários façam agendamentos com você.",
"event_type_created_successfully": "{{eventTypeTitle}} evento criado com sucesso", "event_type_created_successfully": "{{eventTypeTitle}} evento criado com sucesso",
"event_type_updated_successfully": "Tipo de evento atualizado com sucesso", "event_type_updated_successfully": "{{eventTypeTitle}} tipo de evento atualizado com sucesso",
"event_type_deleted_successfully": "Tipo de evento removido com sucesso", "event_type_deleted_successfully": "Tipo de evento removido com sucesso",
"hours": "Horas", "hours": "Horas",
"people": "Pessoas", "people": "Pessoas",

View File

@ -682,7 +682,7 @@
"new_event_type_heading": "Crie o seu primeiro tipo de evento", "new_event_type_heading": "Crie o seu primeiro tipo de evento",
"new_event_type_description": "Os tipos de evento permitem partilhar ligações que mostram os horários disponíveis na sua agenda, e permitem que as pessoas façam reservas consigo.", "new_event_type_description": "Os tipos de evento permitem partilhar ligações que mostram os horários disponíveis na sua agenda, e permitem que as pessoas façam reservas consigo.",
"event_type_created_successfully": "Tipo de evento {{eventTypeTitle}} criado com sucesso", "event_type_created_successfully": "Tipo de evento {{eventTypeTitle}} criado com sucesso",
"event_type_updated_successfully": "Tipo de evento atualizado com sucesso", "event_type_updated_successfully": "Tipo de evento {{eventTypeTitle}} atualizado com sucesso",
"event_type_deleted_successfully": "Tipo de evento eliminado com sucesso", "event_type_deleted_successfully": "Tipo de evento eliminado com sucesso",
"hours": "Horas", "hours": "Horas",
"people": "Pessoas", "people": "Pessoas",

View File

@ -117,7 +117,12 @@ export default function CreateEventTypeDialog({
const createMutation = trpc.viewer.eventTypes.create.useMutation({ const createMutation = trpc.viewer.eventTypes.create.useMutation({
onSuccess: async ({ eventType }) => { onSuccess: async ({ eventType }) => {
await router.replace(`/event-types/${eventType.id}`); await router.replace(`/event-types/${eventType.id}`);
showToast(t("event_type_created_successfully"), "success"); showToast(
t("event_type_created_successfully", {
eventTypeTitle: eventType.title,
}),
"success"
);
}, },
onError: (err) => { onError: (err) => {
if (err instanceof HttpError) { if (err instanceof HttpError) {

View File

@ -66,7 +66,12 @@ const DuplicateDialog = () => {
const duplicateMutation = trpc.viewer.eventTypes.duplicate.useMutation({ const duplicateMutation = trpc.viewer.eventTypes.duplicate.useMutation({
onSuccess: async ({ eventType }) => { onSuccess: async ({ eventType }) => {
await router.replace(`/event-types/${eventType.id}`); await router.replace(`/event-types/${eventType.id}`);
showToast(t("event_type_created_successfully"), "success"); showToast(
t("event_type_created_successfully", {
eventTypeTitle: eventType.title,
}),
"success"
);
}, },
onError: (err) => { onError: (err) => {
if (err instanceof HttpError) { if (err instanceof HttpError) {

View File

@ -179,7 +179,7 @@ const DateOverrideForm = ({
color="primary" color="primary"
type="submit" type="submit"
onClick={() => { onClick={() => {
showToast(t("date_successfully_added"), "success"); showToast(t("date_successfully_added"), "success", 500);
}} }}
disabled={selectedDates.length === 0} disabled={selectedDates.length === 0}
data-testid="add-override-submit-btn"> data-testid="add-override-submit-btn">