feat: ignore preferredSearchOperator for username and orgunit

Author: simonadomnisoru

src/core_modules/capture-core/components/D2Form/field/Components/AgeField/AgeFieldForForm.component.ts

@@ -10,7 +10,6 @@ import {
     withDisplayMessages,
     withFilterProps,
     withInternalChangeHandler,
-    withSearchHelpMessage,
 } from '../../../../FormFields/New';
 import {
     withRequiredFieldCalculation,
@@ -37,10 +36,8 @@ export const AgeFieldForForm = withGotoInterface()(
                                         `${props.fieldLabelMediaBasedClass} ${labelTypeClasses.ageLabel}`,
                                 })(
                                     withDisplayMessages()(
-                                        withSearchHelpMessage()(
-                                            withFilterProps(getFilteredProps)(
-                                                withInternalChangeHandler()(AgeField),
-                                            ),
+                                        withFilterProps(getFilteredProps)(
+                                            withInternalChangeHandler()(AgeField),
                                         ),
                                     ),
                                 ),

src/core_modules/capture-core/components/D2Form/field/Components/OrgUnitField/OrgUnitFieldForForm.component.ts

@@ -9,7 +9,6 @@ import {
     withInternalChangeHandler,
     withFilterProps,
     SingleOrgUnitSelectField,
-    withSearchHelpMessage,
 } from '../../../../FormFields/New';
 import {
     withRequiredFieldCalculation,
@@ -37,11 +36,9 @@ export const OrgUnitFieldForForm = withGotoInterface()(
                             })(
                                 withFilterProps(getFilteredProps)(
                                     withDisplayMessages()(
-                                        withSearchHelpMessage()(
-                                            withInternalChangeHandler()(
-                                                withFormFieldOrgUnitsHandler()(
-                                                    SingleOrgUnitSelectField,
-                                                ),
+                                        withInternalChangeHandler()(
+                                            withFormFieldOrgUnitsHandler()(
+                                                SingleOrgUnitSelectField,
                                             ),
                                         ),
                                     ),

src/core_modules/capture-core/components/D2Form/field/Components/UserNameField/UserNameFieldForForm.component.ts

@@ -10,7 +10,6 @@ import {
     withDisplayMessages,
     withFilterProps,
     withInternalChangeHandler,
-    withSearchHelpMessage,
 } from '../../../../FormFields/New';
 import {
     withRequiredFieldCalculation,
@@ -38,11 +37,9 @@ export const UserNameFieldForForm = withGotoInterface()(
                                         `${props.fieldLabelMediaBasedClass} ${labelTypeClasses.textLabel}`,
                                 })(
                                     withDisplayMessages()(
-                                        withSearchHelpMessage()(
-                                            withFilterProps(getFilteredProps)(
-                                                withTransformPropName(['onBlur', 'onSet'])(
-                                                    withInternalChangeHandler()(UserField),
-                                                ),
+                                        withFilterProps(getFilteredProps)(
+                                            withTransformPropName(['onBlur', 'onSet'])(
+                                                withInternalChangeHandler()(UserField),
                                             ),
                                         ),
                                     ),

src/core_modules/capture-core/metaDataMemoryStoreBuilders/common/factory/searchGroup/searchOperator/defaultSearchOperators.ts

@@ -26,7 +26,7 @@ export const defaultSearchOperators = {
     [dataElementTypes.BOOLEAN]: [searchOperators.EQ],
     [dataElementTypes.PHONE_NUMBER]: [searchOperators.LIKE, searchOperators.SW, searchOperators.EQ],
     [dataElementTypes.EMAIL]: [searchOperators.LIKE, searchOperators.SW, searchOperators.EQ],
-    [dataElementTypes.ORGANISATION_UNIT]: [searchOperators.LIKE, searchOperators.SW, searchOperators.EQ],
+    [dataElementTypes.ORGANISATION_UNIT]: [searchOperators.EQ],
     [dataElementTypes.AGE]: [searchOperators.EQ],
-    [dataElementTypes.USERNAME]: [searchOperators.LIKE, searchOperators.SW, searchOperators.EQ],
+    [dataElementTypes.USERNAME]: [searchOperators.EQ],
 };

src/core_modules/capture-core/metaDataMemoryStoreBuilders/common/factory/searchGroup/searchOperator/forcedSearchOperators.ts

@@ -2,6 +2,7 @@ import { dataElementTypes } from '../../../../../metaData';
 
 // The forcedSearchOperators take precedence over the preferredSearchOperator
 export const forcedSearchOperators: Array<keyof typeof dataElementTypes> = [
+    dataElementTypes.MULTI_TEXT,
     dataElementTypes.NUMBER,
     dataElementTypes.NUMBER_RANGE,
     dataElementTypes.INTEGER,
@@ -20,6 +21,7 @@ export const forcedSearchOperators: Array<keyof typeof dataElementTypes> = [
     dataElementTypes.TIME_RANGE,
     dataElementTypes.BOOLEAN,
     dataElementTypes.TRUE_ONLY,
+    dataElementTypes.ORGANISATION_UNIT,
     dataElementTypes.AGE,
-    dataElementTypes.MULTI_TEXT,
+    dataElementTypes.USERNAME,
 ];