Skip to content

Commit 021e24b

Browse files
committed
remove pagination for user groups
1 parent 90cc690 commit 021e24b

File tree

3 files changed

+1
-26
lines changed

3 files changed

+1
-26
lines changed

backend/services/user_groups.go

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"database/sql"
99
"errors"
1010
"fmt"
11-
"math"
1211
"strconv"
1312
"strings"
1413
"time"
@@ -246,10 +245,7 @@ func SortUsersInToGroups(slugMap SlugMap, pagination Pagination) (*dtos.Paginati
246245

247246
if len(slugMap) == 0 {
248247
return &dtos.PaginationWrapper{
249-
PageNumber: 1,
250-
PageSize: 0,
251248
TotalCount: int64(0),
252-
TotalPages: int64(1),
253249
}, nil
254250
}
255251

@@ -324,25 +320,11 @@ func SortUsersInToGroups(slugMap SlugMap, pagination Pagination) (*dtos.Paginati
324320
}
325321
}
326322

327-
prevLastIndex := (pagination.Page - 1) * pagination.PageSize
328323
groupLength := len(userGroupsDTO)
329-
totalPages := math.Ceil(float64(groupLength) / float64(pagination.PageSize))
330-
remainingItemsCount := (groupLength - int(prevLastIndex)) % int(pagination.PageSize)
331-
332-
currLastIndex := int(pagination.Page * pagination.PageSize)
333-
pageSize := pagination.PageSize
334-
if pagination.Page == int64(totalPages) {
335-
currLastIndex = int(prevLastIndex) + remainingItemsCount
336-
pageSize = int64(remainingItemsCount)
337-
}
338324

339-
paginatedResults := userGroupsDTO[prevLastIndex:currLastIndex]
340325
paginatedData := &dtos.PaginationWrapper{
341-
PageNumber: pagination.Page,
342-
PageSize: pageSize,
343-
Content: paginatedResults,
326+
Content: userGroupsDTO,
344327
TotalCount: int64(groupLength),
345-
TotalPages: int64(totalPages),
346328
}
347329
return paginatedData, nil
348330
}

frontend/src/pages/admin/user_group_table/index.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ export default (props: {
6969
{data?.map(group => <TableRow key={group.slug} data={rowBuilder(group, usersInGroup(wiredUserGroups, group), modifyActions(group, setDeletingUserGroup, setModifyingUserGroup))} />)}
7070
</>)}
7171
</Table>
72-
<StandardPager className={cx('user-table-pager')} {...wiredUserGroups.pagerProps} />
7372

7473
{deletingUserGroup && <DeleteUserGroupModal userGroup={deletingUserGroup} onRequestClose={() => { setDeletingUserGroup(null); wiredUserGroups.reload() }} />}
7574
{modifyingUserGroup && <ModifyUserGroupModal userGroup={modifyingUserGroup} onRequestClose={() => { setModifyingUserGroup(null); wiredUserGroups.reload() }} />}

frontend/src/pages/operation_edit/user_group_permission_editor/index.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,12 +177,6 @@ const PermissionTable = (props: {
177177
/>
178178
))}
179179
</Table>
180-
<StandardPager
181-
className={cx('user-table-pager')}
182-
page={currentPage}
183-
maxPages={Math.ceil(matchingUsers.length / itemsPerPage)}
184-
onPageChange={(newPage) => setCurrentPage(newPage)}
185-
/>
186180
</>
187181
)
188182
})}

0 commit comments

Comments
 (0)