Pull Request branch dev-clone to main #1
|
|
@ -17,42 +17,6 @@ type DataType = ExtractQueryDataType<typeof userQueryOptions>;
|
||||||
|
|
||||||
const columnHelper = createColumnHelper<DataType>();
|
const columnHelper = createColumnHelper<DataType>();
|
||||||
|
|
||||||
// Fungsi untuk mengelompokkan pengguna berdasarkan perusahaan
|
|
||||||
const groupUsersByCompany = (data: DataType[]) => {
|
|
||||||
const companyMap = new Map<string, {
|
|
||||||
companyName: string;
|
|
||||||
users: { id: string; name: string; username: string; email: string; role: string }[];
|
|
||||||
}>();
|
|
||||||
|
|
||||||
data.forEach((item) => {
|
|
||||||
const companyName = item.company || "Unknown Company";
|
|
||||||
|
|
||||||
if (!companyMap.has(companyName)) {
|
|
||||||
companyMap.set(companyName, {
|
|
||||||
companyName,
|
|
||||||
users: [{
|
|
||||||
id: item.id,
|
|
||||||
name: item.name,
|
|
||||||
username: item.username,
|
|
||||||
email: item.email ?? "",
|
|
||||||
role: item.roles.join(", ") // assuming roles is an array
|
|
||||||
}],
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
const existingCompany = companyMap.get(companyName);
|
|
||||||
existingCompany?.users.push({
|
|
||||||
id: item.id,
|
|
||||||
name: item.name,
|
|
||||||
username: item.username,
|
|
||||||
email: item.email ?? "",
|
|
||||||
role: item.roles.join(", "), // assuming roles is an array
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
return Array.from(companyMap.values());
|
|
||||||
};
|
|
||||||
|
|
||||||
export default function UsersPage() {
|
export default function UsersPage() {
|
||||||
return (
|
return (
|
||||||
<PageTemplate
|
<PageTemplate
|
||||||
|
|
@ -86,11 +50,11 @@ export default function UsersPage() {
|
||||||
columnHelper.display({
|
columnHelper.display({
|
||||||
header: "Roles",
|
header: "Roles",
|
||||||
cell: (props) => {
|
cell: (props) => {
|
||||||
const roles = props.row.original.roles; // Ambil array roles dari data
|
const roles = props.row.original.roles; // Get array of roles from data
|
||||||
if (roles && roles.length > 0) {
|
if (roles && roles.length > 0) {
|
||||||
return roles.map(role => role.name).join(", ");
|
return roles.map(role => role.name).join(", ");
|
||||||
}
|
}
|
||||||
return <div>No roles assigned</div>; // Jika tidak ada roles
|
return <div>No roles assigned</div>;
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user