summaryrefslogtreecommitdiffstats
path: root/client/lib
diff options
context:
space:
mode:
authorIgnatzHome <ignatz@maschath.de>2018-06-14 21:14:16 +0200
committerIgnatzHome <ignatz@maschath.de>2018-06-14 21:14:16 +0200
commitba2012af43bdccbff74e40fa6fee9678744c9965 (patch)
treefdbf63c643f27517466b9b5715c312aa3bc3a215 /client/lib
parentb5e6e6ee10b34a2ddfc94fa31447658a484148ad (diff)
downloadwekan-ba2012af43bdccbff74e40fa6fee9678744c9965.tar.gz
wekan-ba2012af43bdccbff74e40fa6fee9678744c9965.tar.bz2
wekan-ba2012af43bdccbff74e40fa6fee9678744c9965.zip
regex for advanced filter
Diffstat (limited to 'client/lib')
-rw-r--r--client/lib/filter.js44
1 files changed, 39 insertions, 5 deletions
diff --git a/client/lib/filter.js b/client/lib/filter.js
index e3658e1e..a4e58692 100644
--- a/client/lib/filter.js
+++ b/client/lib/filter.js
@@ -109,12 +109,20 @@ class AdvancedFilter {
const commands = [];
let current = '';
let string = false;
+ let regex = false;
let wasString = false;
let ignore = false;
for (let i = 0; i < this._filter.length; i++) {
const char = this._filter.charAt(i);
if (ignore) {
ignore = false;
+ current += char;
+ continue;
+ }
+ if (char === '/'){
+ string = !string;
+ if (string) regex = true;
+ current += char;
continue;
}
if (char === '\'') {
@@ -122,12 +130,12 @@ class AdvancedFilter {
if (string) wasString = true;
continue;
}
- if (char === '\\') {
+ if (char === '\\' && !string) {
ignore = true;
continue;
}
if (char === ' ' && !string) {
- commands.push({ 'cmd': current, 'string': wasString });
+ commands.push({ 'cmd': current, 'string': wasString, regex});
wasString = false;
current = '';
continue;
@@ -135,7 +143,7 @@ class AdvancedFilter {
current += char;
}
if (current !== '') {
- commands.push({ 'cmd': current, 'string': wasString });
+ commands.push({ 'cmd': current, 'string': wasString, regex});
}
return commands;
}
@@ -224,7 +232,20 @@ class AdvancedFilter {
{
const field = commands[i - 1].cmd;
const str = commands[i + 1].cmd;
- commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': {$in: [this._fieldValueToId(field, str), parseInt(str, 10)]} };
+ if (commands[i + 1].regex)
+ {
+ const match = str.match(new RegExp('^/(.*?)/([gimy]*)$'));
+ let regex = null;
+ if (match.length > 2)
+ regex = new RegExp(match[1], match[2]);
+ else
+ regex = new RegExp(match[1]);
+ commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': regex };
+ }
+ else
+ {
+ commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': {$in: [this._fieldValueToId(field, str), parseInt(str, 10)]} };
+ }
commands.splice(i - 1, 1);
commands.splice(i, 1);
//changed = true;
@@ -236,7 +257,20 @@ class AdvancedFilter {
{
const field = commands[i - 1].cmd;
const str = commands[i + 1].cmd;
- commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': { $not: {$in: [this._fieldValueToId(field, str), parseInt(str, 10)]} } };
+ if (commands[i + 1].regex)
+ {
+ const match = str.match(new RegExp('^/(.*?)/([gimy]*)$'));
+ let regex = null;
+ if (match.length > 2)
+ regex = new RegExp(match[1], match[2]);
+ else
+ regex = new RegExp(match[1]);
+ commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': { $not: regex } };
+ }
+ else
+ {
+ commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': { $not: {$in: [this._fieldValueToId(field, str), parseInt(str, 10)]} } };
+ }
commands.splice(i - 1, 1);
commands.splice(i, 1);
//changed = true;