@tulip-systems/core 0.8.2 → 0.9.0

package/src/modules/data-tables/components/filters/date-range.client.tsx

@@ -0,0 +1,127 @@
+"use client";
+
+import { Badge, Button, Separator } from "@tulip-systems/core/components";
+import {
+  Calendar,
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@tulip-systems/core/components/client";
+import { format } from "date-fns";
+import { CalendarIcon } from "lucide-react";
+import { type SingleParserBuilder, useQueryState } from "nuqs";
+import { startTransition, useState } from "react";
+
+export type TableFilterDateRangeValue = [Date, Date] | null;
+
+export type TableFilterDateRangeProps = {
+  title?: string;
+  filter: { name: string; parser: SingleParserBuilder<[Date, Date] | null> };
+  presets?: TableFilterDateRangePreset[];
+};
+
+export type TableFilterDateRangePreset = {
+  label: string;
+  value: [Date, Date];
+};
+
+export function TableFilterDateRange({
+  title,
+  filter,
+  presets,
+}: TableFilterDateRangeProps) {
+  const [open, setOpen] = useState(false);
+  const [query, setQuery] = useQueryState(filter.name, filter.parser);
+
+  const from = query?.[0] ?? null;
+  const until = query?.[1] ?? null;
+  const selectedRange =
+    from || until ? { from: from ?? undefined, to: until ?? undefined } : undefined;
+
+  const label = formatDateRange(from, until);
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger asChild>
+        <Button type="button" variant="outline" size="sm" className="h-8 border-dashed">
+          <CalendarIcon className="mr-1 h-4 w-4" />
+          {title}
+          {label && (
+            <>
+              <Separator orientation="vertical" className="mx-2 h-full" />
+              <Badge variant="secondary" className="rounded-sm px-1 font-normal">
+                {label}
+              </Badge>
+            </>
+          )}
+        </Button>
+      </PopoverTrigger>
+      <PopoverContent className="w-auto p-0" align="start">
+        <div className="flex flex-col gap-3 p-3 lg:flex-row">
+          {presets && presets.length > 0 && (
+            <div className="flex min-w-40 flex-col gap-1 lg:border-r lg:pr-3">
+              {presets.map((preset) => (
+                <Button
+                  key={preset.label}
+                  type="button"
+                  size="sm"
+                  variant="ghost"
+                  className="justify-start"
+                  onClick={() => {
+                    setQuery(preset.value, { startTransition });
+                    setOpen(false);
+                  }}
+                >
+                  {preset.label}
+                </Button>
+              ))}
+            </div>
+          )}
+
+          <Calendar
+            mode="range"
+            numberOfMonths={2}
+            selected={selectedRange}
+            onSelect={(range) => {
+              if (range?.from && range?.to) {
+                setQuery([range.from, range.to], { startTransition });
+              } else if (range?.from) {
+                setQuery([range.from, range.from], { startTransition });
+              } else {
+                setQuery(null, { startTransition });
+              }
+            }}
+            autoFocus
+          />
+        </div>
+
+        {label && (
+          <div className="w-full space-y-2 p-1.5">
+            <Separator />
+
+            <Button
+              size="sm"
+              type="button"
+              variant="ghost"
+              onClick={() => {
+                setOpen(false);
+                setQuery(null, { startTransition });
+              }}
+              className="w-full text-center"
+            >
+              Clear filters
+            </Button>
+          </div>
+        )}
+      </PopoverContent>
+    </Popover>
+  );
+}
+
+function formatDateRange(from: Date | null, until: Date | null) {
+  if (from && until) return `${format(from, "dd/MM/yyyy")} tot ${format(until, "dd/MM/yyyy")}`;
+  if (from) return `Vanaf ${format(from, "dd/MM/yyyy")}`;
+  if (until) return `Tot ${format(until, "dd/MM/yyyy")}`;
+
+  return null;
+}

package/src/modules/data-tables/components/filters/search.client.tsx

