fix(Schedule Trigger Node): Default to 0 minute if falsy on hourly run (

#9146)
n8n-io · Apr 18, 2024 · 3d6455e · 3d6455e
1 parent c1d07fb
commit 3d6455e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/packages/nodes-base/nodes/Schedule/GenericFunctions.ts b/packages/nodes-base/nodes/Schedule/GenericFunctions.ts
@@ -81,3 +81,13 @@ export function convertToUnixFormat(interval: IDataObject) {
 	}
 	interval.expression = expression.join(' ');
 }
+
+export const addFallbackValue = <T>(enabled: boolean, fallback: T) => {
+	if (enabled) {
+		return (value: T) => {
+			if (!value) return fallback;
+			return value;
+		};
+	}
+	return (value: T) => value;
+};
diff --git a/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts b/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts
@@ -10,15 +10,15 @@ import { NodeOperationError } from 'n8n-workflow';
 import { CronJob } from 'cron';
 import moment from 'moment-timezone';
 import type { IRecurencyRule } from './SchedulerInterface';
-import { convertToUnixFormat, recurencyCheck } from './GenericFunctions';
+import { addFallbackValue, convertToUnixFormat, recurencyCheck } from './GenericFunctions';
 
 export class ScheduleTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Schedule Trigger',
 		name: 'scheduleTrigger',
 		icon: 'fa:clock',
 		group: ['trigger', 'schedule'],
-		version: [1, 1.1],
+		version: [1, 1.1, 1.2],
 		description: 'Triggers the workflow on a given schedule',
 		eventTriggerDescription: '',
 		activationMessage:
@@ -415,7 +415,7 @@ export class ScheduleTrigger implements INodeType {
 		const rule = this.getNodeParameter('rule', []) as IDataObject;
 		const interval = rule.interval as IDataObject[];
 		const timezone = this.getTimezone();
-		const version = this.getNode().typeVersion;
+		const nodeVersion = this.getNode().typeVersion;
 		const cronJobs: CronJob[] = [];
 		const intervalArr: NodeJS.Timeout[] = [];
 		const staticData = this.getWorkflowStaticData('node') as {
@@ -424,6 +424,7 @@ export class ScheduleTrigger implements INodeType {
 		if (!staticData.recurrencyRules) {
 			staticData.recurrencyRules = [];
 		}
+		const fallbackToZero = addFallbackValue(nodeVersion >= 1.2, '0');
 		const executeTrigger = async (recurency: IRecurencyRule) => {
 			const resultData = {
 				timestamp: moment.tz(timezone).toISOString(true),
@@ -451,7 +452,7 @@ export class ScheduleTrigger implements INodeType {
 		for (let i = 0; i < interval.length; i++) {
 			let intervalValue = 1000;
 			if (interval[i].field === 'cronExpression') {
-				if (version > 1) {
+				if (nodeVersion > 1) {
 					// ! Remove this part if we use a cron library that follows unix cron expression
 					convertToUnixFormat(interval[i]);
 				}
@@ -494,7 +495,8 @@ export class ScheduleTrigger implements INodeType {
 
 			if (interval[i].field === 'hours') {
 				const hour = interval[i].hoursInterval as number;
-				const minute = interval[i].triggerAtMinute?.toString() as string;
+				const minute = fallbackToZero(interval[i].triggerAtMinute?.toString() as string);
+
 				const cronTimes: string[] = [minute, '*', '*', '*', '*'];
 				const cronExpression: string = cronTimes.join(' ');
 				if (hour === 1) {
@@ -527,7 +529,7 @@ export class ScheduleTrigger implements INodeType {
 			if (interval[i].field === 'days') {
 				const day = interval[i].daysInterval as number;
 				const hour = interval[i].triggerAtHour?.toString() as string;
-				const minute = interval[i].triggerAtMinute?.toString() as string;
+				const minute = fallbackToZero(interval[i].triggerAtMinute?.toString() as string);
 				const cronTimes: string[] = [minute, hour, '*', '*', '*'];
 				const cronExpression: string = cronTimes.join(' ');
 				if (day === 1) {
@@ -559,7 +561,7 @@ export class ScheduleTrigger implements INodeType {
 
 			if (interval[i].field === 'weeks') {
 				const hour = interval[i].triggerAtHour?.toString() as string;
-				const minute = interval[i].triggerAtMinute?.toString() as string;
+				const minute = fallbackToZero(interval[i].triggerAtMinute?.toString() as string);
 				const week = interval[i].weeksInterval as number;
 				const days = interval[i].triggerAtDay as IDataObject[];
 				const day = days.length === 0 ? '*' : days.join(',');
@@ -596,7 +598,7 @@ export class ScheduleTrigger implements INodeType {
 				const month = interval[i].monthsInterval;
 				const day = interval[i].triggerAtDayOfMonth?.toString() as string;
 				const hour = interval[i].triggerAtHour?.toString() as string;
-				const minute = interval[i].triggerAtMinute?.toString() as string;
+				const minute = fallbackToZero(interval[i].triggerAtMinute?.toString() as string);
 				const cronTimes: string[] = [minute, hour, day, '*', '*'];
 				const cronExpression: string = cronTimes.join(' ');
 				if (month === 1) {