mythic-insight/calcom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

fix zoom leading to integrations:zoom location (#1242)

Browse source
This commit is contained in:
Alex Johansson 2021-12-02 18:18:17 +01:00 committed by GitHub
parent 813eaa83b7
commit de3c4aa75a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/events/EventManager.ts
View file

@ -117,17 +117,21 @@ export default class EventManager {
const evt = processLocation(event); const evt = processLocation(event);
const isDedicated = evt.location ? isDedicatedIntegration(evt.location) : null; const isDedicated = evt.location ? isDedicatedIntegration(evt.location) : null;
// First, create all calendar events. If this is a dedicated integration event, don't send a mail right here. const results: Array<EventResult> = [];
const results: Array<EventResult> = await this.createAllCalendarEvents(evt);
// If and only if event type is a dedicated meeting, create a dedicated video meeting. // If and only if event type is a dedicated meeting, create a dedicated video meeting.
if (isDedicated) { if (isDedicated) {
const result = await this.createVideoEvent(evt); const result = await this.createVideoEvent(evt);
if (result.createdEvent) { if (result.createdEvent) {
evt.videoCallData = result.createdEvent; evt.videoCallData = result.createdEvent;
evt.location = result.createdEvent.url;
} }
results.push(result); results.push(result);
} }
// Create the calendar event with the proper video call data
results.push(...(await this.createAllCalendarEvents(evt)));
const referencesToCreate: Array<PartialReference> = results.map((result: EventResult) => { const referencesToCreate: Array<PartialReference> = results.map((result: EventResult) => {
return { return {
type: result.type, type: result.type,

2
playwright/booking-pages.test.ts
View file

@ -40,7 +40,7 @@ describe("pro user", () => {
// Click [data-testid="incrementMonth"] // Click [data-testid="incrementMonth"]
await page.click('[data-testid="incrementMonth"]'); await page.click('[data-testid="incrementMonth"]');
// Click [data-testid="day"] // Click [data-testid="day"]
await page.click('[data-testid="day"]'); await page.click('[data-testid="day"][data-disabled="false"]');
// Click [data-testid="time"] // Click [data-testid="time"]
await page.click('[data-testid="time"]'); await page.click('[data-testid="time"]');
// --- fill form // --- fill form