From 3e3276151f3ad5e5ea95ff6a227fa7d5a0168bfb Mon Sep 17 00:00:00 2001
From: Pranita <pfulsundar8@gmail.com>
Date: Sun, 5 Oct 2025 16:03:00 +0530
Subject: [PATCH] fix service listing

---
 .../components/Settings/Services/Services.tsx | 42 ++++++++++++-------
 .../main/resources/ui/src/rest/serviceAPI.ts  | 24 +++++------
 2 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.tsx
index 05d58776ef1..8cb720dbd69 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.tsx
@@ -50,6 +50,7 @@ import {
   getAddServicePath,
   getServiceDetailsPath,
 } from '../../../utils/RouterUtils';
+import { getTermQuery } from '../../../utils/SearchUtils';
 import {
   getOptionalFields,
   getResourceEntityFromServiceCategory,
@@ -100,11 +101,9 @@ const Services = ({ serviceName }: ServicesProps) => {
   const [deleted, setDeleted] = useState<boolean>(false);
   const { permissions } = usePermissionProvider();
 
-  const filterString = useMemo(() => {
+  const serviceTypeQueryFilter = useMemo(() => {
     return serviceTypeFilter?.length
-      ? `(${serviceTypeFilter
-          .map((type) => `serviceType:${type}`)
-          .join(' OR ')})`
+      ? getTermQuery({ 'serviceType.keyword': serviceTypeFilter }, 'should', 1)
       : undefined;
   }, [serviceTypeFilter]);
 
@@ -142,19 +141,19 @@ const Services = ({ serviceName }: ServicesProps) => {
       currentPage,
       after,
       before,
-      filters,
+      queryFilter,
     }: {
       search?: string;
       limit?: number;
       currentPage?: number;
       after?: string;
       before?: string;
-      filters?: string;
+      queryFilter?: Record<string, unknown>;
     }) => {
       setIsLoading(true);
       try {
         let services = [];
-        if (search || !isEmpty(filters)) {
+        if (search || !isEmpty(queryFilter)) {
           const {
             hits: { hits, total },
           } = await searchService({
@@ -162,7 +161,7 @@ const Services = ({ serviceName }: ServicesProps) => {
             searchIndex,
             limit: pageSize,
             currentPage,
-            filters,
+            queryFilter,
             deleted,
           });
 
@@ -206,23 +205,23 @@ const Services = ({ serviceName }: ServicesProps) => {
 
   const handleServicePageChange = useCallback(
     ({ cursorType, currentPage }: PagingHandlerParams) => {
-      if (searchTerm || filterString) {
+      if (searchTerm || serviceTypeQueryFilter) {
         handlePageChange(currentPage);
         getServiceDetails({
           currentPage,
           search: searchTerm,
           limit: pageSize,
-          filters: filterString,
+          queryFilter: serviceTypeQueryFilter,
         });
       } else if (cursorType) {
         handlePageChange(currentPage);
         getServiceDetails({
           [cursorType]: paging[cursorType],
-          filters: filterString,
+          queryFilter: serviceTypeQueryFilter,
         });
       }
     },
-    [getServiceDetails, searchTerm, filterString, paging, pageSize]
+    [getServiceDetails, searchTerm, serviceTypeQueryFilter, paging, pageSize]
   );
 
   const addServicePermission = useMemo(
@@ -271,7 +270,11 @@ const Services = ({ serviceName }: ServicesProps) => {
   }, [serviceName]);
 
   const noDataPlaceholder = useMemo(() => {
-    if (addServicePermission && isEmpty(searchTerm) && !filterString) {
+    if (
+      addServicePermission &&
+      isEmpty(searchTerm) &&
+      !serviceTypeQueryFilter
+    ) {
       return (
         <ErrorPlaceHolder
           className="p-lg border-none"
@@ -298,7 +301,7 @@ const Services = ({ serviceName }: ServicesProps) => {
     servicesDisplayName,
     serviceName,
     searchTerm,
-    filterString,
+    serviceTypeQueryFilter,
     addServicePermission,
     handleAddServiceClick,
   ]);
@@ -463,9 +466,16 @@ const Services = ({ serviceName }: ServicesProps) => {
     getServiceDetails({
       search: searchTerm,
       limit: pageSize,
-      filters: filterString,
+      queryFilter: serviceTypeQueryFilter,
     });
-  }, [searchIndex, pageSize, serviceName, searchTerm, filterString, deleted]);
+  }, [
+    searchIndex,
+    pageSize,
+    serviceName,
+    searchTerm,
+    serviceTypeQueryFilter,
+    deleted,
+  ]);
 
   const handleTableChange: TableProps<ServicesType>['onChange'] = (
     _pagination,
diff --git a/openmetadata-ui/src/main/resources/ui/src/rest/serviceAPI.ts b/openmetadata-ui/src/main/resources/ui/src/rest/serviceAPI.ts
index fe94a05b218..2e5c7adeebc 100644
--- a/openmetadata-ui/src/main/resources/ui/src/rest/serviceAPI.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/rest/serviceAPI.ts
@@ -31,7 +31,7 @@ import {
 } from '../interface/service.interface';
 import { getEncodedFqn } from '../utils/StringsUtils';
 import APIClient from './index';
-import { searchData } from './miscAPI';
+import { searchQuery } from './searchAPI';
 
 interface ServiceRequestParams {
   limit?: number;
@@ -183,28 +183,26 @@ export const searchService = async ({
   searchIndex,
   currentPage = 1,
   limit = PAGE_SIZE,
-  filters,
+  queryFilter,
   deleted = false,
 }: {
   search?: string;
   searchIndex: SearchIndex | SearchIndex[];
   limit?: number;
   currentPage?: number;
-  filters?: string;
+  queryFilter?: Record<string, unknown>;
   deleted?: boolean;
 }) => {
-  const response = await searchData(
-    search ?? WILD_CARD_CHAR,
-    currentPage,
-    limit,
-    filters ?? '',
-    '',
-    '',
+  const response = await searchQuery({
+    query: search ?? WILD_CARD_CHAR,
+    pageNumber: currentPage,
+    pageSize: limit,
+    queryFilter,
     searchIndex,
-    deleted
-  );
+    includeDeleted: deleted,
+  });
 
-  return response.data;
+  return response;
 };
 
 export const restoreService = async (serviceCategory: string, id: string) => {