Skip to content

Commit 255c128

Browse files
bexsoftBenjamin Perezdvaldivia
authored
Fixed pagination un buckets lists (#371)
Co-authored-by: Benjamin Perez <benjamin@bexsoft.net> Co-authored-by: Daniel Valdivia <hola@danielvaldivia.com>
1 parent 06f3333 commit 255c128

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -185,19 +185,19 @@ const ListBuckets = ({
185185
return <Moment>{date}</Moment>;
186186
};
187187

188-
const filteredRecords = records
189-
.filter((b: Bucket) => {
190-
if (filterBuckets === "") {
188+
const filteredRecords = records.filter((b: Bucket) => {
189+
if (filterBuckets === "") {
190+
return true;
191+
} else {
192+
if (b.name.indexOf(filterBuckets) >= 0) {
191193
return true;
192194
} else {
193-
if (b.name.indexOf(filterBuckets) >= 0) {
194-
return true;
195-
} else {
196-
return false;
197-
}
195+
return false;
198196
}
199-
})
200-
.slice(offset, offset + rowsPerPage);
197+
}
198+
});
199+
200+
const showInPage = filteredRecords.slice(offset, offset + rowsPerPage);
201201

202202
return (
203203
<React.Fragment>
@@ -269,13 +269,13 @@ const ListBuckets = ({
269269
},
270270
]}
271271
isLoading={loading}
272-
records={filteredRecords}
272+
records={showInPage}
273273
entityName="Buckets"
274274
idField="name"
275275
paginatorConfig={{
276276
rowsPerPageOptions: [5, 10, 25],
277277
colSpan: 3,
278-
count: totalRecords,
278+
count: filteredRecords.length,
279279
rowsPerPage: rowsPerPage,
280280
page: page,
281281
SelectProps: {

portal-ui/src/screens/Console/ObjectBrowser/BrowseBuckets.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -163,14 +163,14 @@ const BrowseBuckets = ({
163163
}
164164
};
165165

166-
const filteredRecords = records
167-
.filter((b: Bucket) => {
168-
if (filterBuckets === "") {
169-
return true;
170-
}
171-
return b.name.indexOf(filterBuckets) >= 0;
172-
})
173-
.slice(offset, offset + rowsPerPage);
166+
const filteredRecords = records.filter((b: Bucket) => {
167+
if (filterBuckets === "") {
168+
return true;
169+
}
170+
return b.name.indexOf(filterBuckets) >= 0;
171+
});
172+
173+
const showInPage = filteredRecords.slice(offset, offset + rowsPerPage);
174174

175175
const handleChangePage = (event: unknown, newPage: number) => {
176176
setPage(newPage);
@@ -273,7 +273,7 @@ const BrowseBuckets = ({
273273
},
274274
]}
275275
isLoading={loading}
276-
records={filteredRecords}
276+
records={showInPage}
277277
entityName="Buckets"
278278
idField="name"
279279
paginatorConfig={{

0 commit comments

Comments
 (0)