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

⚡ Add parameter include time when setting field type date on Notion node (#1879)

Browse source 
* ⚡ Add parameter include time when setting field type date

Fixes issue #1878

* Fix issue with date format
This commit is contained in:
Ricardo Espinoza 2021-06-12 12:06:47 -04:00 committed by GitHub
parent b2e0bcea16
commit d095588ac7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
packages/nodes-base/nodes/Notion/DatabasePageDescription.ts
View file

@ -339,6 +339,20 @@ export const databasePageFields = [
default: false,
description: 'Weather or not you want to define a date range.',
},
{
displayName: 'Include Time',
name: 'includeTime',
displayOptions: {
show: {
type: [
'date',
],
},
},
type: 'boolean',
default: true,
description: 'Weather or not to include the time in the date.',
},
{
displayName: 'Date',
name: 'date',
@ -685,6 +699,20 @@ export const databasePageFields = [
default: false,
description: 'Weather or not you want to define a date range.',
},
{
displayName: 'Include Time',
name: 'includeTime',
displayOptions: {
show: {
type: [
'date',
],
},
},
type: 'boolean',
default: true,
description: 'Weather or not to include the time in the date.',
},
{
displayName: 'Date',
name: 'date',

14
packages/nodes-base/nodes/Notion/GenericFunctions.ts
View file

@ -270,15 +270,14 @@ function getPropertyKeyValue(value: any, type: string, timezone: string) {
};
break;
case 'date':
//&& value.dateStart !== 'Invalid date' && value.dateEnd !== 'Invalid date'
const format = getDateFormat(value.includeTime);
if (value.range === true) {
result = {
type: 'date', date: { start: moment.tz(value.dateStart, timezone).utc().format(), end: moment.tz(value.dateEnd, timezone).utc().format() },
type: 'date', date: { start: moment.tz(value.dateStart, timezone).format(format), end: moment.tz(value.dateEnd, timezone).format(format) },
};
//if (value.date !== 'Invalid date')
} else {
result = {
type: 'date', date: { start: moment.tz(value.date, timezone).utc().format(), end: null },
type: 'date', date: { start: moment.tz(value.date, timezone).format(format), end: null },
};
}
break;
@ -287,6 +286,13 @@ function getPropertyKeyValue(value: any, type: string, timezone: string) {
return result;
}
function getDateFormat(includeTime: boolean) {
if (includeTime === false) {
return 'yyyy-MM-DD';
}
return '';
}
function getNameAndType(key: string) {
const [name, type] = key.split('|');
return {

2
packages/nodes-base/nodes/Notion/Notion.node.ts
View file

@ -158,7 +158,7 @@ export class Notion implements INodeType {
const databases = await notionApiRequestAllItems.call(this, 'results', 'POST', `/search`, body);
for (const database of databases) {
returnData.push({
name: database.title[0].plain_text,
name: database.title[0]?.plain_text || database.id,
value: database.id,
});
}