Skip to content

AB#84023 - Add 'in' and 'notIn' operator for dashboard filters #951

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

Merged
AntoineRelief merged 8 commits into from
Apr 26, 2024
Merged

AB#84023 - Add 'in' and 'notIn' operator for dashboard filters #951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a3bcd37
feat: Added 'in' and 'notIn' operator in getFilter.
guisoares1 Jan 22, 2024
64705cb
feat: Added 'in' and 'notIn' operator in query getFilter.
guisoares1 Jan 23, 2024
48b3c5f
feat: Changed query creation logic to adapt to the standard implement…
guisoares1 Jan 23, 2024
593c164
change name to notin for consistency
MwanPygmay Jan 25, 2024
1ffb53d
Merge branch '2.x.x' into AB#84023-add-in-and-notIn-operator-for-dash…
estelafs Jan 25, 2024
1cc5f06
Merge branch '2.x.x' into AB#84023-add-in-and-notIn-operator-for-dash…
MwanPygmay Apr 26, 2024
68fa46f
Merge branch '2.x.x' into AB#84023-add-in-and-notIn-operator-for-dash…
AntoineRelief Apr 26, 2024
5081ea6
refactor
AntoineRelief Apr 26, 2024
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
26 changes: 26 additions & 0 deletions src/utils/filter/getFilter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,32 @@ const buildMongoFilter = (filter: any, fields: any[]): any => {
return { [fieldName]: { $exists: true, $ne: '' } };
}
}
// case 'in': {
// value = Array.isArray(value) ? value : [value];
// return {
// $or: [
// { [fieldName]: { $in: value } },
// {
// [fieldName]: {
// $in: value.map((x) => new mongoose.Types.ObjectId(x)),
// },
// },
// ],
// };
// }
// case 'notin': {
// value = Array.isArray(value) ? value : [value];
// return {
// $or: [
// { [fieldName]: { $nin: value } },
// {
// [fieldName]: {
// $nin: value.map((x) => new mongoose.Types.ObjectId(x)),
// },
// },
// ],
// };
// }
default: {
return;
}
Expand Down
9 changes: 8 additions & 1 deletion src/utils/schema/resolvers/Query/getFilter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,16 +428,23 @@ const buildMongoFilter = (
}
}
case 'in': {
if (isAttributeFilter)
if (isAttributeFilter) {
return {
[fieldName]: { $regex: attrValue, $options: 'i' },
};
} else {
value = Array.isArray(value) ? value : [value];
return { [fieldName]: { $in: value } };
}
}
case 'notin': {
if (isAttributeFilter) {
return {
[fieldName]: { $not: { $regex: attrValue, $options: 'i' } },
};
} else {
value = Array.isArray(value) ? value : [value];
return { [fieldName]: { $nin: value } };
}
}
case 'isempty': {
Expand Down