mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-12-24 20:24:05 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(Google Calendar Node): All day option fix (#6274)

Browse source
This commit is contained in:
Michael Kret 2023-05-19 10:39:39 +03:00 committed by GitHub
parent 401cffde57
commit 5bef91e3c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/nodes-base/nodes/Google/Calendar/EventDescription.ts
View file

@ -171,7 +171,7 @@ export const eventFields: INodeProperties[] = [
}, },
], ],
default: 'no', default: 'no',
description: 'Wheater the event is all day or not', description: 'Whether the event is all day or not',
}, },
{ {
displayName: 'Attendees', displayName: 'Attendees',
@ -224,7 +224,7 @@ export const eventFields: INodeProperties[] = [
], ],
}, },
], ],
description: 'Creates a conference link (Hangouts, Meet etc) and attachs it to the event', description: 'Creates a conference link (Hangouts, Meet etc) and attaches it to the event',
}, },
{ {
displayName: 'Description', displayName: 'Description',
@ -828,7 +828,7 @@ export const eventFields: INodeProperties[] = [
}, },
], ],
default: 'no', default: 'no',
description: 'Wheater the event is all day or not', description: 'Whether the event is all day or not',
}, },
{ {
displayName: 'Attendees', displayName: 'Attendees',

8
packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
View file

@ -269,7 +269,7 @@ export class GoogleCalendar implements INodeType {
} }
} }
if (additionalFields.allday) { if (additionalFields.allday === 'yes') {
body.start = { body.start = {
date: timezone date: timezone
? moment.tz(start, timezone).utc(true).format('YYYY-MM-DD') ? moment.tz(start, timezone).utc(true).format('YYYY-MM-DD')
@ -281,6 +281,7 @@ export class GoogleCalendar implements INodeType {
: moment.tz(end, moment.tz.guess()).utc(true).format('YYYY-MM-DD'), : moment.tz(end, moment.tz.guess()).utc(true).format('YYYY-MM-DD'),
}; };
} }
//exampel: RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=10;UNTIL=20110701T170000Z //exampel: RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=10;UNTIL=20110701T170000Z
//https://icalendar.org/iCalendar-RFC-5545/3-8-5-3-recurrence-rule.html //https://icalendar.org/iCalendar-RFC-5545/3-8-5-3-recurrence-rule.html
body.recurrence = []; body.recurrence = [];
@ -526,7 +527,8 @@ export class GoogleCalendar implements INodeType {
body.reminders.overrides = reminders; body.reminders.overrides = reminders;
} }
} }
if (updateFields.allday && updateFields.start && updateFields.end) {
if (updateFields.allday === 'yes' && updateFields.start && updateFields.end) {
body.start = { body.start = {
date: updateTimezone date: updateTimezone
? moment.tz(updateFields.start, updateTimezone).utc(true).format('YYYY-MM-DD') ? moment.tz(updateFields.start, updateTimezone).utc(true).format('YYYY-MM-DD')
@ -538,7 +540,7 @@ export class GoogleCalendar implements INodeType {
: moment.tz(updateFields.end, moment.tz.guess()).utc(true).format('YYYY-MM-DD'), : moment.tz(updateFields.end, moment.tz.guess()).utc(true).format('YYYY-MM-DD'),
}; };
} }
//exampel: RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=10;UNTIL=20110701T170000Z //example: RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=10;UNTIL=20110701T170000Z
//https://icalendar.org/iCalendar-RFC-5545/3-8-5-3-recurrence-rule.html //https://icalendar.org/iCalendar-RFC-5545/3-8-5-3-recurrence-rule.html
body.recurrence = []; body.recurrence = [];
if (updateFields.rrule) { if (updateFields.rrule) {