yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-10-11 08:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: limit change after pagination (#18844)

Browse Source 
* fix: limit change after pagination

* refactor: getOtherDetails function

* refactor: remove limit parameter

---------

Co-authored-by: Ashish Gupta <ashish@getcollate.io>
This commit is contained in:
Pranita Fulsundar 2024-12-03 18:21:59 +05:30 committed by GitHub
parent 7c6f5e67dd
commit e3e686fbd9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.tsx
View File

@ -133,7 +133,6 @@ const Services = ({ serviceName }: ServicesProps) => {
after, after,
before, before,
filters, filters,
limit,
}: { }: {
search?: string; search?: string;
limit?: number; limit?: number;
@ -151,7 +150,7 @@ const Services = ({ serviceName }: ServicesProps) => {
} = await searchService({ } = await searchService({
search, search,
searchIndex, searchIndex,
limit: limit ?? pageSize, limit: pageSize,
currentPage, currentPage,
filters, filters,
deleted, deleted,
@ -164,7 +163,7 @@ const Services = ({ serviceName }: ServicesProps) => {
} else { } else {
const { data, paging } = await getServices({ const { data, paging } = await getServices({
serviceName, serviceName,
limit: limit ?? pageSize, limit: pageSize,
after, after,
before, before,
include: deleted ? Include.Deleted : Include.NonDeleted, include: deleted ? Include.Deleted : Include.NonDeleted,
@ -192,7 +191,7 @@ const Services = ({ serviceName }: ServicesProps) => {
setIsLoading(false); setIsLoading(false);
} }
}, },
[searchIndex, serviceName, deleted] [searchIndex, serviceName, deleted, pageSize]
); );
const handleServicePageChange = useCallback( const handleServicePageChange = useCallback(

3
openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/DatabaseSchemaPage.component.tsx
View File

@ -240,6 +240,7 @@ const DatabaseSchemaPage: FunctionComponent = () => {
const res = await getTableList({ const res = await getTableList({
...params, ...params,
databaseSchema: decodedDatabaseSchemaFQN, databaseSchema: decodedDatabaseSchemaFQN,
limit: pageSize,
include: showDeletedTables ? Include.Deleted : Include.NonDeleted, include: showDeletedTables ? Include.Deleted : Include.NonDeleted,
}); });
setTableData(res.data); setTableData(res.data);
@ -250,7 +251,7 @@ const DatabaseSchemaPage: FunctionComponent = () => {
setTableDataLoading(false); setTableDataLoading(false);
} }
}, },
[decodedDatabaseSchemaFQN, showDeletedTables] [decodedDatabaseSchemaFQN, showDeletedTables, pageSize]
); );
const onDescriptionEdit = useCallback((): void => { const onDescriptionEdit = useCallback((): void => {

24
openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceDetailsPage.tsx
View File

@ -181,7 +181,7 @@ const ServiceDetailsPage: FunctionComponent = () => {
const { const {
paging, paging,
pageSize: databasePageSize, pageSize,
currentPage, currentPage,
handlePageChange, handlePageChange,
handlePagingChange, handlePagingChange,
@ -513,44 +513,45 @@ const ServiceDetailsPage: FunctionComponent = () => {
async (paging?: PagingWithoutTotal) => { async (paging?: PagingWithoutTotal) => {
try { try {
setIsServiceLoading(true); setIsServiceLoading(true);
const pagingParams = { ...paging, limit: pageSize };
switch (serviceCategory) { switch (serviceCategory) {
case ServiceCategory.DATABASE_SERVICES: { case ServiceCategory.DATABASE_SERVICES: {
await fetchDatabases(paging); await fetchDatabases(pagingParams);
break; break;
} }
case ServiceCategory.MESSAGING_SERVICES: { case ServiceCategory.MESSAGING_SERVICES: {
await fetchTopics(paging); await fetchTopics(pagingParams);
break; break;
} }
case ServiceCategory.DASHBOARD_SERVICES: { case ServiceCategory.DASHBOARD_SERVICES: {
await fetchDashboards(paging); await fetchDashboards(pagingParams);
break; break;
} }
case ServiceCategory.PIPELINE_SERVICES: { case ServiceCategory.PIPELINE_SERVICES: {
await fetchPipeLines(paging); await fetchPipeLines(pagingParams);
break; break;
} }
case ServiceCategory.ML_MODEL_SERVICES: { case ServiceCategory.ML_MODEL_SERVICES: {
await fetchMlModal(paging); await fetchMlModal(pagingParams);
break; break;
} }
case ServiceCategory.STORAGE_SERVICES: { case ServiceCategory.STORAGE_SERVICES: {
await fetchContainers(paging); await fetchContainers(pagingParams);
break; break;
} }
case ServiceCategory.SEARCH_SERVICES: { case ServiceCategory.SEARCH_SERVICES: {
await fetchSearchIndexes(paging); await fetchSearchIndexes(pagingParams);
break; break;
} }
case ServiceCategory.API_SERVICES: { case ServiceCategory.API_SERVICES: {
await fetchCollections(paging); await fetchCollections(pagingParams);
break; break;
} }
@ -574,6 +575,7 @@ const ServiceDetailsPage: FunctionComponent = () => {
fetchContainers, fetchContainers,
fetchSearchIndexes, fetchSearchIndexes,
fetchCollections, fetchCollections,
pageSize,
] ]
); );
@ -853,8 +855,8 @@ const ServiceDetailsPage: FunctionComponent = () => {
useEffect(() => { useEffect(() => {
handlePageChange(INITIAL_PAGING_VALUE); handlePageChange(INITIAL_PAGING_VALUE);
getOtherDetails({ limit: databasePageSize }); getOtherDetails({ limit: pageSize });
}, [activeTab, showDeleted, deleted, databasePageSize]); }, [activeTab, showDeleted, deleted, pageSize]);
useEffect(() => { useEffect(() => {
// fetch count for data modal tab, its need only when its dashboard page and data modal tab is not active // fetch count for data modal tab, its need only when its dashboard page and data modal tab is not active