Skip to content

Commit 63faf7c

Browse files
committed
Implement table sorting
1 parent 529ef5c commit 63faf7c

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

src/Administration/Users/UsersList/UsersList.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,12 @@ const UsersList = ({ match }) => {
8383
const userDataRes = await api.users.getList({
8484
limit: rowsPerPage,
8585
offset: page * rowsPerPage,
86+
order,
8687
})
8788

8889
// Make some artificial delay
8990
await new Promise(resolve => {
90-
setTimeout(() => resolve(true), 1000)
91+
setTimeout(() => resolve(true), 500)
9192
})
9293

9394
setStatus('idle')
@@ -101,7 +102,7 @@ const UsersList = ({ match }) => {
101102
}
102103

103104
fetchUsers()
104-
}, [page, rowsPerPage, usersData.count])
105+
}, [order, page, rowsPerPage, usersData.count])
105106

106107
const handleChangePage = (event, newPage) => {
107108
setPage(newPage)

src/_api/_mocks/usersMocks.ts

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import _ from 'lodash'
12
import { AxiosInstance } from 'axios'
23
import MockAdapter from 'axios-mock-adapter'
34
import usersData from '../_data/usersData'
@@ -9,22 +10,29 @@ export default {
910
})
1011

1112
mock.onGet('/users').reply(config => {
12-
const { limit = 10, offset = 0, response } = config.params
13+
const { limit = 10, offset = 0, order = {}, customResponse } = config.params
1314

14-
if (response) {
15+
if (customResponse) {
1516
return [
16-
response.status || 403,
17+
customResponse.status || 403,
1718
{
18-
message: response.message || 'Something went wrong...',
19+
message: customResponse.message || 'Something went wrong...',
1920
},
2021
]
2122
}
2223

24+
const usersAll = order
25+
? _.orderBy(usersData.list, [order.orderBy], [order.order])
26+
: usersData.list
27+
28+
if (order) {
29+
}
30+
2331
return [
2432
200,
2533
{
26-
users: usersData.list.slice(offset, offset + limit),
27-
count: usersData.list.length,
34+
users: usersAll.slice(offset, offset + limit),
35+
count: usersAll.length,
2836
},
2937
]
3038
})

0 commit comments

Comments
 (0)