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 && ( { {showPagination && ( { { 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( { {showPagination && ( = ({ pageSize, isNumberBased = false, currentPage = 1, + isLoading, ...pagingProps }: NextPreviousProps) => { const { t } = useTranslation(); @@ -91,7 +92,7 @@ const NextPrevious: FC = ({ ghost className="hover-button text-sm flex-center" data-testid="previous" - disabled={computePrevDisableState()} + disabled={computePrevDisableState() || isLoading} icon={} type="primary" onClick={onPreviousHandler}> @@ -105,7 +106,7 @@ const NextPrevious: FC = ({ ghost className="hover-button text-sm flex-center" data-testid="next" - disabled={computeNextDisableState()} + disabled={computeNextDisableState() || isLoading} type="primary" onClick={onNextHandler}> {t('label.next')} @@ -113,6 +114,7 @@ const NextPrevious: FC = ({ {onShowSizeChange && ( ({ 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({ { {showPagination && ( { {showPagination && ( { { {showPagination && ( { {showPagination && ( { {showPagination && ( 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 && ( { { {showPagination && ( { {showPagination && ( { {showPagination && ( { {showPagination && (