Skip to content

Open-source status page, incident response and uptime monitoring

chore: dashboard logs response ui improvements (#2648)

Maximilian Kasked273a161825c
diff --git a/apps/dashboard/src/app/(dashboard)/monitors/[id]/logs/client.tsx b/apps/dashboard/src/app/(dashboard)/monitors/[id]/logs/client.tsx
index 4794e677a..b45bbec6e 100644
--- a/apps/dashboard/src/app/(dashboard)/monitors/[id]/logs/client.tsx
+++ b/apps/dashboard/src/app/(dashboard)/monitors/[id]/logs/client.tsx
@@ -60,7 +60,11 @@ type LogsFilterState = {
trigger?: string[];
};
-export function Client() {
+export function Client({
+ controlsDefaultOpen,
+}: {
+ controlsDefaultOpen: boolean;
+}) {
const trpc = useTRPC();
const { id } = useParams<{ id: string }>();
const { data: workspace } = useQuery(trpc.workspace.get.queryOptions());
@@ -80,13 +84,22 @@ export function Client() {
{workspace.plan === "free" ? (
<BillingPlaceholder />
) : (
- <LogsTable monitor={monitor} />
+ <LogsTable
+ monitor={monitor}
+ controlsDefaultOpen={controlsDefaultOpen}
+ />
)}
</div>
);
}
-function LogsTable({ monitor }: { monitor: Monitor }) {
+function LogsTable({
+ monitor,
+ controlsDefaultOpen,
+}: {
+ monitor: Monitor;
+ controlsDefaultOpen: boolean;
+}) {
const { schema, columns, filterFields, filterSchema } = useMemo(
() =>
createLogsTable({
@@ -103,6 +116,7 @@ function LogsTable({ monitor }: { monitor: Monitor }) {
<DataTableStoreProvider adapter={adapter}>
<LogsTableInner
monitor={monitor}
+ controlsDefaultOpen={controlsDefaultOpen}
columns={columns}
filterFields={filterFields}
schema={schema}
@@ -114,12 +128,14 @@ function LogsTable({ monitor }: { monitor: Monitor }) {
function LogsTableInner({
monitor,
+ controlsDefaultOpen,
columns,
filterFields,
schema,
filterSchema,
}: {
monitor: Monitor;
+ controlsDefaultOpen: boolean;
columns: ReturnType<typeof createLogsTable>["columns"];
filterFields: ReturnType<typeof createLogsTable>["filterFields"];
schema: ReturnType<typeof createLogsTable>["schema"];
@@ -261,6 +277,7 @@ function LogsTableInner({
totalRows={facets?.totalRowCount}
filterRows={facets?.filterRowCount}
totalRowsFetched={rows.length}
+ controlsDefaultOpen={controlsDefaultOpen}
isFetching={isFetching}
isLoading={isLoading}
isFacetsLoading={isFacetsPending}
diff --git a/apps/dashboard/src/app/(dashboard)/monitors/[id]/logs/page.tsx b/apps/dashboard/src/app/(dashboard)/monitors/[id]/logs/page.tsx
index e3dc7ede6..83eeabf1b 100644
--- a/apps/dashboard/src/app/(dashboard)/monitors/[id]/logs/page.tsx
+++ b/apps/dashboard/src/app/(dashboard)/monitors/[id]/logs/page.tsx
@@ -1,5 +1,13 @@
+import { CONTROLS_COOKIE_NAME } from "@openstatus/ui/lib/data-table-filters/cookie";
+
+import { getSidebarDefaultOpen } from "@/lib/sidebar-cookie";
+
import { Client } from "./client";
-export default function Page() {
- return <Client />;
+export default async function Page() {
+ const controlsDefaultOpen = await getSidebarDefaultOpen(
+ CONTROLS_COOKIE_NAME,
+ true,
+ );
+ return <Client controlsDefaultOpen={controlsDefaultOpen} />;
}
diff --git a/apps/dashboard/src/components/common/kbd.tsx b/apps/dashboard/src/components/common/kbd.tsx
deleted file mode 100644
index 4aafb2697..000000000
--- a/apps/dashboard/src/components/common/kbd.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { type VariantProps, cva } from "class-variance-authority";
-import type * as React from "react";
-
-import { cn } from "@/lib/utils";
-
-const kbdVariants = cva(
- "ms-2 -me-1 inline-flex h-5 max-h-full items-center rounded border px-1 font-[inherit] text-[0.625rem] font-medium",
- {
- variants: {
- variant: {
- default: "border-input bg-background text-muted-foreground/70",
- secondary: "bg-secondary text-secondary-foreground",
- ghost: "border-transparent",
- },
- },
- defaultVariants: {
- variant: "default",
- },
- },
-);
-
-export function Kbd({
- children,
- className,
- variant,
- ...props
-}: React.ComponentProps<"kbd"> & VariantProps<typeof kbdVariants>) {
- return (
- <kbd className={cn(kbdVariants({ variant, className }))} {...props}>
- {children}
- </kbd>
- );
-}
diff --git a/apps/dashboard/src/components/date-picker.tsx b/apps/dashboard/src/components/date-picker.tsx
index 6830ba4b5..8fb2954de 100644
--- a/apps/dashboard/src/components/date-picker.tsx
+++ b/apps/dashboard/src/components/date-picker.tsx
@@ -3,13 +3,13 @@
import { Button } from "@openstatus/ui/components/ui/button";
import { Calendar } from "@openstatus/ui/components/ui/calendar";
import { Input } from "@openstatus/ui/components/ui/input";
+import { Kbd } from "@openstatus/ui/components/ui/kbd";
import { Label } from "@openstatus/ui/components/ui/label";
import { Separator } from "@openstatus/ui/components/ui/separator";
import { endOfDay } from "date-fns";
import { useState } from "react";
import type { DateRange } from "react-day-picker";
-import { Kbd } from "@/components/common/kbd";
import { formatDateForInput } from "@/lib/formatter";
type DatePickerProps = {
diff --git a/apps/dashboard/src/components/development-indicator.tsx b/apps/dashboard/src/components/development-indicator.tsx
index 0d41d0174..651bd3ffb 100644
--- a/apps/dashboard/src/components/development-indicator.tsx
+++ b/apps/dashboard/src/components/development-indicator.tsx
@@ -30,8 +30,7 @@ export function DevelopmentIndicator() {
<TooltipContent side="top">
{!isMobile ? (
<p>
- Press <Kbd className="ms-0 -me-0">F</Kbd> key to provide
- feedback.
+ Press <Kbd>F</Kbd> key to provide feedback.
</p>
) : (
<p>Use a larger screen to provide feedback.</p>
diff --git a/apps/dashboard/src/components/nav/app-header.tsx b/apps/dashboard/src/components/nav/app-header.tsx
index 6e6bf639d..8383ba454 100644
--- a/apps/dashboard/src/components/nav/app-header.tsx
+++ b/apps/dashboard/src/components/nav/app-header.tsx
@@ -8,7 +8,7 @@ export function AppHeader({
return (
<header
className={cn(
- "bg-background h-app-header sticky top-0 z-10 flex shrink-0 items-center gap-2 border-b px-2",
+ "bg-background h-app-header sticky top-0 z-10 flex shrink-0 items-center gap-2 border-b px-2.5",
className,
)}
{...props}
@@ -24,10 +24,7 @@ export function AppHeaderContent({
...props
}: React.ComponentProps<"div">) {
return (
- <div
- className={cn("flex flex-1 items-center gap-2 px-3", className)}
- {...props}
- >
+ <div className={cn("flex flex-1 items-center gap-2", className)} {...props}>
{children}
</div>
);
@@ -39,7 +36,7 @@ export function AppHeaderActions({
...props
}: React.ComponentProps<"div">) {
return (
- <div className={cn("ml-auto px-3", className)} {...props}>
+ <div className={cn("ml-auto", className)} {...props}>
{children}
</div>
);
diff --git a/apps/dashboard/src/components/nav/app-sidebar.tsx b/apps/dashboard/src/components/nav/app-sidebar.tsx
index 2ee4863f1..b93cee535 100644
--- a/apps/dashboard/src/components/nav/app-sidebar.tsx
+++ b/apps/dashboard/src/components/nav/app-sidebar.tsx
@@ -2,6 +2,7 @@
import { SidebarLeft } from "@openstatus/icons";
import { Button } from "@openstatus/ui/components/ui/button";
+import { Kbd, KbdGroup } from "@openstatus/ui/components/ui/kbd";
import {
Sidebar,
SidebarContent,
@@ -18,7 +19,6 @@ import {
} from "@openstatus/ui/components/ui/tooltip";
import * as React from "react";
-import { Kbd } from "@/components/common/kbd";
import { NavMonitors } from "@/components/nav/nav-monitors";
import { NavOverview } from "@/components/nav/nav-overview";
import { NavStatusPages } from "@/components/nav/nav-status-pages";
@@ -115,16 +115,12 @@ export function AppSidebarTrigger() {
<span className="sr-only">Toggle Sidebar</span>
</Button>
</TooltipTrigger>
- <TooltipContent side="right">
- <p className="mr-px inline-flex items-center">
- Toggle Sidebar{" "}
- <Kbd className="border-muted-foreground bg-primary text-background font-mono">
- ⌘
- </Kbd>
- <Kbd className="border-muted-foreground bg-primary text-background font-mono">
- {SIDEBAR_KEYBOARD_SHORTCUT}
- </Kbd>
- </p>
+ <TooltipContent side="right" className="flex items-center gap-2">
+ Toggle Sidebar
+ <KbdGroup>
+ <Kbd>⌘</Kbd>
+ <Kbd>{SIDEBAR_KEYBOARD_SHORTCUT}</Kbd>
+ </KbdGroup>
</TooltipContent>
</Tooltip>
</TooltipProvider>
diff --git a/apps/dashboard/src/components/nav/nav-tabs.tsx b/apps/dashboard/src/components/nav/nav-tabs.tsx
index 6650d0568..bed2bd45a 100644
--- a/apps/dashboard/src/components/nav/nav-tabs.tsx
+++ b/apps/dashboard/src/components/nav/nav-tabs.tsx
@@ -21,7 +21,7 @@ export function NavTabs({ items }: NavTabsProps) {
return (
<nav className="bg-background top-app-header h-app-tabs sticky z-10 w-full overflow-x-auto border-b px-2">
- <ul className="inline-flex h-full items-center gap-1 px-3 text-sm">
+ <ul className="inline-flex h-full items-center gap-1 text-sm">
{items.map((item) => {
const normalizedHref = item.href.replace(/\/+$/, "") || "/";
const isActive =
@@ -33,7 +33,7 @@ export function NavTabs({ items }: NavTabsProps) {
className={cn(
"relative flex h-full items-center",
isActive &&
- "after:bg-foreground after:absolute after:inset-x-0 after:bottom-0 after:h-px",
+ "after:bg-foreground after:absolute after:inset-x-2 after:bottom-0 after:h-px",
)}
>
<Link
diff --git a/apps/dashboard/src/components/nav/sidebar-right.tsx b/apps/dashboard/src/components/nav/sidebar-right.tsx
index bdf2b296f..736326fcf 100644
--- a/apps/dashboard/src/components/nav/sidebar-right.tsx
+++ b/apps/dashboard/src/components/nav/sidebar-right.tsx
@@ -2,6 +2,7 @@
import { Sidebar as SidebarIcon } from "@openstatus/icons";
import { Button } from "@openstatus/ui/components/ui/button";
+import { Kbd, KbdGroup } from "@openstatus/ui/components/ui/kbd";
import {
Sidebar,
SidebarContent,
@@ -22,7 +23,6 @@ import {
import { cn } from "@openstatus/ui/lib/utils";
import * as React from "react";
-import { Kbd } from "../common/kbd";
import { SidebarMetadata, type SidebarMetadataProps } from "./sidebar-metadata";
const SIDEBAR_KEYBOARD_SHORTCUT = "]";
@@ -54,16 +54,12 @@ export function SidebarRight({
<TooltipTrigger asChild>
<SidebarTrigger />
</TooltipTrigger>
- <TooltipContent side="left">
- <p className="mr-px inline-flex items-center">
- Toggle Sidebar{" "}
- <Kbd className="border-muted-foreground bg-primary text-background font-mono">
- ⌘
- </Kbd>
- <Kbd className="border-muted-foreground bg-primary text-background font-mono">
- {SIDEBAR_KEYBOARD_SHORTCUT}
- </Kbd>
- </p>
+ <TooltipContent side="left" className="flex items-center gap-2">
+ Toggle Sidebar
+ <KbdGroup>
+ <Kbd>⌘</Kbd>
+ <Kbd>{SIDEBAR_KEYBOARD_SHORTCUT}</Kbd>
+ </KbdGroup>
</TooltipContent>
</Tooltip>
</TooltipProvider>
diff --git a/apps/status-page/src/components/common/kbd.tsx b/apps/status-page/src/components/common/kbd.tsx
deleted file mode 100644
index 0562d076a..000000000
--- a/apps/status-page/src/components/common/kbd.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { cn } from "@openstatus/ui/lib/utils";
-
-export function Kbd({
- children,
- className,
- ...props
-}: React.ComponentProps<"kbd">) {
- return (
- <kbd
- className={cn(
- "bg-background text-muted-foreground/70 ms-2 -me-1 inline-flex h-5 max-h-full items-center rounded border px-1 font-[inherit] text-[0.625rem] font-medium",
- className,
- )}
- {...props}
- >
- {children}
- </kbd>
- );
-}
diff --git a/apps/status-page/src/components/date-picker.tsx b/apps/status-page/src/components/date-picker.tsx
index 608fc8e88..bfda727bc 100644
--- a/apps/status-page/src/components/date-picker.tsx
+++ b/apps/status-page/src/components/date-picker.tsx
@@ -3,6 +3,7 @@
import { Button } from "@openstatus/ui/components/ui/button";
import { Calendar } from "@openstatus/ui/components/ui/calendar";
import { Input } from "@openstatus/ui/components/ui/input";
+import { Kbd } from "@openstatus/ui/components/ui/kbd";
import { Label } from "@openstatus/ui/components/ui/label";
import { Separator } from "@openstatus/ui/components/ui/separator";
import { endOfDay } from "date-fns";
@@ -11,7 +12,6 @@ import { useState } from "react";
import type { DateRange } from "react-day-picker";
import { formatDateForInput } from "../lib/formatter";
-import { Kbd } from "./common/kbd";
type DatePickerProps = {
range: DateRange;
diff --git a/apps/status-page/src/components/themes/theme-palette-picker.tsx b/apps/status-page/src/components/themes/theme-palette-picker.tsx
index 1d06f8d31..3b0ee239f 100644
--- a/apps/status-page/src/components/themes/theme-palette-picker.tsx
+++ b/apps/status-page/src/components/themes/theme-palette-picker.tsx
@@ -20,10 +20,9 @@ export function ThemePalettePicker() {
</Button>
</TooltipTrigger>
<TooltipContent className="flex items-center gap-2">
- Toggle Sidebar{" "}
+ Toggle Sidebar
<KbdGroup>
<Kbd>⌘</Kbd>
- <span>+</span>
<Kbd>B</Kbd>
</KbdGroup>
</TooltipContent>
diff --git a/apps/status-page/src/components/themes/theme-sidebar.tsx b/apps/status-page/src/components/themes/theme-sidebar.tsx
index f154774e3..1fcd428f5 100644
--- a/apps/status-page/src/components/themes/theme-sidebar.tsx
+++ b/apps/status-page/src/components/themes/theme-sidebar.tsx
@@ -449,10 +449,9 @@ export function SidebarTrigger({
</Button>
</TooltipTrigger>
<TooltipContent side="left" className="flex items-center gap-2">
- Toggle Sidebar{" "}
+ Toggle Sidebar
<KbdGroup>
<Kbd>⌘</Kbd>
- <span>+</span>
<Kbd>B</Kbd>
</KbdGroup>
</TooltipContent>
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 29846760e..0e5c534cf 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -71,6 +71,7 @@
"@dnd-kit/sortable": "catalog:",
"@dnd-kit/utilities": "catalog:",
"@hookform/resolvers": "catalog:",
+ "@openstatus/icons": "workspace:*",
"@radix-ui/react-accordion": "catalog:",
"@radix-ui/react-alert-dialog": "catalog:",
"@radix-ui/react-avatar": "catalog:",
diff --git a/packages/ui/src/components/custom/date-picker-with-range.tsx b/packages/ui/src/components/custom/date-picker-with-range.tsx
index d10ce233e..eb0f9a8f5 100644
--- a/packages/ui/src/components/custom/date-picker-with-range.tsx
+++ b/packages/ui/src/components/custom/date-picker-with-range.tsx
@@ -1,5 +1,6 @@
"use client";
+import { Calendar as CalendarIcon } from "@openstatus/icons";
import type { DatePreset } from "@openstatus/ui/components/data-table-filters/types";
import { Button } from "@openstatus/ui/components/ui/button";
import { Calendar } from "@openstatus/ui/components/ui/calendar";
@@ -25,7 +26,6 @@ import { useDebounce } from "@openstatus/ui/hooks/use-debounce";
import { presets as defaultPresets } from "@openstatus/ui/lib/date-preset";
import { cn } from "@openstatus/ui/lib/utils";
import { endOfDay, format } from "date-fns";
-import { Calendar as CalendarIcon } from "lucide-react";
import * as React from "react";
import type { DateRange } from "react-day-picker";
diff --git a/packages/ui/src/components/data-table-filters/controls.tsx b/packages/ui/src/components/data-table-filters/controls.tsx
index 6b754c77e..1a3737c65 100644
--- a/packages/ui/src/components/data-table-filters/controls.tsx
+++ b/packages/ui/src/components/data-table-filters/controls.tsx
@@ -1,6 +1,10 @@
-import { useLocalStorage } from "@openstatus/ui/hooks/use-local-storage";
-import { CONTROLS_KEY } from "@openstatus/ui/lib/data-table-filters/local-storage";
-import { createContext, useContext } from "react";
+"use client";
+
+import {
+ CONTROLS_COOKIE_MAX_AGE,
+ CONTROLS_COOKIE_NAME,
+} from "@openstatus/ui/lib/data-table-filters/cookie";
+import { createContext, useCallback, useContext, useState } from "react";
interface ControlsContextType {
open: boolean;
@@ -9,8 +13,27 @@ interface ControlsContextType {
export const ControlsContext = createContext<ControlsContextType | null>(null);
-export function ControlsProvider({ children }: { children: React.ReactNode }) {
- const [open, setOpen] = useLocalStorage(CONTROLS_KEY, true);
+export function ControlsProvider({
+ children,
+ defaultOpen = true,
+}: {
+ children: React.ReactNode;
+ /**
+ * Read `CONTROLS_COOKIE_NAME` on the server and pass it in to persist the
+ * panel across loads; without it the panel reopens on every reload.
+ */
+ defaultOpen?: boolean;
+}) {
+ const [open, setOpenState] = useState(defaultOpen);
+
+ const setOpen = useCallback(
+ (value: React.SetStateAction<boolean>) => {
+ const next = value instanceof Function ? value(open) : value;
+ setOpenState(next);
+ document.cookie = `${CONTROLS_COOKIE_NAME}=${next}; path=/; max-age=${CONTROLS_COOKIE_MAX_AGE}`;
+ },
+ [open],
+ );
return (
<ControlsContext.Provider value={{ open, setOpen }}>
diff --git a/packages/ui/src/components/data-table-filters/data-table-cell/data-table-cell-boolean.tsx b/packages/ui/src/components/data-table-filters/data-table-cell/data-table-cell-boolean.tsx
index c571f9c35..0050d41d5 100644
--- a/packages/ui/src/components/data-table-filters/data-table-cell/data-table-cell-boolean.tsx
+++ b/packages/ui/src/components/data-table-filters/data-table-cell/data-table-cell-boolean.tsx
@@ -1,4 +1,4 @@
-import { Check, Minus } from "lucide-react";
+import { Check, Remove } from "@openstatus/icons";
export function DataTableCellBoolean({
value,
@@ -16,7 +16,7 @@ export function DataTableCellBoolean({
);
}
return (
- <Minus
+ <Remove
className={`ml-auto h-4 w-4 ${color ? "" : "text-muted-foreground/50"}`}
style={color ? { color } : undefined}
/>
diff --git a/packages/ui/src/components/data-table-filters/data-table-column-header.tsx b/packages/ui/src/components/data-table-filters/data-table-column-header.tsx
index 66f8a4a8c..97728877d 100644
--- a/packages/ui/src/components/data-table-filters/data-table-column-header.tsx
+++ b/packages/ui/src/components/data-table-filters/data-table-column-header.tsx
@@ -1,7 +1,7 @@
+import { ChevronDown, ChevronUp } from "@openstatus/icons";
import { Button } from "@openstatus/ui/components/ui/button";
import { cn } from "@openstatus/ui/lib/utils";
import type { Column } from "@tanstack/react-table";
-import { ChevronDown, ChevronUp } from "lucide-react";
import type React from "react";
interface DataTableColumnHeaderProps<
diff --git a/packages/ui/src/components/data-table-filters/data-table-filter-checkbox.tsx b/packages/ui/src/components/data-table-filters/data-table-filter-checkbox.tsx
index 00dec50fa..f1ebe165e 100644
--- a/packages/ui/src/components/data-table-filters/data-table-filter-checkbox.tsx
+++ b/packages/ui/src/components/data-table-filters/data-table-filter-checkbox.tsx
@@ -1,5 +1,6 @@
"use client";
+import { Search } from "@openstatus/icons";
import { useDataTable } from "@openstatus/ui/components/data-table-filters/data-table-provider";
import { Checkbox } from "@openstatus/ui/components/ui/checkbox";
import {
@@ -11,7 +12,6 @@ import { Label } from "@openstatus/ui/components/ui/label";
import { Skeleton } from "@openstatus/ui/components/ui/skeleton";
import { formatCompactNumber } from "@openstatus/ui/lib/format";
import { cn } from "@openstatus/ui/lib/utils";
-import { Search } from "lucide-react";
import { useMemo, useState } from "react";
import type { DataTableCheckboxFilterField, Option } from "./types";
diff --git a/packages/ui/src/components/data-table-filters/data-table-filter-command-ai/index.tsx b/packages/ui/src/components/data-table-filters/data-table-filter-command-ai/index.tsx
index 066c20ff0..8a144f914 100644
--- a/packages/ui/src/components/data-table-filters/data-table-filter-command-ai/index.tsx
+++ b/packages/ui/src/components/data-table-filters/data-table-filter-command-ai/index.tsx
@@ -1,5 +1,6 @@
"use client";
+import { AI, Close, Loading, Search } from "@openstatus/icons";
import { TextShimmer } from "@openstatus/ui/components/data-table-filters/data-table-filter-command-ai/text-shimmer";
import {
columnFiltersParserFromSchema,
@@ -18,7 +19,7 @@ import {
CommandList,
CommandSeparator,
} from "@openstatus/ui/components/ui/command";
-import { Kbd } from "@openstatus/ui/components/ui/kbd";
+import { Kbd, KbdGroup } from "@openstatus/ui/components/ui/kbd";
import { Separator } from "@openstatus/ui/components/ui/separator";
import { useHotKey } from "@openstatus/ui/hooks/use-hot-key";
import { useLocalStorage } from "@openstatus/ui/hooks/use-local-storage";
@@ -31,7 +32,6 @@ import { formatCompactNumber } from "@openstatus/ui/lib/format";
import { cn } from "@openstatus/ui/lib/utils";
import { Command as CommandPrimitive } from "cmdk";
import { formatDistanceToNow } from "date-fns";
-import { LoaderCircle, Search, Sparkles, X } from "lucide-react";
import React, { useEffect, useMemo, useRef, useState } from "react";
import { toast } from "sonner";
@@ -277,7 +277,7 @@ export function DataTableFilterAICommand({
onClick={() => setOpen(true)}
>
{isLoading || isAILoading ? (
- <LoaderCircle className="text-muted-foreground group-hover:text-popover-foreground mr-2 h-4 w-4 shrink-0 animate-spin opacity-50" />
+ <Loading className="text-muted-foreground group-hover:text-popover-foreground mr-2 h-4 w-4 shrink-0 animate-spin opacity-50" />
) : (
<Search className="text-muted-foreground group-hover:text-popover-foreground mr-2 h-4 w-4 shrink-0 opacity-50" />
)}
@@ -290,10 +290,10 @@ export function DataTableFilterAICommand({
<span>Search data table...</span>
)}
</span>
- <Kbd className="text-muted-foreground group-hover:text-accent-foreground ml-auto">
- <span className="mr-1">⌘</span>
- <span>J</span>
- </Kbd>
+ <KbdGroup className="text-muted-foreground group-hover:text-accent-foreground ml-auto">
+ <Kbd>⌘</Kbd>
+ <Kbd>J</Kbd>
+ </KbdGroup>
</button>
<Command
className={cn(
@@ -434,7 +434,7 @@ export function DataTableFilterAICommand({
}
}}
>
- <Sparkles className="size-4 shrink-0" />
+ <AI className="size-4 shrink-0" />
{inputValue.trim()}
<span className="text-muted-foreground ml-auto text-xs">
describe your query to infer filters
@@ -488,7 +488,7 @@ export function DataTableFilterAICommand({
}}
className="hover:bg-background ml-1 hidden rounded-md p-0.5 group-aria-selected:block"
>
- <X className="h-4 w-4" />
+ <Close className="h-4 w-4" />
</button>
</CommandItem>
);
@@ -531,7 +531,7 @@ export function DataTableFilterAICommand({
<span>
AI:{" "}
<Kbd>
- <Sparkles className="size-2.5 shrink-0" />
+ <AI className="size-2.5 shrink-0" />
</Kbd>
</span>
</div>
diff --git a/packages/ui/src/components/data-table-filters/data-table-filter-controls-drawer.tsx b/packages/ui/src/components/data-table-filters/data-table-filter-controls-drawer.tsx
index 1f9daca48..6d358a4c6 100644
--- a/packages/ui/src/components/data-table-filters/data-table-filter-controls-drawer.tsx
+++ b/packages/ui/src/components/data-table-filters/data-table-filter-controls-drawer.tsx
@@ -1,3 +1,4 @@
+import { Filter } from "@openstatus/icons";
import { Button } from "@openstatus/ui/components/ui/button";
import {
Drawer,
@@ -9,7 +10,7 @@ import {
DrawerTitle,
DrawerTrigger,
} from "@openstatus/ui/components/ui/drawer";
-import { Kbd } from "@openstatus/ui/components/ui/kbd";
+import { Kbd, KbdGroup } from "@openstatus/ui/components/ui/kbd";
import {
Tooltip,
TooltipContent,
@@ -19,7 +20,6 @@ import {
import { useHotKey } from "@openstatus/ui/hooks/use-hot-key";
import { useMediaQuery } from "@openstatus/ui/hooks/use-media-query";
import { VisuallyHidden } from "@radix-ui/react-visually-hidden";
-import { FilterIcon } from "lucide-react";
import React from "react";
import { DataTableFilterControls } from "./data-table-filter-controls";
@@ -28,9 +28,13 @@ export function DataTableFilterControlsDrawer() {
const triggerButtonRef = React.useRef<HTMLButtonElement>(null);
const isMobile = useMediaQuery("(max-width: 640px)");
- useHotKey(() => {
- triggerButtonRef.current?.click();
- }, "b");
+ useHotKey(
+ () => {
+ triggerButtonRef.current?.click();
+ },
+ "\\",
+ { code: "Backslash" },
+ );
return (
<Drawer>
@@ -44,18 +48,19 @@ export function DataTableFilterControlsDrawer() {
size="icon"
className="h-9 w-9"
>
- <FilterIcon className="h-4 w-4" />
+ <Filter className="h-4 w-4" />
</Button>
</DrawerTrigger>
</TooltipTrigger>
- <TooltipContent side="right">
- <p className="text-nowrap">
- Toggle controls with{" "}
- <Kbd className="text-muted-foreground group-hover:text-accent-foreground ml-1">
- <span className="mr-1">⌘</span>
- <span>B</span>
- </Kbd>
- </p>
+ <TooltipContent
+ side="right"
+ className="flex items-center gap-2 text-nowrap"
+ >
+ Toggle Controls
+ <KbdGroup>
+ <Kbd>⌘</Kbd>
+ <Kbd>\</Kbd>
+ </KbdGroup>
</TooltipContent>
</Tooltip>
</TooltipProvider>
diff --git a/packages/ui/src/components/data-table-filters/data-table-filter-input.tsx b/packages/ui/src/components/data-table-filters/data-table-filter-input.tsx
index c8a063744..53db021a3 100644
--- a/packages/ui/src/components/data-table-filters/data-table-filter-input.tsx
+++ b/packages/ui/src/components/data-table-filters/data-table-filter-input.tsx
@@ -1,5 +1,6 @@
"use client";
+import { Search } from "@openstatus/icons";
import { useDataTable } from "@openstatus/ui/components/data-table-filters/data-table-provider";
import {
InputGroup,
@@ -8,7 +9,6 @@ import {
} from "@openstatus/ui/components/ui/input-group";
import { Label } from "@openstatus/ui/components/ui/label";
import { useDebounce } from "@openstatus/ui/hooks/use-debounce";
-import { Search } from "lucide-react";
import { useEffect, useState } from "react";
import type { DataTableInputFilterField } from "./types";
diff --git a/packages/ui/src/components/data-table-filters/data-table-filter-reset-button.tsx b/packages/ui/src/components/data-table-filters/data-table-filter-reset-button.tsx
index 6852c2b67..f75108913 100644
--- a/packages/ui/src/components/data-table-filters/data-table-filter-reset-button.tsx
+++ b/packages/ui/src/components/data-table-filters/data-table-filter-reset-button.tsx
@@ -1,8 +1,8 @@
"use client";
+import { Close } from "@openstatus/icons";
import { useDataTable } from "@openstatus/ui/components/data-table-filters/data-table-provider";
import { Button } from "@openstatus/ui/components/ui/button";
-import { X } from "lucide-react";
import type { DataTableFilterField } from "./types";
@@ -42,7 +42,7 @@ export function DataTableFilterResetButton<TData>({
{/* REMINDER: `AccordionTrigger` is also a button(!) and we get Hydration error when rendering button within button */}
<div role="button" tabIndex={0}>
<span>{filters.length}</span>
- <X className="text-muted-foreground ml-1! size-2.5!" />
+ <Close className="text-muted-foreground ml-1! size-2.5!" />
</div>
</Button>
);
diff --git a/packages/ui/src/components/data-table-filters/data-table-infinite.tsx b/packages/ui/src/components/data-table-filters/data-table-infinite.tsx
index 4d2938747..8e063c727 100644
--- a/packages/ui/src/components/data-table-filters/data-table-infinite.tsx
+++ b/packages/ui/src/components/data-table-filters/data-table-infinite.tsx
@@ -3,6 +3,7 @@
// REMINDER: React Compiler is not compatible with Tanstack Table v8 https://github.com/TanStack/table/issues/5567
"use no memo";
+import { Loading } from "@openstatus/icons";
import {
Table,
TableBody,
@@ -11,6 +12,7 @@ import {
TableHeader,
TableRow,
} from "@openstatus/ui/components/custom/table";
+import { useControls } from "@openstatus/ui/components/data-table-filters/controls";
import { DataTableFilterControls } from "@openstatus/ui/components/data-table-filters/data-table-filter-controls";
import { DataTableFilterRail } from "@openstatus/ui/components/data-table-filters/data-table-filter-rail";
import { DataTableProvider } from "@openstatus/ui/components/data-table-filters/data-table-provider";
@@ -56,7 +58,6 @@ import {
getFacetedMinMaxValues as getTTableFacetedMinMaxValues,
useReactTable,
} from "@tanstack/react-table";
-import { LoaderCircle } from "lucide-react";
import * as React from "react";
// TODO: add a possible chartGroupBy
@@ -94,6 +95,8 @@ export interface DataTableInfiniteProps<TData, TValue> {
renderLiveRow?: (props?: { row: Row<TData> }) => React.ReactNode;
// Used to store column order and visibility in local storage for specific data-table namespace
tableId?: string;
+ /** Server-read initial state of the filter controls panel. */
+ controlsDefaultOpen?: boolean;
// Optional slots for extensibility
commandSlot?: React.ReactNode;
sheetSlot?: React.ReactNode;
@@ -127,6 +130,7 @@ export function DataTableInfinite<TData, TValue>({
getFacetedMinMaxValues,
renderLiveRow,
tableId = "infinite",
+ controlsDefaultOpen,
commandSlot,
sheetSlot,
toolbarActions,
@@ -313,6 +317,7 @@ export function DataTableInfinite<TData, TValue>({
filterRows={filterRows ?? table.getFilteredRowModel().rows.length}
getFacetedUniqueValues={getFacetedUniqueValues}
getFacetedMinMaxValues={getFacetedMinMaxValues}
+ controlsDefaultOpen={controlsDefaultOpen}
>
<div
className={cn(
@@ -327,13 +332,7 @@ export function DataTableInfinite<TData, TValue>({
} as React.CSSProperties
}
>
- <div
- className={cn(
- "h-full w-full flex-col sm:w-[var(--controls-width)] sm:shrink-0",
- "group-data-[expanded=false]/controls:hidden",
- "hidden sm:flex",
- )}
- >
+ <FilterPanel>
<div className="border-border bg-background shrink-0 border-b p-2">
<div className="flex h-[46px] items-center justify-between gap-3">
<p className="text-foreground px-2 font-medium">Filters</p>
@@ -354,19 +353,26 @@ export function DataTableInfinite<TData, TValue>({
{footerSlot}
</div>
) : null}
- </div>
+ </FilterPanel>
<div
className={cn(
- "border-border relative flex min-h-0 max-w-full flex-1 flex-col sm:border-l",
+ "border-border relative flex min-h-0 max-w-full flex-1 flex-col",
+ // Collapsed, the panel is w-0 and this border would stack on the app
+ // sidebar's border-r. Keep the 1px so nothing shifts, drop the colour.
+ "sm:border-l sm:border-l-transparent",
+ "sm:group-data-[expanded=true]/controls:border-l-border",
// Chrome issue
"sm:group-data-[expanded=true]/controls:max-w-[calc(100%-var(--controls-width))]",
+ // Matches the panel's own transition: without it the pane snaps to
+ // its final width while the panel is still sliding.
+ "transition-[max-width,border-color] duration-200 ease-linear motion-reduce:transition-none",
)}
>
<DataTableFilterRail />
<div
ref={topBarRef}
className={cn(
- "bg-background flex flex-col gap-4 p-2",
+ "bg-background flex flex-col gap-4 px-4 py-2",
"z-10 shrink-0 pb-4",
)}
>
@@ -494,7 +500,7 @@ export function DataTableInfinite<TData, TValue>({
variant="outline"
>
{isFetching ? (
- <LoaderCircle className="mr-2 h-4 w-4 animate-spin" />
+ <Loading className="mr-2 h-4 w-4 animate-spin" />
) : null}
Load More
</Button>
@@ -524,6 +530,33 @@ export function DataTableInfinite<TData, TValue>({
);
}
+/**
+ * The filter controls column. Collapsing animates `width` — `display` can't be
+ * transitioned — so the inner wrapper holds its own width and the content
+ * slides out of view instead of reflowing on every frame.
+ */
+function FilterPanel({ children }: { children: React.ReactNode }) {
+ const { open } = useControls();
+
+ return (
+ <div
+ // `hidden sm:flex` is the breakpoint only; the collapsed state is `w-0`,
+ // which leaves the filters focusable — hence `inert`.
+ inert={!open}
+ className={cn(
+ "h-full w-full flex-col sm:w-[var(--controls-width)] sm:shrink-0",
+ "sm:group-data-[expanded=false]/controls:w-0",
+ "hidden overflow-hidden transition-[width] duration-200 ease-linear sm:flex",
+ "motion-reduce:transition-none",
+ )}
+ >
+ <div className="flex h-full w-full flex-col sm:w-[var(--controls-width)]">
+ {children}
+ </div>
+ </div>
+ );
+}
+
/**
* REMINDER: this is the heaviest component in the table if lots of rows
* Some other components are rendered more often necessary, but are fixed size (not like rows that can grow in height)
diff --git a/packages/ui/src/components/data-table-filters/data-table-infinite/hover-card-timestamp.tsx b/packages/ui/src/components/data-table-filters/data-table-infinite/hover-card-timestamp.tsx
index 8a3416283..d33afb0a7 100644
--- a/packages/ui/src/components/data-table-filters/data-table-infinite/hover-card-timestamp.tsx
+++ b/packages/ui/src/components/data-table-filters/data-table-infinite/hover-card-timestamp.tsx
@@ -1,6 +1,7 @@
"use client";
import { UTCDate } from "@date-fns/utc";
+import { Check, Copy } from "@openstatus/icons";
import {
HoverCard,
HoverCardContent,
@@ -9,7 +10,6 @@ import {
import { useCopyToClipboard } from "@openstatus/ui/hooks/use-copy-to-clipboard";
import { cn } from "@openstatus/ui/lib/utils";
import { format, formatDistanceToNowStrict } from "date-fns";
-import { Check, Copy } from "lucide-react";
import type { ComponentPropsWithoutRef } from "react";
type HoverCardContentProps = ComponentPropsWithoutRef<typeof HoverCardContent>;
diff --git a/packages/ui/src/components/data-table-filters/data-table-provider.tsx b/packages/ui/src/components/data-table-filters/data-table-provider.tsx
index a541e1e38..fd8fd4b22 100644
--- a/packages/ui/src/components/data-table-filters/data-table-provider.tsx
+++ b/packages/ui/src/components/data-table-filters/data-table-provider.tsx
@@ -62,10 +62,13 @@ export const DataTableContext = createContext<DataTableContextType<
export function DataTableProvider<TData, TValue>({
children,
+ controlsDefaultOpen,
...props
}: Partial<DataTableStateContextType> &
DataTableBaseContextType<TData, TValue> & {
children: React.ReactNode;
+ /** Server-read initial state of the filter controls panel. */
+ controlsDefaultOpen?: boolean;
}) {
const value = useMemo(
// eslint-disable-next-line react-hooks/preserve-manual-memoization
@@ -102,7 +105,7 @@ export function DataTableProvider<TData, TValue>({
return (
<DataTableContext.Provider value={value}>
- <ControlsProvider>
+ <ControlsProvider defaultOpen={controlsDefaultOpen}>
<DataTableStoreSync />
{children}
</ControlsProvider>
diff --git a/packages/ui/src/components/data-table-filters/data-table-refresh-button.tsx b/packages/ui/src/components/data-table-filters/data-table-refresh-button.tsx
index 954a1f4f8..7e4530545 100644
--- a/packages/ui/src/components/data-table-filters/data-table-refresh-button.tsx
+++ b/packages/ui/src/components/data-table-filters/data-table-refresh-button.tsx
@@ -1,5 +1,6 @@
"use client";
+import { Refresh } from "@openstatus/icons";
import { useDataTable } from "@openstatus/ui/components/data-table-filters/data-table-provider";
import { Button } from "@openstatus/ui/components/ui/button";
import {
@@ -9,7 +10,6 @@ import {
TooltipTrigger,
} from "@openstatus/ui/components/ui/tooltip";
import { cn } from "@openstatus/ui/lib/utils";
-import { RefreshCcw } from "lucide-react";
export function DataTableRefreshButton() {
const { refresh, isLoading } = useDataTable();
@@ -26,9 +26,7 @@ export function DataTableRefreshButton() {
disabled={isLoading}
onClick={() => refresh()}
>
- <RefreshCcw
- className={cn("h-4 w-4", isLoading && "animate-spin")}
- />
+ <Refresh className={cn("h-4 w-4", isLoading && "animate-spin")} />
<span className="sr-only">Refresh</span>
</Button>
</TooltipTrigger>
diff --git a/packages/ui/src/components/data-table-filters/data-table-reset-button.tsx b/packages/ui/src/components/data-table-filters/data-table-reset-button.tsx
index 1f44d8d37..863480ebe 100644
--- a/packages/ui/src/components/data-table-filters/data-table-reset-button.tsx
+++ b/packages/ui/src/components/data-table-filters/data-table-reset-button.tsx
@@ -1,8 +1,9 @@
"use client";
+import { Close } from "@openstatus/icons";
import { useDataTable } from "@openstatus/ui/components/data-table-filters/data-table-provider";
import { Button } from "@openstatus/ui/components/ui/button";
-import { Kbd } from "@openstatus/ui/components/ui/kbd";
+import { Kbd, KbdGroup } from "@openstatus/ui/components/ui/kbd";
import {
Tooltip,
TooltipContent,
@@ -10,7 +11,6 @@ import {
TooltipTrigger,
} from "@openstatus/ui/components/ui/tooltip";
import { useHotKey } from "@openstatus/ui/hooks/use-hot-key";
-import { X } from "lucide-react";
export function DataTableResetButton() {
const { table } = useDataTable();
@@ -21,18 +21,19 @@ export function DataTableResetButton() {
<Tooltip delayDuration={100}>
<TooltipTrigger asChild>
<Button variant="ghost" onClick={() => table.resetColumnFilters()}>
- <X className="mr-2 h-4 w-4" />
+ <Close className="mr-2 h-4 w-4" />
Reset
</Button>
</TooltipTrigger>
- <TooltipContent side="left">
- <p className="text-nowrap">
- Reset filters with{" "}
- <Kbd className="text-muted-foreground group-hover:text-accent-foreground ml-1">
- <span className="mr-1">⌘</span>
- <span>Esc</span>
- </Kbd>
- </p>
+ <TooltipContent
+ side="left"
+ className="flex items-center gap-2 text-nowrap"
+ >
+ Reset Filters
+ <KbdGroup>
+ <Kbd>⌘</Kbd>
+ <Kbd>Esc</Kbd>
+ </KbdGroup>
</TooltipContent>
</Tooltip>
</TooltipProvider>
diff --git a/packages/ui/src/components/data-table-filters/data-table-toolbar.tsx b/packages/ui/src/components/data-table-filters/data-table-toolbar.tsx
index b6d7419ed..63211063a 100644
--- a/packages/ui/src/components/data-table-filters/data-table-toolbar.tsx
+++ b/packages/ui/src/components/data-table-filters/data-table-toolbar.tsx
@@ -1,9 +1,10 @@
"use client";
+import { SidebarLeft } from "@openstatus/icons";
import { useControls } from "@openstatus/ui/components/data-table-filters/controls";
import { useDataTable } from "@openstatus/ui/components/data-table-filters/data-table-provider";
import { Button } from "@openstatus/ui/components/ui/button";
-import { Kbd } from "@openstatus/ui/components/ui/kbd";
+import { Kbd, KbdGroup } from "@openstatus/ui/components/ui/kbd";
import {
Tooltip,
TooltipContent,
@@ -12,7 +13,6 @@ import {
} from "@openstatus/ui/components/ui/tooltip";
import { useHotKey } from "@openstatus/ui/hooks/use-hot-key";
import { formatCompactNumber } from "@openstatus/ui/lib/format";
-import { PanelLeftClose, PanelLeftOpen } from "lucide-react";
import { DataTableFilterControlsDrawer } from "./data-table-filter-controls-drawer";
import { DataTableRefreshButton } from "./data-table-refresh-button";
@@ -27,7 +27,7 @@ export function DataTableToolbar({ renderActions }: DataTableToolbarProps) {
const { table, isLoading, columnFilters, totalRows, filterRows } =
useDataTable();
const { open, setOpen } = useControls();
- useHotKey(() => setOpen((prev) => !prev), "b");
+ useHotKey(() => setOpen((prev) => !prev), "\\", { code: "Backslash" });
const rows = {
total: totalRows ?? table.getCoreRowModel().rows.length,
filtered: filterRows ?? table.getFilteredRowModel().rows.length,
@@ -35,36 +35,31 @@ export function DataTableToolbar({ renderActions }: DataTableToolbarProps) {
return (
<div className="flex flex-wrap items-center justify-between gap-4">
- <div className="flex flex-wrap items-center gap-2">
+ <div className="-ml-2.5 flex flex-wrap items-center gap-2">
<TooltipProvider>
<Tooltip delayDuration={100}>
<TooltipTrigger asChild>
<Button
variant="ghost"
+ size="icon"
onClick={() => setOpen((prev) => !prev)}
- className="hidden gap-2 sm:flex"
+ className="hidden h-9 w-9 sm:flex"
>
- {open ? (
- <>
- <PanelLeftClose className="h-4 w-4" />
- <span className="hidden md:block">Hide Controls</span>
- </>
- ) : (
- <>
- <PanelLeftOpen className="h-4 w-4" />
- <span className="hidden md:block">Show Controls</span>
- </>
- )}
+ <SidebarLeft />
+ <span className="sr-only">
+ {open ? "Hide Controls" : "Show Controls"}
+ </span>
</Button>
</TooltipTrigger>
- <TooltipContent side="right">
- <p className="text-nowrap">
- Toggle controls with{" "}
- <Kbd className="text-muted-foreground group-hover:text-accent-foreground ml-1">
- <span className="mr-1">⌘</span>
- <span>B</span>
- </Kbd>
- </p>
+ <TooltipContent
+ side="right"
+ className="flex items-center gap-2 text-nowrap"
+ >
+ Toggle Controls
+ <KbdGroup>
+ <Kbd>⌘</Kbd>
+ <Kbd>\</Kbd>
+ </KbdGroup>
</TooltipContent>
</Tooltip>
</TooltipProvider>
diff --git a/packages/ui/src/components/data-table-filters/data-table-view-options.tsx b/packages/ui/src/components/data-table-filters/data-table-view-options.tsx
index 10baa2907..cd146304f 100644
--- a/packages/ui/src/components/data-table-filters/data-table-view-options.tsx
+++ b/packages/ui/src/components/data-table-filters/data-table-view-options.tsx
@@ -1,5 +1,6 @@
"use client";
+import { Check, DragHandle } from "@openstatus/icons";
import {
Sortable,
SortableDragHandle,
@@ -21,7 +22,7 @@ import {
PopoverTrigger,
} from "@openstatus/ui/components/ui/popover";
import { cn } from "@openstatus/ui/lib/utils";
-import { Check, GripVertical, Settings2 } from "lucide-react";
+import { Settings2 } from "lucide-react";
import { useMemo, useState } from "react";
export function DataTableViewOptions() {
@@ -108,10 +109,7 @@ export function DataTableViewOptions() {
size="icon"
className="text-muted-foreground hover:text-foreground focus:bg-muted focus:text-foreground ml-auto size-5"
>
- <GripVertical
- className="size-4"
- aria-hidden="true"
- />
+ <DragHandle className="size-4" aria-hidden="true" />
</SortableDragHandle>
) : null}
</CommandItem>
diff --git a/packages/ui/src/hooks/use-hot-key.ts b/packages/ui/src/hooks/use-hot-key.ts
index 53f88064a..963207ccf 100644
--- a/packages/ui/src/hooks/use-hot-key.ts
+++ b/packages/ui/src/hooks/use-hot-key.ts
@@ -3,19 +3,30 @@ import { useEffect, useRef } from "react";
export function useHotKey(
callback: () => void,
key: string,
- options?: { shift?: boolean },
+ options?: { shift?: boolean; code?: string },
): void {
// Use ref to always have the latest callback without re-registering the listener
const callbackRef = useRef(callback);
// eslint-disable-next-line react-hooks/refs
callbackRef.current = callback;
+ const code = options?.code;
+
useEffect(() => {
function handler(e: KeyboardEvent) {
const shiftMatch = options?.shift ? e.shiftKey : !e.shiftKey;
+ // A layout that doesn't type `key` unmodified reports its own character
+ // for that physical key (⌘\ is ⌘# on German), so `e.key` alone never
+ // matches a bare ⌘/ctrl press. `code` is the layout-independent position.
+ const keyMatch =
+ e.key.toLowerCase() === key.toLowerCase() ||
+ (code !== undefined && e.code === code);
if (
- e.key.toLowerCase() === key.toLowerCase() &&
+ keyMatch &&
(e.metaKey || e.ctrlKey) &&
+ // Windows reports AltGr as ctrl+alt, so without this every AltGr-typed
+ // character matches `(metaKey || ctrlKey)` and gets swallowed.
+ !e.altKey &&
shiftMatch
) {
// every shortcut is meta/ctrl based, so stop the browser default (⌘K
@@ -29,5 +40,5 @@ export function useHotKey(
return () => {
window.removeEventListener("keydown", handler);
};
- }, [key, options?.shift]);
+ }, [key, code, options?.shift]);
}
diff --git a/packages/ui/src/lib/data-table-filters/cookie.ts b/packages/ui/src/lib/data-table-filters/cookie.ts
new file mode 100644
index 000000000..0b8ceae19
--- /dev/null
+++ b/packages/ui/src/lib/data-table-filters/cookie.ts
@@ -0,0 +1,6 @@
+// Controls panel open/close state (global).
+// A cookie, not localStorage: the panel renders during SSR, so the state has to
+// be known on the server. A client-side read only lands after hydration, and
+// the correction would animate the panel's width on every page load.
+export const CONTROLS_COOKIE_NAME = "data_table_controls_state";
+export const CONTROLS_COOKIE_MAX_AGE = 60 * 60 * 24 * 7;
diff --git a/packages/ui/src/lib/data-table-filters/local-storage.ts b/packages/ui/src/lib/data-table-filters/local-storage.ts
index 7651f7f70..9cdbf64dc 100644
--- a/packages/ui/src/lib/data-table-filters/local-storage.ts
+++ b/packages/ui/src/lib/data-table-filters/local-storage.ts
@@ -8,6 +8,3 @@ export const getColumnOrderKey = (tableId: string) =>
// Filter command search history per table
export const getCommandHistoryKey = (tableId: string) =>
`data-table-command-${tableId}`;
-
-// Controls panel open/close state (global)
-export const CONTROLS_KEY = "data-table-controls";
diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json
index 683550116..5c4828e8a 100644
--- a/packages/ui/tsconfig.json
+++ b/packages/ui/tsconfig.json
@@ -4,6 +4,7 @@
"exclude": ["dist", "build", "node_modules"],
"compilerOptions": {
"lib": ["ES2022", "DOM", "DOM.Iterable"],
+ "moduleResolution": "bundler",
"paths": {
"@openstatus/ui/*": ["./src/*"]
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 297a246bd..ee1c49990 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -769,7 +769,7 @@ importers:
next-auth:
specifier: 'catalog:'
next-themes:
specifier: 'catalog:'
@@ -1219,7 +1219,7 @@ importers:
next-auth:
specifier: 'catalog:'
next-intl:
specifier: 'catalog:'
@@ -1487,7 +1487,7 @@ importers:
next-auth:
specifier: 'catalog:'
next-mdx-remote:
specifier: 'catalog:'
version: 6.0.0(@types/[email protected])([email protected])
@@ -2013,7 +2013,7 @@ importers:
version: 0.31.10
next-auth:
specifier: 'catalog:'
typescript:
specifier: 'catalog:'
version: 5.9.3
@@ -2914,6 +2914,9 @@ importers:
'@hookform/resolvers':
specifier: 'catalog:'
+ '@openstatus/icons':
+ specifier: workspace:*
+ version: link:../icons
'@radix-ui/react-accordion':
specifier: 'catalog:'
@@ -18833,7 +18836,7 @@ snapshots:
dependencies:
'@auth/core': 0.41.2