Updated the UserList to show the corporates
This commit is contained in:
@@ -31,6 +31,10 @@ import useUserBalance from "@/hooks/useUserBalance";
|
|||||||
const columnHelper = createColumnHelper<User>();
|
const columnHelper = createColumnHelper<User>();
|
||||||
const searchFields = [["name"], ["email"], ["corporateInformation", "companyInformation", "name"]];
|
const searchFields = [["name"], ["email"], ["corporateInformation", "companyInformation", "name"]];
|
||||||
|
|
||||||
|
const corporatesHash = {
|
||||||
|
type: "corporate",
|
||||||
|
};
|
||||||
|
|
||||||
const CompanyNameCell = ({users, user, groups}: {user: User; users: User[]; groups: Group[]}) => {
|
const CompanyNameCell = ({users, user, groups}: {user: User; users: User[]; groups: Group[]}) => {
|
||||||
const [companyName, setCompanyName] = useState("");
|
const [companyName, setCompanyName] = useState("");
|
||||||
const [isLoading, setIsLoading] = useState(false);
|
const [isLoading, setIsLoading] = useState(false);
|
||||||
@@ -70,6 +74,10 @@ export default function UserList({
|
|||||||
);
|
);
|
||||||
|
|
||||||
const {users, total, isLoading, reload} = useUsers(userHash);
|
const {users, total, isLoading, reload} = useUsers(userHash);
|
||||||
|
const {users: corporates} = useUsers(corporatesHash);
|
||||||
|
|
||||||
|
const totalUsers = useMemo(() => [...users, ...corporates], [users, corporates]);
|
||||||
|
|
||||||
const {permissions} = usePermissions(user?.id || "");
|
const {permissions} = usePermissions(user?.id || "");
|
||||||
const {balance} = useUserBalance();
|
const {balance} = useUserBalance();
|
||||||
const {groups} = useGroups({
|
const {groups} = useGroups({
|
||||||
@@ -354,7 +362,7 @@ export default function UserList({
|
|||||||
<SorterArrow name="companyName" />
|
<SorterArrow name="companyName" />
|
||||||
</button>
|
</button>
|
||||||
) as any,
|
) as any,
|
||||||
cell: (info) => <CompanyNameCell user={info.row.original} users={users} groups={groups} />,
|
cell: (info) => <CompanyNameCell user={info.row.original} users={totalUsers} groups={groups} />,
|
||||||
}),
|
}),
|
||||||
columnHelper.accessor("subscriptionExpirationDate", {
|
columnHelper.accessor("subscriptionExpirationDate", {
|
||||||
header: (
|
header: (
|
||||||
|
|||||||
Reference in New Issue
Block a user