Skip to content

Commit 87a85a3

Browse files
committed
Manage users:
- select ALL by default. - change default perPage from 5 to 25
1 parent 59d3534 commit 87a85a3

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

src/apps/admin/src/challenge-management/ManageUserPage/ManageUserPage.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import {
2828
PageContent,
2929
PageHeader,
3030
} from '../../lib/components'
31+
import { TABLE_PAGINATION_ITEM_PER_PAGE } from '../../config/index.config'
3132
import {
3233
ChallengeFilterCriteria,
3334
ChallengeResource,
@@ -77,7 +78,7 @@ export const ManageUserPage: FC = () => {
7778
Dispatch<SetStateAction<ChallengeResourceFilterCriteria>>,
7879
] = useState<ChallengeResourceFilterCriteria>({
7980
page: 1,
80-
perPage: 5,
81+
perPage: TABLE_PAGINATION_ITEM_PER_PAGE,
8182
roleId: '',
8283
})
8384
const [users, setUsers]: [

src/apps/admin/src/lib/components/ChallengeUserFilters/ChallengeUserFilters.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { ChangeEvent, FC, useContext, useEffect, useMemo, useRef } from 'react'
2-
import _ from 'lodash'
32

43
import { Button, InputSelect, InputSelectOption } from '~/libs/ui'
54

@@ -25,7 +24,6 @@ interface ChallengeUserFiltersProps {
2524
}
2625

2726
const ChallengeUserFilters: FC<ChallengeUserFiltersProps> = props => {
28-
const DEFAULT_ROLE_FILTER_NAME = 'Submitter'
2927
const { resourceRoles, loadResourceRoles }: ChallengeManagementContextType
3028
= useContext(ChallengeManagementContext)
3129
const {
@@ -40,13 +38,9 @@ const ChallengeUserFilters: FC<ChallengeUserFiltersProps> = props => {
4038
value: item.id,
4139
})
4240
const emptyOption: InputSelectOption = { label: 'All', value: '' }
43-
const o: InputSelectOption | undefined = _.filter(resourceRoles, {
44-
name: DEFAULT_ROLE_FILTER_NAME,
45-
})
46-
.map(role2Option)[0]
4741

4842
return {
49-
defaultResourceRoleOption: o,
43+
defaultResourceRoleOption: emptyOption,
5044
resourceRoleOptions: [
5145
emptyOption,
5246
...resourceRoles.map(role2Option),

0 commit comments

Comments
 (0)