From abe68dac9c485756a1672f51c3e6b36225f02cfb Mon Sep 17 00:00:00 2001
From: Brandon Andre <brandon.andre@agr.gc.ca>
Date: Wed, 4 Oct 2023 14:22:28 -0400
Subject: [PATCH] Support #32023 - Test partial search

- Removed the "Contains word" option since depending on what's stored it can be confusing what's considered a word.
- "Starts with" will now not automatically lowercase the query.
- "Starts with" will include the "case_insensitive" as true.
- NotEquals should be using term not match, removed the "matchQuery" function.
- Removed all partial match/contains word tests and updated snapshots.
---
 .../__tests__/QueryOperatorSelector.test.tsx  |  4 -
 .../QueryOperatorSelector.test.tsx.snap       | 17 ++---
 .../QueryBuilderElasticSearchExport.tsx       | 25 ++-----
 .../QueryBuilderElasticSearchExport8.tsx      | 25 ++-----
 .../QueryBuilderElasticSearchExport.test.tsx  |  5 --
 ...ryBuilderElasticSearchExport.test.tsx.snap | 38 ++++++----
 .../QueryBuilderFieldExtensionSearch.tsx      |  1 -
 .../QueryBuilderManagedAttributeSearch.tsx    |  1 -
 .../QueryBuilderTextSearch.tsx                | 23 ++----
 .../__tests__/QueryBuilderDateSearch.test.tsx | 29 --------
 .../QueryBuilderFieldExtensionSearch.test.tsx |  1 -
 ...ueryBuilderManagedAttributeSearch.test.tsx |  1 -
 .../QueryBuilderNumberSearch.test.tsx         | 29 --------
 .../__tests__/QueryBuilderTextSearch.test.tsx | 29 --------
 ...yBuilderFieldExtensionSearch.test.tsx.snap | 50 +++----------
 ...uilderManagedAttributeSearch.test.tsx.snap | 74 ++++++-------------
 .../query-builder/useQueryBuilderConfig.tsx   |  6 --
 packages/dina-ui/intl/dina-ui-en.ts           |  1 -
 packages/dina-ui/intl/dina-ui-fr.ts           |  1 -
 19 files changed, 86 insertions(+), 274 deletions(-)

diff --git a/packages/common-ui/lib/list-page/query-builder/query-builder-core-components/__tests__/QueryOperatorSelector.test.tsx b/packages/common-ui/lib/list-page/query-builder/query-builder-core-components/__tests__/QueryOperatorSelector.test.tsx
index 68e7416cfa..0f5eba2232 100644
--- a/packages/common-ui/lib/list-page/query-builder/query-builder-core-components/__tests__/QueryOperatorSelector.test.tsx
+++ b/packages/common-ui/lib/list-page/query-builder/query-builder-core-components/__tests__/QueryOperatorSelector.test.tsx
@@ -8,10 +8,6 @@ const OPERATOR_OPTIONS: FieldItems = [
     key: "exactMatch",
     label: "Exact Match"
   },
