Browse Source

Merge pull request #5457 from nocodb/fix/api-date-filters

fix(nocodb): add missing parsing logic
pull/5461/head
Raju Udava 2 years ago committed by GitHub
parent
commit
ec67ab0e4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 13
      packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts

13
packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts

@ -3242,17 +3242,24 @@ function extractCondition(nestedArrayConditions, aliasColObjMap) {
// eslint-disable-next-line prefer-const
let [logicOp, alias, op, value] =
str.match(/(?:~(and|or|not))?\((.*?),(\w+),(.*)\)/)?.slice(1) || [];
if (!alias && !op && !value) {
// try match with blank filter format
[logicOp, alias, op, value] =
str.match(/(?:~(and|or|not))?\((.*?),(\w+)\)/)?.slice(1) || [];
}
let sub_op = null;
if (aliasColObjMap[alias]) {
if (
[UITypes.Date, UITypes.DateTime].includes(aliasColObjMap[alias].uidt)
) {
value = value.split(',');
value = value?.split(',');
// the first element would be sub_op
sub_op = value[0];
sub_op = value?.[0];
// remove the first element which is sub_op
value.shift();
value?.shift();
value = value?.[0];
} else if (op === 'in') {
value = value.split(',');
}

Loading…
Cancel
Save