Add edit ToolType; Users type; Reports cleanup; Type safery

This commit is contained in:
cracklesparkle
2024-12-19 17:00:11 +09:00
parent 71055e7cd0
commit 5218ee851f
7 changed files with 13 additions and 80 deletions

View File

@ -6,13 +6,14 @@ import UserService from "../services/UserService"
import FormFields from "../components/FormFields"
import { Badge, Button, Flex, Loader, Modal, Pagination, ScrollAreaAutosize, Select, Table } from "@mantine/core"
import { useDisclosure } from "@mantine/hooks"
import { IUser } from "../interfaces/user"
export default function Users() {
const { users, isError, isLoading } = useUsers()
const { roles } = useRoles()
const [roleOptions, setRoleOptions] = useState<any>()
const [roleOptions, setRoleOptions] = useState<{ label: string, value: string }[]>()
useEffect(() => {
if (Array.isArray(roles)) {
@ -54,7 +55,7 @@ export default function Users() {
Произошла ошибка при получении данных.
</div>
)
if (isLoading) {
return (
<Flex direction='column' align='flex-start' gap='sm' p='sm'>
@ -86,7 +87,7 @@ export default function Users() {
</Table.Tr>
</Table.Thead>
<Table.Tbody>
{users.map((user: any) => (
{users.map((user: IUser) => (
<Table.Tr
key={user.id}
//bg={selectedRows.includes(element.position) ? 'var(--mantine-color-blue-light)' : undefined}
@ -100,7 +101,6 @@ export default function Users() {
Активен
</Badge>
</Table.Td>
) : (
<Table.Td key={column.field}>
<Badge color="gray" fullWidth variant="light">
@ -123,7 +123,7 @@ export default function Users() {
)
}
else return (
<Table.Td key={column.field}>{user[column.field]}</Table.Td>
<Table.Td key={column.field}>{user[column.field as keyof IUser]}</Table.Td>
)
})}
</Table.Tr>