Skip to content

fix: allow filtering by attributes as uuids #12

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: allow filtering by attributes as uuids #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions src/utils/convert-filter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { Filter } from 'adminjs';
import { Model, QueryBuilder, raw } from 'objection';

export const uuidRegex = /^[0-9A-F]{8}-[0-9A-F]{4}-[5|4|3|2|1][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i;

export const operators = {
from: '>=',
to: '<=',
Expand Down Expand Up @@ -31,8 +33,12 @@ export const convertFilter = (
} else if (property.type() === 'string' && !!property.availableValues()) {
qb.where(path, operators.eq, value as string);
} else if (property.type() === 'string') {
// Should be safe: https://github.com/knex/documentation/issues/73#issuecomment-572482153
qb.where(raw('lower(??)', [path]), operators.like, `%${String(value).toLowerCase()}%`);
if (value || uuidRegex.test(value.toString())) {
qb.where(path, operators.eq, value as string);
} else {
// Should be safe: https://github.com/knex/documentation/issues/73#issuecomment-572482153
qb.where(raw('lower(??)', [path]), operators.like, `%${String(value).toLowerCase()}%`);
}
} else {
qb.where(path, operators.eq, value as string);
}
Expand Down