@@ -0,0 +1,37 @@
+"use client";
+
+import { Search } from "lucide-react";
+import { debounce, type SingleParserBuilder, useQueryState } from "nuqs";
+import { startTransition } from "react";
+import { Input } from "@/components/ui/input";
+
+export type TableFilterSearchProps = {
+  placeholder?: string;
+  filter: { name: string; parser: SingleParserBuilder<string | null> };
+};
+
+export function TableFilterSearch({ placeholder, filter }: TableFilterSearchProps) {
+  const [query, setQuery] = useQueryState(filter.name, filter.parser);
+
+  return (
+    <div className="relative">
+      <Search className="pointer-events-none absolute top-1/2 left-2.5 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
+      <Input
+        defaultValue={query ?? undefined}
+        placeholder={placeholder}
+        className="h-8 w-[150px] pl-8 lg:w-[250px]"
+        onChange={(e) => {
+          setQuery(e.target.value || null, {
+            limitUrlUpdates: e.target.value === "" ? undefined : debounce(350),
+            startTransition,
+          });
+        }}
+        onKeyDown={(e) => {
+          if (e.key === "Enter") {
+            setQuery(e.currentTarget.value || null, { startTransition });
+          }
+        }}
+      />
+    </div>
+  );
+}

package/src/modules/data-tables/components/filters/slider.client.tsx

@@ -1,7 +1,7 @@
 "use client";
 
-import { PlusCircle } from "lucide-react";
-import { type ParserBuilder, useQueryState } from "nuqs";
+import { SlidersHorizontal } from "lucide-react";
+import { type SingleParserBuilder, useQueryState } from "nuqs";
 import { startTransition, useState } from "react";
 import { useDebouncedCallback } from "use-debounce";
 import { Badge } from "@/components/ui/badge";
@@ -13,7 +13,7 @@ import { Slider } from "@/components/ui/slider";
 
 export type TableFilterSliderProps = {
   title?: string;
-  filter: { name: string; parser: ParserBuilder<[number, number] | null> };
+  filter: { name: string; parser: SingleParserBuilder<[number, number] | null> };
   options?: { min: number; max: number };
 };
 
