⚡ Improved Clickify-Node

packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts

@@ -1,3 +1,5 @@
+import * as moment from 'moment-timezone';
+
 import {IPollFunctions} from 'n8n-core';
 import {
 	IDataObject,
@@ -12,22 +14,21 @@ import {
 	clockifyApiRequest,
 } from './GenericFunctions';
 
-import {IWorkspaceDto} from "./WorkpaceInterfaces";
-import {EntryTypeEnum} from "./EntryTypeEnum";
-import {ICurrentUserDto} from "./UserDtos";
-import * as moment from "moment";
+import { EntryTypeEnum } from './EntryTypeEnum';
+import { ICurrentUserDto } from './UserDtos';
+import { IWorkspaceDto } from './WorkpaceInterfaces';
 
 
 export class ClockifyTrigger implements INodeType {
 	description: INodeTypeDescription = {
-		displayName: 'Clockify Event',
-		icon: 'file:images/clockify-mark-blue.png',
+		displayName: 'Clockify Trigger',
+		icon: 'file:clockify.png',
 		name: 'clockifyTrigger',
 		group: ['trigger'],
 		version: 1,
 		description: 'Watches Clockify For Events',
 		defaults: {
-			name: 'Clockify Event',
+			name: 'Clockify Trigger',
 			color: '#00FF00',
 		},
 		inputs: [],
@@ -38,6 +39,7 @@ export class ClockifyTrigger implements INodeType {
 				required: true,
 			}
 		],
+		polling: true,
 		properties: [
 			{
 				displayName: 'Workspace',
@@ -60,7 +62,7 @@ export class ClockifyTrigger implements INodeType {
 					}
 				],
 				required: true,
-				default: '',
+				default: EntryTypeEnum.NEW_TIME_ENTRY,
 			},
 		]
 	};
@@ -89,7 +91,12 @@ export class ClockifyTrigger implements INodeType {
 		const triggerField = this.getNodeParameter('watchField') as EntryTypeEnum;
 		const workspaceId  = this.getNodeParameter('workspaceId');
 
+		if (!webhookData.userId) {
+			// Cache the user-id that we do not have to request it every time
 			const userInfo: ICurrentUserDto = await clockifyApiRequest.call(this, 'GET', 'user');
+			webhookData.userId = userInfo.id;
+		}
+
 		const qs : IDataObject = {};
 		let resource: string;
 		let result = null;
@@ -97,21 +104,18 @@ export class ClockifyTrigger implements INodeType {
 		switch (triggerField) {
 			case EntryTypeEnum.NEW_TIME_ENTRY :
 			default:
-				resource = `workspaces/${workspaceId}/user/${userInfo.id}/time-entries`;
+				const workflowTimezone = this.getTimezone();
+				resource = `workspaces/${workspaceId}/user/${webhookData.userId}/time-entries`;
 				qs.start = webhookData.lastTimeChecked;
-				qs.end = moment().toISOString();
+				qs.end = moment().tz(workflowTimezone).format('YYYY-MM-DDTHH:mm:SS') + 'Z';
 				qs.hydrated = true;
 				qs['in-progress'] = false;
 			break;
 		}
 
-		try {
 		result = await clockifyApiRequest.call(this, 'GET', resource, {}, qs );
-			webhookData.lastTimeChecked = qs.end_date;
-		}
-		catch( e ) {
-			throw new Error(`Clockify Exception: ${e}`);
-		}
+		webhookData.lastTimeChecked = qs.end;
+
 		if (Array.isArray(result) && result.length !== 0) {
 			result = [this.helpers.returnJsonArray(result)];
 		}

packages/nodes-base/nodes/Clockify/CommonDtos.ts

@@ -4,10 +4,10 @@ export interface IHourlyRateDto {
 }
 
 enum MembershipStatusEnum {
-	PENDING = "PENDING",
-	ACTIVE = "ACTIVE",
-	DECLINED = "DECLINED",
-	INACTIVE = "INACTIVE"
+	PENDING = 'PENDING',
+	ACTIVE = 'ACTIVE',
+	DECLINED = 'DECLINED',
+	INACTIVE = 'INACTIVE'
 }
 
 export interface IMembershipDto {

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

@@ -2,16 +2,16 @@ import { OptionsWithUri } from 'request';
 import {
 	ILoadOptionsFunctions,
 	IPollFunctions
-} from "n8n-core";
+} from 'n8n-core';
 
-import {IDataObject} from "n8n-workflow";
+import { IDataObject } from 'n8n-workflow';
 
 export async function clockifyApiRequest(this: ILoadOptionsFunctions | IPollFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('clockifyApi');
 	if (credentials === undefined) {
 		throw new Error('No credentials got returned!');
 	}
-	const BASE_URL = `https://api.clockify.me/api/v1`;
+	const BASE_URL = 'https://api.clockify.me/api/v1';
 
 	const options: OptionsWithUri = {
 		headers: {

packages/nodes-base/nodes/Clockify/UserDtos.ts

@@ -1,4 +1,4 @@
-import {IMembershipDto} from "./CommonDtos";
+import { IMembershipDto } from './CommonDtos';
 
 enum UserStatusEnum {
 	ACTIVE, PENDING_EMAIL_VERIFICATION, DELETED

packages/nodes-base/nodes/Clockify/WorkpaceInterfaces.ts

@@ -1,31 +1,31 @@
-import {IHourlyRateDto, IMembershipDto} from "./CommonDtos";
+import { IHourlyRateDto, IMembershipDto } from './CommonDtos';
 
 enum AdminOnlyPagesEnum {
-	PROJECT ="PROJECT",
-	TEAM = "TEAM",
-	REPORTS = "REPORTS"
+	PROJECT ='PROJECT',
+	TEAM = 'TEAM',
+	REPORTS = 'REPORTS',
 }
 
 enum DaysOfWeekEnum {
-	MONDAY = "MONDAY",
-	TUESDAY = "TUESDAY",
-	WEDNESDAY = "WEDNESDAY",
-	THURSDAY = "THURSDAY",
-	FRIDAY = "FRIDAY",
-	SATURDAY = "SATURDAY",
-	SUNDAY = "SUNDAY"
+	MONDAY = 'MONDAY',
+	TUESDAY = 'TUESDAY',
+	WEDNESDAY = 'WEDNESDAY',
+	THURSDAY = 'THURSDAY',
+	FRIDAY = 'FRIDAY',
+	SATURDAY = 'SATURDAY',
+	SUNDAY = 'SUNDAY',
 }
 
 enum DatePeriodEnum {
-	DAYS="DAYS",
-	WEEKS = "WEEKS",
-	MONTHS = "MONTHS"
+	DAYS = 'DAYS',
+	WEEKS = 'WEEKS',
+	MONTHS = 'MONTHS',
 }
 
 enum AutomaticLockTypeEnum {
-	WEEKLY = "WEEKLY",
-	MONTHLY = "MONTHLY",
-	OLDER_THAN = "OLDER_THAN"
+	WEEKLY = 'WEEKLY',
+	MONTHLY = 'MONTHLY',
+	OLDER_THAN = 'OLDER_THAN',
 }
 
 interface IAutomaticLockDto {
@@ -74,4 +74,3 @@ export interface IWorkspaceDto {
 	name: string;
 	workspaceSettings: IWorkspaceSettingsDto;
 }
-

packages/nodes-base/package.json

@@ -295,4 +295,3 @@
         ]
     }
 }
-