From 289404748a49885394b4a51a9fc64ed7ec2d5af8 Mon Sep 17 00:00:00 2001
From: Chirag Madlani <12962843+chirag-madlani@users.noreply.github.com>
Date: Wed, 30 Oct 2024 14:05:44 +0530
Subject: [PATCH] fix(ui): block multiple paging req while fetching data
 (#18436)

---
 .../ClassificationDetails/ClassificationDetails.tsx         | 3 ++-
 .../Dashboard/DataModel/DataModels/DataModelsTable.tsx      | 1 +
 .../TestSuite/TestSuiteList/TestSuites.component.tsx        | 1 +
 .../DatabaseSchemaTable/DatabaseSchemaTable.tsx             | 1 +
 .../TableProfiler/QualityTab/QualityTab.component.tsx       | 1 +
 .../Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx    | 1 +
 .../AppRunsHistory/AppRunsHistory.component.tsx             | 1 +
 .../Settings/Bot/BotListV1/BotListV1.component.tsx          | 1 +
 .../Ingestion/IngestionListTable/IngestionListTable.tsx     | 1 +
 .../ui/src/components/Settings/Services/Services.tsx        | 1 +
 .../Settings/Team/TeamDetails/UserTab/UserTab.component.tsx | 1 +
 .../common/NextPrevious/NextPrevious.interface.ts           | 1 +
 .../ui/src/components/common/NextPrevious/NextPrevious.tsx  | 6 ++++--
 .../ui/src/pages/APICollectionPage/APIEndpointsTab.tsx      | 1 +
 .../resources/ui/src/pages/Application/ApplicationPage.tsx  | 1 +
 .../ui/src/pages/CustomPageSettings/CustomPageSettings.tsx  | 1 +
 .../main/resources/ui/src/pages/DataInsightPage/KPIList.tsx | 1 +
 .../ui/src/pages/DatabaseSchemaPage/SchemaTablesTab.tsx     | 1 +
 .../ui/src/pages/MarketPlacePage/MarketPlacePage.tsx        | 1 +
 .../src/pages/MetricsPage/MetricListPage/MetricListPage.tsx | 1 +
 .../src/pages/NotificationListPage/NotificationListPage.tsx | 1 +
 .../ObservabilityAlertsPage/ObservabilityAlertsPage.tsx     | 1 +
 .../ui/src/pages/Persona/PersonaListPage/PersonaPage.tsx    | 1 +
 .../PoliciesPage/PoliciesListPage/PoliciesListPage.tsx      | 1 +
 .../ui/src/pages/RolesPage/RolesListPage/RolesListPage.tsx  | 1 +
 .../src/pages/ServiceDetailsPage/ServiceMainTabContent.tsx  | 1 +
 .../ServiceVersionPage/ServiceVersionMainTabContent.tsx     | 1 +
 .../ui/src/pages/StoredProcedure/StoredProcedureTab.tsx     | 1 +
 .../resources/ui/src/pages/UserListPage/UserListPageV1.tsx  | 1 +
 29 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Classifications/ClassificationDetails/ClassificationDetails.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Classifications/ClassificationDetails/ClassificationDetails.tsx
index 30ab4a06487..4f2b4b5ef43 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Classifications/ClassificationDetails/ClassificationDetails.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Classifications/ClassificationDetails/ClassificationDetails.tsx
@@ -521,9 +521,10 @@ const ClassificationDetails = forwardRef(
             size="small"
           />
 
-          {showPagination && !isTagsLoading && (
+          {showPagination && (
             <NextPrevious
               currentPage={currentPage}
+              isLoading={isTagsLoading}
               pageSize={pageSize}
               paging={paging}
               pagingHandler={handleTagsPageChange}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelsTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelsTable.tsx
index 00fc6cfcbd5..1ac09ad1089 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelsTable.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelsTable.tsx
@@ -183,6 +183,7 @@ const DataModelTable = () => {
         {showPagination && (
           <NextPrevious
             currentPage={currentPage}
+            isLoading={isLoading}
             pageSize={pageSize}
             paging={paging}
             pagingHandler={handleDataModelPageChange}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteList/TestSuites.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteList/TestSuites.component.tsx
index d6f3ff5ae8a..6345a58abe0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteList/TestSuites.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteList/TestSuites.component.tsx
@@ -344,6 +344,7 @@ export const TestSuites = () => {
           <NextPrevious
             isNumberBased
             currentPage={currentPage}
+            isLoading={isLoading}
             pageSize={pageSize}
             paging={paging}
             pagingHandler={handleTestSuitesPageChange}
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 748a4403141..36acb772229 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
@@ -206,6 +206,7 @@ export const DatabaseSchemaTable = ({
         {showPagination && (
           <NextPrevious
             currentPage={currentPage}
+            isLoading={isLoading}
             isNumberBased={Boolean(searchValue)}
             pageSize={pageSize}
             paging={paging}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/QualityTab/QualityTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/QualityTab/QualityTab.component.tsx
index be2659562ad..4cb10b0ae92 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/QualityTab/QualityTab.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/QualityTab/QualityTab.component.tsx
@@ -176,6 +176,7 @@ export const QualityTab = () => {
                 <NextPrevious
                   isNumberBased
                   currentPage={currentPage}
+                  isLoading={isTestsLoading}
                   pageSize={pageSize}
                   paging={paging}
                   pagingHandler={handleTestCasePageChange}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx
index 08f0e3df21e..80c94bd5676 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx
@@ -631,6 +631,7 @@ const AssetsTabs = forwardRef(
               <NextPrevious
                 isNumberBased
                 currentPage={currentPage}
+                isLoading={isLoading}
                 pageSize={pageSize}
                 paging={paging}
                 pagingHandler={({ currentPage }: PagingHandlerParams) =>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppRunsHistory/AppRunsHistory.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppRunsHistory/AppRunsHistory.component.tsx
index aecccc6167c..a570f7dbd42 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppRunsHistory/AppRunsHistory.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppRunsHistory/AppRunsHistory.component.tsx
@@ -308,6 +308,7 @@ const AppRunsHistory = forwardRef(
             <NextPrevious
               isNumberBased
               currentPage={currentPage}
+              isLoading={isLoading}
               pageSize={pageSize}
               paging={paging}
               pagingHandler={handleAppHistoryPageChange}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotListV1/BotListV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotListV1/BotListV1.component.tsx
index 4ba6cb97b47..d63e26c2a0e 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotListV1/BotListV1.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotListV1/BotListV1.component.tsx
@@ -317,6 +317,7 @@ const BotListV1 = ({
         {showPagination && (
           <NextPrevious
             currentPage={currentPage}
+            isLoading={loading}
             pageSize={pageSize}
             paging={paging}
             pagingHandler={handleBotPageChange}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable/IngestionListTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable/IngestionListTable.tsx
index f52757a4cff..27890b21905 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable/IngestionListTable.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable/IngestionListTable.tsx
@@ -362,6 +362,7 @@ function IngestionListTable({
             <Col span={24}>
               <NextPrevious
                 currentPage={ingestionPagingInfo.currentPage}
+                isLoading={isLoading}
                 isNumberBased={isNumberBasedPaging}
                 pageSize={ingestionPagingInfo.pageSize}
                 paging={ingestionPagingInfo.paging}
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 f7a9ca2a29b..73b82c8978d 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
@@ -525,6 +525,7 @@ const Services = ({ serviceName }: ServicesProps) => {
         {showPagination && (
           <NextPrevious
             currentPage={currentPage}
+            isLoading={isLoading}
             isNumberBased={!isEmpty(searchTerm)}
             pageSize={pageSize}
             paging={paging}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/UserTab/UserTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/UserTab/UserTab.component.tsx
index 851b88bfb5e..8aace9b5bea 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/UserTab/UserTab.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/UserTab/UserTab.component.tsx
@@ -401,6 +401,7 @@ export const UserTab = ({
         {showPagination && (
           <NextPrevious
             currentPage={currentPage}
+            isLoading={isLoading}
             isNumberBased={Boolean(searchText)}
             pageSize={pageSize}
             paging={paging}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/NextPrevious/NextPrevious.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/NextPrevious/NextPrevious.interface.ts
index 8464639ba05..b0fd14a990f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/NextPrevious/NextPrevious.interface.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/NextPrevious/NextPrevious.interface.ts
@@ -27,6 +27,7 @@ interface BasicProps {
   pageSize: number;
   currentPage: number;
   isNumberBased?: boolean;
+  isLoading?: boolean;
 }
 
 export interface PagingProps {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/NextPrevious/NextPrevious.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/NextPrevious/NextPrevious.tsx
index aa220beaf7d..a60bd47f55c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/NextPrevious/NextPrevious.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/NextPrevious/NextPrevious.tsx
@@ -37,6 +37,7 @@ const NextPrevious: FC<NextPreviousProps> = ({
   pageSize,
   isNumberBased = false,
   currentPage = 1,
+  isLoading,
   ...pagingProps
 }: NextPreviousProps) => {
   const { t } = useTranslation();
@@ -91,7 +92,7 @@ const NextPrevious: FC<NextPreviousProps> = ({
         ghost
         className="hover-button text-sm flex-center"
         data-testid="previous"
-        disabled={computePrevDisableState()}
+        disabled={computePrevDisableState() || isLoading}
         icon={<ArrowLeftOutlined />}
         type="primary"
         onClick={onPreviousHandler}>
@@ -105,7 +106,7 @@ const NextPrevious: FC<NextPreviousProps> = ({
         ghost
         className="hover-button text-sm flex-center"
         data-testid="next"
-        disabled={computeNextDisableState()}
+        disabled={computeNextDisableState() || isLoading}
         type="primary"
         onClick={onNextHandler}>
         <span> {t('label.next')}</span>
@@ -113,6 +114,7 @@ const NextPrevious: FC<NextPreviousProps> = ({
       </Button>
       {onShowSizeChange && (
         <Dropdown
+          disabled={isLoading}
           menu={{
             items: pageSizeOptions.map((size) => ({
               label: `${size} / Page`,
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/APICollectionPage/APIEndpointsTab.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/APICollectionPage/APIEndpointsTab.tsx
index af02fca7bb3..67914237e0b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/APICollectionPage/APIEndpointsTab.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/APICollectionPage/APIEndpointsTab.tsx
@@ -185,6 +185,7 @@ function APIEndpointsTab({
         <Col span={24}>
           <NextPrevious
             currentPage={currentEndpointsPage}
+            isLoading={apiEndpointsLoading}
             pageSize={PAGE_SIZE}
             paging={apiEndpoints.paging}
             pagingHandler={endpointPaginationHandler}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/Application/ApplicationPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/Application/ApplicationPage.tsx
index 2373bdef986..b6a831187cd 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/Application/ApplicationPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/Application/ApplicationPage.tsx
@@ -199,6 +199,7 @@ const ApplicationPage = () => {
               {showPagination && (
                 <NextPrevious
                   currentPage={currentPage}
+                  isLoading={isLoading}
                   pageSize={pageSize}
                   paging={paging}
                   pagingHandler={handleApplicationPageChange}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/CustomPageSettings/CustomPageSettings.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/CustomPageSettings/CustomPageSettings.tsx
index 118e4290ba8..448470afd26 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/CustomPageSettings/CustomPageSettings.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/CustomPageSettings/CustomPageSettings.tsx
@@ -211,6 +211,7 @@ export const CustomPageSettings = () => {
           {showPagination && (
             <NextPrevious
               currentPage={currentPage}
+              isLoading={isLoading}
               pageSize={pageSize}
               paging={paging}
               pagingHandler={handlePersonaPageChange}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/KPIList.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/KPIList.tsx
index 0c2454b77a2..8d2a93d95e9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/KPIList.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/KPIList.tsx
@@ -251,6 +251,7 @@ const KPIList = () => {
         <Col span={24}>
           <NextPrevious
             currentPage={kpiPage}
+            isLoading={isLoading}
             pageSize={PAGE_SIZE_MEDIUM}
             paging={kpiPaging}
             pagingHandler={kpiPagingHandler}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/SchemaTablesTab.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/SchemaTablesTab.tsx
index a319199ab34..650b4597321 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/SchemaTablesTab.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/SchemaTablesTab.tsx
@@ -176,6 +176,7 @@ function SchemaTablesTab({
         <Col span={24}>
           <NextPrevious
             currentPage={currentTablesPage}
+            isLoading={tableDataLoading}
             pageSize={PAGE_SIZE}
             paging={tableData.paging}
             pagingHandler={tablePaginationHandler}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/MarketPlacePage/MarketPlacePage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/MarketPlacePage/MarketPlacePage.tsx
index dda41fec345..7c46ead4c5e 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/MarketPlacePage/MarketPlacePage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/MarketPlacePage/MarketPlacePage.tsx
@@ -153,6 +153,7 @@ const MarketPlacePage = () => {
           {showPagination && (
             <NextPrevious
               currentPage={currentPage}
+              isLoading={isLoading}
               pageSize={pageSize}
               paging={paging}
               pagingHandler={handleMarketPlacePageChange}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/MetricsPage/MetricListPage/MetricListPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/MetricsPage/MetricListPage/MetricListPage.tsx
index 5c2826d26f8..2c479c463ff 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/MetricsPage/MetricListPage/MetricListPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/MetricsPage/MetricListPage/MetricListPage.tsx
@@ -291,6 +291,7 @@ const MetricListPage = () => {
           {showPagination && (
             <NextPrevious
               currentPage={currentPage}
+              isLoading={loadingMore}
               pageSize={pageSize}
               paging={paging}
               pagingHandler={onPageChange}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/NotificationListPage/NotificationListPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/NotificationListPage/NotificationListPage.tsx
index e6629b4b742..7e5d5703931 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/NotificationListPage/NotificationListPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/NotificationListPage/NotificationListPage.tsx
@@ -275,6 +275,7 @@ const NotificationListPage = () => {
           {showPagination && (
             <NextPrevious
               currentPage={currentPage}
+              isLoading={loadingCount > 0}
               pageSize={pageSize}
               paging={paging}
               pagingHandler={onPageChange}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ObservabilityAlertsPage/ObservabilityAlertsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ObservabilityAlertsPage/ObservabilityAlertsPage.tsx
index 8bfb0e9a8fe..a50abccabe0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/ObservabilityAlertsPage/ObservabilityAlertsPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/ObservabilityAlertsPage/ObservabilityAlertsPage.tsx
@@ -242,6 +242,7 @@ const ObservabilityAlertsPage = () => {
           {showPagination && (
             <NextPrevious
               currentPage={currentPage}
+              isLoading={loading}
               pageSize={pageSize}
               paging={paging}
               pagingHandler={onPageChange}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaListPage/PersonaPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaListPage/PersonaPage.tsx
index dedd5bbaa63..2e44883c389 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaListPage/PersonaPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaListPage/PersonaPage.tsx
@@ -162,6 +162,7 @@ export const PersonaPage = () => {
           <Col span={24}>
             <NextPrevious
               currentPage={currentPage}
+              isLoading={isLoading}
               pageSize={pageSize}
               paging={paging}
               pagingHandler={handlePersonaPageChange}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesListPage/PoliciesListPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesListPage/PoliciesListPage.tsx
index 38ea52f66ad..c0fb82b92fb 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesListPage/PoliciesListPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesListPage/PoliciesListPage.tsx
@@ -337,6 +337,7 @@ const PoliciesListPage = () => {
           {showPagination && (
             <NextPrevious
               currentPage={currentPage}
+              isLoading={isLoading}
               pageSize={pageSize}
               paging={paging}
               pagingHandler={handlePaging}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesListPage/RolesListPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesListPage/RolesListPage.tsx
index c4575e636fb..9a16191150c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesListPage/RolesListPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesListPage/RolesListPage.tsx
@@ -335,6 +335,7 @@ const RolesListPage = () => {
           {showPagination && (
             <NextPrevious
               currentPage={currentPage}
+              isLoading={isLoading}
               pageSize={pageSize}
               paging={paging}
               pagingHandler={handlePaging}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceMainTabContent.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceMainTabContent.tsx
index 66022e73746..c44228f6dc8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceMainTabContent.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceMainTabContent.tsx
@@ -214,6 +214,7 @@ function ServiceMainTabContent({
                         !isEmpty(data) && (
                           <NextPrevious
                             currentPage={currentPage}
+                            isLoading={isServiceLoading}
                             pageSize={PAGE_SIZE}
                             paging={paging}
                             pagingHandler={pagingHandler}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ServiceVersionPage/ServiceVersionMainTabContent.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ServiceVersionPage/ServiceVersionMainTabContent.tsx
index 002670a7828..ff362630d74 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/ServiceVersionPage/ServiceVersionMainTabContent.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/ServiceVersionPage/ServiceVersionMainTabContent.tsx
@@ -94,6 +94,7 @@ function ServiceVersionMainTabContent({
                 !isEmpty(data) && (
                   <NextPrevious
                     currentPage={currentPage}
+                    isLoading={isServiceLoading}
                     pageSize={PAGE_SIZE}
                     paging={paging}
                     pagingHandler={pagingHandler}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/StoredProcedureTab.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/StoredProcedureTab.tsx
index 240a805eeef..22cb9830522 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/StoredProcedureTab.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/StoredProcedureTab.tsx
@@ -157,6 +157,7 @@ const StoredProcedureTab = () => {
         {showPagination && (
           <NextPrevious
             currentPage={currentPage}
+            isLoading={isLoading}
             pageSize={pageSize}
             paging={paging}
             pagingHandler={storedProcedurePagingHandler}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/UserListPage/UserListPageV1.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/UserListPage/UserListPageV1.tsx
index 2ea3d1ee2fd..ce47eb07264 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/UserListPage/UserListPageV1.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/UserListPage/UserListPageV1.tsx
@@ -476,6 +476,7 @@ const UserListPageV1 = () => {
           {showPagination && (
             <NextPrevious
               currentPage={currentPage}
+              isLoading={isDataLoading}
               isNumberBased={Boolean(searchValue)}
               pageSize={pageSize}
               paging={paging}