diff --git a/src/pages/(admin)/Lists/GroupList.tsx b/src/pages/(admin)/Lists/GroupList.tsx index fa72cf58..855e68ad 100644 --- a/src/pages/(admin)/Lists/GroupList.tsx +++ b/src/pages/(admin)/Lists/GroupList.tsx @@ -218,9 +218,7 @@ export default function GroupList({user}: {user: User}) { header: "Admin", cell: (info) => (
x.id === info.getValue())?.type)}> - {users.find((x) => x.id === info.getValue())?.type === "corporate" - ? (users.find((x) => x.id === info.getValue()) as CorporateUser)?.corporateInformation?.companyInformation?.name - : users.find((x) => x.id === info.getValue())?.name} + {users.find((x) => x.id === info.getValue())?.name}
), }), diff --git a/src/utils/groups.ts b/src/utils/groups.ts index 3742f2d7..6b96380c 100644 --- a/src/utils/groups.ts +++ b/src/utils/groups.ts @@ -1,24 +1,20 @@ -import { CorporateUser, Group, User } from "@/interfaces/user"; +import {CorporateUser, Group, User} from "@/interfaces/user"; import axios from "axios"; export const isUserFromCorporate = async (userID: string) => { - const groups = (await axios.get(`/api/groups?participant=${userID}`)) - .data; - const users = (await axios.get("/api/users/list")).data; + const groups = (await axios.get(`/api/groups?participant=${userID}`)).data; + const users = (await axios.get("/api/users/list")).data; - const adminTypes = groups.map( - (g) => users.find((u) => u.id === g.admin)?.type, - ); - return adminTypes.includes("corporate"); + const adminTypes = groups.map((g) => users.find((u) => u.id === g.admin)?.type); + return adminTypes.includes("corporate"); }; export const getUserCorporate = async (userID: string) => { - const groups = (await axios.get(`/api/groups?participant=${userID}`)) - .data; - const users = (await axios.get("/api/users/list")).data; + const users = (await axios.get("/api/users/list")).data; + if (users.find((u) => u.id === userID)?.type === "corporate") return users.find((u) => u.id === userID) as CorporateUser; - const admins = groups - .map((g) => users.find((u) => u.id === g.admin)) - .filter((x) => x?.type === "corporate"); - return admins.length > 0 ? (admins[0] as CorporateUser) : undefined; + const groups = (await axios.get(`/api/groups?participant=${userID}`)).data; + + const admins = groups.map((g) => users.find((u) => u.id === g.admin)).filter((x) => x?.type === "corporate"); + return admins.length > 0 ? (admins[0] as CorporateUser) : undefined; };