From 825d561164ba014cc99ca5424c5e8c2ea9b8a2c7 Mon Sep 17 00:00:00 2001
From: Ashish Gupta <ashish@getcollate.io>
Date: Wed, 8 Nov 2023 15:51:38 +0530
Subject: [PATCH 1/4] fix search in roles input in user profile page

---
 .../cypress/e2e/Pages/SearchIndexDetails.spec.js  |  4 +++-
 .../CreateUser/CreateUser.component.tsx           |  5 ++---
 .../EntityLineage/CustomControls.component.tsx    | 11 +----------
 .../UserProfileRoles.component.tsx                |  3 +++
 .../main/resources/ui/src/utils/CommonUtils.tsx   | 15 +++++++++++++++
 5 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/SearchIndexDetails.spec.js b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/SearchIndexDetails.spec.js
index ac9858c36332..85e64da8095c 100644
--- a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/SearchIndexDetails.spec.js
+++ b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/SearchIndexDetails.spec.js
@@ -257,7 +257,9 @@ describe('Prerequisite for data steward role tests', () => {
 
     cy.get('[data-testid="edit-roles-button"]').click();
 
-    cy.get('[data-testid="inline-edit-container"] #select-role').click();
+    cy.get('[data-testid="inline-edit-container"] #select-role')
+      .click()
+      .type(role.name);
 
     cy.get(`[title=${role.name}]`).click();
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.component.tsx
index e9b202d44a9f..c5db3d8ee6a1 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.component.tsx
@@ -37,6 +37,7 @@ import { EntityReference } from '../../generated/entity/type';
 import { AuthProvider } from '../../generated/settings/settings';
 import { checkEmailInUse, generateRandomPwd } from '../../rest/auth-API';
 import { getJWTTokenExpiryOptions } from '../../utils/BotsUtils';
+import { handleSearchFilterOption } from '../../utils/CommonUtils';
 import { getEntityName } from '../../utils/EntityUtils';
 import SVGIcons, { Icons } from '../../utils/SvgUtils';
 import { showErrorToast } from '../../utils/ToastUtils';
@@ -346,9 +347,7 @@ const CreateUser = ({
             <Select
               data-testid="roles-dropdown"
               disabled={isEmpty(roles)}
-              filterOption={(input, option) =>
-                (option?.label ?? '').includes(input)
-              }
+              filterOption={handleSearchFilterOption}
               mode="multiple"
               options={roleOptions}
               placeholder={t('label.please-select-entity', {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomControls.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomControls.component.tsx
index 2b678d88274d..5ede34d32961 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomControls.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomControls.component.tsx
@@ -38,6 +38,7 @@ import {
   ZOOM_SLIDER_STEP,
   ZOOM_TRANSITION_DURATION,
 } from '../../../constants/Lineage.constants';
+import { handleSearchFilterOption } from '../../../utils/CommonUtils';
 import { getLoadingStatusValue } from '../../../utils/EntityLineageUtils';
 import { getEntityName } from '../../../utils/EntityUtils';
 import SVGIcons, { Icons } from '../../../utils/SvgUtils';
@@ -100,16 +101,6 @@ const CustomControls: FC<ControlProps> = ({
     fitView?.(fitViewParams);
   }, [fitView, fitViewParams]);
 
-  const handleSearchFilterOption = (
-    input: string,
-    option?: {
-      label: string;
-      value: string;
-    }
-  ) => {
-    return (option?.label || '').toLowerCase().includes(input.toLowerCase());
-  };
-
   const onRangeChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     const zoomValue = parseFloat(event.target.value);
     onZoomHandler(zoomValue);
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileRoles/UserProfileRoles.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileRoles/UserProfileRoles.component.tsx
index 475cfb6e2fb8..67256f5e0a7c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileRoles/UserProfileRoles.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileRoles/UserProfileRoles.component.tsx
@@ -29,6 +29,7 @@ import {
 import { Role } from '../../../../generated/entity/teams/role';
 import { useAuth } from '../../../../hooks/authHooks';
 import { getRoles } from '../../../../rest/rolesAPIV1';
+import { handleSearchFilterOption } from '../../../../utils/CommonUtils';
 import { getEntityName } from '../../../../utils/EntityUtils';
 import { showErrorToast } from '../../../../utils/ToastUtils';
 import { UserProfileRolesProps } from './UserProfileRoles.interface';
@@ -172,6 +173,8 @@ const UserProfileRoles = ({
               showSearch
               aria-label="Select roles"
               className="w-full"
+              data-testid="select-user-roles"
+              filterOption={handleSearchFilterOption}
               id="select-role"
               loading={isRolesLoading}
               maxTagCount={4}
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx
index d3c1084264c2..6ba42c035d0c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx
@@ -25,6 +25,7 @@ import {
   isNull,
   isString,
   isUndefined,
+  lowerCase,
   toNumber,
 } from 'lodash';
 import {
@@ -868,3 +869,17 @@ export const getUniqueArray = (count: number) =>
   [...Array(count)].map((_, index) => ({
     key: `key${index}`,
   }));
+
+/**
+ * @param searchValue search input
+ * @param option select options list
+ * @returns boolean
+ */
+export const handleSearchFilterOption = (
+  searchValue: string,
+  option?: {
+    label: string;
+    value: string;
+  }
+) => lowerCase(option?.label ?? option?.value).includes(lowerCase(searchValue));
+// Check label while searching anything and filter that options out if found matching

From 04660272e78055219cc3e627127341e1e6d72147 Mon Sep 17 00:00:00 2001
From: Ashish Gupta <ashish@getcollate.io>
Date: Wed, 8 Nov 2023 16:01:30 +0530
Subject: [PATCH 2/4] minor change

---
 openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx
index 6ba42c035d0c..6362182255b1 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx
@@ -881,5 +881,5 @@ export const handleSearchFilterOption = (
     label: string;
     value: string;
   }
-) => lowerCase(option?.label ?? option?.value).includes(lowerCase(searchValue));
+) => lowerCase(option?.label).includes(lowerCase(searchValue));
 // Check label while searching anything and filter that options out if found matching

From dd4af7bf38d48620d4f4d09b0ec513656217c18e Mon Sep 17 00:00:00 2001
From: Ashish Gupta <ashish@getcollate.io>
Date: Wed, 8 Nov 2023 16:52:36 +0530
Subject: [PATCH 3/4] changes as per comments

---
 .../src/main/resources/ui/src/utils/CommonUtils.tsx            | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx
index 6362182255b1..fbb0a9d47bc0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx
@@ -25,7 +25,6 @@ import {
   isNull,
   isString,
   isUndefined,
-  lowerCase,
   toNumber,
 } from 'lodash';
 import {
@@ -881,5 +880,5 @@ export const handleSearchFilterOption = (
     label: string;
     value: string;
   }
-) => lowerCase(option?.label).includes(lowerCase(searchValue));
+) => (option?.label ?? '').toLowerCase().includes(searchValue.toLowerCase());
 // Check label while searching anything and filter that options out if found matching

From edd7c341a840fff1f00488923489c112b2b15d25 Mon Sep 17 00:00:00 2001
From: Ashish Gupta <ashish@getcollate.io>
Date: Wed, 8 Nov 2023 17:00:29 +0530
Subject: [PATCH 4/4] minor changes

---
 .../src/main/resources/ui/src/utils/CommonUtils.tsx            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx
index fbb0a9d47bc0..1bf6a28814c5 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx
@@ -25,6 +25,7 @@ import {
   isNull,
   isString,
   isUndefined,
+  toLower,
   toNumber,
 } from 'lodash';
 import {
@@ -880,5 +881,5 @@ export const handleSearchFilterOption = (
     label: string;
     value: string;
   }
-) => (option?.label ?? '').toLowerCase().includes(searchValue.toLowerCase());
+) => toLower(option?.label).includes(toLower(searchValue));
 // Check label while searching anything and filter that options out if found matching