lucene

DataBiosphere · Aug 21, 2024 · 5cbfbd4 · 5cbfbd4
1 parent 1370a32
commit 5cbfbd4
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 2 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.yarn/cache/lucene-npm-2.1.1-bbf1fe5fbc-29bbbddfc0.zip b/.yarn/cache/lucene-npm-2.1.1-bbf1fe5fbc-29bbbddfc0.zip
diff --git a/package.json b/package.json
@@ -35,6 +35,7 @@
     "jwt-decode": "^3.1.2",
     "keycode-js": "^3.1.0",
     "lodash": "^4.17.21",
+    "lucene": "^2.1.1",
     "marked": "^4.0.10",
     "oidc-client-ts": "^2.4.0",
     "outdated-browser-rework": "^3.0.1",

diff --git a/src/libs/ajax/data-table-providers/WdsDataTableProvider.ts b/src/libs/ajax/data-table-providers/WdsDataTableProvider.ts
@@ -1,4 +1,5 @@
 import _ from 'lodash/fp';
+import lucene from 'lucene';
 import { Ajax } from 'src/libs/ajax';
 import {
   AttributeArray,
@@ -242,8 +243,8 @@ export class WdsDataTableProvider implements DataTableProvider {
   };
 
   protected transformQuery = (query: string): string => {
-    const specialCharactersRegex = /([+\-&|!(){}[\]^"~*?:\\/\s])/g;
-    return query.replace(specialCharactersRegex, '\\$1').replace('=', ':');
+    const escapedQuery = lucene.term.escape(query);
+    return escapedQuery.replace('=', ':');
   };
 
   protected queryOptionsToSearchRequest = (queryOptions: EntityQueryOptions): SearchRequest => {

diff --git a/yarn.lock b/yarn.lock
@@ -12389,6 +12389,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lucene@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "lucene@npm:2.1.1"
+  checksum: 29bbbddfc0b31b3b5f24b2ee19bc134bb5ca9db0f948b7506df96215e2c24631ed7031cc31a0dddc71024c640ce6eb05c92722bf57bf0e6a4f387ca796cc8df7
+  languageName: node
+  linkType: hard
+
 "lz-string@npm:^1.5.0":
   version: 1.5.0
   resolution: "lz-string@npm:1.5.0"
@@ -16471,6 +16478,7 @@ __metadata:
     keycode-js: ^3.1.0
     lint-staged: ^13.0.3
     lodash: ^4.17.21
+    lucene: ^2.1.1
     marked: ^4.0.10
     oidc-client-ts: ^2.4.0
     outdated-browser-rework: ^3.0.1