Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Highlevel node update #10820

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 34 additions & 18 deletions packages/nodes-base/nodes/HighLevel/v2/GenericFunctions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import type {
IPollFunctions,
IWebhookFunctions,
} from 'n8n-workflow';
import { NodeApiError } from 'n8n-workflow';
import { ApplicationError, NodeApiError } from 'n8n-workflow';

import type { ToISOTimeOptions } from 'luxon';
import { DateTime } from 'luxon';
Expand Down Expand Up @@ -64,7 +64,7 @@ export async function dueDatePreSendAction(
);
}
const dueDate = dateToIsoSupressMillis(dueDateParam);
requestOptions.body = (requestOptions.body || {}) as object;
requestOptions.body = (requestOptions.body ?? {}) as object;
Object.assign(requestOptions.body, { dueDate });
return requestOptions;
}
Expand All @@ -73,7 +73,7 @@ export async function contactIdentifierPreSendAction(
this: IExecuteSingleFunctions,
requestOptions: IHttpRequestOptions,
): Promise<IHttpRequestOptions> {
requestOptions.body = (requestOptions.body || {}) as object;
requestOptions.body = (requestOptions.body ?? {}) as object;
let identifier = this.getNodeParameter('contactIdentifier', null) as string;
if (!identifier) {
const fields = this.getNodeParameter('updateFields') as { contactIdentifier: string };
Expand All @@ -93,7 +93,7 @@ export async function validEmailAndPhonePreSendAction(
this: IExecuteSingleFunctions,
requestOptions: IHttpRequestOptions,
): Promise<IHttpRequestOptions> {
const body = (requestOptions.body || {}) as { email?: string; phone?: string };
const body = (requestOptions.body ?? {}) as { email?: string; phone?: string };

if (body.email && !isEmailValid(body.email)) {
const message = `email "${body.email}" has invalid format`;
Expand All @@ -112,7 +112,7 @@ export async function dateTimeToEpochPreSendAction(
this: IExecuteSingleFunctions,
requestOptions: IHttpRequestOptions,
): Promise<IHttpRequestOptions> {
const qs = (requestOptions.qs || {}) as {
const qs = (requestOptions.qs ?? {}) as {
startDate?: string | number;
endDate?: string | number;
};
Expand All @@ -134,22 +134,22 @@ export async function addLocationIdPreSendAction(

if (resource === 'contact') {
if (operation === 'getAll') {
requestOptions.qs = requestOptions.qs || {};
requestOptions.qs = requestOptions.qs ?? {};
Object.assign(requestOptions.qs, { locationId });
}
if (operation === 'create') {
requestOptions.body = requestOptions.body || {};
requestOptions.body = requestOptions.body ?? {};
Object.assign(requestOptions.body, { locationId });
}
}

if (resource === 'opportunity') {
if (operation === 'create') {
requestOptions.body = requestOptions.body || {};
requestOptions.body = requestOptions.body ?? {};
Object.assign(requestOptions.body, { locationId });
}
if (operation === 'getAll') {
requestOptions.qs = requestOptions.qs || {};
requestOptions.qs = requestOptions.qs ?? {};
Object.assign(requestOptions.qs, { location_id: locationId });
}
}
Expand Down Expand Up @@ -180,7 +180,7 @@ export async function highLevelApiRequest(
method,
body,
qs,
url: url || `https://services.leadconnectorhq.com${resource}`,
url: url ?? `https://services.leadconnectorhq.com${resource}`,
json: true,
};
if (!Object.keys(body).length) {
Expand All @@ -197,7 +197,7 @@ export async function taskUpdatePreSendAction(
this: IExecuteSingleFunctions,
requestOptions: IHttpRequestOptions,
): Promise<IHttpRequestOptions> {
const body = (requestOptions.body || {}) as { title?: string; dueDate?: string };
const body = (requestOptions.body ?? {}) as { title?: string; dueDate?: string };
if (!body.title || !body.dueDate) {
const contactId = this.getNodeParameter('contactId');
const taskId = this.getNodeParameter('taskId');
Expand All @@ -215,7 +215,7 @@ export async function splitTagsPreSendAction(
this: IExecuteSingleFunctions,
requestOptions: IHttpRequestOptions,
): Promise<IHttpRequestOptions> {
const body = (requestOptions.body || {}) as IDataObject;
const body = (requestOptions.body ?? {}) as IDataObject;
if (body.tags) {
if (Array.isArray(body.tags)) return requestOptions;
body.tags = (body.tags as string).split(',').map((tag) => tag.trim());
Expand Down Expand Up @@ -346,10 +346,26 @@ export async function getUsers(this: ILoadOptionsFunctions): Promise<INodeProper
}

export async function getTimezones(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
const responseData = await highLevelApiRequest.call(this, 'GET', '/timezones');
const timezones = responseData.timezones as string[];
return timezones.map((zone) => ({
name: zone,
value: zone,
})) as INodePropertyOptions[];
try {
const locationId = this.getCurrentNodeParameter('locationId') as string;
if (!locationId) {
throw new ApplicationError('Location ID is not available.');
}
const responseData = await highLevelApiRequest.call(
this,
'GET',
`/locations/${locationId}/timezones`,
undefined,
);
const timezones = responseData?.timeZones ?? [];
if (timezones.length === 0) {
throw new ApplicationError('No timezones available.');
}
return timezones.map((zone: string) => ({
name: zone.trim(),
value: zone.trim(),
})) as INodePropertyOptions[];
} catch (error) {
throw new ApplicationError('Error fetching timezones from HighLevel API.');
}
}
7 changes: 7 additions & 0 deletions packages/nodes-base/nodes/HighLevel/v2/HighLevelV2.node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { NodeConnectionType } from 'n8n-workflow';
import { contactFields, contactNotes, contactOperations } from './description/ContactDescription';
import { opportunityFields, opportunityOperations } from './description/OpportunityDescription';
import { taskFields, taskOperations } from './description/TaskDescription';
import { calendarFields, calendarOperations } from './description/CalendarDescription';
import {
getContacts,
getPipelines,
Expand Down Expand Up @@ -38,6 +39,10 @@ const resources: INodeProperties[] = [
name: 'Task',
value: 'task',
},
{
name: 'Calendar',
value: 'calendar',
},
],
default: 'contact',
required: true,
Expand Down Expand Up @@ -83,6 +88,8 @@ const versionDescription: INodeTypeDescription = {
...opportunityFields,
...taskOperations,
...taskFields,
...calendarOperations,
...calendarFields,
],
};

Expand Down
Loading