betterstart-cli 0.0.13 → 0.0.15

package/dist/assets/adapters/next/templates/init/lib/actions/audit/get-audit-logs.ts

@@ -3,19 +3,21 @@
 import { requireRole, UserRole } from '@admin/auth/middleware'
 import db from '@admin/db'
 import { auditLog } from '@admin/db/schema'
-import { and, desc, eq, gte, ilike, lt, or, sql } from 'drizzle-orm'
+import { and, asc, desc, eq, gte, ilike, lt, or, sql } from 'drizzle-orm'
 import type { AuditLogEntry, AuditLogPage, AuditLogQuery } from './types'
 
-const DEFAULT_AUDIT_LOG_PAGE = 1
-const DEFAULT_AUDIT_LOG_PAGE_SIZE = 25
+const DEFAULT_AUDIT_LOG_PAGE = 0
+const DEFAULT_AUDIT_LOG_PAGE_SIZE = 20
 const MAX_AUDIT_LOG_PAGE_SIZE = 100
 
 function clampPage(value: number | undefined): number {
   if (typeof value !== 'number' || !Number.isFinite(value)) return DEFAULT_AUDIT_LOG_PAGE
-  return Math.max(DEFAULT_AUDIT_LOG_PAGE, Math.floor(value))
+  return Math.max(0, Math.floor(value))
 }
 
