Skip to content

Fixed pagination in buckets lists #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 5, 2020
Merged

Fixed pagination in buckets lists #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
289a0f5
Fixed pagination un buckets lists
Nov 4, 2020
8ec0b47
Merge branch 'master' into fix-pagination
dvaldivia Nov 4, 2020
780722b
Merge branch 'master' into fix-pagination
dvaldivia Nov 5, 2020
9adeeca
Merge branch 'master' into fix-pagination
dvaldivia Nov 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,19 +185,19 @@ const ListBuckets = ({
return <Moment>{date}</Moment>;
};

const filteredRecords = records
.filter((b: Bucket) => {
if (filterBuckets === "") {
const filteredRecords = records.filter((b: Bucket) => {
if (filterBuckets === "") {
return true;
} else {
if (b.name.indexOf(filterBuckets) >= 0) {
return true;
} else {
if (b.name.indexOf(filterBuckets) >= 0) {
return true;
} else {
return false;
}
return false;
}
})
.slice(offset, offset + rowsPerPage);
}
});

const showInPage = filteredRecords.slice(offset, offset + rowsPerPage);

return (
<React.Fragment>
Expand Down Expand Up @@ -269,13 +269,13 @@ const ListBuckets = ({
},
]}
isLoading={loading}
records={filteredRecords}
records={showInPage}
entityName="Buckets"
idField="name"
paginatorConfig={{
rowsPerPageOptions: [5, 10, 25],
colSpan: 3,
count: totalRecords,
count: filteredRecords.length,
rowsPerPage: rowsPerPage,
page: page,
SelectProps: {
Expand Down
18 changes: 9 additions & 9 deletions portal-ui/src/screens/Console/ObjectBrowser/BrowseBuckets.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,14 @@ const BrowseBuckets = ({
}
};

const filteredRecords = records
.filter((b: Bucket) => {
if (filterBuckets === "") {
return true;
}
return b.name.indexOf(filterBuckets) >= 0;
})
.slice(offset, offset + rowsPerPage);
const filteredRecords = records.filter((b: Bucket) => {
if (filterBuckets === "") {
return true;
}
return b.name.indexOf(filterBuckets) >= 0;
});

const showInPage = filteredRecords.slice(offset, offset + rowsPerPage);

const handleChangePage = (event: unknown, newPage: number) => {
setPage(newPage);
Expand Down Expand Up @@ -273,7 +273,7 @@ const BrowseBuckets = ({
},
]}
isLoading={loading}
records={filteredRecords}
records={showInPage}
entityName="Buckets"
idField="name"
paginatorConfig={{
Expand Down