From d55100592d250f15a200410ceea91bb91ab13913 Mon Sep 17 00:00:00 2001
From: dechoma <dominik.choma@gmail.com>
Date: Tue, 21 Nov 2023 06:25:01 +0100
Subject: [PATCH] Fixes #13987 database schema search pagination (#13989)

* fix db schema search pagination

* reorder conditions

* added searchValue

Co-authored-by: Chirag Madlani <12962843+chirag-madlani@users.noreply.github.com>

---------

Co-authored-by: Chirag Madlani <12962843+chirag-madlani@users.noreply.github.com>
---
 .../DatabaseSchemaTable/DatabaseSchemaTable.tsx            | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/DatabaseSchema/DatabaseSchemaTable/DatabaseSchemaTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/DatabaseSchema/DatabaseSchemaTable/DatabaseSchemaTable.tsx
index ab3591e57dd..836e237de44 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/DatabaseSchema/DatabaseSchemaTable/DatabaseSchemaTable.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/DatabaseSchema/DatabaseSchemaTable/DatabaseSchemaTable.tsx
@@ -128,12 +128,14 @@ export const DatabaseSchemaTable = () => {
 
   const handleSchemaPageChange = useCallback(
     ({ currentPage, cursorType }: PagingHandlerParams) => {
-      if (cursorType) {
+      if (searchValue) {
+        searchSchema(searchValue, currentPage);
+      } else if (cursorType) {
         fetchDatabaseSchema({ [cursorType]: paging[cursorType] });
       }
       handlePageChange(currentPage);
     },
-    [paging, fetchDatabaseSchema]
+    [paging, fetchDatabaseSchema, searchSchema, searchValue]
   );
 
   const onSchemaSearch = (value: string) => {
@@ -195,6 +197,7 @@ export const DatabaseSchemaTable = () => {
         {showPagination && (
           <NextPrevious
             currentPage={currentPage}
+            isNumberBased={Boolean(searchValue)}
             pageSize={pageSize}
             paging={paging}
             pagingHandler={handleSchemaPageChange}