admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 10:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

⚡ Add timezone support to date type field in Notion (#2082)

Browse Source 
* Add timezone in date property on Notion

Signed-off-by: 5pecia1 <pdpxpd@gmail.com>

* ⚡ Improvements to #2036

* ⚡ Minor improvements

Co-authored-by: 5pecia1 <pdpxpd@gmail.com>
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
This commit is contained in:
Ricardo Espinoza
2021-08-13 14:57:18 -04:00
committed by GitHub
parent a6bdc0d0b2
commit a9987cd541
3 changed files with 70 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/nodes-base/nodes/Notion/GenericFunctions.ts
View File

@@ -284,13 +284,22 @@ function getPropertyKeyValue(value: any, type: string, timezone: string) {
break;
case 'date':
const format = getDateFormat(value.includeTime);
const timezoneValue = (value.timezone === 'default') ? timezone : value.timezone;
if (value.range === true) {
result = {
type: 'date', date: { start: moment.tz(value.dateStart, timezone).format(format), end: moment.tz(value.dateEnd, timezone).format(format) },
type: 'date',
date: {
start: moment.tz(value.dateStart, timezoneValue).format(format),
end: moment.tz(value.dateEnd, timezoneValue).format(format),
},
};
} else {
result = {
type: 'date', date: { start: moment.tz(value.date, timezone).format(format), end: null },
type: 'date',
date: {
start: moment.tz(value.date, timezoneValue).format(format),
end: null,
},
};
}
break;
@@ -350,7 +359,7 @@ export function mapFilters(filters: IDataObject[], timezone: string) {
} else if (key === 'date' && !['is_empty', 'is_not_empty'].includes(value.condition as string)) {
valuePropertyName = (valuePropertyName !== undefined && !Object.keys(valuePropertyName).length) ? {} : moment.tz(value.date, timezone).utc().format();
}
return Object.assign(obj, {
['property']: getNameAndType(value.key).name,
[key]: { [`${value.condition}`]: valuePropertyName },