Do AND of filter words for string find

SoftwareBrothers · Jul 3, 2022 · dec159a · dec159a
1 parent 3c2bf69
commit dec159a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/utils/convert-filter.ts b/src/utils/convert-filter.ts
@@ -16,7 +16,12 @@ export const convertFilter = (filter) => {
     switch (property.type()) {
     case 'string':
       return {
-        [property.name()]: { $regex: escape(value), $options: 'i' },
+        [property.name()]: { $regex: new RegExp(
+          value
+            .split(' ')
+            .map((word) => '(?=.*\\b' + escape(word) + '\\b)')
+            .join('') + '.+'
+        ), $options: 'i' },
         ...memo,
       }
     case 'date':