From e3e686fbd9448c144aea5f20e3bf0837aedcd79a Mon Sep 17 00:00:00 2001
From: Pranita Fulsundar <pfulsundar8@gmail.com>
Date: Tue, 3 Dec 2024 18:21:59 +0530
Subject: [PATCH] Fix: limit change after pagination (#18844)

* fix: limit change after pagination

* refactor: getOtherDetails function

* refactor: remove limit parameter

---------

Co-authored-by: Ashish Gupta <ashish@getcollate.io>
---
 .../components/Settings/Services/Services.tsx |  7 +++---
 .../DatabaseSchemaPage.component.tsx          |  3 ++-
 .../ServiceDetailsPage/ServiceDetailsPage.tsx | 24 ++++++++++---------
 3 files changed, 18 insertions(+), 16 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 73b82c8978d..49b4d14cce2 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
@@ -133,7 +133,6 @@ const Services = ({ serviceName }: ServicesProps) => {
       after,
       before,
       filters,
-      limit,
     }: {
       search?: string;
       limit?: number;
@@ -151,7 +150,7 @@ const Services = ({ serviceName }: ServicesProps) => {
           } = await searchService({
             search,
             searchIndex,
-            limit: limit ?? pageSize,
+            limit: pageSize,
             currentPage,
             filters,
             deleted,
@@ -164,7 +163,7 @@ const Services = ({ serviceName }: ServicesProps) => {
         } else {
           const { data, paging } = await getServices({
             serviceName,
-            limit: limit ?? pageSize,
+            limit: pageSize,
             after,
             before,
             include: deleted ? Include.Deleted : Include.NonDeleted,
@@ -192,7 +191,7 @@ const Services = ({ serviceName }: ServicesProps) => {
         setIsLoading(false);
       }
     },
-    [searchIndex, serviceName, deleted]
+    [searchIndex, serviceName, deleted, pageSize]
   );
 
   const handleServicePageChange = useCallback(
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/DatabaseSchemaPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/DatabaseSchemaPage.component.tsx
index 280f897d8a3..2a1bf7852f3 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/DatabaseSchemaPage.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/DatabaseSchemaPage.component.tsx
@@ -240,6 +240,7 @@ const DatabaseSchemaPage: FunctionComponent = () => {
         const res = await getTableList({
           ...params,
           databaseSchema: decodedDatabaseSchemaFQN,
+          limit: pageSize,
           include: showDeletedTables ? Include.Deleted : Include.NonDeleted,
         });
         setTableData(res.data);
@@ -250,7 +251,7 @@ const DatabaseSchemaPage: FunctionComponent = () => {
         setTableDataLoading(false);
       }
     },
-    [decodedDatabaseSchemaFQN, showDeletedTables]
+    [decodedDatabaseSchemaFQN, showDeletedTables, pageSize]
   );
 
   const onDescriptionEdit = useCallback((): void => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceDetailsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceDetailsPage.tsx
index 6d878b917fb..5d3dac7d379 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceDetailsPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceDetailsPage.tsx
@@ -181,7 +181,7 @@ const ServiceDetailsPage: FunctionComponent = () => {
 
   const {
     paging,
-    pageSize: databasePageSize,
+    pageSize,
     currentPage,
     handlePageChange,
     handlePagingChange,
@@ -513,44 +513,45 @@ const ServiceDetailsPage: FunctionComponent = () => {
     async (paging?: PagingWithoutTotal) => {
       try {
         setIsServiceLoading(true);
+        const pagingParams = { ...paging, limit: pageSize };
         switch (serviceCategory) {
           case ServiceCategory.DATABASE_SERVICES: {
-            await fetchDatabases(paging);
+            await fetchDatabases(pagingParams);
 
             break;
           }
           case ServiceCategory.MESSAGING_SERVICES: {
-            await fetchTopics(paging);
+            await fetchTopics(pagingParams);
 
             break;
           }
           case ServiceCategory.DASHBOARD_SERVICES: {
-            await fetchDashboards(paging);
+            await fetchDashboards(pagingParams);
 
             break;
           }
           case ServiceCategory.PIPELINE_SERVICES: {
-            await fetchPipeLines(paging);
+            await fetchPipeLines(pagingParams);
 
             break;
           }
           case ServiceCategory.ML_MODEL_SERVICES: {
-            await fetchMlModal(paging);
+            await fetchMlModal(pagingParams);
 
             break;
           }
           case ServiceCategory.STORAGE_SERVICES: {
-            await fetchContainers(paging);
+            await fetchContainers(pagingParams);
 
             break;
           }
           case ServiceCategory.SEARCH_SERVICES: {
-            await fetchSearchIndexes(paging);
+            await fetchSearchIndexes(pagingParams);
 
             break;
           }
           case ServiceCategory.API_SERVICES: {
-            await fetchCollections(paging);
+            await fetchCollections(pagingParams);
 
             break;
           }
@@ -574,6 +575,7 @@ const ServiceDetailsPage: FunctionComponent = () => {
       fetchContainers,
       fetchSearchIndexes,
       fetchCollections,
+      pageSize,
     ]
   );
 
@@ -853,8 +855,8 @@ const ServiceDetailsPage: FunctionComponent = () => {
 
   useEffect(() => {
     handlePageChange(INITIAL_PAGING_VALUE);
-    getOtherDetails({ limit: databasePageSize });
-  }, [activeTab, showDeleted, deleted, databasePageSize]);
+    getOtherDetails({ limit: pageSize });
+  }, [activeTab, showDeleted, deleted, pageSize]);
 
   useEffect(() => {
     // fetch count for data modal tab, its need only when its dashboard page and data modal tab is not active