@@ -38,7 +38,7 @@ export function TableFilterSlider({
     <Popover open={open} onOpenChange={setOpen}>
       <PopoverTrigger asChild>
         <Button type="button" variant="outline" size="sm" className="h-8 border-dashed">
-          <PlusCircle className="mr-2 h-4 w-4" />
+          <SlidersHorizontal className="mr-1 h-4 w-4" />
           {title}
           {selectedValues && selectedValues?.length > 0 && (
             <>

package/src/modules/data-tables/components/filters/toggle.client.tsx

@@ -0,0 +1,32 @@
+"use client";
+
+import { ToggleLeft } from "lucide-react";
+import { type SingleParserBuilder, useQueryState } from "nuqs";
+import { startTransition } from "react";
+import { Toggle } from "@/components/ui/toggle.client";
+
+export type TableFilterToggleProps = {
+  title?: string;
+  filter: { name: string; parser: SingleParserBuilder<boolean | null> };
+};
+
+export function TableFilterToggle({ title, filter }: TableFilterToggleProps) {
+  const [query, setQuery] = useQueryState(filter.name, filter.parser);
+
+  return (
+    <Toggle
+      variant="outline"
+      size="sm"
+      className="h-8 border-border border-dashed bg-background data-[state=on]:border-primary data-[state=on]:border-solid data-[state=on]:bg-primary data-[state=on]:text-primary-foreground dark:border-input dark:bg-input/30"
+      pressed={query === true}
+      onPressedChange={(pressed) =>
+        startTransition(() => {
+          setQuery(pressed ? true : null);
+        })
+      }
+    >
+      <ToggleLeft className="mr-2 h-4 w-4" />
+      {title}
+    </Toggle>
+  );
+}

package/src/modules/data-tables/components/footer.tsx

@@ -8,7 +8,7 @@ import { PaginationTableFooter } from "../strategies/pagination/components";
 /**
  * Table bottombar
  */
-export function TableFooter<TData extends { id: string }>({ table }: { table: Table<TData> }) {
+export function TableFooter<TData>({ table }: { table: Table<TData> }) {
   const meta = table.options.meta as TableMeta<TData>;
 
   if (meta.strategy.name === "pagination") {
@@ -25,7 +25,7 @@ export function TableFooter<TData extends { id: string }>({ table }: { table: Ta
 /**
  * Table bottombar
  */
-export function TableBottombar<TData extends { id: string }>({ table }: { table: Table<TData> }) {
+export function TableBottombar<TData>({ table }: { table: Table<TData> }) {
   const meta = table.options.meta as TableMeta<TData>;
 
   if (meta.strategy.name === "pagination") {

package/src/modules/data-tables/entry.client.ts

@@ -5,7 +5,10 @@ export * from "./components/cell/common.client";
 export * from "./components/cell/index.client";
 export * from "./components/cell/select.client";
 export * from "./components/filters/combobox.client";
+export * from "./components/filters/date-range.client";
+export * from "./components/filters/search.client";
 export * from "./components/filters/slider.client";
+export * from "./components/filters/toggle.client";
 export * from "./components/search-input.client";
 /**
  * Hooks

package/src/modules/data-tables/entry.server.ts

@@ -1,9 +1,9 @@
 /**
  * Lib
  */
-export * from "./lib/converters/cursor";
 export * from "./lib/converters/dto";
-export * from "./lib/converters/filter";
+export * from "./lib/converters/filters";
+export * from "./lib/converters/pagination";
 export * from "./lib/converters/search";
 export * from "./lib/converters/sorting";
 

package/src/modules/data-tables/hooks/use-context.client.tsx

@@ -10,14 +10,11 @@ import {
   useEffect,
   useState,
 } from "react";
-import type { CommandDef } from "@/modules/commands/lib/definitions";
+import type { CommandDef } from "@/modules/commands/lib/builder";
 import type { TableFiltersResult } from "../lib/filters/config";
 import type { Selection, TableColumnDef, TableMetaInput, TableStrategy } from "../lib/types";
 
-type useReactTableProps<TData extends { id: string }> = Omit<
-  TableOptions<TData>,
-  "getCoreRowModel"
-> & {
+type useReactTableProps<TData> = Omit<TableOptions<TData>, "getCoreRowModel"> & {
   getCoreRowModel?: TableOptions<TData>["getCoreRowModel"];
 };
 
@@ -25,18 +22,19 @@ type useReactTableProps<TData extends { id: string }> = Omit<
  * Use table config
  */
 export type TableConfigContextValue<
-  TData extends { id: string },
+  TData,
   TFilters extends TableFiltersResult = TableFiltersResult,
   TMeta extends TableMetaInput<TData> = TableMetaInput<TData>,
 > = useReactTableProps<TData> & {
   queryData: TData[];
   data: TData[];
   setData: Dispatch<SetStateAction<TData[]>>;
+  getRowId: (row: TData) => string;
   columns: TableColumnDef<TData>[];
   strategy: TableStrategy;
   selection?: Selection;
   columnVisibility?: VisibilityState;
-  commands?: CommandDef<TData, TMeta>[];
+  commands?: CommandDef[];
   meta?: TMeta;
   where?: TFilters;
 };
@@ -47,7 +45,7 @@ const TableConfigContext = createContext({});
  * Table context hook
  */
 export function useTableConfigContext<
-  TData extends { id: string },
+  TData,
   TFilters extends TableFiltersResult = TableFiltersResult,
   TMeta extends TableMetaInput<TData> = TableMetaInput<TData>,
 >(): TableConfigContextValue<TData, TFilters, TMeta> {
@@ -60,7 +58,7 @@ export function useTableConfigContext<
  * Table context provider
  */
 export function TableConfigProvider<
-  TData extends { id: string },
+  TData,
   TFilters extends TableFiltersResult = TableFiltersResult,
   TMeta extends TableMetaInput<TData> = TableMetaInput<TData>,
 >({
@@ -77,13 +75,13 @@ export function TableConfigProvider<
  * Create use table config hook
  */
 type CreateTableConfigInput<
-  TData extends { id: string },
+  TData,
   TFilters extends TableFiltersResult = TableFiltersResult,
   TMeta extends TableMetaInput<TData> = TableMetaInput<TData>,
 > = Omit<TableConfigContextValue<TData, TFilters, TMeta>, "data" | "setData">;
 
 export const createTableConfig = <
-  TData extends { id: string },
+  TData,
   TFilters extends TableFiltersResult = TableFiltersResult,
   TMeta extends TableMetaInput<TData> = TableMetaInput<TData>,
 >(

package/src/modules/data-tables/hooks/use-selection.client.ts

@@ -7,16 +7,17 @@ import type { Selection } from "../lib/types";
 /**
  * Row selection props
  */
-type UseSelectionProps<TData extends { id: string }> = {
+type UseSelectionProps<TData> = {
   data: TData[];
   selection?: Selection;
+  getRowId: (row: TData) => string;
 };
 
 /**
  * Row selection hook for tanstack/react-table
  * @param { UseSelectionProps<TData> } props
  */
-export function useSelection<TData extends { id: string }>(props: UseSelectionProps<TData>) {
+export function useSelection<TData>(props: UseSelectionProps<TData>) {
   const [rowSelectionState, setRowSelectionState] = React.useState({});
   const [selectedData, setSelectedData] = React.useState<TData[]>([]);
 
@@ -41,11 +42,17 @@ export function useSelection<TData extends { id: string }>(props: UseSelectionPr
     // Filter out the items that are no longer selected and add the newly selected items
     setSelectedData((prevData) => {
       // Create a Set of previously selected IDs for faster lookup
-      const prevSelectedIds = new Set(prevData.map((item) => item.id));
+      const prevSelectedIds = new Set(prevData.map((item) => props.getRowId(item)));
 
       return [
-        ...prevData.filter(({ id }) => selectedIds.has(id)),
-        ...props.data.filter(({ id }) => selectedIds.has(id) && !prevSelectedIds.has(id)),
+        ...prevData.filter((row) => {
+          const id = props.getRowId(row);
+          return selectedIds.has(id) && prevSelectedIds.has(id);
+        }),
+        ...props.data.filter((row) => {
+          const id = props.getRowId(row);
+          return selectedIds.has(id) && !prevSelectedIds.has(id);
+        }),
       ];
     });
 

package/src/modules/data-tables/hooks/use-table.client.ts

@@ -14,16 +14,14 @@ import { useSelection } from "./use-selection.client";
 /**
  * Server data table
  */
-export function useTable<
-  TData extends { id: string },
-  TMeta extends TableMeta<TData> = TableMeta<TData>,
->() {
-  const { data, strategy, selection, columnVisibility, commands, ...options } =
+export function useTable<TData, TMeta extends TableMeta<TData> = TableMeta<TData>>() {
+  const { data, strategy, selection, columnVisibility, commands, getRowId, ...options } =
     useTableConfigContext<TData, TMeta>();
 
   const { rowSelection, selectedData, onRowSelectionChange } = useSelection({
     data,
     selection,
+    getRowId,
   });
   const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
 
@@ -44,7 +42,7 @@ export function useTable<
       pagination: strategy.paginationState,
     },
     getCoreRowModel: getCoreRowModel(),
-    getRowId: (row) => row.id,
+    getRowId: getRowId,
     manualPagination: strategy.manualPagination,
     onPaginationChange: strategy.onPaginationChange,
     manualSorting: strategy.manualSorting,

package/src/modules/data-tables/lib/converters/filters.ts

@@ -0,0 +1,85 @@
+import type { TDatabaseSchema } from "@tulip-systems/core/config";
+import { and, type SQL } from "drizzle-orm";
+import type { Database } from "@/modules/database/lib/service.server";
+
+/**
+ * Parser function for a single filter key.
+ * Returns a SQL condition or undefined when the filter is not active.
+ */
+type FilterParser<TFilters, TSchema extends TDatabaseSchema = TDatabaseSchema> = (
+  filters: TFilters,
+  context: { db: Database<TSchema> },
+) => SQL | undefined;
+
+/**
+ * Map of filter keys to parser functions.
+ * Parsers are optional so routes can define only the keys they need.
+ */
+type FilterParserConfig<
+  TFilters extends Record<string, unknown>,
+  TSchema extends TDatabaseSchema = TDatabaseSchema,
+> = {
+  [K in keyof TFilters]?: FilterParser<TFilters, TSchema>;
+};
+
+/**
+ * Boolean key selection used by .pick() and .omit().
+ * Example: { search: true, status: true }
+ */
+type KeySelection<K extends PropertyKey> = Partial<Record<K, boolean>>;
+
+/**
+ * Creates a chainable parser builder for table query filters.
+ *
+ * Usage:
+ * - create parser once from config
+ * - bind context per request
+ * - optionally narrow keys with pick/omit
+ * - parse filters into a single `and(...)` SQL condition
+ */
+export function createTableQueryFiltersParser<
+  TFilters extends Record<string, unknown>,
+  TSchema extends TDatabaseSchema = TDatabaseSchema,
+>(config: FilterParserConfig<TFilters, TSchema>) {
+  type Key = Extract<keyof TFilters, string>;
+  // All configured filter keys; used as the default selected set.
+  const configKeys = Object.keys(config) as Key[];
+
+  // Immutable builder: each pick/omit returns a new builder instance.
+  function createBuilder(context: { db: Database<TSchema> }, selected: Set<Key>) {
+    return {
+      // Keep only the keys explicitly marked as true.
+      pick(keys: KeySelection<Key>) {
+        const selectedKeys = Object.entries(keys)
+          .filter(([_, value]) => value)
+          .map(([key]) => key) as Key[];
+
+        const next = new Set<Key>(selectedKeys);
+        return createBuilder(context, next);
+      },
+
+      // Remove keys marked as true from the current selected set.
+      omit(keys: KeySelection<Key>) {
+        const selectedKeys = Array.from(selected).filter((key) => !keys[key]);
+
+        const next = new Set(selectedKeys);
+        return createBuilder(context, next);
+      },
+
+      // Parse active filter keys into one SQL `and(...)` expression.
+      parse(filters: TFilters): SQL | undefined {
+        const conditions: (SQL | undefined)[] = Array.from(selected).map((key) => {
+          const parser = config[key];
+          if (!parser) throw new Error(`No parser defined for filter key "${key}"`);
+
+          return parser(filters, context);
+        });
+
+        return and(...conditions);
+      },
+    };
+  }
+
+  // Bind request context and start with all configured keys selected.
+  return (context: { db: Database<TSchema> }) => createBuilder(context, new Set(configKeys));
+}

package/src/modules/data-tables/lib/converters/pagination.ts

@@ -0,0 +1,13 @@
+import type { TableQuerySchema } from "../validators";
+
+/**
+ * Convert pagination to DB query
+ * @param {ConvertPaginationToQueryParamsInput} pagination
+ * @returns {{ limit: number; offset: number; }}
+ */
+export function parseTableQueryPagination({
+  limit,
+  cursor,
+}: Pick<TableQuerySchema, "cursor" | "limit">) {
+  return { limit, offset: cursor * limit };
+}

package/src/modules/data-tables/lib/converters/sorting.ts

@@ -1,25 +1,68 @@
-import { type AnyColumn, asc, desc, type SQL, type ValueOrArray } from "drizzle-orm";
-import type { PgColumn, PgTable } from "drizzle-orm/pg-core";
+import { asc, desc, type SQL } from "drizzle-orm";
+import type { PgColumn } from "drizzle-orm/pg-core";
 import type { TableQuerySchema } from "../validators";
 
-export type ConvertSortToQueryParamsFallback = ValueOrArray<AnyColumn | SQL>;
-
 /**
- * Convert pagination to DB query
- * @param {ConvertSortToQueryParamsInput} pagination
- * @returns { { orderBy: Record<string, "asc" | "desc"> } }
+ * Creates a reusable sorting parser for table query parameters.
+ *
+ * Resolves a user's sort/order selection to Drizzle SQL expressions.
+ * Supports sorting on both own-table columns and relation columns (via joins).
+ *
+ * Returns an object with the resolved config, normalized options, and a `parse`
+ * function that converts `TableQuerySchema` input into `SQL[]` for `.orderBy(...orderBy)`.
+ *
+ * @param config - Sortable columns keyed by their URL sort parameter name.
+ *   Use `getTableColumns(table)` as a base, and spread in relation columns.
+ * @param options.fallback - Order applied when no valid sort is provided by the user.
+ * @param options.every - Order appended to every result, regardless of user sort.
+ *   Useful for deterministic tiebreakers (e.g. always sort by id as secondary).
+ *
+ * @example
+ * const runSortingConfig = {
+ *   ...getTableColumns(runs),
+ *   projectTitle: projects.title,
+ * };
+ *
+ * export const parseRunTableQuerySorting = createTableQuerySortingParser(
+ *   runSortingConfig,
+ *   { fallback: [desc(runs.scheduledAt)] },
+ * );
+ *
+ * // In handler:
+ * const orderBy = parseRunTableQuerySorting.parse(input);
+ * db.select().from(runs).orderBy(...orderBy);
  */
-export function convertOrderByToQueryParams(
-  query: Pick<TableQuerySchema, "sort" | "order">,
-  table: PgTable,
-  fallback: ConvertSortToQueryParamsFallback,
-): ValueOrArray<AnyColumn | SQL> {
-  const { sort, order } = query;
+export function createTableQuerySortingParser<TConfig extends Record<string, PgColumn>>(
+  config: TConfig,
+  options?: { fallback?: SQL | SQL[]; every?: SQL | SQL[] },
+) {
+  const every = options?.every
+    ? Array.isArray(options.every)
+      ? options.every
+      : [options.every]
+    : [];
+
+  const fallback = options?.fallback
+    ? Array.isArray(options.fallback)
+      ? options.fallback
+      : [options.fallback]
+    : [];
+
+  return {
+    config,
+    options: {
+      every,
+      fallback,
+    },
+    parse: (input: Pick<TableQuerySchema, "sort" | "order">): SQL[] => {
+      const direction = input.order === "asc" ? asc : desc;
 
-  if (sort && sort in table) {
-    const column = table[sort as keyof typeof table] as PgColumn;
-    return order === "asc" ? asc(column) : desc(column);
-  }
+      if (input.sort && input.sort in config) {
+        const column = config[input.sort as keyof typeof config] as PgColumn;
+        return [direction(column), ...every];
+      }
 
-  return fallback;
+      return [...fallback, ...every];
+    },
+  };
 }

package/src/modules/data-tables/lib/filters/parsers.ts

@@ -79,6 +79,24 @@ export const parseFilterDatetime = <TSchema extends ParseFilterDatetimeSchema>(
   encode: (decoded) => (decoded ? decoded.toISOString() : ""),
 });
 
+/**
+ * Filter datetime range value (tuple of two dates)
+ */
+export type ParseFilterDatetimeRangeSchema = z.ZodTuple<[z.ZodDate, z.ZodDate]>;
+
+export const parseFilterDatetimeRange = <TSchema extends ParseFilterDatetimeRangeSchema>(
+  schema: TSchema,
+): ParseFilter<TSchema> => ({
+  schema: schema.nullable(),
+  decode: (encoded) => {
+    if (!encoded) return null as unknown as z.input<TSchema>;
+    const [from, to] = encoded.split("_");
+    return (from && to ? [new Date(from), new Date(to)] : null) as unknown as z.input<TSchema>;
+  },
+  encode: (decoded) =>
+    decoded ? `${decoded[0].toISOString()}_${decoded[1].toISOString()}` : "",
+});
+
 /**
  * Filter range value
  */

package/src/modules/data-tables/lib/types.ts

@@ -8,17 +8,17 @@ import type {
 } from "@tanstack/react-table";
 import type { UseQueryStatesKeysMap } from "nuqs";
 import type { Permission } from "@/modules/auth/lib/permissions";
-import type { CommandDef } from "@/modules/commands/lib/definitions";
+import type { CommandDef } from "@/modules/commands/lib/builder";
 
 /**
  * Data table meta
  */
-export type TableMetaInput<TData extends { id: string }> = TanStackTableMeta<TData>;
+export type TableMetaInput<TData> = TanStackTableMeta<TData>;
 
-export type TableMeta<TData extends { id: string }, TMeta = TableMetaInput<TData>> = {
+export type TableMeta<TData, TMeta = TableMetaInput<TData>> = {
   strategy: TableStrategy;
   selectedData: TData[];
-  commands?: CommandDef<TData, TMeta>[];
+  commands?: CommandDef[];
 };
 
 /**