Improvements to UsersContainer.tsx

This commit is contained in:
Matthew Penner 2021-01-04 12:44:44 -07:00
parent 95c55e7d28
commit ed73f6a020
6 changed files with 93 additions and 29 deletions

View file

@ -1,7 +1,8 @@
import AdminCheckbox from '@/components/admin/AdminCheckbox';
import CopyOnClick from '@/components/elements/CopyOnClick';
import React, { useContext, useEffect, useState } from 'react';
import getUsers, { Context as UsersContext } from '@/api/admin/users/getUsers';
import AdminTable, { ContentWrapper, Loading, NoItems, Pagination, TableBody, TableHead, TableHeader, TableRow } from '@/components/admin/AdminTable';
import AdminTable, { ContentWrapper, Loading, NoItems, Pagination, TableBody, TableHead, TableHeader } from '@/components/admin/AdminTable';
import Button from '@/components/elements/Button';
import FlashMessageRender from '@/components/FlashMessageRender';
import useFlash from '@/plugins/useFlash';
@ -11,9 +12,9 @@ import tw from 'twin.macro';
import AdminContentBlock from '@/components/admin/AdminContentBlock';
const RowCheckbox = ({ id }: { id: number}) => {
const isChecked = AdminContext.useStoreState(state => state.nests.selectedNests.indexOf(id) >= 0);
const appendSelectedUser = AdminContext.useStoreActions(actions => actions.nests.appendSelectedNest);
const removeSelectedUser = AdminContext.useStoreActions(actions => actions.nests.removeSelectedNest);
const isChecked = AdminContext.useStoreState(state => state.users.selectedUsers.indexOf(id) >= 0);
const appendSelectedUser = AdminContext.useStoreActions(actions => actions.users.appendSelectedUser);
const removeSelectedUser = AdminContext.useStoreActions(actions => actions.users.removeSelectedUser);
return (
<AdminCheckbox
@ -48,8 +49,8 @@ const UsersContainer = () => {
const length = users?.items?.length || 0;
const setSelectedUsers = AdminContext.useStoreActions(actions => actions.nests.setSelectedNests);
const selectedUserLength = AdminContext.useStoreState(state => state.nests.selectedNests.length);
const setSelectedUsers = AdminContext.useStoreActions(actions => actions.users.setSelectedUsers);
const selectedUserLength = AdminContext.useStoreState(state => state.users.selectedUsers.length);
const onSelectAllClick = (e: React.ChangeEvent<HTMLInputElement>) => {
setSelectedUsers(e.currentTarget.checked ? (users?.items?.map(user => user.id) || []) : []);
@ -90,28 +91,56 @@ const UsersContainer = () => {
<table css={tw`w-full table-auto`}>
<TableHead>
<TableHeader name={'ID'}/>
<TableHeader name={'Email'}/>
<TableHeader name={'Name'}/>
<TableHeader name={'Username'}/>
<TableHeader name={'Client Name'}/>
<TableHeader name={'Status'}/>
<TableHeader name={'Role'}/>
</TableHead>
<TableBody>
{
users.items.map(user => (
<TableRow key={user.id}>
<tr key={user.id} css={tw`h-14 hover:bg-neutral-600`}>
<td css={tw`pl-6`}>
<RowCheckbox id={user.id}/>
</td>
<td css={tw`px-6 text-sm text-neutral-200 text-left whitespace-nowrap`}>{user.id}</td>
<td css={tw`px-6 text-sm text-neutral-200 text-left whitespace-nowrap`}>
<NavLink to={`${match.url}/${user.id}`} css={tw`text-primary-400 hover:text-primary-300`}>
{user.email}
<CopyOnClick text={user.id.toString()}>
<code css={tw`font-mono bg-neutral-900 rounded py-1 px-2`}>{user.id}</code>
</CopyOnClick>
</td>
<td css={tw`px-6 whitespace-nowrap`}>
<NavLink to={`${match.url}/${user.id}`}>
<div css={tw`flex items-center`}>
<div css={tw`flex-shrink-0 h-10 w-10`}>
<img css={tw`h-10 w-10 rounded-full`} alt="" src="https://www.gravatar.com/avatar/92623b66155f7e475250b549226a5023"/>
</div>
<div css={tw`ml-4`}>
<div css={tw`text-sm text-neutral-200`}>
{user.firstName} {user.lastName}
</div>
<div css={tw`text-sm text-neutral-400`}>
{user.email}
</div>
</div>
</div>
</NavLink>
</td>
<td css={tw`px-6 text-sm text-neutral-200 text-left whitespace-nowrap`}>{user.username}</td>
<td css={tw`px-6 text-sm text-neutral-200 text-left whitespace-nowrap`}>{user.lastName}, {user.firstName}</td>
</TableRow>
<td css={tw`px-6 whitespace-nowrap`}>
<span css={tw`px-2 inline-flex text-xs leading-5 font-medium rounded-full bg-green-100 text-green-800`}>
Active
</span>
</td>
<td css={tw`px-6 text-sm text-neutral-200 text-left whitespace-nowrap`}>{user.roleName}</td>
</tr>
))
}
</TableBody>