-  {
-    key: "partialMatch",
-    label: "Partial Match"
-  },
   {
     key: "notEquals",
     label: "Not Equals"
diff --git a/packages/common-ui/lib/list-page/query-builder/query-builder-core-components/__tests__/__snapshots__/QueryOperatorSelector.test.tsx.snap b/packages/common-ui/lib/list-page/query-builder/query-builder-core-components/__tests__/__snapshots__/QueryOperatorSelector.test.tsx.snap
index 12df7aae2a..d62d910715 100644
--- a/packages/common-ui/lib/list-page/query-builder/query-builder-core-components/__tests__/__snapshots__/QueryOperatorSelector.test.tsx.snap
+++ b/packages/common-ui/lib/list-page/query-builder/query-builder-core-components/__tests__/__snapshots__/QueryOperatorSelector.test.tsx.snap
@@ -87,30 +87,23 @@ exports[`QueryOperatorSelector component Snapshot Test 1`] = `
                                   </div>
                                 </EmotionCssPropInternal>
                               </Option>
-                              <Option clearValue={[Function (anonymous)]} cx={[Function (anonymous)]} getStyles={[Function (anonymous)]} getValue={[Function (anonymous)]} hasValue={true} isMulti={false} isRtl={false} options={{...}} selectOption={[Function (anonymous)]} selectProps={{...}} setValue={[Function (anonymous)]} theme={{...}} innerProps={{...}} data={{...}} isDisabled={false} isSelected={false} label=\\"Partial Match\\" type=\\"option\\" value=\\"partialMatch\\" isFocused={false} innerRef={[undefined]}>
+                              <Option clearValue={[Function (anonymous)]} cx={[Function (anonymous)]} getStyles={[Function (anonymous)]} getValue={[Function (anonymous)]} hasValue={true} isMulti={false} isRtl={false} options={{...}} selectOption={[Function (anonymous)]} selectProps={{...}} setValue={[Function (anonymous)]} theme={{...}} innerProps={{...}} data={{...}} isDisabled={false} isSelected={false} label=\\"Not Equals\\" type=\\"option\\" value=\\"notEquals\\" isFocused={false} innerRef={[undefined]}>
                                 <EmotionCssPropInternal css={{...}} className=\\"\\" aria-disabled={false} id=\\"react-select-2-option-1\\" onClick={[Function (anonymous)]} onMouseMove={[Function (anonymous)]} onMouseOver={[Function (anonymous)]} tabIndex={-1} __EMOTION_TYPE_PLEASE_DO_NOT_USE__=\\"div\\" __EMOTION_LABEL_PLEASE_DO_NOT_USE__=\\"Option\\">
                                   <div className=\\" css-yt9ioa-option\\" aria-disabled={false} id=\\"react-select-2-option-1\\" onClick={[Function (anonymous)]} onMouseMove={[Function (anonymous)]} onMouseOver={[Function (anonymous)]} tabIndex={-1}>
-                                    Partial Match
-                                  </div>
-                                </EmotionCssPropInternal>
-                              </Option>
-                              <Option clearValue={[Function (anonymous)]} cx={[Function (anonymous)]} getStyles={[Function (anonymous)]} getValue={[Function (anonymous)]} hasValue={true} isMulti={false} isRtl={false} options={{...}} selectOption={[Function (anonymous)]} selectProps={{...}} setValue={[Function (anonymous)]} theme={{...}} innerProps={{...}} data={{...}} isDisabled={false} isSelected={false} label=\\"Not Equals\\" type=\\"option\\" value=\\"notEquals\\" isFocused={false} innerRef={[undefined]}>
-                                <EmotionCssPropInternal css={{...}} className=\\"\\" aria-disabled={false} id=\\"react-select-2-option-2\\" onClick={[Function (anonymous)]} onMouseMove={[Function (anonymous)]} onMouseOver={[Function (anonymous)]} tabIndex={-1} __EMOTION_TYPE_PLEASE_DO_NOT_USE__=\\"div\\" __EMOTION_LABEL_PLEASE_DO_NOT_USE__=\\"Option\\">
-                                  <div className=\\" css-yt9ioa-option\\" aria-disabled={false} id=\\"react-select-2-option-2\\" onClick={[Function (anonymous)]} onMouseMove={[Function (anonymous)]} onMouseOver={[Function (anonymous)]} tabIndex={-1}>
                                     Not Equals
                                   </div>
                                 </EmotionCssPropInternal>
                               </Option>
                               <Option clearValue={[Function (anonymous)]} cx={[Function (anonymous)]} getStyles={[Function (anonymous)]} getValue={[Function (anonymous)]} hasValue={true} isMulti={false} isRtl={false} options={{...}} selectOption={[Function (anonymous)]} selectProps={{...}} setValue={[Function (anonymous)]} theme={{...}} innerProps={{...}} data={{...}} isDisabled={false} isSelected={false} label=\\"Empty\\" type=\\"option\\" value=\\"empty\\" isFocused={false} innerRef={[undefined]}>
-                                <EmotionCssPropInternal css={{...}} className=\\"\\" aria-disabled={false} id=\\"react-select-2-option-3\\" onClick={[Function (anonymous)]} onMouseMove={[Function (anonymous)]} onMouseOver={[Function (anonymous)]} tabIndex={-1} __EMOTION_TYPE_PLEASE_DO_NOT_USE__=\\"div\\" __EMOTION_LABEL_PLEASE_DO_NOT_USE__=\\"Option\\">
-                                  <div className=\\" css-yt9ioa-option\\" aria-disabled={false} id=\\"react-select-2-option-3\\" onClick={[Function (anonymous)]} onMouseMove={[Function (anonymous)]} onMouseOver={[Function (anonymous)]} tabIndex={-1}>
+                                <EmotionCssPropInternal css={{...}} className=\\"\\" aria-disabled={false} id=\\"react-select-2-option-2\\" onClick={[Function (anonymous)]} onMouseMove={[Function (anonymous)]} onMouseOver={[Function (anonymous)]} tabIndex={-1} __EMOTION_TYPE_PLEASE_DO_NOT_USE__=\\"div\\" __EMOTION_LABEL_PLEASE_DO_NOT_USE__=\\"Option\\">
+                                  <div className=\\" css-yt9ioa-option\\" aria-disabled={false} id=\\"react-select-2-option-2\\" onClick={[Function (anonymous)]} onMouseMove={[Function (anonymous)]} onMouseOver={[Function (anonymous)]} tabIndex={-1}>
                                     Empty
                                   </div>
                                 </EmotionCssPropInternal>
                               </Option>
                               <Option clearValue={[Function (anonymous)]} cx={[Function (anonymous)]} getStyles={[Function (anonymous)]} getValue={[Function (anonymous)]} hasValue={true} isMulti={false} isRtl={false} options={{...}} selectOption={[Function (anonymous)]} selectProps={{...}} setValue={[Function (anonymous)]} theme={{...}} innerProps={{...}} data={{...}} isDisabled={false} isSelected={false} label=\\"Not Empty\\" type=\\"option\\" value=\\"notEmpty\\" isFocused={false} innerRef={[undefined]}>
-                                <EmotionCssPropInternal css={{...}} className=\\"\\" aria-disabled={false} id=\\"react-select-2-option-4\\" onClick={[Function (anonymous)]} onMouseMove={[Function (anonymous)]} onMouseOver={[Function (anonymous)]} tabIndex={-1} __EMOTION_TYPE_PLEASE_DO_NOT_USE__=\\"div\\" __EMOTION_LABEL_PLEASE_DO_NOT_USE__=\\"Option\\">
-                                  <div className=\\" css-yt9ioa-option\\" aria-disabled={false} id=\\"react-select-2-option-4\\" onClick={[Function (anonymous)]} onMouseMove={[Function (anonymous)]} onMouseOver={[Function (anonymous)]} tabIndex={-1}>
+                                <EmotionCssPropInternal css={{...}} className=\\"\\" aria-disabled={false} id=\\"react-select-2-option-3\\" onClick={[Function (anonymous)]} onMouseMove={[Function (anonymous)]} onMouseOver={[Function (anonymous)]} tabIndex={-1} __EMOTION_TYPE_PLEASE_DO_NOT_USE__=\\"div\\" __EMOTION_LABEL_PLEASE_DO_NOT_USE__=\\"Option\\">
+                                  <div className=\\" css-yt9ioa-option\\" aria-disabled={false} id=\\"react-select-2-option-3\\" onClick={[Function (anonymous)]} onMouseMove={[Function (anonymous)]} onMouseOver={[Function (anonymous)]} tabIndex={-1}>
                                     Not Empty
                                   </div>
                                 </EmotionCssPropInternal>
diff --git a/packages/common-ui/lib/list-page/query-builder/query-builder-elastic-search/QueryBuilderElasticSearchExport.tsx b/packages/common-ui/lib/list-page/query-builder/query-builder-elastic-search/QueryBuilderElasticSearchExport.tsx
index 2581ca55e2..36304ccc3f 100644
--- a/packages/common-ui/lib/list-page/query-builder/query-builder-elastic-search/QueryBuilderElasticSearchExport.tsx
+++ b/packages/common-ui/lib/list-page/query-builder/query-builder-elastic-search/QueryBuilderElasticSearchExport.tsx
@@ -403,15 +403,6 @@ export function wildcardQuery(fieldName: string, matchValue: any, keywordSupport
   };
 }
 
-// Query used for partial matches (contains word).
-export function matchQuery(fieldName: string, matchValue: any): any {
-  return {
-    match: {
-      [fieldName]: matchValue
-    }
-  };
-}
-
 // Query used to see if the field exists.
 export function existsQuery(fieldName: string): any {
   return {
@@ -442,11 +433,6 @@ export function prefixQuery(
     return {};
   }
 
-  // Lowercase the matchValue here, if it's a string.
-  if (typeof matchValue === "string") {
-    matchValue = matchValue.toLowerCase();
-  }
-
   return parentType
     ? {
         nested: {
@@ -456,8 +442,10 @@ export function prefixQuery(
               must: [
                 {
                   prefix: {
-                    [optimizedPrefix ? fieldName + ".prefix" : keywordSupport ? fieldName + ".keyword" : fieldName]:
-                      matchValue
+                    [optimizedPrefix ? fieldName + ".prefix" : keywordSupport ? fieldName + ".keyword" : fieldName]: {
+                      value: matchValue,
+                      case_insensitive: true
+                    }
                   }
                 },
                 includedTypeQuery(parentType)
@@ -468,7 +456,10 @@ export function prefixQuery(
       }
     : {
         prefix: {
-          [optimizedPrefix ? fieldName + ".prefix" : keywordSupport ? fieldName + ".keyword" : fieldName]: matchValue
+          [optimizedPrefix ? fieldName + ".prefix" : keywordSupport ? fieldName + ".keyword" : fieldName]: {
+            value: matchValue,
+            case_insensitive: true
+          }
         }
       };
 }
diff --git a/packages/common-ui/lib/list-page/query-builder/query-builder-elastic-search/QueryBuilderElasticSearchExport8.tsx b/packages/common-ui/lib/list-page/query-builder/query-builder-elastic-search/QueryBuilderElasticSearchExport8.tsx
index eb16ba18ea..8c2aae6aaa 100644
--- a/packages/common-ui/lib/list-page/query-builder/query-builder-elastic-search/QueryBuilderElasticSearchExport8.tsx
+++ b/packages/common-ui/lib/list-page/query-builder/query-builder-elastic-search/QueryBuilderElasticSearchExport8.tsx
@@ -415,15 +415,6 @@ export function wildcardQuery(fieldName: string, matchValue: any, keywordSupport
   };
 }
 
-// Query used for partial matches (contains word).
-export function matchQuery(fieldName: string, matchValue: any): any {
-  return {
-    match: {
-      [fieldName]: matchValue
-    }
-  };
-}
-
 // Query used to see if the field exists.
 export function existsQuery(fieldName: string): any {
   return {
@@ -454,11 +445,6 @@ export function prefixQuery(
     return {};
   }
 
-  // Lowercase the matchValue here, if it's a string.
-  if (typeof matchValue === "string") {
-    matchValue = matchValue.toLowerCase();
-  }
-
   return parentType
     ? {
         nested: {
@@ -468,8 +454,10 @@ export function prefixQuery(
               must: [
                 {
                   prefix: {
-                    [optimizedPrefix ? fieldName + ".prefix" : keywordSupport ? fieldName + ".keyword" : fieldName]:
-                      matchValue
+                    [optimizedPrefix ? fieldName + ".prefix" : keywordSupport ? fieldName + ".keyword" : fieldName]: {
+                      value: matchValue,
+                      case_insensitive: true
+                    }
                   }
                 },
                 includedTypeQuery(parentType)
@@ -480,7 +468,10 @@ export function prefixQuery(
       }
     : {
         prefix: {
-          [optimizedPrefix ? fieldName + ".prefix" : keywordSupport ? fieldName + ".keyword" : fieldName]: matchValue
+          [optimizedPrefix ? fieldName + ".prefix" : keywordSupport ? fieldName + ".keyword" : fieldName]: {
+            value: matchValue,
+            case_insensitive: true
+          }
         }
       };
 }
diff --git a/packages/common-ui/lib/list-page/query-builder/query-builder-elastic-search/__tests__/QueryBuilderElasticSearchExport.test.tsx b/packages/common-ui/lib/list-page/query-builder/query-builder-elastic-search/__tests__/QueryBuilderElasticSearchExport.test.tsx
index 10187310c8..81f8ad130e 100644
--- a/packages/common-ui/lib/list-page/query-builder/query-builder-elastic-search/__tests__/QueryBuilderElasticSearchExport.test.tsx
+++ b/packages/common-ui/lib/list-page/query-builder/query-builder-elastic-search/__tests__/QueryBuilderElasticSearchExport.test.tsx
@@ -8,7 +8,6 @@ import {
   applySourceFiltering,
   includedTypeQuery,
   termQuery,
-  matchQuery,
   existsQuery,
   rangeQuery,
   prefixQuery,
@@ -275,10 +274,6 @@ describe("QueryBuilderElasticSearchExport functionality", () => {
       expect(wildcardQuery("fieldTest", "valueToMatch", true)).toMatchSnapshot();
     });
 
-    test("matchQuery", async () => {
-      expect(matchQuery("fieldTest", "valueToMatch")).toMatchSnapshot();
-    });
-
     test("existsQuery", async () => {
       expect(existsQuery("fieldTest")).toMatchSnapshot();
     });
diff --git a/packages/common-ui/lib/list-page/query-builder/query-builder-elastic-search/__tests__/__snapshots__/QueryBuilderElasticSearchExport.test.tsx.snap b/packages/common-ui/lib/list-page/query-builder/query-builder-elastic-search/__tests__/__snapshots__/QueryBuilderElasticSearchExport.test.tsx.snap
index cbe04f36f3..6c73f72266 100644
--- a/packages/common-ui/lib/list-page/query-builder/query-builder-elastic-search/__tests__/__snapshots__/QueryBuilderElasticSearchExport.test.tsx.snap
+++ b/packages/common-ui/lib/list-page/query-builder/query-builder-elastic-search/__tests__/__snapshots__/QueryBuilderElasticSearchExport.test.tsx.snap
@@ -39,7 +39,10 @@ Object {
 exports[`QueryBuilderElasticSearchExport functionality Partial matching query helper functions prefixQuery attribute (not optimized) 1`] = `
 Object {
   "prefix": Object {
-    "data.attribute.materialSampleName": "searchvalue",
+    "data.attribute.materialSampleName": Object {
+      "case_insensitive": true,
+      "value": "searchValue",
+    },
   },
 }
 `;
@@ -47,7 +50,10 @@ Object {
 exports[`QueryBuilderElasticSearchExport functionality Partial matching query helper functions prefixQuery attribute (not optimized, keyword support) 1`] = `
 Object {
   "prefix": Object {
-    "data.attribute.materialSampleName.keyword": "searchvalue",
+    "data.attribute.materialSampleName.keyword": Object {
+      "case_insensitive": true,
+      "value": "searchValue",
+    },
   },
 }
 `;
@@ -55,7 +61,10 @@ Object {
 exports[`QueryBuilderElasticSearchExport functionality Partial matching query helper functions prefixQuery attribute (optimized) 1`] = `
 Object {
   "prefix": Object {
-    "data.attribute.materialSampleName.prefix": "searchvalue",
+    "data.attribute.materialSampleName.prefix": Object {
+      "case_insensitive": true,
+      "value": "searchValue",
+    },
   },
 }
 `;
@@ -69,7 +78,10 @@ Object {
         "must": Array [
           Object {
             "prefix": Object {
-              "included.attributes.dwcRecordNumber": "searchvalue",
+              "included.attributes.dwcRecordNumber": Object {
+                "case_insensitive": true,
+                "value": "searchValue",
+              },
             },
           },
           Object {
@@ -93,7 +105,10 @@ Object {
         "must": Array [
           Object {
             "prefix": Object {
-              "included.attributes.dwcRecordNumber.keyword": "searchvalue",
+              "included.attributes.dwcRecordNumber.keyword": Object {
+                "case_insensitive": true,
+                "value": "searchValue",
+              },
             },
           },
           Object {
@@ -117,7 +132,10 @@ Object {
         "must": Array [
           Object {
             "prefix": Object {
-              "included.attributes.dwcRecordNumber.prefix": "searchvalue",
+              "included.attributes.dwcRecordNumber.prefix": Object {
+                "case_insensitive": true,
+                "value": "searchValue",
+              },
             },
           },
           Object {
@@ -180,14 +198,6 @@ Object {
 }
 `;
 
-exports[`QueryBuilderElasticSearchExport functionality Query helper functions matchQuery 1`] = `
-Object {
-  "match": Object {
-    "fieldTest": "valueToMatch",
-  },
-}
-`;
-
 exports[`QueryBuilderElasticSearchExport functionality Query helper functions rangeQuery 1`] = `
 Object {
   "range": Object {
diff --git a/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/QueryBuilderFieldExtensionSearch.tsx b/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/QueryBuilderFieldExtensionSearch.tsx
index c0c6e42a15..9fd52d608d 100644
--- a/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/QueryBuilderFieldExtensionSearch.tsx
+++ b/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/QueryBuilderFieldExtensionSearch.tsx
@@ -121,7 +121,6 @@ export default function QueryRowFieldExtensionSearch({
   const operatorOptions = [
     "exactMatch",
     "wildcard",
-    "partialMatch",
     "startsWith",
     "notEquals",
     "empty",
diff --git a/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/QueryBuilderManagedAttributeSearch.tsx b/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/QueryBuilderManagedAttributeSearch.tsx
index 03aa6d9c34..f5e5f14b11 100644
--- a/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/QueryBuilderManagedAttributeSearch.tsx
+++ b/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/QueryBuilderManagedAttributeSearch.tsx
@@ -131,7 +131,6 @@ export default function QueryRowManagedAttributeSearch({
         return [
           "exactMatch",
           "wildcard",
-          "partialMatch",
           "startsWith",
           "notEquals",
           "empty",
diff --git a/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/QueryBuilderTextSearch.tsx b/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/QueryBuilderTextSearch.tsx
index c890e7f5a8..50c4d80f91 100644
--- a/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/QueryBuilderTextSearch.tsx
+++ b/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/QueryBuilderTextSearch.tsx
@@ -1,7 +1,6 @@
 import React from "react";
 import {
   includedTypeQuery,
-  matchQuery,
   termQuery,
   existsQuery,
   prefixQuery,
@@ -75,13 +74,9 @@ export function transformTextSearchToDSL({
     keywordMultiFieldSupport
   } = fieldInfo;
 
-  // Is the "Exact" option selected? (Or if auto suggestions are being used.)
-  const isExactMatch: boolean = distinctTerm || operation === "exactMatch";
-
   switch (operation) {
     // Equals match type.
     case "equals":
-    case "partialMatch":
     case "exactMatch":
       // Autocompletion expects to use the full text search.
       return parentType
@@ -91,18 +86,14 @@ export function transformTextSearchToDSL({
               query: {
                 bool: {
                   must: [
-                    isExactMatch
-                      ? termQuery(fieldPath, value, keywordMultiFieldSupport)
-                      : matchQuery(fieldPath, value),
+                    termQuery(fieldPath, value, keywordMultiFieldSupport),
                     includedTypeQuery(parentType)
                   ]
                 }
               }
             }
           }
-        : isExactMatch
-        ? termQuery(fieldPath, value, keywordMultiFieldSupport)
-        : matchQuery(fieldPath, value);
+        : termQuery(fieldPath, value, keywordMultiFieldSupport)
 
     // Wild card search
     case "wildcard":
@@ -146,13 +137,11 @@ export function transformTextSearchToDSL({
                     path: "included",
                     query: {
                       bool: {
-                        must_not: isExactMatch
-                          ? termQuery(
+                        must_not: termQuery(
                               fieldPath,
                               value,
                               keywordMultiFieldSupport
-                            )
-                          : matchQuery(fieldPath, value),
+                            ),
                         must: includedTypeQuery(parentType)
                       }
                     }
@@ -188,9 +177,7 @@ export function transformTextSearchToDSL({
               should: [
                 {
                   bool: {
-                    must_not: isExactMatch
-                      ? termQuery(fieldPath, value, keywordMultiFieldSupport)
-                      : matchQuery(fieldPath, value)
+                    must_not: termQuery(fieldPath, value, keywordMultiFieldSupport)
                   }
                 },
                 {
diff --git a/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/QueryBuilderDateSearch.test.tsx b/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/QueryBuilderDateSearch.test.tsx
index fd09b04a7c..8946f80c34 100644
--- a/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/QueryBuilderDateSearch.test.tsx
+++ b/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/QueryBuilderDateSearch.test.tsx
@@ -239,35 +239,6 @@ describe("QueryBuilderDateSearch", () => {
       });
     });
 
-    describe("Partial Match operation", () => {
-      test("With relationship as field", async () => {
-        expect(
-          transformDateSearchToDSL({
-            operation: "partialMatch",
-            value: "1998-05-19",
-            fieldInfo: {
-              parentType: "collection",
-              parentName: "collection"
-            } as any,
-            fieldPath: "includes.name",
-            queryType: "partialMatch"
-          })
-        ).toMatchSnapshot();
-      });
-
-      test("Normal field", async () => {
-        expect(
-          transformDateSearchToDSL({
-            operation: "partialMatch",
-            value: "1998-05-19",
-            fieldInfo: {} as any,
-            fieldPath: "data.attributes.dateField",
-            queryType: "partialMatch"
-          })
-        ).toMatchSnapshot();
-      });
-    });
-
     describe("Exact Match operation", () => {
       test("With relationship as field", async () => {
         expect(
diff --git a/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/QueryBuilderFieldExtensionSearch.test.tsx b/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/QueryBuilderFieldExtensionSearch.test.tsx
index 55acfb46d1..d1946966f2 100644
--- a/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/QueryBuilderFieldExtensionSearch.test.tsx
+++ b/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/QueryBuilderFieldExtensionSearch.test.tsx
@@ -5,7 +5,6 @@ describe("QueryBuilderManagedAttributeSearch", () => {
     const operators = [
       "exactMatch",
       "wildcard",
-      "partialMatch",
       "startsWith",
       "notEquals",
       "empty",
diff --git a/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/QueryBuilderManagedAttributeSearch.test.tsx b/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/QueryBuilderManagedAttributeSearch.test.tsx
index 4d88df94d4..6f86df0e55 100644
--- a/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/QueryBuilderManagedAttributeSearch.test.tsx
+++ b/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/QueryBuilderManagedAttributeSearch.test.tsx
@@ -23,7 +23,6 @@ describe("QueryBuilderManagedAttributeSearch", () => {
         operators: [
           "exactMatch",
           "wildcard",
-          "partialMatch",
           "startsWith",
           "notEquals",
           "empty",
diff --git a/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/QueryBuilderNumberSearch.test.tsx b/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/QueryBuilderNumberSearch.test.tsx
index ea352af882..32c1cc7291 100644
--- a/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/QueryBuilderNumberSearch.test.tsx
+++ b/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/QueryBuilderNumberSearch.test.tsx
@@ -215,35 +215,6 @@ describe("QueryBuilderNumberSearch", () => {
       });
     });
 
-    describe("Partial Match operation", () => {
-      test("With relationship as field", async () => {
-        expect(
-          transformNumberSearchToDSL({
-            operation: "partialMatch",
-            value: "123",
-            fieldInfo: {
-              parentType: "collection",
-              parentName: "collection"
-            } as any,
-            fieldPath: "includes.name",
-            queryType: "partialMatch"
-          })
-        ).toMatchSnapshot();
-      });
-
-      test("Normal field", async () => {
-        expect(
-          transformNumberSearchToDSL({
-            operation: "partialMatch",
-            value: "123",
-            fieldInfo: {} as any,
-            fieldPath: "data.attributes.numberField",
-            queryType: "partialMatch"
-          })
-        ).toMatchSnapshot();
-      });
-    });
-
     describe("Exact Match operation", () => {
       test("With relationship as field", async () => {
         expect(
diff --git a/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/QueryBuilderTextSearch.test.tsx b/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/QueryBuilderTextSearch.test.tsx
index a230f7bb5b..bb918c751f 100644
--- a/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/QueryBuilderTextSearch.test.tsx
+++ b/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/QueryBuilderTextSearch.test.tsx
@@ -326,35 +326,6 @@ describe("QueryBuilderTextSearch", () => {
       });
     });
 
-    describe("Partial Match operation", () => {
-      test("With relationship as field", async () => {
-        expect(
-          transformTextSearchToDSL({
-            operation: "partialMatch",
-            value: "text search",
-            fieldInfo: {
-              parentType: "collection",
-              parentName: "collection"
-            } as any,
-            fieldPath: "includes.name",
-            queryType: "partialMatch"
-          })
-        ).toMatchSnapshot();
-      });
-
-      test("Normal field", async () => {
-        expect(
-          transformTextSearchToDSL({
-            operation: "partialMatch",
-            value: "text search",
-            fieldInfo: {} as any,
-            fieldPath: "data.attributes.textField",
-            queryType: "partialMatch"
-          })
-        ).toMatchSnapshot();
-      });
-    });
-
     describe("Exact Match operation", () => {
       test("With relationship as field", async () => {
         expect(
diff --git a/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/__snapshots__/QueryBuilderFieldExtensionSearch.test.tsx.snap b/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/__snapshots__/QueryBuilderFieldExtensionSearch.test.tsx.snap
index eea5ebc104..ae821c746d 100644
--- a/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/__snapshots__/QueryBuilderFieldExtensionSearch.test.tsx.snap
+++ b/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/__snapshots__/QueryBuilderFieldExtensionSearch.test.tsx.snap
@@ -59,8 +59,8 @@ Object {
       Object {
         "bool": Object {
           "must_not": Object {
-            "match": Object {
-              "data.attributes.extensionValues.extension.field": "test123",
+            "term": Object {
+              "data.attributes.extensionValues.extension.field.keyword": "test123",
             },
           },
         },
@@ -79,18 +79,13 @@ Object {
 }
 `;
 
-exports[`QueryBuilderManagedAttributeSearch transformFieldExtensionToDSL function Attribute level tests Using the partialMatch operator. 1`] = `
-Object {
-  "match": Object {
-    "data.attributes.extensionValues.extension.field": "test123",
-  },
-}
-`;
-
 exports[`QueryBuilderManagedAttributeSearch transformFieldExtensionToDSL function Attribute level tests Using the startsWith operator. 1`] = `
 Object {
   "prefix": Object {
-    "data.attributes.extensionValues.extension.field.keyword": "test123",
+    "data.attributes.extensionValues.extension.field.keyword": Object {
+      "case_insensitive": true,
+      "value": "test123",
+    },
   },
 }
 `;
@@ -243,8 +238,8 @@ Object {
                 },
               },
               "must_not": Object {
-                "match": Object {
-                  "included.attributes.extensionValues.extension.field": "test123",
+                "term": Object {
+                  "included.attributes.extensionValues.extension.field.keyword": "test123",
                 },
               },
             },
