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.

Sign up for GitHub

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

Jump to bottom

fix(IF Node): Fix "Is Empty" and "Is Not Empty" operation fails for date objects #4670

Merged
merged 2 commits into from
Nov 21, 2022
Merged

fix(IF Node): Fix "Is Empty" and "Is Not Empty" operation fails for date objects #4670

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6fc6e0
IF node isEmtpy and IsNotEmpty operation: ignore empty date objects
maspio Nov 21, 2022
d4cf6ee
IF node isEmtpy and IsNotEmpty operation: treat invalid dates as empty
maspio Nov 21, 2022
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
13 changes: 9 additions & 4 deletions packages/nodes-base/nodes/If/If.node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,9 @@ export class If implements INodeType {
let item: INodeExecutionData;
let combineOperation: string;

const isDateObject = (value: NodeParameterValue) => Object.prototype.toString.call(value) === '[object Date]';
const isDateInvalid = (value: NodeParameterValue) => value?.toString() === 'Invalid Date';

// The compare operations
const compareOperationFunctions: {
[key: string]: (value1: NodeParameterValue, value2: NodeParameterValue) => boolean;
Expand Down Expand Up @@ -347,15 +350,17 @@ export class If implements INodeType {
!(value1 as string).startsWith(value2 as string),
isEmpty: (value1: NodeParameterValue) =>
[undefined, null, '', NaN].includes(value1 as string) ||
(typeof value1 === 'object' && value1 !== null
(typeof value1 === 'object' && value1 !== null && !isDateObject(value1)
? Object.entries(value1 as string).length === 0
: false),
: false) ||
(isDateObject(value1) && isDateInvalid(value1)),
isNotEmpty: (value1: NodeParameterValue) =>
!(
[undefined, null, '', NaN].includes(value1 as string) ||
(typeof value1 === 'object' && value1 !== null
(typeof value1 === 'object' && value1 !== null && !isDateObject(value1)
? Object.entries(value1 as string).length === 0
: false)
: false) ||
(isDateObject(value1) && isDateInvalid(value1))
),
regex: (value1: NodeParameterValue, value2: NodeParameterValue) => {
const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimusy]*)$'));
Expand Down