wibu/jenna-mcp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:list user #46

Merged
amaliadwiy merged 1 commits from amalia/28-nov-25 into main 2025-11-28 17:39:47 +08:00
Conversation 0 Commits 1 Files Changed 2 +45 -45
2 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/components/UserSetting.tsx
View File

@@ -1,5 +1,6 @@
import apiFetch from "@/lib/apiFetch"; import apiFetch from "@/lib/apiFetch";
import { import {
ActionIcon,
Button, Button,
Divider, Divider,
Flex, Flex,
@@ -11,10 +12,10 @@ import {
Table, Table,
Text, Text,
Title, Title,
Tooltip Tooltip,
} from "@mantine/core"; } from "@mantine/core";
import { useDisclosure, useShallowEffect } from "@mantine/hooks"; import { useDisclosure, useShallowEffect } from "@mantine/hooks";
import { IconPlus } from "@tabler/icons-react"; import { IconEdit, IconPlus, IconTrash } from "@tabler/icons-react";
import type { JsonValue } from "generated/prisma/runtime/library"; import type { JsonValue } from "generated/prisma/runtime/library";
import { useState } from "react"; import { useState } from "react";
import useSWR from "swr"; import useSWR from "swr";
@@ -465,49 +466,44 @@ export default function UserSetting({ permissions }: { permissions: JsonValue[]
</Table.Thead> </Table.Thead>
<Table.Tbody> <Table.Tbody>
{list && Array.isArray(list) && list.length > 0 ? ( {list && Array.isArray(list) && list.length > 0 ? (
<Table.Tr> list?.map((v: any) => (
<Table.Td colSpan={5} align="center"> <Table.Tr key={v.id}>
Ada banyak {JSON.stringify(list)} <Table.Td>{v.name}</Table.Td>
<Table.Td>{v.phone}</Table.Td>
<Table.Td>{v.email}</Table.Td>
<Table.Td>{v.nameRole}</Table.Td>
<Table.Td>
<Group>
<Tooltip label={permissions.includes('setting.user.edit') ? "Edit User" : "Edit User - Anda tidak memiliki akses"}>
<ActionIcon
variant="light"
size="sm"
style={{ boxShadow: "0 0 8px rgba(0,255,200,0.2)" }}
onClick={() => chooseEdit({ data: v })}
disabled={!permissions.includes('setting.user.edit') || v.roleId == "developer"}
>
<IconEdit size={20} />
</ActionIcon>
</Tooltip>
<Tooltip label={permissions.includes('setting.user.delete') ? "Delete User" : "Delete User - Anda tidak memiliki akses"}>
<ActionIcon
variant="light"
size="sm"
color="red"
style={{ boxShadow: "0 0 8px rgba(0,255,200,0.2)" }}
onClick={() => {
setDataDelete(v.id);
openDelete();
}}
disabled={!permissions.includes('setting.user.delete') || v.roleId == "developer"}
>
<IconTrash size={20} />
</ActionIcon>
</Tooltip>
</Group>
</Table.Td> </Table.Td>
</Table.Tr> </Table.Tr>
// list?.map((v: any) => ( ))
// <Table.Tr key={v.id}>
// <Table.Td>{v.name}</Table.Td>
// <Table.Td>{v.phone}</Table.Td>
// <Table.Td>{v.email}</Table.Td>
// <Table.Td>{v.nameRole}</Table.Td>
// <Table.Td>
// <Group>
// <Tooltip label={permissions.includes('setting.user.edit') ? "Edit User" : "Edit User - Anda tidak memiliki akses"}>
// <ActionIcon
// variant="light"
// size="sm"
// style={{ boxShadow: "0 0 8px rgba(0,255,200,0.2)" }}
// onClick={() => chooseEdit({ data: v })}
// disabled={!permissions.includes('setting.user.edit') || v.roleId == "developer"}
// >
// <IconEdit size={20} />
// </ActionIcon>
// </Tooltip>
// <Tooltip label={permissions.includes('setting.user.delete') ? "Delete User" : "Delete User - Anda tidak memiliki akses"}>
// <ActionIcon
// variant="light"
// size="sm"
// color="red"
// style={{ boxShadow: "0 0 8px rgba(0,255,200,0.2)" }}
// onClick={() => {
// setDataDelete(v.id);
// openDelete();
// }}
// disabled={!permissions.includes('setting.user.delete') || v.roleId == "developer"}
// >
// <IconTrash size={20} />
// </ActionIcon>
// </Tooltip>
// </Group>
// </Table.Td>
// </Table.Tr>
// ))
) : ( ) : (
<Table.Tr> <Table.Tr>
<Table.Td colSpan={5} align="center"> <Table.Td colSpan={5} align="center">

4
src/server/routes/user_route.ts
View File

@@ -164,6 +164,10 @@ const UserRoute = new Elysia({
const dataFix = data.map((item: any) => ({ const dataFix = data.map((item: any) => ({
..._.omit(item, ["Role"]), ..._.omit(item, ["Role"]),
nameRole: item.Role?.name, nameRole: item.Role?.name,
name: String(item.name),
phone: String(item.phone),
email: String(item.email),
roleId: String(item.roleId),
})) }))
return dataFix return dataFix