added server side searching and added numbering
This commit is contained in:
parent
6d72ed4735
commit
b8861fbf41
@ -6,12 +6,18 @@ import { CollectionRepository } from "../../repositories/ColllectionRepository";
|
|||||||
|
|
||||||
const PmGridCollection = ({ selectedProject, fromDate, toDate, isPending }) => {
|
const PmGridCollection = ({ selectedProject, fromDate, toDate, isPending }) => {
|
||||||
const columns = [
|
const columns = [
|
||||||
{ key: "invoiceNumber", title: "Invoice Number", className: "text-start" },
|
{
|
||||||
|
key: "invoiceNumber",
|
||||||
|
title: "Invoice Number",
|
||||||
|
className: "text-start",
|
||||||
|
groupable: true,
|
||||||
|
},
|
||||||
{ key: "title", title: "Title", sortable: true, className: "text-start" },
|
{ key: "title", title: "Title", sortable: true, className: "text-start" },
|
||||||
{
|
{
|
||||||
key: "clientSubmitedDate",
|
key: "clientSubmitedDate",
|
||||||
title: "Submission Date",
|
title: "Submission Date",
|
||||||
className: "text-start",
|
className: "text-start",
|
||||||
|
groupable: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: "exceptedPaymentDate",
|
key: "exceptedPaymentDate",
|
||||||
@ -23,7 +29,6 @@ const PmGridCollection = ({ selectedProject, fromDate, toDate, isPending }) => {
|
|||||||
{ key: "isActive", title: "Status" },
|
{ key: "isActive", title: "Status" },
|
||||||
];
|
];
|
||||||
|
|
||||||
// --- SERVER SIDE FETCHER (correct) ---
|
|
||||||
const fetcher = async ({ page, pageSize, search }) => {
|
const fetcher = async ({ page, pageSize, search }) => {
|
||||||
const response = await CollectionRepository.getCollections(
|
const response = await CollectionRepository.getCollections(
|
||||||
selectedProject,
|
selectedProject,
|
||||||
@ -87,6 +92,14 @@ const PmGridCollection = ({ selectedProject, fromDate, toDate, isPending }) => {
|
|||||||
pinning: true,
|
pinning: true,
|
||||||
resizing: true,
|
resizing: true,
|
||||||
selection: false,
|
selection: false,
|
||||||
|
reorder: true,
|
||||||
|
columnVisibility: true,
|
||||||
|
pageSizeSelector: true,
|
||||||
|
// groupByKey: "clientSubmitedDate",
|
||||||
|
aggregation: true,
|
||||||
|
pinning: true,
|
||||||
|
IsNumbering: true,
|
||||||
|
grouping: true,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -38,6 +38,8 @@ export default function PmsGrid({
|
|||||||
pageSize,
|
pageSize,
|
||||||
setPage,
|
setPage,
|
||||||
setPageSize,
|
setPageSize,
|
||||||
|
setGroupBy
|
||||||
|
,
|
||||||
search,
|
search,
|
||||||
setSearch,
|
setSearch,
|
||||||
selected,
|
selected,
|
||||||
@ -248,7 +250,12 @@ export default function PmsGrid({
|
|||||||
className="bg-light-secondary border p-2 bg-light rounded"
|
className="bg-light-secondary border p-2 bg-light rounded"
|
||||||
style={{ position: "sticky", top: 0, zIndex: 10 }}
|
style={{ position: "sticky", top: 0, zIndex: 10 }}
|
||||||
>
|
>
|
||||||
<tr className="p-3">
|
<tr className="p-2">
|
||||||
|
{features.IsNumbering && (
|
||||||
|
<th>
|
||||||
|
<h5>#</h5>
|
||||||
|
</th>
|
||||||
|
)}
|
||||||
{features.selection && (
|
{features.selection && (
|
||||||
<th
|
<th
|
||||||
style={{ width: 32, position: "sticky", top: 0, zIndex: 10 }}
|
style={{ width: 32, position: "sticky", top: 0, zIndex: 10 }}
|
||||||
@ -404,7 +411,7 @@ export default function PmsGrid({
|
|||||||
{g.items.map((row) => renderRow(row))}
|
{g.items.map((row) => renderRow(row))}
|
||||||
</React.Fragment>
|
</React.Fragment>
|
||||||
))
|
))
|
||||||
: currentRows.map((row) => renderRow(row))}
|
: currentRows.map((row, ind) => renderRow(row, ind))}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
@ -439,13 +446,18 @@ export default function PmsGrid({
|
|||||||
);
|
);
|
||||||
|
|
||||||
// render a single row (function hoisted so it can reference visibleColumns)
|
// render a single row (function hoisted so it can reference visibleColumns)
|
||||||
function renderRow(row) {
|
function renderRow(row, ind) {
|
||||||
const isSelected = selected.has(row[rowKey]);
|
const isSelected = selected.has(row[rowKey]);
|
||||||
const isExpanded = expanded.has(row[rowKey]);
|
const isExpanded = expanded.has(row[rowKey]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<React.Fragment key={row[rowKey]}>
|
<React.Fragment key={row[rowKey]}>
|
||||||
<tr>
|
<tr>
|
||||||
|
{features.IsNumbering && (
|
||||||
|
<td className="text-center align-middle p-2">
|
||||||
|
<small className="text-secondry">{ind + 1}</small>
|
||||||
|
</td>
|
||||||
|
)}
|
||||||
{/* Selection checkbox (always left) */}
|
{/* Selection checkbox (always left) */}
|
||||||
{features.selection && (
|
{features.selection && (
|
||||||
<td className="text-center align-middle p-2">
|
<td className="text-center align-middle p-2">
|
||||||
@ -593,7 +605,7 @@ function ColumnVisibilityPanel({ columns, onToggle }) {
|
|||||||
className="btn btn-sm btn-outline-secondary"
|
className="btn btn-sm btn-outline-secondary"
|
||||||
data-bs-toggle="dropdown"
|
data-bs-toggle="dropdown"
|
||||||
>
|
>
|
||||||
Columns
|
<i className="bx bx-sm me-2 bx-columns "></i> Columns
|
||||||
</button>
|
</button>
|
||||||
<div className="dropdown-menu dropdown-menu-end p-2">
|
<div className="dropdown-menu dropdown-menu-end p-2">
|
||||||
{columns.map((c) => (
|
{columns.map((c) => (
|
||||||
|
|||||||
@ -17,6 +17,8 @@ export function useGridCore({
|
|||||||
const [page, setPage] = useState(1);
|
const [page, setPage] = useState(1);
|
||||||
const [pageSize, setPageSize] = useState(initialPageSize);
|
const [pageSize, setPageSize] = useState(initialPageSize);
|
||||||
const [search, setSearch] = useState("");
|
const [search, setSearch] = useState("");
|
||||||
|
const [debouncedSearch, setDebouncedSearch] = useState("");
|
||||||
|
const [groupBy, setGroupBy] = useState(null);
|
||||||
const [sortBy, setSortBy] = useState({ key: null, dir: "asc" });
|
const [sortBy, setSortBy] = useState({ key: null, dir: "asc" });
|
||||||
const [selected, setSelected] = useState(new Set());
|
const [selected, setSelected] = useState(new Set());
|
||||||
const [expanded, setExpanded] = useState(new Set());
|
const [expanded, setExpanded] = useState(new Set());
|
||||||
@ -27,6 +29,15 @@ export function useGridCore({
|
|||||||
const [loading, setLoading] = useState(false);
|
const [loading, setLoading] = useState(false);
|
||||||
const [serverRows, setServerRows] = useState([]);
|
const [serverRows, setServerRows] = useState([]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const handler = setTimeout(() => {
|
||||||
|
setDebouncedSearch(search);
|
||||||
|
setPage(1); // Important — when search changes, go back to page 1
|
||||||
|
}, 500);
|
||||||
|
|
||||||
|
return () => clearTimeout(handler);
|
||||||
|
}, [search]);
|
||||||
|
|
||||||
// client-side derived rows
|
// client-side derived rows
|
||||||
const clientFiltered = useMemo(() => {
|
const clientFiltered = useMemo(() => {
|
||||||
if (!data) return [];
|
if (!data) return [];
|
||||||
@ -64,14 +75,19 @@ export function useGridCore({
|
|||||||
if (!serverMode || typeof fetcher !== "function") return;
|
if (!serverMode || typeof fetcher !== "function") return;
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
try {
|
try {
|
||||||
const resp = await fetcher({ page, pageSize, sortBy, search });
|
const resp = await fetcher({
|
||||||
|
page,
|
||||||
|
pageSize,
|
||||||
|
sortBy,
|
||||||
|
search: debouncedSearch,
|
||||||
|
});
|
||||||
// expected: { rows: [], total }
|
// expected: { rows: [], total }
|
||||||
setServerRows(resp.rows || []);
|
setServerRows(resp.rows || []);
|
||||||
setTotalRows(resp.total || (resp.rows ? resp.rows.length : 0));
|
setTotalRows(resp.total || (resp.rows ? resp.rows.length : 0));
|
||||||
} finally {
|
} finally {
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
}
|
}
|
||||||
}, [serverMode, fetcher, page, pageSize, sortBy, search]);
|
}, [serverMode, fetcher, page, pageSize, sortBy, debouncedSearch]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (serverMode) fetchServer();
|
if (serverMode) fetchServer();
|
||||||
@ -164,7 +180,8 @@ export function useGridCore({
|
|||||||
visibleColumns,
|
visibleColumns,
|
||||||
updateColumn,
|
updateColumn,
|
||||||
setColState,
|
setColState,
|
||||||
|
groupBy,
|
||||||
|
setGroupBy,
|
||||||
// data
|
// data
|
||||||
rows,
|
rows,
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user