admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 18:12:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: IsWeekend not checking if DateTime (#5221) (no-changelog)

Browse Source
This commit is contained in:
Valya
2023-01-23 13:28:17 +00:00
committed by GitHub
parent 3ea83d872e
commit 683492155e
3 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/workflow/src/Extensions/DateExtensions.ts
View File

@@ -139,7 +139,10 @@ function isBetween(date: Date | DateTime, extraArgs: unknown[]): boolean {
return secondDate > date && date > firstDate;
}
function isDst(date: Date): boolean {
function isDst(date: Date | DateTime): boolean {
if (isDateTime(date)) {
return date.isInDST;
}
return DateTime.fromJSDate(date).isInDST;
}
@@ -154,11 +157,14 @@ function isInLast(date: Date | DateTime, extraArgs: unknown[]): boolean {
return dateInThePast <= thisDate && thisDate <= DateTime.now();
}
function isWeekend(date: Date): boolean {
function isWeekend(date: Date | DateTime): boolean {
enum DAYS {
saturday = 6,
sunday = 7,
}
if (isDateTime(date)) {
return [DAYS.saturday, DAYS.sunday].includes(date.weekday);
}
return [DAYS.saturday, DAYS.sunday].includes(DateTime.fromJSDate(date).weekday);
}
@@ -200,7 +206,7 @@ function toLocaleString(date: Date | DateTime, extraArgs: unknown[]): string {
return DateTime.fromJSDate(date).toLocaleString(dateFormat, { locale });
}
function toTimeFromNow(date: Date): string {
function toTimeFromNow(date: Date | DateTime): string {
let diffObj: Duration;
if (isDateTime(date)) {
diffObj = date.diffNow();