create-astram-app 0.4.0 → 0.6.0

package/template/frontend/src/components/MultiSelectChecklist.jsx

@@ -0,0 +1,166 @@
+/**
+ * MultiSelectChecklist — a searchable checkbox list for picking several items (roles, scope nodes).
+ * Shows a selected count and "Select all / None" (applied to the VISIBLE, unlocked options).
+ * Tree-shaped lists pass `depth` per option and are indented by it (a flat tree, no tree widget).
+ *
+ * Options: `{ id, name, depth?, locked? }`. `id` is only the value — never rendered; `name` is shown
+ * (ADR-0012). A `locked` option renders checked + disabled with `lockedHint` (e.g. "assigned by
+ * someone with more access"): it is not part of `value` and never toggled.
+ *
+ * Props:
+ *   id               — base id for the search input + list (a11y)
+ *   label            — field label
+ *   options          — the option list (above)
+ *   value            — array of selected (unlocked) ids
+ *   onChange         — (nextIds) => void
+ *   searchPlaceholder, emptyLabel, lockedHint, hint, error, disabled, loading
+ */
+import { useMemo, useState } from 'react';
+import { Lock } from 'lucide-react';
+import { cn } from '@/lib/utils';
+import { Checkbox } from '@/components/ui/checkbox';
+import { Input } from '@/components/ui/input';
+import { Label } from '@/components/ui/label';
+import { Badge } from '@/components/ui/badge';
+import { Button } from '@/components/ui/button';
+
+// Indent steps as literal classes (Tailwind scans literal strings; no inline spacing styles).
+const INDENT = ['pl-0', 'pl-5', 'pl-10', 'pl-14', 'pl-20'];
+const indentClass = (depth) => INDENT[Math.min(Math.max(depth || 0, 0), INDENT.length - 1)];
+
+export default function MultiSelectChecklist({
+  id,
+  label,
+  options,
+  value,
+  onChange,
+  searchPlaceholder = 'Search…',
+  emptyLabel = 'Nothing to choose from.',
+  lockedHint = 'locked',
+  hint,
+  error,
+  disabled = false,
+  loading = false,
+}) {
+  const [query, setQuery] = useState('');
+  const selected = useMemo(() => new Set(value), [value]);
+  const q = query.trim().toLowerCase();
+  // While searching, show matches flat (indent only makes sense for the whole tree).
+  const visible = q ? options.filter((o) => o.name.toLowerCase().includes(q)) : options;
+  const visibleUnlocked = visible.filter((o) => !o.locked);
+  const lockedTotal = options.filter((o) => o.locked).length;
+  const count = selected.size + lockedTotal;
+
+  const toggle = (optId) => {
+    const next = new Set(selected);
+    if (next.has(optId)) next.delete(optId);
+    else next.add(optId);
+    onChange(options.filter((o) => !o.locked && next.has(o.id)).map((o) => o.id));
+  };
+  const selectAll = () => {
+    const next = new Set(selected);
+    for (const o of visibleUnlocked) next.add(o.id);
+    onChange(options.filter((o) => !o.locked && next.has(o.id)).map((o) => o.id));
+  };
+  const selectNone = () => {
+    const drop = new Set(visibleUnlocked.map((o) => o.id));
+    onChange(value.filter((v) => !drop.has(v)));
+  };
+
+  const errorId = error ? `${id}-error` : undefined;
+
+  return (
+    <div className="space-y-1.5">
+      <div className="flex items-center justify-between gap-2">
+        <Label htmlFor={`${id}-search`} variant="field">
+          {label}
+        </Label>
+        <Badge variant="secondary" aria-live="polite">
+          {count} selected
+        </Badge>
+      </div>
+
+      <div className="flex items-center gap-2">
+        <Input
+          id={`${id}-search`}
+          value={query}
+          onChange={(e) => setQuery(e.target.value)}
+          placeholder={searchPlaceholder}
+          disabled={disabled || loading}
+          className="h-8"
+        />
+        <Button
+          type="button"
+          variant="ghost"
+          size="sm"
+          onClick={selectAll}
+          disabled={disabled || loading || visibleUnlocked.length === 0}
+        >
+          Select all
+        </Button>
+        <Button
+          type="button"
+          variant="ghost"
+          size="sm"
+          onClick={selectNone}
+          disabled={disabled || loading || visibleUnlocked.length === 0}
+        >
+          None
+        </Button>
+      </div>
+
+      <div
+        id={id}
+        role="group"
+        aria-label={label}
+        aria-describedby={errorId}
+        className={cn(
+          'max-h-48 overflow-y-auto rounded-md border border-border p-2',
+          error && 'border-destructive',
+        )}
+      >
+        {loading ? (
+          <p className="px-1 py-2 text-xs text-muted-foreground">Loading…</p>
+        ) : visible.length === 0 ? (
+          <p className="px-1 py-2 text-xs text-muted-foreground">
+            {q ? 'No matches.' : emptyLabel}
+          </p>
+        ) : (
+          <ul className="space-y-1">
+            {visible.map((o) => (
+              <li key={o.id} className={cn(!q && indentClass(o.depth))}>
+                <label
+                  className={cn(
+                    'flex items-center gap-2 rounded px-1 py-1 text-sm',
+                    o.locked ? 'text-muted-foreground' : 'cursor-pointer hover:bg-accent',
+                  )}
+                >
+                  <Checkbox
+                    checked={o.locked ? true : selected.has(o.id)}
+                    disabled={disabled || o.locked}
+                    onCheckedChange={() => !o.locked && toggle(o.id)}
+                  />
+                  <span className="truncate">{o.name}</span>
+                  {o.locked && (
+                    <span className="ml-auto inline-flex shrink-0 items-center gap-1 text-xs">
+                      <Lock className="size-3" aria-hidden="true" />
+                      {lockedHint}
+                    </span>
+                  )}
+                </label>
+              </li>
+            ))}
+          </ul>
+        )}
+      </div>
+
+      {error ? (
+        <p id={errorId} className="text-xs text-destructive">
+          {error}
+        </p>
+      ) : (
+        hint && <p className="text-xs text-muted-foreground">{hint}</p>
+      )}
+    </div>
+  );
+}

