improvement: add pagination, sort and filtering to identity projects table with minor UI adjustments

This commit is contained in:
Scott Wilson
2024-11-27 12:05:46 -08:00
parent ecea79f040
commit c3956c60e9
3 changed files with 129 additions and 38 deletions
@@ -62,7 +62,7 @@ export const IdentityProjectRow = ({
}); });
}} }}
> >
<Td>{project.name}</Td> <Td className="max-w-0 truncate">{project.name}</Td>
<Td>{`${formatRoleName(roles[0].role, roles[0].customRoleName)}${ <Td>{`${formatRoleName(roles[0].role, roles[0].customRoleName)}${
roles.length > 1 ? ` (+${roles.length - 1})` : "" roles.length > 1 ? ` (+${roles.length - 1})` : ""
}`}</Td> }`}</Td>
@@ -1,7 +1,18 @@
import { faFolder } from "@fortawesome/free-solid-svg-icons"; import { useMemo } from "react";
import {
faArrowDown,
faArrowUp,
faFolder,
faMagnifyingGlass,
faSearch
} from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { import {
EmptyState, EmptyState,
IconButton,
Input,
Pagination,
Table, Table,
TableContainer, TableContainer,
TableSkeleton, TableSkeleton,
@@ -10,7 +21,9 @@ import {
THead, THead,
Tr Tr
} from "@app/components/v2"; } from "@app/components/v2";
import { usePagination, useResetPageHelper } from "@app/hooks";
import { useGetIdentityProjectMemberships } from "@app/hooks/api"; import { useGetIdentityProjectMemberships } from "@app/hooks/api";
import { OrderByDirection } from "@app/hooks/api/generic/types";
import { UsePopUpState } from "@app/hooks/usePopUp"; import { UsePopUpState } from "@app/hooks/usePopUp";
import { IdentityProjectRow } from "./IdentityProjectRow"; import { IdentityProjectRow } from "./IdentityProjectRow";
@@ -23,14 +36,76 @@ type Props = {
) => void; ) => void;
}; };
enum IdentityProjectsOrderBy {
Name = "name"
}
export const IdentityProjectsTable = ({ identityId, handlePopUpOpen }: Props) => { export const IdentityProjectsTable = ({ identityId, handlePopUpOpen }: Props) => {
const { data: projectMemberships, isLoading } = useGetIdentityProjectMemberships(identityId); const { data: projectMemberships = [], isLoading } = useGetIdentityProjectMemberships(identityId);
const {
search,
setSearch,
setPage,
page,
perPage,
setPerPage,
offset,
orderDirection,
toggleOrderDirection
} = usePagination(IdentityProjectsOrderBy.Name, { initPerPage: 10 });
const filteredProjectMemberships = useMemo(
() =>
projectMemberships
?.filter((membership) =>
membership.project.name.toLowerCase().includes(search.trim().toLowerCase())
)
.sort((a, b) => {
const [membershipOne, membershipTwo] =
orderDirection === OrderByDirection.ASC ? [a, b] : [b, a];
return membershipOne.project.name
.toLowerCase()
.localeCompare(membershipTwo.project.name.toLowerCase());
}) ?? [],
[projectMemberships, orderDirection, search]
);
useResetPageHelper({
totalCount: filteredProjectMemberships.length,
offset,
setPage
});
return ( return (
<TableContainer> <div>
<Input
value={search}
onChange={(e) => setSearch(e.target.value)}
leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
placeholder="Search projects..."
/>
<TableContainer className="mt-4">
<Table> <Table>
<THead> <THead>
<Tr> <Tr>
<Th>Name</Th> <Th className="w-2/3">
<div className="flex items-center">
Name
<IconButton
variant="plain"
className="ml-2"
ariaLabel="sort"
onClick={toggleOrderDirection}
>
<FontAwesomeIcon
icon={orderDirection === OrderByDirection.DESC ? faArrowUp : faArrowDown}
/>
</IconButton>
</div>
</Th>
<Th>Role</Th> <Th>Role</Th>
<Th>Added On</Th> <Th>Added On</Th>
<Th className="w-5" /> <Th className="w-5" />
@@ -39,7 +114,7 @@ export const IdentityProjectsTable = ({ identityId, handlePopUpOpen }: Props) =>
<TBody> <TBody>
{isLoading && <TableSkeleton columns={4} innerKey="identity-project-memberships" />} {isLoading && <TableSkeleton columns={4} innerKey="identity-project-memberships" />}
{!isLoading && {!isLoading &&
projectMemberships?.map((membership) => { filteredProjectMemberships.slice(offset, perPage * page).map((membership) => {
return ( return (
<IdentityProjectRow <IdentityProjectRow
key={`identity-project-membership-${membership.id}`} key={`identity-project-membership-${membership.id}`}
@@ -50,9 +125,26 @@ export const IdentityProjectsTable = ({ identityId, handlePopUpOpen }: Props) =>
})} })}
</TBody> </TBody>
</Table> </Table>
{!isLoading && !projectMemberships?.length && ( {Boolean(filteredProjectMemberships.length) && (
<EmptyState title="This identity has not been assigned to any projects" icon={faFolder} /> <Pagination
count={filteredProjectMemberships.length}
page={page}
perPage={perPage}
onChangePage={setPage}
onChangePerPage={setPerPage}
/>
)}
{!isLoading && !filteredProjectMemberships?.length && (
<EmptyState
title={
projectMemberships.length
? "No projects match search..."
: "This identity has not been assigned to any projects"
}
icon={projectMemberships.length ? faSearch : faFolder}
/>
)} )}
</TableContainer> </TableContainer>
</div>
); );
}; };
@@ -49,7 +49,6 @@ export const UserProjectsTable = ({ membershipId, handlePopUpOpen }: Props) => {
perPage, perPage,
setPerPage, setPerPage,
offset, offset,
limit,
orderDirection, orderDirection,
toggleOrderDirection toggleOrderDirection
} = usePagination(UserProjectsOrderBy.Name, { initPerPage: 10 }); } = usePagination(UserProjectsOrderBy.Name, { initPerPage: 10 });
@@ -59,7 +58,7 @@ export const UserProjectsTable = ({ membershipId, handlePopUpOpen }: Props) => {
membershipId membershipId
); );
const filteredProjects = useMemo( const filteredProjectMemberships = useMemo(
() => () =>
projectMemberships projectMemberships
?.filter((membership) => ?.filter((membership) =>
@@ -77,7 +76,7 @@ export const UserProjectsTable = ({ membershipId, handlePopUpOpen }: Props) => {
); );
useResetPageHelper({ useResetPageHelper({
totalCount: filteredProjects.length, totalCount: filteredProjectMemberships.length,
offset, offset,
setPage setPage
}); });
@@ -116,7 +115,7 @@ export const UserProjectsTable = ({ membershipId, handlePopUpOpen }: Props) => {
<TBody> <TBody>
{isLoading && <TableSkeleton columns={3} innerKey="user-project-memberships" />} {isLoading && <TableSkeleton columns={3} innerKey="user-project-memberships" />}
{!isLoading && {!isLoading &&
filteredProjects?.slice(offset, limit * page)?.map((membership) => { filteredProjectMemberships.slice(offset, perPage * page).map((membership) => {
return ( return (
<UserProjectRow <UserProjectRow
key={`user-project-membership-${membership.id}`} key={`user-project-membership-${membership.id}`}
@@ -127,16 +126,16 @@ export const UserProjectsTable = ({ membershipId, handlePopUpOpen }: Props) => {
})} })}
</TBody> </TBody>
</Table> </Table>
{Boolean(filteredProjects.length) && ( {Boolean(filteredProjectMemberships.length) && (
<Pagination <Pagination
count={filteredProjects.length} count={filteredProjectMemberships.length}
page={page} page={page}
perPage={perPage} perPage={perPage}
onChangePage={setPage} onChangePage={setPage}
onChangePerPage={setPerPage} onChangePerPage={setPerPage}
/> />
)} )}
{!isLoading && !filteredProjects?.length && ( {!isLoading && !filteredProjectMemberships?.length && (
<EmptyState <EmptyState
title={ title={
projectMemberships.length projectMemberships.length