-function clampPageSize(value: number | undefined): number {
+function normalizePageSize(value: number | undefined): number | null {
+  if (value === -1) return null
+
   if (typeof value !== 'number' || !Number.isFinite(value) || value <= 0) {
     return DEFAULT_AUDIT_LOG_PAGE_SIZE
   }
@@ -23,6 +25,28 @@ function clampPageSize(value: number | undefined): number {
   return Math.min(MAX_AUDIT_LOG_PAGE_SIZE, Math.max(1, Math.floor(value)))
 }
 
+function getAuditLogOrderBy(query: AuditLogQuery) {
+  const sortFn = query.dir === 'asc' ? asc : desc
+
+  switch (query.sort) {
+    case 'event':
+      return [sortFn(auditLog.category), sortFn(auditLog.action), desc(auditLog.createdAt)]
+    case 'target':
+      return [
+        sortFn(auditLog.targetType),
+        sortFn(auditLog.targetLabel),
+        sortFn(auditLog.targetId),
+        desc(auditLog.createdAt)
+      ]
+    case 'actor':
+      return [sortFn(auditLog.actorEmail), sortFn(auditLog.actorName), desc(auditLog.createdAt)]
+    case 'sourceType':
+      return [sortFn(auditLog.sourceType), desc(auditLog.createdAt)]
+    default:
+      return [sortFn(auditLog.createdAt)]
+  }
+}
+
 function getExclusiveDateUpperBound(value: string | undefined): string | null {
   if (!value) return null
   const date = new Date(value)
@@ -34,8 +58,8 @@ function getExclusiveDateUpperBound(value: string | undefined): string | null {
 
 async function queryAuditLogs(query: AuditLogQuery = {}): Promise<AuditLogPage> {
   const page = clampPage(query.page)
-  const pageSize = clampPageSize(query.pageSize)
-  const offset = (page - 1) * pageSize
+  const pageSize = normalizePageSize(query.pageSize)
+  const offset = pageSize ? page * pageSize : 0
   const conditions = []
 
   if (query.category) conditions.push(eq(auditLog.category, query.category))
@@ -70,24 +94,25 @@ async function queryAuditLogs(query: AuditLogQuery = {}): Promise<AuditLogPage>
   }
 
   const where = conditions.length > 0 ? and(...conditions) : undefined
+  const orderBy = getAuditLogOrderBy(query)
+  const orderedQuery = db
+    .select()
+    .from(auditLog)
+    .where(where)
+    .orderBy(...orderBy)
   const [rows, countResult] = await Promise.all([
-    db
-      .select()
-      .from(auditLog)
-      .where(where)
-      .orderBy(desc(auditLog.createdAt))
-      .limit(pageSize)
-      .offset(offset),
+    pageSize ? orderedQuery.limit(pageSize).offset(offset) : orderedQuery,
     db.select({ count: sql<number>`count(*)` }).from(auditLog).where(where)
   ])
   const total = Number(countResult[0]?.count ?? 0)
+  const resolvedPageSize = pageSize ?? total
 
   return {
     auditLogs: rows as AuditLogEntry[],
     total,
     page,
-    pageSize,
-    totalPages: Math.max(1, Math.ceil(total / pageSize))
+    pageSize: resolvedPageSize,
+    totalPages: pageSize ? Math.max(1, Math.ceil(total / pageSize)) : 1
   }
 }
 

package/dist/assets/adapters/next/templates/init/lib/actions/audit/index.ts

@@ -6,6 +6,8 @@ export type {
   AuditLogEntry,
   AuditLogPage,
   AuditLogQuery,
+  AuditLogSortDirection,
+  AuditLogSortField,
   AuditLogSourceType,
   CleanupAuditLogsResult
 } from './types'

package/dist/assets/adapters/next/templates/init/lib/actions/audit/types.ts

@@ -1,5 +1,6 @@
 export const AUDIT_LOG_CATEGORIES = [
   'entity',
+  'form',
   'settings',
   'user',
   'auth',
@@ -19,6 +20,8 @@ export const AUDIT_LOG_SOURCE_TYPES = ['admin_ui', 'server_action', 'system_job'
 export type AuditLogCategory = (typeof AUDIT_LOG_CATEGORIES)[number]
 export type AuditLogAction = (typeof AUDIT_LOG_ACTIONS)[number]
 export type AuditLogSourceType = (typeof AUDIT_LOG_SOURCE_TYPES)[number]
+export type AuditLogSortField = 'createdAt' | 'event' | 'target' | 'actor' | 'sourceType'
+export type AuditLogSortDirection = 'asc' | 'desc'
 
 export interface AuditLogEntry {
   id: string
@@ -49,6 +52,8 @@ export interface AuditLogQuery {
   createdAtTo?: string
   page?: number
   pageSize?: number
+  sort?: AuditLogSortField
+  dir?: AuditLogSortDirection
 }
 
 export interface AuditLogPage {

package/dist/assets/adapters/next/templates/init/lib/lifecycle-hooks/runner.ts

@@ -76,7 +76,7 @@ function toAdminEventContext(
   if (!action) return null
 
   return {
-    category: 'entity',
+    category: context.schemaType === 'form' ? 'form' : 'entity',
     action,
     targetType: context.entityType,
     targetId: context.entityId ?? null,
@@ -89,6 +89,7 @@ function toAdminEventContext(
     changedFields: getChangedFieldsFromLifecycleContext(event, context),
     metadata: {
       entityType: context.entityType,
+      schemaType: context.schemaType ?? 'entity',
       ...(context.metadata ?? {})
     }
   }

package/dist/assets/adapters/next/templates/init/lib/lifecycle-hooks/types.ts

@@ -21,8 +21,9 @@ export type BeforeLifecycleHookEvent = Extract<LifecycleHookEvent, `before${stri
 export type AfterLifecycleHookEvent = Extract<LifecycleHookEvent, `after${string}`>
 
 export interface LifecycleHookContext {
-  user: User
+  user: User | null
   entityType: string
+  schemaType?: 'entity' | 'form' | undefined
   timestamp: string
   entityId?: string | undefined
   input?: Record<string, unknown> | undefined

package/dist/assets/adapters/next/templates/init/pages/audit-log/audit-log-detail-drawer.tsx

@@ -2,6 +2,7 @@
 
 import type { AuditLogEntry } from '@admin/actions/audit'
 import { Badge } from '@admin/components/ui/badge'
+import { Card, CardContent, CardHeader, CardTitle } from '@admin/components/ui/card'
 import {
   Drawer,
   DrawerContent,
@@ -43,50 +44,57 @@ export function AuditLogDetailDrawer({ auditLog, open, onOpenChange }: AuditLogD
             {auditLog ? `${auditLog.category}.${auditLog.action}` : 'No event selected'}
           </DrawerDescription>
         </DrawerHeader>
-        <ScrollArea className="min-h-0 flex-1">
+        <ScrollArea className="min-h-0 flex-1 px-6">
           {auditLog ? (
-            <div className="p-4">
-              <dl className="rounded-lg border border-border bg-card px-4">
-                <AuditLogDetailRow label="Time" value={formatDateTime(auditLog.createdAt)} />
-                <AuditLogDetailRow label="Category" value={auditLog.category} />
-                <AuditLogDetailRow label="Action" value={auditLog.action} />
-                <AuditLogDetailRow
-                  label="Target"
-                  value={auditLog.targetLabel ?? auditLog.targetId}
-                />
-                <AuditLogDetailRow label="Target Type" value={auditLog.targetType} />
-                <AuditLogDetailRow label="Target ID" value={auditLog.targetId} />
-                <AuditLogDetailRow
-                  label="Actor"
-                  value={auditLog.actorEmail ?? auditLog.actorName ?? auditLog.actorUserId}
-                />
-                <AuditLogDetailRow label="Actor Role" value={auditLog.actorRole} />
-                <AuditLogDetailRow label="Source" value={auditLog.sourceType} />
-                <AuditLogDetailRow label="IP" value={auditLog.ipAddress} />
-                <AuditLogDetailRow label="User Agent" value={auditLog.userAgent} />
-                <AuditLogDetailRow
-                  label="Fields"
-                  value={
-                    auditLog.changedFields.length > 0 ? (
-                      <div className="flex flex-wrap gap-1">
-                        {auditLog.changedFields.map((field) => (
-                          <Badge key={field} variant="secondary">
-                            {field}
-                          </Badge>
-                        ))}
-                      </div>
-                    ) : (
-                      'None'
-                    )
-                  }
-                />
-              </dl>
-              <div className="mt-4 rounded-lg border border-border bg-card p-4">
-                <h3 className="mb-2 text-sm font-medium">Metadata</h3>
-                <pre className="max-h-72 overflow-auto rounded-md bg-muted p-3 text-xs leading-relaxed">
-                  {formatMetadata(auditLog.metadata)}
-                </pre>
-              </div>
+            <div className="flex flex-col w-full gap-4">
+              <Card>
+                <CardHeader>
+                  <CardTitle>Event Details</CardTitle>
+                </CardHeader>
+
+                <CardContent className="p-0!">
+                  <AuditLogDetailRow label="Time" value={formatDateTime(auditLog.createdAt)} />
+                  <AuditLogDetailRow label="Category" value={auditLog.category} />
+                  <AuditLogDetailRow label="Action" value={auditLog.action} />
+                  <AuditLogDetailRow
+                    label="Target"
+                    value={auditLog.targetLabel ?? auditLog.targetId}
+                  />
+                  <AuditLogDetailRow label="Target Type" value={auditLog.targetType} />
+                  <AuditLogDetailRow label="Target ID" value={auditLog.targetId} />
+                  <AuditLogDetailRow
+                    label="Actor"
+                    value={auditLog.actorEmail ?? auditLog.actorName ?? auditLog.actorUserId}
+                  />
+                  <AuditLogDetailRow label="Actor Role" value={auditLog.actorRole} />
+                  <AuditLogDetailRow label="Source" value={auditLog.sourceType} />
+                  <AuditLogDetailRow label="IP" value={auditLog.ipAddress} />
+                  <AuditLogDetailRow label="User Agent" value={auditLog.userAgent} />
+                  <AuditLogDetailRow
+                    label="Fields"
+                    value={
+                      auditLog.changedFields.length > 0 ? (
+                        <div className="flex flex-wrap gap-1">
+                          {auditLog.changedFields.map((field) => (
+                            <Badge key={field} variant="secondary">
+                              {field}
+                            </Badge>
+                          ))}
+                        </div>
+                      ) : (
+                        'None'
+                      )
+                    }
+                  />
+                </CardContent>
+              </Card>
+
+              <Card>
+                <CardHeader>
+                  <CardTitle>Event Metadata</CardTitle>
+                </CardHeader>
+                <CardContent>{formatMetadata(auditLog.metadata)}</CardContent>
+              </Card>
             </div>
           ) : null}
         </ScrollArea>

package/dist/assets/adapters/next/templates/init/pages/audit-log/audit-log-detail-row.tsx

@@ -7,10 +7,8 @@ interface AuditLogDetailRowProps {
 
 export function AuditLogDetailRow({ label, value }: AuditLogDetailRowProps) {
   return (
-    <div className="grid grid-cols-[120px_1fr] gap-3 border-b border-border/70 py-3 last:border-b-0">
-      <dt className="text-xs font-medium uppercase tracking-normal text-muted-foreground">
-        {label}
-      </dt>
+    <div className="grid grid-cols-[120px_1fr] gap-3 border-b border-border py-2 px-4 last:border-b-0">
+      <dt className="text-sm font-medium text-muted-foreground">{label}</dt>
       <dd className="min-w-0 text-sm text-foreground break-words">{value || 'Unknown'}</dd>
     </div>
   )