Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#605 Fix table responsiveness #611

Merged
merged 1 commit into from
Oct 30, 2024
Merged

#605 Fix table responsiveness #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 23 additions & 30 deletions src/components/DataTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,11 @@ function DataTable({ data, columns, title, loading, className }: TableData) {
prepareRow,
state: { pageIndex: currentPageIndex, pageSize },
} = tableInstance;

useEffect(() => {
setPageIndex(currentPageIndex);
}, [currentPageIndex]);

const handleFilterChange = (e) => {
const value = e.target.value || '';
setGlobalFilter(value);
Expand All @@ -66,42 +68,37 @@ function DataTable({ data, columns, title, loading, className }: TableData) {

return (
<div
className={`relative font-serif bg-indigo-100 dark:bg-dark-bg shadow-lg h-fit px-5 py-8 rounded-md w-[100%] "lg:ml-60 mx-auto"} mb-10`}
className={`relative font-serif bg-indigo-100 dark:bg-dark-bg shadow-lg h-fit px-5 py-8 rounded-md w-full lg:w-auto mx-auto mb-10 ${className}`}
>
<div className="flex items-center justify-between pb-6 ">
<div className="flex flex-col md:flex-row items-center justify-between pb-6 space-y-4 md:space-y-0">
<div>
<h2 className="text-xl font-semibold text-gray-800 dark:text-white ">
<h2 className="text-lg md:text-xl font-semibold text-gray-800 dark:text-white">
{t(title)}
</h2>
<input
value={filterInput}
aria-label="Filter table data"
placeholder="Filter"
className="px-5 py-2 mt-4 font-sans text-xs border rounded outline-none border-primary dark:bg-neutral-600 dark:text-white w-52 md:w-96"
className="px-4 py-2 mt-4 font-sans text-xs md:text-sm border rounded outline-none border-primary dark:bg-neutral-600 dark:text-white w-full sm:w-52 md:w-96"
onChange={handleFilterChange}
/>
</div>
</div>
<div className="overflow-visible ">
<table className="min-w-full leading-normal" {...getTableProps()}>
<div className="overflow-x-auto">
<table
className="min-w-full leading-normal text-xs md:text-sm"
{...getTableProps()}
>
<thead>
{headerGroups.map((headerGroup, index) => (
<tr
{...headerGroup.getHeaderGroupProps()}
key={headerGroup.getHeaderGroupProps().key}
>
{headerGroup.headers.map((column, colIndex) => (
{headerGroups.map((headerGroup) => (
<tr {...headerGroup.getHeaderGroupProps()} key={headerGroup.id}>
{headerGroup.headers.map((column) => (
<th
className={column.isSorted ? 'sort-asc thead' : ' thead'}
className={`thead ${column.isSorted ? 'sort-asc' : ''}`}
{...column.getHeaderProps(column.getSortByToggleProps())}
key={
column.getHeaderProps(column.getSortByToggleProps()).key
}
key={column.id}
>
{column.render('Header')}
<span>
{/* // {column.isSorted ? (column.isSortedDesc ? ' ▼' : ' ▲') : ''} */}
</span>
</th>
))}
</tr>
Expand All @@ -112,7 +109,6 @@ function DataTable({ data, columns, title, loading, className }: TableData) {
!loading &&
page.map((row) => {
prepareRow(row);
// console.log(row.getRowProps());
return (
<tr
className={`border-b dark:border-gray-700 ${
Expand All @@ -121,13 +117,13 @@ function DataTable({ data, columns, title, loading, className }: TableData) {
: 'bg-white dark:bg-dark-bg'
}`}
{...row.getRowProps()}
key={row.getRowProps().key}
key={row.id}
>
{row.cells.map((cell) => (
<td
className="data-cell "
className="data-cell px-4 py-2"
{...cell.getCellProps()}
key={cell.getCellProps().key}
key={cell.column.id}
>
{cell.render('Cell')}
</td>
Expand All @@ -137,11 +133,8 @@ function DataTable({ data, columns, title, loading, className }: TableData) {
})
) : (
<tr>
<td
colSpan={columns.length || 100}
className="p-4 text-center h-24"
>
<p className="text-lg font-medium text-gray-600 dark:text-gray-400 pt-8">
<td colSpan={columns.length} className="p-4 text-center h-24">
<p className="text-sm md:text-lg font-medium text-gray-600 dark:text-gray-400">
No records available
</p>
</td>
Expand All @@ -151,7 +144,7 @@ function DataTable({ data, columns, title, loading, className }: TableData) {
<tr>
<td
colSpan={columns.length}
className="px-6 py-4 text-sm text-center text-gray-500 dark:text-gray-300 "
className="px-6 py-4 text-sm text-center text-gray-500 dark:text-gray-300"
>
Loading...
</td>
Expand All @@ -160,7 +153,7 @@ function DataTable({ data, columns, title, loading, className }: TableData) {
</tbody>
</table>
</div>
<div className="px-6 py-4">
<div className="px-4 md:px-6 py-4">
<DataPagination
pageOptions={pageOptions}
canNextPage={canNextPage}
Expand Down
22 changes: 11 additions & 11 deletions src/pages/invitation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import InvitationCard from '../components/InvitationCard';
import InvitationModal from './invitationModalComponet';
import { GET_INVITATIONS_STATISTICS_QUERY } from '../queries/invitationStats.queries';
import InvitationCardSkeleton from '../Skeletons/InvitationCardSkeleton';
import { useTranslation } from 'react-i18next';
import { ReactI18NextChild, useTranslation } from 'react-i18next';
import { Icon } from '@iconify/react';
import {
CANCEL_INVITATION,
Expand Down Expand Up @@ -211,15 +211,15 @@ useEffect(() => {

if (isSearching && searchData?.getInvitations) {
invitation = searchData.getInvitations.invitations.find(
(inv) => inv.id === selectedInvitationId
(inv: { id: string; }) => inv.id === selectedInvitationId
);
} else if (isFiltering && filterData?.filterInvitations) {
invitation = filterData.filterInvitations.invitations.find(
(inv) => inv.id === selectedInvitationId
(inv: { id: string; }) => inv.id === selectedInvitationId
);
} else if (data && data.getAllInvitations) {
invitation = data.getAllInvitations.invitations.find(
(inv) => inv.id === selectedInvitationId
(inv: { id: string; }) => inv.id === selectedInvitationId
);
}

Expand Down Expand Up @@ -412,20 +412,20 @@ useEffect(() => {
{
id: "email",
header: t('email'),
accessor: (row) => row.email,
cell: (info) => <div>{info.getValue()}</div>,
accessor: (row: { email: any; }) => row.email,
cell: (info: { getValue: () => string | number | boolean | React.ReactElement<any, string | React.JSXElementConstructor<any>> | Iterable<React.ReactNode> | React.ReactPortal | Iterable<ReactI18NextChild> | null | undefined; }) => <div>{info.getValue()}</div>,
},
{
id: "role",
header: t('role'),
accessor: (row) => row.role,
cell: (info) => <div>{info.getValue()}</div>,
accessor: (row: { role: any; }) => row.role,
cell: (info: { getValue: () => string | number | boolean | React.ReactElement<any, string | React.JSXElementConstructor<any>> | Iterable<React.ReactNode> | React.ReactPortal | Iterable<ReactI18NextChild> | null | undefined; }) => <div>{info.getValue()}</div>,
},
{
id: "Status",
header: t('Status'),
accessor: (row) => row.Status,
cell: (info) => <div>{info.getValue()}</div>,
accessor: (row: { Status: any; }) => row.Status,
cell: (info: { getValue: () => string | number | boolean | React.ReactElement<any, string | React.JSXElementConstructor<any>> | Iterable<React.ReactNode> | React.ReactPortal | Iterable<ReactI18NextChild> | null | undefined; }) => <div>{info.getValue()}</div>,
},
{
id: "Action",
Expand Down Expand Up @@ -572,7 +572,7 @@ const currentInvitationsTotal = isSearching && searchData?.getInvitations
: data?.getAllInvitations?.totalInvitations;

if (currentInvitations && currentInvitations.length > 0) {
currentInvitations.forEach((invitation) => {
currentInvitations.forEach((invitation: { invitees: any[]; status: string; id: any; }) => {
invitation.invitees?.forEach((invitee: any) => {
let entry: any = {};
entry.email = invitee.email;
Expand Down
Loading