⚡ Improvements

packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.ts

@@ -26,6 +26,7 @@ export class EventbriteTrigger implements INodeType {
 		group: ['trigger'],
 		version: 1,
 		description: 'Handle Eventbrite events via webhooks',
+		subtitle: '={{$parameter["event"]}}',
 		defaults: {
 			name: 'Eventbrite Trigger',
 		},
@@ -79,7 +80,6 @@ export class EventbriteTrigger implements INodeType {
 					},
 				],
 				default: 'privateKey',
-				description: 'The resource to operate on.',
 			},
 			{
 				displayName: 'Organization',
@@ -90,20 +90,21 @@ export class EventbriteTrigger implements INodeType {
 					loadOptionsMethod: 'getOrganizations',
 				},
 				default: '',
-				description: 'The Eventbrite Organization to work on.',
+				description: 'The Eventbrite Organization to work on',
 			},
 			{
 				displayName: 'Event',
 				name: 'event',
 				type: 'options',
+				required: true,
 				typeOptions: {
 					loadOptionsDependsOn: [
 						'organization',
 					],
 					loadOptionsMethod: 'getEvents',
 				},
 				default: '',
-				description: 'Limit the triggers to this event.',
+				description: 'Limit the triggers to this event',
 			},
 			{
 				displayName: 'Actions',
@@ -180,10 +181,9 @@ export class EventbriteTrigger implements INodeType {
 				name: 'resolveData',
 				type: 'boolean',
 				default: true,
-				description: 'By default does the webhook-data only contain the URL to receive the object data manually. If this option gets activated, it will resolve the data automatically.',
+				description: 'By default does the webhook-data only contain the URL to receive the object data manually. If this option gets activated, it will resolve the data automatically',
 			},
 		],
-		'subtitle': 'Subscribe to get notifications of Eventbrite actions.',
 	};
 
 	methods = {
@@ -206,7 +206,7 @@ export class EventbriteTrigger implements INodeType {
 			// Get all the available events to display them to user so that he can
 			// select them easily
 			async getEvents(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [{name: 'All', value: ''}];
+				const returnData: INodePropertyOptions[] = [{ name: 'All', value: 'all' }];
 				const organization = this.getCurrentNodeParameter('organization');
 				const events = await eventbriteApiRequestAllItems.call(this, 'events', 'GET', `/organizations/${organization}/events`);
 				for (const event of events) {
@@ -262,13 +262,12 @@ export class EventbriteTrigger implements INodeType {
 				const body: IDataObject = {
 					endpoint_url: webhookUrl,
 					actions: actions.join(','),
+					event_id: event,
 				};
-				if (event.length) {
-					body.event_id = event;
+				if (event === 'all' || event === '') {
+					delete body.event_id;
 				}
-
 				const responseData = await eventbriteApiRequest.call(this, 'POST', endpoint, body);
-
 				webhookData.webhookId = responseData.id;
 				return true;
 			},

packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts

@@ -11,7 +11,7 @@ import {
 } from 'n8n-core';
 
 import {
-	IDataObject, NodeApiError, NodeOperationError,
+	IDataObject, JsonObject, NodeApiError, NodeOperationError,
 } from 'n8n-workflow';
 
 export async function eventbriteApiRequest(this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IWebhookFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
@@ -38,13 +38,12 @@ export async function eventbriteApiRequest(this: IHookFunctions | IExecuteFuncti
 			}
 
 			options.headers!['Authorization'] = `Bearer ${credentials.apiKey}`;
-
 			return await this.helpers.request!(options);
 		} else {
 			return await this.helpers.requestOAuth2!.call(this, 'eventbriteOAuth2Api', options);
 		}
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }