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

Show eventDescription on email (#2371)

Browse Source 
* Show eventDescription on email

* Fixing Inheritance

* Fixing Duplicate getLocation

* Type fixes

Co-authored-by: zomars <zomars@me.com>
This commit is contained in:
sean-brydon
2022-04-07 18:22:11 +00:00
committed by GitHub
co-authored by zomars
parent 5e7d34b9c4
commit 96f6294542
17 changed files with 67 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/web/lib/emails/templates/attendee-awaiting-payment-email.ts
+2
View File
@@ -48,6 +48,7 @@ ${this.attendee.language.translate("emailed_you_and_any_other_attendees")}
${this.getWhat()}
${this.getWhen()}
${this.getLocation()}
${this.getDescription()}
${this.getAdditionalNotes()}
`.replace(/(<([^>]+)>)/gi, "");
}
@@ -94,6 +95,7 @@ ${this.getAdditionalNotes()}
${this.getWhen()}
${this.getWho()}
${this.getLocation()}
${this.getDescription()}
${this.getAdditionalNotes()}
</div>
</td>
apps/web/lib/emails/templates/attendee-cancelled-email.ts
+2
View File
@@ -47,6 +47,7 @@ ${this.attendee.language.translate("emailed_you_and_any_other_attendees")}
${this.getWhat()}
${this.getWhen()}
${this.getLocation()}
${this.getDescription()}
${this.getAdditionalNotes()}
${this.calEvent.cancellationReason && this.getCancellationReason()}
`.replace(/(<([^>]+)>)/gi, "");
@@ -95,6 +96,7 @@ ${this.calEvent.cancellationReason && this.getCancellationReason()}
${this.getWhen()}
${this.getWho()}
${this.getLocation()}
${this.getDescription()}
${this.getAdditionalNotes()}
${this.calEvent.cancellationReason && this.getCancellationReason()}
</div>
apps/web/lib/emails/templates/attendee-declined-email.ts
+2
View File
@@ -47,6 +47,7 @@ ${this.attendee.language.translate("emailed_you_and_any_other_attendees")}
${this.getWhat()}
${this.getWhen()}
${this.getLocation()}
${this.getDescription()}
${this.getAdditionalNotes()}
${this.getRejectionReason()}
`.replace(/(<([^>]+)>)/gi, "");
@@ -95,6 +96,7 @@ ${this.getRejectionReason()}
${this.getWhen()}
${this.getWho()}
${this.getLocation()}
${this.getDescription()}
${this.getAdditionalNotes()}
${this.getRejectionReason()}
</div>
apps/web/lib/emails/templates/attendee-request-email.ts
+2
View File
@@ -60,6 +60,7 @@ ${this.calEvent.attendees[0].language.translate("user_needs_to_confirm_or_reject
${this.getWhat()}
${this.getWhen()}
${this.getLocation()}
${this.getDescription()}
${this.getAdditionalNotes()}
`.replace(/(<([^>]+)>)/gi, "");
}
@@ -109,6 +110,7 @@ ${this.getAdditionalNotes()}
${this.getWhen()}
${this.getWho()}
${this.getLocation()}
${this.getDescription()}
${this.getAdditionalNotes()}
</div>
</td>
apps/web/lib/emails/templates/attendee-rescheduled-email.ts
+2 -1
View File
@@ -45,7 +45,6 @@ export default class AttendeeRescheduledEmail extends AttendeeScheduledEmail {
text: this.getTextBody(),
};
}
protected getTextBody(): string {
// Only the original attendee can make changes to the event
// Guests cannot
@@ -56,6 +55,7 @@ export default class AttendeeRescheduledEmail extends AttendeeScheduledEmail {
${this.getWhat()}
${this.getWhen()}
${this.getLocation()}
${this.getDescription()}
${this.getAdditionalNotes()}
${this.attendee.language.translate("need_to_reschedule_or_cancel")}
${getCancelLink(this.calEvent)}
@@ -114,6 +114,7 @@ ${this.getAdditionalNotes()}
${this.getWhen()}
${this.getWho()}
${this.getLocation()}
${this.getDescription()}
${this.getAdditionalNotes()}
</div>
</td>
apps/web/lib/emails/templates/attendee-scheduled-email.ts
+15 -3
View File
@@ -112,7 +112,18 @@ export default class AttendeeScheduledEmail {
from: serverConfig.from,
};
}
protected getDescription(): string {
if (!this.calEvent.description) return "";
return `
<p style="height: 6px"></p>
<div style="line-height: 6px;">
<p style="color: #494949;">${this.calEvent.organizer.language.translate("description")}</p>
<p style="color: #494949; font-weight: 400; line-height: 24px; white-space: pre-wrap;">${
this.calEvent.description
}</p>
</div>
`;
}
protected getTextBody(): string {
return `
${this.calEvent.attendees[0].language.translate("your_event_has_been_scheduled")}
@@ -168,6 +179,7 @@ ${getRichDescription(this.calEvent)}
${this.getWhen()}
${this.getWho()}
${this.getLocation()}
${this.getDescription()}
${this.getAdditionalNotes()}
</div>
</td>
@@ -286,13 +298,13 @@ ${getRichDescription(this.calEvent)}
}
protected getAdditionalNotes(): string {
if (!this.calEvent.description) return "";
if (!this.calEvent.additionalNotes) return "";
return `
<p style="height: 6px"></p>
<div style="line-height: 6px;">
<p style="color: #494949;">${this.calEvent.attendees[0].language.translate("additional_notes")}</p>
<p style="color: #494949; font-weight: 400; line-height: 24px; white-space: pre-wrap;">${
this.calEvent.description
this.calEvent.additionalNotes
}</p>
</div>
`;
apps/web/lib/emails/templates/organizer-cancelled-email.ts
+2
View File
@@ -56,6 +56,7 @@ ${this.calEvent.organizer.language.translate("emailed_you_and_any_other_attendee
${this.getWhat()}
${this.getWhen()}
${this.getLocation()}
${this.getDescription()}
${this.getAdditionalNotes()}
${this.calEvent.cancellationReason && this.getCancellationReason()}
`.replace(/(<([^>]+)>)/gi, "");
@@ -103,6 +104,7 @@ ${this.calEvent.cancellationReason && this.getCancellationReason()}
${this.getWhen()}
${this.getWho()}
${this.getLocation()}
${this.getDescription()}
${this.getAdditionalNotes()}
${this.calEvent.cancellationReason && this.getCancellationReason()}
</div>
apps/web/lib/emails/templates/organizer-payment-refund-failed-email.ts
+2
View File
@@ -58,6 +58,7 @@ ${
${this.getWhat()}
${this.getWhen()}
${this.getLocation()}
${this.getDescription()}
${this.getAdditionalNotes()}
`.replace(/(<([^>]+)>)/gi, "");
}
@@ -136,6 +137,7 @@ ${this.getAdditionalNotes()}
${this.getWhen()}
${this.getWho()}
${this.getLocation()}
${this.getDescription()}
${this.getAdditionalNotes()}
</div>
</td>
apps/web/lib/emails/templates/organizer-request-email.ts
+1
View File
@@ -57,6 +57,7 @@ ${this.calEvent.organizer.language.translate("someone_requested_an_event")}
${this.getWhat()}
${this.getWhen()}
${this.getLocation()}
${this.getDescription()}
${this.getAdditionalNotes()}
${this.calEvent.organizer.language.translate("confirm_or_reject_request")}
${process.env.NEXT_PUBLIC_WEBAPP_URL} + "/bookings/upcoming"
apps/web/lib/emails/templates/organizer-request-reminder-email.ts
+2
View File
@@ -57,6 +57,7 @@ ${this.calEvent.organizer.language.translate("someone_requested_an_event")}
${this.getWhat()}
${this.getWhen()}
${this.getLocation()}
${this.getDescription()}
${this.getAdditionalNotes()}
${this.calEvent.organizer.language.translate("confirm_or_reject_request")}
${process.env.NEXT_PUBLIC_WEBAPP_URL} + "/bookings/upcoming"
@@ -105,6 +106,7 @@ ${process.env.NEXT_PUBLIC_WEBAPP_URL} + "/bookings/upcoming"
${this.getWhen()}
${this.getWho()}
${this.getLocation()}
${this.getDescription()}
${this.getAdditionalNotes()}
</div>
</td>
apps/web/lib/emails/templates/organizer-rescheduled-email.ts
+2
View File
@@ -62,6 +62,7 @@ ${this.calEvent.organizer.language.translate("emailed_you_and_any_other_attendee
${this.getWhat()}
${this.getWhen()}
${this.getLocation()}
${this.getDescription()}
${this.getAdditionalNotes()}
${this.calEvent.organizer.language.translate("need_to_reschedule_or_cancel")}
${getCancelLink(this.calEvent)}
@@ -110,6 +111,7 @@ ${getCancelLink(this.calEvent)}
${this.getWhen()}
${this.getWho()}
${this.getLocation()}
${this.getDescription()}
${this.getAdditionalNotes()}
</div>
</td>
apps/web/lib/emails/templates/organizer-scheduled-email.ts
+15 -1
View File
@@ -175,6 +175,7 @@ ${getRichDescription(this.calEvent)}
${this.getWhen()}
${this.getWho()}
${this.getLocation()}
${this.getDescription()}
${this.getAdditionalNotes()}
</div>
</td>
@@ -287,11 +288,24 @@ ${getRichDescription(this.calEvent)}
}
protected getAdditionalNotes(): string {
if (!this.calEvent.description) return "";
if (!this.calEvent.additionalNotes) return "";
return `
<p style="height: 6px"></p>
<div style="line-height: 6px;">
<p style="color: #494949;">${this.calEvent.organizer.language.translate("additional_notes")}</p>
<p style="color: #494949; font-weight: 400; line-height: 24px; white-space: pre-wrap;">${
this.calEvent.additionalNotes
}</p>
</div>
`;
}
protected getDescription(): string {
if (!this.calEvent.description) return "";
return `
<p style="height: 6px"></p>
<div style="line-height: 6px;">
<p style="color: #494949;">${this.calEvent.organizer.language.translate("description")}</p>
<p style="color: #494949; font-weight: 400; line-height: 24px; white-space: pre-wrap;">${
this.calEvent.description
}</p>
apps/web/pages/api/book/event.ts
+7 -5
View File
@@ -200,6 +200,7 @@ const getEventTypesFromDB = async (eventTypeId: number) => {
length: true,
eventName: true,
schedulingType: true,
description: true,
periodType: true,
periodStartDate: true,
periodEndDate: true,
@@ -337,7 +338,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
t: tOrganizer,
};
const description =
const additionalNotes =
reqBody.notes +
reqBody.customInputs.reduce(
(str, input) => str + "<br /><br />" + input.label + ":<br />" + input.value,
@@ -346,7 +347,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
const evt: CalendarEvent = {
type: eventType.title,
title: getEventName(eventNameObject), //this needs to be either forced in english, or fetched for each attendee and organizer separately
description,
description: eventType.description,
additionalNotes,
startTime: reqBody.start,
endTime: reqBody.end,
organizer: {
@@ -402,7 +404,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
title: evt.title,
startTime: dayjs(evt.startTime).toDate(),
endTime: dayjs(evt.endTime).toDate(),
description: evt.description,
description: evt.additionalNotes,
confirmed: (!eventType.requiresConfirmation && !eventType.price) || !!rescheduleUid,
location: evt.location,
eventType: eventTypeRel,
@@ -557,7 +559,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
const updateManager = await eventManager.update(evt, rescheduleUid);
// This gets overridden when updating the event - to check if notes have been hidden or not. We just reset this back
// to the default description when we are sending the emails.
evt.description = description;
evt.description = eventType.description;
results = updateManager.results;
referencesToCreate = updateManager.referencesToCreate;
@@ -594,7 +596,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
// This gets overridden when creating the event - to check if notes have been hidden or not. We just reset this back
// to the default description when we are sending the emails.
evt.description = description;
evt.description = eventType.description;
results = createManager.results;
referencesToCreate = createManager.referencesToCreate;
apps/web/playwright/integrations.test.ts-snapshots/webhookResponse-chromium.txt
+1 -1
View File
@@ -1 +1 @@
{"triggerEvent":"BOOKING_CREATED","createdAt":"[redacted/dynamic]","payload":{"type":"30min","title":"30min between Pro Example and Test Testson","description":"","startTime":"[redacted/dynamic]","endTime":"[redacted/dynamic]","organizer":{"name":"Pro Example","email":"pro@example.com","timeZone":"[redacted/dynamic]","language":"[redacted/dynamic]"},"attendees":[{"email":"test@example.com","name":"Test Testson","timeZone":"[redacted/dynamic]","language":"[redacted/dynamic]"}],"location":"[redacted/dynamic]","destinationCalendar":null,"hideCalendarNotes":false,"uid":"[redacted/dynamic]","metadata":{},"additionInformation":"[redacted/dynamic]"}}
{"triggerEvent":"BOOKING_CREATED","createdAt":"[redacted/dynamic]","payload":{"type":"30min","title":"30min between Pro Example and Test Testson","description":null,"additionalNotes":"","startTime":"[redacted/dynamic]","endTime":"[redacted/dynamic]","organizer":{"name":"Pro Example","email":"pro@example.com","timeZone":"[redacted/dynamic]","language":"[redacted/dynamic]"},"attendees":[{"email":"test@example.com","name":"Test Testson","timeZone":"[redacted/dynamic]","language":"[redacted/dynamic]"}],"location":"[redacted/dynamic]","destinationCalendar":null,"hideCalendarNotes":false,"uid":"[redacted/dynamic]","metadata":{},"additionInformation":"[redacted/dynamic]"}}
packages/core/CalendarManager.ts
+1 -1
View File
@@ -104,7 +104,7 @@ export const createEvent = async (credential: Credential, calEvent: CalendarEven
// Check if the disabledNotes flag is set to true
if (calEvent.hideCalendarNotes) {
calEvent.description = "Notes have been hidden by the organiser"; // TODO: i18n this string?
calEvent.additionalNotes = "Notes have been hidden by the organiser"; // TODO: i18n this string?
}
const creationResult = calendar
packages/lib/CalEventParser.ts
+8 -1
View File
@@ -48,10 +48,15 @@ ${organizer + attendees}
export const getAdditionalNotes = (calEvent: CalendarEvent) => {
return `
${calEvent.organizer.language.translate("additional_notes")}:
${calEvent.description}
${calEvent.additionalNotes}
`;
};
export const getDescription = (calEvent: CalendarEvent) => {
return `\n${calEvent.attendees[0].language.translate("description")}
${calEvent.description}
`;
};
export const getLocation = (calEvent: CalendarEvent) => {
let providerName = "";
@@ -97,6 +102,7 @@ ${getWhen(calEvent)}
${getWho(calEvent)}
${calEvent.organizer.language.translate("where")}:
${getLocation(calEvent)}
${getDescription(calEvent)}
${getAdditionalNotes(calEvent)}
`.trim();
}
@@ -107,6 +113,7 @@ ${getWhen(calEvent)}
${getWho(calEvent)}
${calEvent.organizer.language.translate("where")}:
${getLocation(calEvent)}
${getDescription(calEvent)}
${getAdditionalNotes(calEvent)}
${getManageLink(calEvent)}
`.trim();
packages/types/Calendar.d.ts
Vendored
+1
View File
@@ -75,6 +75,7 @@ export interface CalendarEvent {
title: string;
startTime: string;
endTime: string;
additionalNotes?: string | null;
description?: string | null;
team?: {
name: string;