DDF-6037 Correct Tokenized Filter Behavior (#6038)

codice · Jun 1, 2020 · 25a9d11 · 25a9d11
1 parent ed5503a
commit 25a9d11
Showing 1 changed file with 8 additions and 15 deletions.
diff --git a/ui/packages/catalog-ui-search/src/main/webapp/js/filter.js b/ui/packages/catalog-ui-search/src/main/webapp/js/filter.js
@@ -64,26 +64,19 @@ function checkToken(token, filter) {
 }
 
 function matchesILIKE(value, filter) {
-  const valueToCheckFor = filter.value.toLowerCase()
+  filter.value = filter.value.toLowerCase()
   value = value.toString().toLowerCase()
-  const tokens = value.split(' ')
-  for (let i = 0; i <= tokens.length - 1; i++) {
-    if (checkToken(tokens[i], valueToCheckFor)) {
-      return true
-    }
-  }
-  return false
+  return matchesLIKE(value, filter)
 }
 
 function matchesLIKE(value, filter) {
-  const valueToCheckFor = filter.value
-  const tokens = value.toString().split(' ')
-  for (let i = 0; i <= tokens.length - 1; i++) {
-    if (checkToken(tokens[i], valueToCheckFor)) {
-      return true
-    }
+  if (!filter.value.startsWith('*')) {
+    filter.value = '*' + filter.value
   }
-  return false
+  if (!filter.value.endsWith('*')) {
+    filter.value = filter.value + '*'
+  }
+  return checkToken(value, filter.value)
 }
 
 function matchesEQUALS(value, filter) {