Skip to content

Commit 71a0229

Browse files
committed
Fix MSW
1 parent 712131d commit 71a0229

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,4 @@
103103
"msw": {
104104
"workerDirectory": "public"
105105
}
106-
}
106+
}

src/Administration/Users/UsersList/UsersList.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ type UsersData = {
7474
count: number
7575
}
7676

77-
const UsersList: React.FC<UsersListProps> = ({ match }) => {
78-
const [status, setStatus] = React.useState('idle')
79-
const [statusMessage, setStatusMessage] = React.useState('')
80-
const [page, setPage] = React.useState(0)
77+
const UsersList: React.FC<UsersListProps> = () => {
78+
const [status, setStatus] = useState('idle')
79+
const [statusMessage, setStatusMessage] = useState('')
80+
const [page, setPage] = useState(0)
8181
const [usersData, setUsersData] = useState<UsersData>({ users: [], count: 0 })
82-
const [rowsPerPage, setRowsPerPage] = React.useState(10)
83-
const [order, setOrder] = React.useState({
82+
const [rowsPerPage, setRowsPerPage] = useState(10)
83+
const [order, setOrder] = useState({
8484
order: 'desc',
8585
orderBy: 'createdAt',
8686
})
@@ -159,7 +159,7 @@ const UsersList: React.FC<UsersListProps> = ({ match }) => {
159159
<TableSortLabel
160160
active={order.orderBy === column.id}
161161
direction={order.orderBy === column.id ? 'desc' : 'asc'}
162-
onClick={(event) => handelChangeOrder(event, column.id)}
162+
onClick={(event: any) => handelChangeOrder(event, column.id)}
163163
>
164164
{column.label}
165165
</TableSortLabel>

src/_api/_mocks/usersMocks.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ const userMocks = [
1212
}),
1313

1414
rest.get(`${apiUrl}/users`, async (req, res, ctx) => {
15-
let limit = parseInt(req.params.limit || '0')
16-
let offset = parseInt(req.params.offset || '10')
17-
let order = JSON.parse(req.params.order || '{}')
15+
let limit = parseInt(req.params.limit || '10')
16+
let offset = parseInt(req.params.offset || '0')
17+
let order = req.params.order ? JSON.parse(req.params.order || '{}') : null
1818

1919
const usersAll = order
2020
? _.orderBy(usersData.list, [order.orderBy], [order.order])

src/_common/AppSidebar/AppSidebar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Link } from 'react-router-dom'
55
import Typography from '@material-ui/core/Typography'
66

77
import BaseLogo from '_common/BaseLogo'
8-
import SidebarNav from './SidebarNav'
8+
// import SidebarNav from './SidebarNav'
99
import SidebarNavRecursive from './SidebarNavRecursive'
1010

1111
export type AppSidebarProps = {

0 commit comments

Comments
 (0)