File tree Expand file tree Collapse file tree 2 files changed +21
-21
lines changed
portal-ui/src/screens/Console Expand file tree Collapse file tree 2 files changed +21
-21
lines changed Original file line number Diff line number Diff line change @@ -185,19 +185,19 @@ const ListBuckets = ({
185
185
return < Moment > { date } </ Moment > ;
186
186
} ;
187
187
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 ) {
191
193
return true ;
192
194
} else {
193
- if ( b . name . indexOf ( filterBuckets ) >= 0 ) {
194
- return true ;
195
- } else {
196
- return false ;
197
- }
195
+ return false ;
198
196
}
199
- } )
200
- . slice ( offset , offset + rowsPerPage ) ;
197
+ }
198
+ } ) ;
199
+
200
+ const showInPage = filteredRecords . slice ( offset , offset + rowsPerPage ) ;
201
201
202
202
return (
203
203
< React . Fragment >
@@ -269,13 +269,13 @@ const ListBuckets = ({
269
269
} ,
270
270
] }
271
271
isLoading = { loading }
272
- records = { filteredRecords }
272
+ records = { showInPage }
273
273
entityName = "Buckets"
274
274
idField = "name"
275
275
paginatorConfig = { {
276
276
rowsPerPageOptions : [ 5 , 10 , 25 ] ,
277
277
colSpan : 3 ,
278
- count : totalRecords ,
278
+ count : filteredRecords . length ,
279
279
rowsPerPage : rowsPerPage ,
280
280
page : page ,
281
281
SelectProps : {
Original file line number Diff line number Diff line change @@ -163,14 +163,14 @@ const BrowseBuckets = ({
163
163
}
164
164
} ;
165
165
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 ) ;
174
174
175
175
const handleChangePage = ( event : unknown , newPage : number ) => {
176
176
setPage ( newPage ) ;
@@ -273,7 +273,7 @@ const BrowseBuckets = ({
273
273
} ,
274
274
] }
275
275
isLoading = { loading }
276
- records = { filteredRecords }
276
+ records = { showInPage }
277
277
entityName = "Buckets"
278
278
idField = "name"
279
279
paginatorConfig = { {
You can’t perform that action at this time.
0 commit comments