package/template/frontend/src/components/PageHeader.jsx

@@ -26,7 +26,10 @@ export default function PageHeader({ title, section, icon: Icon = Shield, action
         {title}
       </h1>
       {/* Breadcrumb (relocated from the app header): Section › Page — no leading icon. */}
-      <nav aria-label="Breadcrumb" className="mt-1 flex items-center gap-2 text-sm text-muted-foreground">
+      <nav
+        aria-label="Breadcrumb"
+        className="mt-1 flex items-center gap-2 text-sm text-muted-foreground"
+      >
         {section ? (
           <>
             <span>{section}</span>
@@ -46,9 +49,7 @@ export default function PageHeader({ title, section, icon: Icon = Shield, action
   return (
     <div className="mb-4 flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
       {titleAndCrumb}
-      {actions && (
-        <div className="flex shrink-0 items-center gap-2 max-sm:w-full">{actions}</div>
-      )}
+      {actions && <div className="flex shrink-0 items-center gap-2 max-sm:w-full">{actions}</div>}
     </div>
   );
 }

package/template/frontend/src/components/ShareDialog.jsx

@@ -96,8 +96,8 @@ export default function ShareDialog({
         value: row.id ?? row.uuid,
         label:
           granteeKind === 'role'
-            ? row.fields?.name ?? '(role)'
-            : row.fields?.username ?? row.fields?.email ?? '(user)',
+            ? (row.fields?.name ?? '(role)')
+            : (row.fields?.username ?? row.fields?.email ?? '(user)'),
       }));
       return { options, total: r.total ?? options.length, page: page ?? 1 };
     },
@@ -225,9 +225,7 @@ export default function ShareDialog({
                 onChange={(value) =>
                   setGrantee(value ? { value, label: grantee?.label ?? '' } : null)
                 }
-                onLabelChange={(label) =>
-                  setGrantee((g) => (g ? { ...g, label: label ?? '' } : g))
-                }
+                onLabelChange={(label) => setGrantee((g) => (g ? { ...g, label: label ?? '' } : g))}
                 fetchPage={fetchGrantees}
                 placeholder={`Pick a ${granteeKind}`}
               />

package/template/frontend/src/components/access/CollapsibleGroup.jsx

@@ -18,7 +18,10 @@ export default function CollapsibleGroup({ title, count, total, open, onToggle,
         aria-expanded={open}
       >
         <ChevronRight
-          className={cn('size-4 shrink-0 text-muted-foreground transition-transform', open && 'rotate-90')}
+          className={cn(
+            'size-4 shrink-0 text-muted-foreground transition-transform',
+            open && 'rotate-90',
+          )}
         />
         <span className="flex-1">{title}</span>
         {typeof count === 'number' && typeof total === 'number' && (

package/template/frontend/src/components/ui/alert-dialog.tsx

@@ -1,8 +1,8 @@
-import * as React from "react";
-import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog";
+import * as React from 'react';
+import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog';
 
-import { cn } from "@/lib/utils";
-import { buttonVariants } from "@/components/ui/button";
+import { cn } from '@/lib/utils';
+import { buttonVariants } from '@/components/ui/button';
 
 /**
  * Radix AlertDialog — the semantic confirm primitive (Phase B moves
@@ -20,9 +20,7 @@ import { buttonVariants } from "@/components/ui/button";
  * NOTE: requires `@radix-ui/react-alert-dialog` to be installed.
  */
 
-function AlertDialog({
-  ...props
-}: React.ComponentProps<typeof AlertDialogPrimitive.Root>) {
+function AlertDialog({ ...props }: React.ComponentProps<typeof AlertDialogPrimitive.Root>) {
   return <AlertDialogPrimitive.Root data-slot="alert-dialog" {...props} />;
 }
 
@@ -30,20 +28,12 @@ const AlertDialogTrigger = React.forwardRef<
   React.ElementRef<typeof AlertDialogPrimitive.Trigger>,
   React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Trigger>
 >((props, ref) => (
-  <AlertDialogPrimitive.Trigger
-    ref={ref}
-    data-slot="alert-dialog-trigger"
-    {...props}
-  />
+  <AlertDialogPrimitive.Trigger ref={ref} data-slot="alert-dialog-trigger" {...props} />
 ));
-AlertDialogTrigger.displayName = "AlertDialogTrigger";
+AlertDialogTrigger.displayName = 'AlertDialogTrigger';
 
-function AlertDialogPortal({
-  ...props
-}: React.ComponentProps<typeof AlertDialogPrimitive.Portal>) {
-  return (
-    <AlertDialogPrimitive.Portal data-slot="alert-dialog-portal" {...props} />
-  );
+function AlertDialogPortal({ ...props }: React.ComponentProps<typeof AlertDialogPrimitive.Portal>) {
+  return <AlertDialogPrimitive.Portal data-slot="alert-dialog-portal" {...props} />;
 }
 
 const AlertDialogOverlay = React.forwardRef<
@@ -54,13 +44,13 @@ const AlertDialogOverlay = React.forwardRef<
     ref={ref}
     data-slot="alert-dialog-overlay"
     className={cn(
-      "data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50",
-      className
+      'data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50',
+      className,
     )}
     {...props}
   />
 ));
-AlertDialogOverlay.displayName = "AlertDialogOverlay";
+AlertDialogOverlay.displayName = 'AlertDialogOverlay';
 
 const AlertDialogContent = React.forwardRef<
   React.ElementRef<typeof AlertDialogPrimitive.Content>,
@@ -72,39 +62,30 @@ const AlertDialogContent = React.forwardRef<
       ref={ref}
       data-slot="alert-dialog-content"
       className={cn(
-        "bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100vw-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border p-6 shadow-lg duration-200 sm:max-w-lg",
-        className
+        'bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100vw-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border p-6 shadow-lg duration-200 sm:max-w-lg',
+        className,
       )}
       {...props}
     />
   </AlertDialogPortal>
 ));
-AlertDialogContent.displayName = "AlertDialogContent";
+AlertDialogContent.displayName = 'AlertDialogContent';
 
-function AlertDialogHeader({
-  className,
-  ...props
-}: React.ComponentProps<"div">) {
+function AlertDialogHeader({ className, ...props }: React.ComponentProps<'div'>) {
   return (
     <div
       data-slot="alert-dialog-header"
-      className={cn("flex flex-col gap-2 text-center sm:text-left", className)}
+      className={cn('flex flex-col gap-2 text-center sm:text-left', className)}
       {...props}
     />
   );
 }
 
-function AlertDialogFooter({
-  className,
-  ...props
-}: React.ComponentProps<"div">) {
+function AlertDialogFooter({ className, ...props }: React.ComponentProps<'div'>) {
   return (
     <div
       data-slot="alert-dialog-footer"
-      className={cn(
-        "flex flex-col-reverse gap-2 sm:flex-row sm:justify-end",
-        className
-      )}
+      className={cn('flex flex-col-reverse gap-2 sm:flex-row sm:justify-end', className)}
       {...props}
     />
   );
@@ -117,11 +98,11 @@ const AlertDialogTitle = React.forwardRef<
   <AlertDialogPrimitive.Title
     ref={ref}
     data-slot="alert-dialog-title"
-    className={cn("text-lg leading-none font-semibold", className)}
+    className={cn('text-lg leading-none font-semibold', className)}
     {...props}
   />
 ));
-AlertDialogTitle.displayName = "AlertDialogTitle";
+AlertDialogTitle.displayName = 'AlertDialogTitle';
 
 const AlertDialogDescription = React.forwardRef<
   React.ElementRef<typeof AlertDialogPrimitive.Description>,
@@ -130,23 +111,19 @@ const AlertDialogDescription = React.forwardRef<
   <AlertDialogPrimitive.Description
     ref={ref}
     data-slot="alert-dialog-description"
-    className={cn("text-muted-foreground text-sm", className)}
+    className={cn('text-muted-foreground text-sm', className)}
     {...props}
   />
 ));
-AlertDialogDescription.displayName = "AlertDialogDescription";
+AlertDialogDescription.displayName = 'AlertDialogDescription';
 
 const AlertDialogAction = React.forwardRef<
   React.ElementRef<typeof AlertDialogPrimitive.Action>,
   React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Action>
 >(({ className, ...props }, ref) => (
-  <AlertDialogPrimitive.Action
-    ref={ref}
-    className={cn(buttonVariants(), className)}
-    {...props}
-  />
+  <AlertDialogPrimitive.Action ref={ref} className={cn(buttonVariants(), className)} {...props} />
 ));
-AlertDialogAction.displayName = "AlertDialogAction";
+AlertDialogAction.displayName = 'AlertDialogAction';
 
 const AlertDialogCancel = React.forwardRef<
   React.ElementRef<typeof AlertDialogPrimitive.Cancel>,
@@ -154,11 +131,11 @@ const AlertDialogCancel = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <AlertDialogPrimitive.Cancel
     ref={ref}
-    className={cn(buttonVariants({ variant: "outline" }), className)}
+    className={cn(buttonVariants({ variant: 'outline' }), className)}
     {...props}
   />
 ));
-AlertDialogCancel.displayName = "AlertDialogCancel";
+AlertDialogCancel.displayName = 'AlertDialogCancel';
 
 export {
   AlertDialog,

package/template/frontend/src/components/ui/alert.tsx

@@ -1,7 +1,7 @@
-import * as React from "react";
-import { cva, type VariantProps } from "class-variance-authority";
+import * as React from 'react';
+import { cva, type VariantProps } from 'class-variance-authority';
 
-import { cn } from "@/lib/utils";
+import { cn } from '@/lib/utils';
 
 /**
  * Inline alert / callout — the shared replacement for the ~8 ad-hoc
@@ -16,31 +16,31 @@ import { cn } from "@/lib/utils";
  */
 
 const alertVariants = cva(
-  "relative grid w-full grid-cols-[0_1fr] items-start gap-y-0.5 rounded-lg border px-4 py-3 text-sm has-[>svg]:grid-cols-[calc(var(--spacing)*4)_1fr] has-[>svg]:gap-x-3 [&>svg]:size-4 [&>svg]:translate-y-0.5",
+  'relative grid w-full grid-cols-[0_1fr] items-start gap-y-0.5 rounded-lg border px-4 py-3 text-sm has-[>svg]:grid-cols-[calc(var(--spacing)*4)_1fr] has-[>svg]:gap-x-3 [&>svg]:size-4 [&>svg]:translate-y-0.5',
   {
     variants: {
       variant: {
-        default: "bg-card text-card-foreground border-border [&>svg]:text-foreground",
+        default: 'bg-card text-card-foreground border-border [&>svg]:text-foreground',
         destructive:
-          "border-destructive/30 bg-destructive/10 text-destructive [&>svg]:text-destructive [&_[data-slot=alert-description]]:text-destructive/90",
+          'border-destructive/30 bg-destructive/10 text-destructive [&>svg]:text-destructive [&_[data-slot=alert-description]]:text-destructive/90',
         warning:
-          "border-warn/30 bg-warn/10 text-warn [&>svg]:text-warn [&_[data-slot=alert-description]]:text-warn/90",
+          'border-warn/30 bg-warn/10 text-warn [&>svg]:text-warn [&_[data-slot=alert-description]]:text-warn/90',
         success:
-          "border-ok/30 bg-ok/10 text-ok [&>svg]:text-ok [&_[data-slot=alert-description]]:text-ok/90",
-        info: "border-primary/30 bg-primary/10 text-primary [&>svg]:text-primary [&_[data-slot=alert-description]]:text-primary/90",
+          'border-ok/30 bg-ok/10 text-ok [&>svg]:text-ok [&_[data-slot=alert-description]]:text-ok/90',
+        info: 'border-primary/30 bg-primary/10 text-primary [&>svg]:text-primary [&_[data-slot=alert-description]]:text-primary/90',
       },
     },
     defaultVariants: {
-      variant: "default",
+      variant: 'default',
     },
-  }
+  },
 );
 
 function Alert({
   className,
   variant,
   ...props
-}: React.ComponentProps<"div"> & VariantProps<typeof alertVariants>) {
+}: React.ComponentProps<'div'> & VariantProps<typeof alertVariants>) {
   return (
     <div
       data-slot="alert"
@@ -51,29 +51,23 @@ function Alert({
   );
 }
 
-function AlertTitle({ className, ...props }: React.ComponentProps<"div">) {
+function AlertTitle({ className, ...props }: React.ComponentProps<'div'>) {
   return (
     <div
       data-slot="alert-title"
-      className={cn(
-        "col-start-2 line-clamp-1 min-h-4 font-semibold tracking-tight",
-        className
-      )}
+      className={cn('col-start-2 line-clamp-1 min-h-4 font-semibold tracking-tight', className)}
       {...props}
     />
   );
 }
 
-function AlertDescription({
-  className,
-  ...props
-}: React.ComponentProps<"div">) {
+function AlertDescription({ className, ...props }: React.ComponentProps<'div'>) {
   return (
     <div
       data-slot="alert-description"
       className={cn(
-        "text-muted-foreground col-start-2 grid justify-items-start gap-1 text-sm [&_p]:leading-relaxed",
-        className
+        'text-muted-foreground col-start-2 grid justify-items-start gap-1 text-sm [&_p]:leading-relaxed',
+        className,
       )}
       {...props}
     />

package/template/frontend/src/components/ui/avatar.tsx

@@ -1,32 +1,23 @@
-import * as React from "react";
-import * as AvatarPrimitive from "@radix-ui/react-avatar";
+import * as React from 'react';
+import * as AvatarPrimitive from '@radix-ui/react-avatar';
 
-import { cn } from "@/lib/utils";
+import { cn } from '@/lib/utils';
 
-function Avatar({
-  className,
-  ...props
-}: React.ComponentProps<typeof AvatarPrimitive.Root>) {
+function Avatar({ className, ...props }: React.ComponentProps<typeof AvatarPrimitive.Root>) {
   return (
     <AvatarPrimitive.Root
       data-slot="avatar"
-      className={cn(
-        "relative flex size-8 shrink-0 overflow-hidden rounded-full",
-        className
-      )}
+      className={cn('relative flex size-8 shrink-0 overflow-hidden rounded-full', className)}
       {...props}
     />
   );
 }
 
-function AvatarImage({
-  className,
-  ...props
-}: React.ComponentProps<typeof AvatarPrimitive.Image>) {
+function AvatarImage({ className, ...props }: React.ComponentProps<typeof AvatarPrimitive.Image>) {
   return (
     <AvatarPrimitive.Image
       data-slot="avatar-image"
-      className={cn("aspect-square size-full", className)}
+      className={cn('aspect-square size-full', className)}
       {...props}
     />
   );
@@ -39,10 +30,7 @@ function AvatarFallback({
   return (
     <AvatarPrimitive.Fallback
       data-slot="avatar-fallback"
-      className={cn(
-        "bg-muted flex size-full items-center justify-center rounded-full",
-        className
-      )}
+      className={cn('bg-muted flex size-full items-center justify-center rounded-full', className)}
       {...props}
     />
   );

package/template/frontend/src/components/ui/badge.tsx

@@ -1,8 +1,8 @@
-import * as React from "react";
-import { Slot } from "@radix-ui/react-slot";
-import { cva, type VariantProps } from "class-variance-authority";
+import * as React from 'react';
+import { Slot } from '@radix-ui/react-slot';
+import { cva, type VariantProps } from 'class-variance-authority';
 
-import { cn } from "@/lib/utils";
+import { cn } from '@/lib/utils';
 
 // Pill shape (`rounded-full`) + OCA's `.dsa-badge` density (.72rem-ish text,
 // weight 600, 3px/10px padding). Existing solid variants kept intact; the new
@@ -10,29 +10,25 @@ import { cn } from "@/lib/utils";
 // same-family colored text (OCA's tint-bg + colored-label treatment), driven by
 // `--ok` / `--warn` / `--primary` so light + dark both read correctly.
 const badgeVariants = cva(
-  "inline-flex items-center justify-center rounded-full border px-2.5 py-0.5 text-xs font-semibold w-fit whitespace-nowrap shrink-0 [&>svg]:size-3 gap-1 [&>svg]:pointer-events-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive transition-[color,box-shadow] overflow-hidden",
+  'inline-flex items-center justify-center rounded-full border px-2.5 py-0.5 text-xs font-semibold w-fit whitespace-nowrap shrink-0 [&>svg]:size-3 gap-1 [&>svg]:pointer-events-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive transition-[color,box-shadow] overflow-hidden',
   {
     variants: {
       variant: {
-        default:
-          "border-transparent bg-primary text-primary-foreground [a&]:hover:bg-primary/90",
+        default: 'border-transparent bg-primary text-primary-foreground [a&]:hover:bg-primary/90',
         secondary:
-          "border-transparent bg-secondary text-secondary-foreground [a&]:hover:bg-secondary/90",
+          'border-transparent bg-secondary text-secondary-foreground [a&]:hover:bg-secondary/90',
         destructive:
-          "border-transparent bg-destructive text-white [a&]:hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
-        outline:
-          "text-foreground [a&]:hover:bg-accent [a&]:hover:text-accent-foreground",
-        success:
-          "border-transparent bg-ok/15 text-ok [a&]:hover:bg-ok/20",
-        warning:
-          "border-transparent bg-warn/15 text-warn [a&]:hover:bg-warn/20",
-        info: "border-transparent bg-primary/15 text-primary [a&]:hover:bg-primary/20",
+          'border-transparent bg-destructive text-white [a&]:hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60',
+        outline: 'text-foreground [a&]:hover:bg-accent [a&]:hover:text-accent-foreground',
+        success: 'border-transparent bg-ok/15 text-ok [a&]:hover:bg-ok/20',
+        warning: 'border-transparent bg-warn/15 text-warn [a&]:hover:bg-warn/20',
+        info: 'border-transparent bg-primary/15 text-primary [a&]:hover:bg-primary/20',
       },
     },
     defaultVariants: {
-      variant: "default",
+      variant: 'default',
     },
-  }
+  },
 );
 
 function Badge({
@@ -40,16 +36,11 @@ function Badge({
   variant,
   asChild = false,
   ...props
-}: React.ComponentProps<"span"> &
-  VariantProps<typeof badgeVariants> & { asChild?: boolean }) {
-  const Comp = asChild ? Slot : "span";
+}: React.ComponentProps<'span'> & VariantProps<typeof badgeVariants> & { asChild?: boolean }) {
+  const Comp = asChild ? Slot : 'span';
 
   return (
-    <Comp
-      data-slot="badge"
-      className={cn(badgeVariants({ variant }), className)}
-      {...props}
-    />
+    <Comp data-slot="badge" className={cn(badgeVariants({ variant }), className)} {...props} />
   );
 }