Compare commits

...

2 Commits

Author SHA1 Message Date
18c55262d2
ongoing editable category 2025-07-28 22:12:05 +01:00
f7c0c0430d
feat: implement last button for transactions
Use X-Total-Count header now sent from the backend to send to the table
pagination model, so that it can jump directly to the last page.
2025-07-27 00:39:19 +01:00
4 changed files with 60 additions and 23 deletions

View File

@ -4,13 +4,17 @@ import { createRoot } from "react-dom/client";
import { RouterProvider } from "react-router"; import { RouterProvider } from "react-router";
import "./index.css"; import "./index.css";
import { router } from "./routes.ts"; import { router } from "./routes.ts";
import { loader as categoriesLoader } from "./routes/categories";
import { CategoryContext } from "./store/CategoryContext.ts";
const queryClient = new QueryClient(); const queryClient = new QueryClient();
createRoot(document.getElementById("root")!).render( createRoot(document.getElementById("root")!).render(
<StrictMode> <StrictMode>
<QueryClientProvider client={queryClient}> <QueryClientProvider client={queryClient}>
<CategoryContext value={await categoriesLoader()}>
<RouterProvider router={router} /> <RouterProvider router={router} />
</CategoryContext>
</QueryClientProvider> </QueryClientProvider>
</StrictMode> </StrictMode>
); );

View File

@ -1,16 +1,18 @@
import { useLoaderData } from "react-router"; import { useLoaderData } from "react-router";
export async function loader() { type Category = {
return await fetch(`http://localhost:9000/categories`).then((response) => { name: string;
group: { name: string } | undefined;
};
export async function loader(): Promise<Category[]> {
return fetch(`http://localhost:9000/categories`).then((response) => {
return response.json(); return response.json();
}); });
} }
export default function Categories() { export default function Categories() {
const data: { const data = useLoaderData<typeof loader>();
name: string;
group: { name: string } | undefined;
}[] = useLoaderData<typeof loader>();
return ( return (
<table> <table>

View File

@ -7,22 +7,12 @@ import {
PaginationState, PaginationState,
useReactTable, useReactTable,
} from "@tanstack/react-table"; } from "@tanstack/react-table";
import { useState } from "react"; import { useContext, useState } from "react";
import { DebounceInput } from "react-debounce-input"; import { DebounceInput } from "react-debounce-input";
import { CategoryContext } from "../store/CategoryContext";
const PageSize = 30; const PageSize = 30;
async function loader(page = 0, category: string | undefined = "") {
const url = new URL("http://localhost:9000/transactions");
url.search = new URLSearchParams({
limit: String(PageSize),
offset: String(page * PageSize),
...(category !== "" && { category: category }),
}).toString();
return await fetch(url).then((response) => response.json());
}
type Transaction = { type Transaction = {
id: number; id: number;
date: string; date: string;
@ -31,19 +21,52 @@ type Transaction = {
category: string; category: string;
}; };
async function loader(page = 0, category: string | undefined = "") {
const url = new URL("http://localhost:9000/transactions");
url.search = new URLSearchParams({
limit: String(PageSize),
offset: String(page * PageSize),
...(category !== "" && { category: category }),
}).toString();
return await fetch(url).then(async (response) => {
return {
transactions: (await response.json()) as Transaction[],
totalCount: response.headers.get("x-total-count"),
};
});
}
const columnHelper = createColumnHelper<Transaction>(); const columnHelper = createColumnHelper<Transaction>();
const columns = [ const columns = [
columnHelper.accessor("date", { columnHelper.accessor("date", {
header: "Date",
enableColumnFilter: false, enableColumnFilter: false,
}), }),
columnHelper.accessor("description", { columnHelper.accessor("description", {
header: "Description",
enableColumnFilter: false, enableColumnFilter: false,
}), }),
columnHelper.accessor("value", { columnHelper.accessor("value", {
header: "Value",
enableColumnFilter: false, enableColumnFilter: false,
}), }),
columnHelper.accessor("category", {}), columnHelper.accessor("category", {
header: "Category",
cell: (props) => {
console.log(props.getValue());
return (
<select defaultValue={props.getValue()}>
{useContext(CategoryContext).map((category) => (
<option key={category.name} value={category.name}>
{category.name}
</option>
))}
</select>
);
},
}),
]; ];
export default function Transactions() { export default function Transactions() {
@ -70,18 +93,18 @@ export default function Transactions() {
const table = useReactTable({ const table = useReactTable({
columns, columns,
data, data: data?.transactions ?? [],
getCoreRowModel: getCoreRowModel(), getCoreRowModel: getCoreRowModel(),
manualPagination: true, manualPagination: true,
manualFiltering: true, manualFiltering: true,
// rowCount: , // TODO: get this from the server rowCount: data?.totalCount ? +data.totalCount : undefined,
pageCount: -1,
onPaginationChange: setPagination, onPaginationChange: setPagination,
onColumnFiltersChange: setColumnFilters, onColumnFiltersChange: setColumnFilters,
state: { state: {
pagination, pagination,
columnFilters, columnFilters,
}, },
debugTable: true,
}); });
if (isPending) { if (isPending) {

View File

@ -0,0 +1,8 @@
import { createContext } from "react";
type Category = {
name: string;
group: { name: string } | undefined;
};
export const CategoryContext = createContext<Category[]>([]);