Pull Request branch dev-clone to main #1

Merged
gitea merged 429 commits from dev-clone into main 2024-12-23 09:31:34 +00:00
Showing only changes of commit 22eb64d611 - Show all commits

View File

@ -25,7 +25,7 @@ export default function UsersPage() {
modals={[<UserFormModal />, <UserDeleteModal />]} modals={[<UserFormModal />, <UserDeleteModal />]}
columnDefs={[ columnDefs={[
columnHelper.display({ columnHelper.display({
header: "#", header: "No",
cell: (props) => props.row.index + 1, cell: (props) => props.row.index + 1,
}), }),
@ -38,16 +38,28 @@ export default function UsersPage() {
header: "Username", header: "Username",
cell: (props) => props.row.original.username, cell: (props) => props.row.original.username,
}), }),
columnHelper.display({ columnHelper.display({
header: "Status", header: "Email",
cell: (props) => cell: (props) => props.row.original.email,
props.row.original.isEnabled ? (
<Badge color="green">Active</Badge>
) : (
<Badge color="red">Inactive</Badge>
),
}), }),
columnHelper.display({
header: "Company",
cell: (props) => props.row.original.company,
}),
columnHelper.display({
header: "role",
cell: (props) => props.row.original.roles,
}),
// columnHelper.display({
// header: "Status",
// cell: (props) =>
// props.row.original.isEnabled ? (
// <Badge color="green">Active</Badge>
// ) : (
// <Badge color="red">Inactive</Badge>
// ),
// }),
columnHelper.display({ columnHelper.display({
header: "Actions", header: "Actions",