@@ -284,30 +279,6 @@ Object {
 }
 `;
 
-exports[`QueryBuilderManagedAttributeSearch transformFieldExtensionToDSL function Relationship level tests Using the partialMatch operator. 1`] = `
-Object {
-  "nested": Object {
-    "path": "included",
-    "query": Object {
-      "bool": Object {
-        "must": Array [
-          Object {
-            "match": Object {
-              "included.attributes.extensionValues.extension.field": "test123",
-            },
-          },
-          Object {
-            "term": Object {
-              "included.type": "collecting-event",
-            },
-          },
-        ],
-      },
-    },
-  },
-}
-`;
-
 exports[`QueryBuilderManagedAttributeSearch transformFieldExtensionToDSL function Relationship level tests Using the startsWith operator. 1`] = `
 Object {
   "nested": Object {
@@ -317,7 +288,10 @@ Object {
         "must": Array [
           Object {
             "prefix": Object {
-              "included.attributes.extensionValues.extension.field.keyword": "test123",
+              "included.attributes.extensionValues.extension.field.keyword": Object {
+                "case_insensitive": true,
+                "value": "test123",
+              },
             },
           },
           Object {
diff --git a/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/__snapshots__/QueryBuilderManagedAttributeSearch.test.tsx.snap b/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/__snapshots__/QueryBuilderManagedAttributeSearch.test.tsx.snap
index 9eecf522db..5fcb008b61 100644
--- a/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/__snapshots__/QueryBuilderManagedAttributeSearch.test.tsx.snap
+++ b/packages/common-ui/lib/list-page/query-builder/query-builder-value-types/__tests__/__snapshots__/QueryBuilderManagedAttributeSearch.test.tsx.snap
@@ -29,8 +29,8 @@ Object {
 
 exports[`QueryBuilderManagedAttributeSearch transformManagedAttributeToDSL function BOOL based managed attribute tests Attribute level with operator equals 1`] = `
 Object {
-  "match": Object {
-    "data.attributes.managedAttributes.attributeName": "true",
+  "term": Object {
+    "data.attributes.managedAttributes.attributeName.keyword": "true",
   },
 }
 `;
@@ -130,8 +130,8 @@ Object {
       "bool": Object {
         "must": Array [
           Object {
-            "match": Object {
-              "included.attributes.managedAttributes.attributeName": "true",
+            "term": Object {
+              "included.attributes.managedAttributes.attributeName.keyword": "true",
             },
           },
           Object {
@@ -1282,8 +1282,8 @@ Object {
 
 exports[`QueryBuilderManagedAttributeSearch transformManagedAttributeToDSL function PICK_LIST based managed attribute tests Attribute level with operator equals 1`] = `
 Object {
-  "match": Object {
-    "data.attributes.managedAttributes.attributeName": "3.5",
+  "term": Object {
+    "data.attributes.managedAttributes.attributeName.keyword": "3.5",
   },
 }
 `;
@@ -1312,8 +1312,8 @@ Object {
       Object {
         "bool": Object {
           "must_not": Object {
-            "match": Object {
-              "data.attributes.managedAttributes.attributeName": "3.5",
+            "term": Object {
+              "data.attributes.managedAttributes.attributeName.keyword": "3.5",
             },
           },
         },
@@ -1410,8 +1410,8 @@ Object {
       "bool": Object {
         "must": Array [
           Object {
-            "match": Object {
-              "included.attributes.managedAttributes.attributeName": "3.5",
+            "term": Object {
+              "included.attributes.managedAttributes.attributeName.keyword": "3.5",
             },
           },
           Object {
@@ -1470,8 +1470,8 @@ Object {
                 },
               },
               "must_not": Object {
-                "match": Object {
-                  "included.attributes.managedAttributes.attributeName": "3.5",
+                "term": Object {
+                  "included.attributes.managedAttributes.attributeName.keyword": "3.5",
                 },
               },
             },
@@ -1570,8 +1570,8 @@ Object {
       Object {
         "bool": Object {
           "must_not": Object {
-            "match": Object {
-              "data.attributes.managedAttributes.attributeName": "stringValue",
+            "term": Object {
+              "data.attributes.managedAttributes.attributeName.keyword": "stringValue",
             },
           },
         },
@@ -1590,18 +1590,13 @@ Object {
 }
 `;
 
-exports[`QueryBuilderManagedAttributeSearch transformManagedAttributeToDSL function STRING based managed attribute tests Attribute level with operator partialMatch 1`] = `
-Object {
-  "match": Object {
-    "data.attributes.managedAttributes.attributeName": "stringValue",
-  },
-}
-`;
-
 exports[`QueryBuilderManagedAttributeSearch transformManagedAttributeToDSL function STRING based managed attribute tests Attribute level with operator startsWith 1`] = `
 Object {
   "prefix": Object {
-    "data.attributes.managedAttributes.attributeName.keyword": "stringvalue",
+    "data.attributes.managedAttributes.attributeName.keyword": Object {
+      "case_insensitive": true,
+      "value": "stringValue",
+    },
   },
 }
 `;
@@ -1754,8 +1749,8 @@ Object {
                 },
               },
               "must_not": Object {
-                "match": Object {
-                  "included.attributes.managedAttributes.attributeName": "stringValue",
+                "term": Object {
+                  "included.attributes.managedAttributes.attributeName.keyword": "stringValue",
                 },
               },
             },
@@ -1795,30 +1790,6 @@ Object {
 }
 `;
 
-exports[`QueryBuilderManagedAttributeSearch transformManagedAttributeToDSL function STRING based managed attribute tests Relationship level with operator partialMatch 1`] = `
-Object {
-  "nested": Object {
-    "path": "included",
-    "query": Object {
-      "bool": Object {
-        "must": Array [
-          Object {
-            "match": Object {
-              "included.attributes.managedAttributes.attributeName": "stringValue",
-            },
-          },
-          Object {
-            "term": Object {
-              "included.type": "collecting-event",
-            },
-          },
-        ],
-      },
-    },
-  },
-}
-`;
-
 exports[`QueryBuilderManagedAttributeSearch transformManagedAttributeToDSL function STRING based managed attribute tests Relationship level with operator startsWith 1`] = `
 Object {
   "nested": Object {
@@ -1828,7 +1799,10 @@ Object {
         "must": Array [
           Object {
             "prefix": Object {
-              "included.attributes.managedAttributes.attributeName.keyword": "stringvalue",
+              "included.attributes.managedAttributes.attributeName.keyword": Object {
+                "case_insensitive": true,
+                "value": "stringValue",
+              },
             },
           },
           Object {
diff --git a/packages/common-ui/lib/list-page/query-builder/useQueryBuilderConfig.tsx b/packages/common-ui/lib/list-page/query-builder/useQueryBuilderConfig.tsx
index c1c40fc718..6dea214216 100644
--- a/packages/common-ui/lib/list-page/query-builder/useQueryBuilderConfig.tsx
+++ b/packages/common-ui/lib/list-page/query-builder/useQueryBuilderConfig.tsx
@@ -222,11 +222,6 @@ function generateBuilderConfig(
       label: formatMessage({ id: "queryBuilder_operator_wildcard" }),
       cardinality: 1
     },
-    partialMatch: {
-      // Displayed as "Contains word"
-      label: formatMessage({ id: "queryBuilder_operator_partialMatch" }),
-      cardinality: 1
-    },
     startsWith: {
       label: formatMessage({ id: "queryBuilder_operator_startsWith" }),
       cardinality: 1
@@ -478,7 +473,6 @@ function generateBuilderConfig(
           operators: [
             "exactMatch",
             "wildcard",
-            "partialMatch",
             "startsWith", // Only displayed if supported on the mapping.
             "containsText", // Only displayed if supported on the mapping.
             "endsWith", // Only displayed if supported on the mapping.
diff --git a/packages/dina-ui/intl/dina-ui-en.ts b/packages/dina-ui/intl/dina-ui-en.ts
index 046f062d7a..373157d27a 100644
--- a/packages/dina-ui/intl/dina-ui-en.ts
+++ b/packages/dina-ui/intl/dina-ui-en.ts
@@ -697,7 +697,6 @@ export const DINAUI_MESSAGES_ENGLISH = {
   queryBuilder_operator_lessThanOrEqualTo: "Less than or equal to",
   queryBuilder_operator_notEmpty: "Not empty",
   queryBuilder_operator_notEquals: "Not equals",
-  queryBuilder_operator_partialMatch: "Contains word",
   queryBuilder_operator_wildcard: "Contains",
   queryBuilder_operator_startsWith: "Starts with",
   queryBuilder_pickList_placeholder: "Select an accepted value...",
diff --git a/packages/dina-ui/intl/dina-ui-fr.ts b/packages/dina-ui/intl/dina-ui-fr.ts
index f6aea6e442..ffbad18592 100644
--- a/packages/dina-ui/intl/dina-ui-fr.ts
+++ b/packages/dina-ui/intl/dina-ui-fr.ts
@@ -714,7 +714,6 @@ export const DINAUI_MESSAGES_FRENCH: Partial<typeof DINAUI_MESSAGES_ENGLISH> = {
   queryBuilder_operator_lessThanOrEqualTo: "Inférieur ou égal à",
   queryBuilder_operator_notEmpty: "N'est pas vide",
   queryBuilder_operator_notEquals: "N'est pas égal à",
-  queryBuilder_operator_partialMatch: "Correspondance partielle",
   queryBuilder_operator_startsWith: "Commence par ",
   queryBuilder_pickList_placeholder: "Sélectionner une valeur acceptée...",
   queryBuilder_value_false: "Faux ",