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

fix: Filter component - array contains comparison not correct when ignore case option set to true (#10012)

Browse Source
This commit is contained in:
Michael Kret
2024-07-11 17:06:07 +03:00
committed by GitHub
parent 1aae65dfdc
commit 4a3b97cede
2 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/workflow/src/NodeParameters/FilterParameter.ts
View File

@@ -137,6 +137,18 @@ function parseRegexPattern(pattern: string): RegExp {
return regex;
}
export function arrayContainsValue(array: unknown[], value: unknown, ignoreCase: boolean): boolean {
if (ignoreCase && typeof value === 'string') {
return array.some((item) => {
if (typeof item !== 'string') {
return false;
}
return item.toString().toLocaleLowerCase() === value.toLocaleLowerCase();
});
}
return array.includes(value);
}
// eslint-disable-next-line complexity
export function executeFilterCondition(
condition: FilterConditionValue,
@@ -284,15 +296,9 @@ export function executeFilterCondition(
switch (condition.operator.operation) {
case 'contains':
if (ignoreCase && typeof rightValue === 'string') {
rightValue = rightValue.toLocaleLowerCase();
}
return left.includes(rightValue);
return arrayContainsValue(left, rightValue, ignoreCase);
case 'notContains':
if (ignoreCase && typeof rightValue === 'string') {
rightValue = rightValue.toLocaleLowerCase();
}
return !left.includes(rightValue);
return !arrayContainsValue(left, rightValue, ignoreCase);
case 'lengthEquals':
return left.length === rightNumber;
case 'lengthNotEquals':