store column order in local storage, refactor a bit

This commit is contained in:
2024-07-14 17:34:45 +02:00
parent 1c976ecda1
commit 2ca70ec1a5
8 changed files with 74 additions and 153 deletions

View File

@@ -21,7 +21,12 @@ import { useSessionStore } from "@/state/db-session-store";
import { zodResolver } from "@hookform/resolvers/zod";
import { createFileRoute } from "@tanstack/react-router";
import { useState } from "react";
import { type Control, useForm } from "react-hook-form";
import {
type Control,
type FieldPath,
type FieldValues,
useForm,
} from "react-hook-form";
import { z } from "zod";
export const Route = createFileRoute("/auth/login")({
@@ -56,7 +61,7 @@ function ConnectionStringForm({
onSubmit={handleSubmit(onSubmit)}
id={"login-form"}
>
<DatabaseTypeSelector control={control} />
<DatabaseTypeSelector control={control} name={"type"} />
<FormInput
label={"Connection string"}
name={"connectionString"}
@@ -104,7 +109,7 @@ function ConnectionFieldsForm({
onSubmit={handleSubmit(onSubmit)}
id={"login-form"}
>
<DatabaseTypeSelector control={control} />
<DatabaseTypeSelector control={control} name={"type"} />
<FormInput
name={"host"}
control={control}
@@ -193,15 +198,17 @@ function LoginForm() {
);
}
function DatabaseTypeSelector({
function DatabaseTypeSelector<T extends FieldValues>({
control,
name,
}: {
control: Control<any>;
control: Control<T>;
name: FieldPath<T>;
}) {
return (
<div className="grid gap-2">
<Label htmlFor="dbType">Database type</Label>
<FormSelect control={control} name={"type"}>
<FormSelect control={control} name={name}>
<SelectTrigger className="w-full" id={"dbType"}>
<SelectValue />
</SelectTrigger>

View File

@@ -1,5 +1,6 @@
import { useColumns } from "@/components/db-table-view/columns";
import { ColumnsDropdown } from "@/components/db-table-view/columns-dropdown";
import { ResetStateDropdown } from "@/components/db-table-view/reset-state-dropdown";
import {
TableScrollContainer,
TableView,
@@ -29,8 +30,8 @@ import { useLocalStorage } from "usehooks-ts";
import { z } from "zod";
const tableSearchSchema = z.object({
pageSize: z.number().catch(10),
pageIndex: z.number().catch(0),
pageSize: z.number().optional(),
pageIndex: z.number().optional(),
sortField: z.string().optional(),
sortDesc: z.boolean().optional(),
});
@@ -42,6 +43,7 @@ export const Route = createFileRoute("/db/$dbName/tables/$tableName/data")({
function Component() {
const { tableName, dbName } = Route.useParams();
const columns = useColumns({ dbName, tableName });
const { filters, setFilters } = useFilters(Route.fullPath);
const [whereQuery, setWhereQuery] = useState("");
@@ -54,6 +56,15 @@ function Component() {
`columnVisibility-${dbName}-${tableName}`,
{},
);
const [columnOrder, setColumnOrder] = useLocalStorage<string[]>(
`columnOrder-${dbName}-${tableName}`,
() => columns.map((c) => c.id ?? ""),
);
useEffect(() => {
if (columnOrder.length === columns.length) return;
setColumnOrder(columns.map((c) => c.id ?? ""));
}, [columns, columnOrder.length, setColumnOrder]);
const paginationState = useMemo(
() => ({
@@ -64,20 +75,13 @@ function Component() {
);
const sortingState = useMemo(() => sortByToState(filters), [filters]);
const columns = useColumns({ dbName, tableName });
const [columnOrder, setColumnOrder] = useState<string[]>(() =>
columns.map((c) => c.id ?? ""),
);
useEffect(() => {
if (columnOrder.length !== 0) return;
setColumnOrder(columns.map((c) => c.id ?? ""));
}, [columns, columnOrder.length]);
const { data, refetch } = useTableDataQuery({
whereQuery,
tableName,
dbName,
perPage: filters.pageSize,
page: filters.pageIndex,
perPage: filters.pageSize ?? DEFAULT_PAGE_SIZE,
page: filters.pageIndex ?? DEFAULT_PAGE_INDEX,
sortField: filters.sortField,
sortDesc: filters.sortDesc,
});
@@ -150,6 +154,7 @@ function Component() {
columnOrder={columnOrder}
setColumnOrder={setColumnOrder}
/>
<ResetStateDropdown table={table} />
<p>
Rows: <strong>{data?.count}</strong>
</p>

View File

@@ -97,10 +97,6 @@ function TableDetailsTable() {
<Link
from={Route.fullPath}
to={"./data"}
search={{
pageIndex: 0,
pageSize: 10,
}}
className={cn("flex gap-2 items-center", "hover:underline")}
>
Explore data <ArrowRight className={"size-4"} />