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

feat(Gmail Trigger Node): Add filter option to include drafts (#11441)

Browse source
This commit is contained in:
Ria Scholz 2024-11-06 18:58:26 +05:30 committed by GitHub
parent a6070afdda
commit 7a2be77f38
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts
View file

@ -24,7 +24,7 @@ export class GmailTrigger implements INodeType {
name: 'gmailTrigger',
icon: 'file:gmail.svg',
group: ['trigger'],
version: [1, 1.1],
version: [1, 1.1, 1.2],
description:
'Fetches emails from Gmail and starts the workflow on specified polling intervals.',
subtitle: '={{"Gmail Trigger"}}',
@ -106,6 +106,13 @@ export class GmailTrigger implements INodeType {
default: false,
description: 'Whether to include messages from SPAM and TRASH in the results',
},
{
displayName: 'Include Drafts',
name: 'includeDrafts',
type: 'boolean',
default: false,
description: 'Whether to include email drafts in the results',
},
{
displayName: 'Label Names or IDs',
name: 'labelIds',
@ -284,6 +291,15 @@ export class GmailTrigger implements INodeType {
qs.format = 'raw';
}
let includeDrafts;
if (node.typeVersion > 1.1) {
includeDrafts = (qs.includeDrafts as boolean) ?? false;
} else {
includeDrafts = (qs.includeDrafts as boolean) ?? true;
}
delete qs.includeDrafts;
const withoutDrafts = [];
for (let i = 0; i < responseData.length; i++) {
responseData[i] = await googleApiRequest.call(
this,
@ -292,8 +308,12 @@ export class GmailTrigger implements INodeType {
{},
qs,
);
if (!simple) {
if (!includeDrafts) {
if (responseData[i].labelIds.includes('DRAFT')) {
continue;
}
}
if (!simple && responseData?.length) {
const dataPropertyNameDownload =
(options.dataPropertyAttachmentsPrefixName as string) || 'attachment_';
@ -303,9 +323,14 @@ export class GmailTrigger implements INodeType {
dataPropertyNameDownload,
);
}
withoutDrafts.push(responseData[i]);
}
if (simple) {
if (!includeDrafts) {
responseData = withoutDrafts;
}
if (simple && responseData?.length) {
responseData = this.helpers.returnJsonArray(
await simplifyOutput.call(this, responseData as IDataObject[]),
);
@ -324,17 +349,14 @@ export class GmailTrigger implements INodeType {
},
);
}
if (!responseData?.length) {
nodeStaticData.lastTimeChecked = endDate;
return null;
}
const emailsWithInvalidDate = new Set<string>();
const getEmailDateAsSeconds = (email: IDataObject): number => {
let date;
if (email.internalDate) {
date = +(email.internalDate as string) / 1000;
} else if (email.date) {