betterstart-cli 0.0.27 → 0.0.29

package/dist/assets/adapters/next/templates/init/lib/actions/webhooks/update-webhook.ts

@@ -0,0 +1,72 @@
+'use server'
+
+import { requireRole, UserRole } from '@admin/auth/middleware'
+import db from '@admin/db'
+import { webhookSubscriptions, webhooks } from '@admin/db/schema'
+import { and, eq, notInArray } from 'drizzle-orm'
+import { updateTag } from 'next/cache'
+import type { UpdateWebhookInput, WebhookResult } from './types'
+import { webhooksCacheTags } from './types'
+
+export async function updateWebhook(id: string, input: UpdateWebhookInput): Promise<WebhookResult> {
+  await requireRole([UserRole.ADMIN])
+
+  try {
+    const updated = await db.transaction(async (tx) => {
+      const [row] = await tx
+        .update(webhooks)
+        .set({
+          ...(input.name !== undefined ? { name: input.name } : {}),
+          ...(input.url !== undefined ? { url: input.url } : {}),
+          ...(input.enabled !== undefined ? { enabled: input.enabled } : {}),
+          updatedAt: new Date().toISOString()
+        })
+        .where(eq(webhooks.id, id))
+        .returning()
+
+      if (!row) throw new Error('Webhook not found')
+
+      if (input.events !== undefined) {
+        const events = input.events
+        if (events.length > 0) {
+          await tx
+            .delete(webhookSubscriptions)
+            .where(
+              and(
+                eq(webhookSubscriptions.webhookId, id),
+                notInArray(webhookSubscriptions.event, events)
+              )
+            )
+          await tx
+            .insert(webhookSubscriptions)
+            .values(events.map((event) => ({ webhookId: id, event })))
+            .onConflictDoNothing()
+        } else {
+          await tx.delete(webhookSubscriptions).where(eq(webhookSubscriptions.webhookId, id))
+        }
+      }
+
+      return row
+    })
+
+    updateTag(webhooksCacheTags.endpoints)
+    updateTag(webhooksCacheTags.subscriptions)
+    return {
+      success: true,
+      webhook: {
+        id: updated.id,
+        name: updated.name,
+        url: updated.url,
+        enabled: updated.enabled,
+        createdAt: updated.createdAt,
+        updatedAt: updated.updatedAt
+      }
+    }
+  } catch (error) {
+    console.error('Error updating webhook:', error)
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : 'Failed to update webhook'
+    }
+  }
+}

package/dist/assets/adapters/next/templates/init/lib/db/core/schema.ts

@@ -80,8 +80,6 @@ export const formSettings = pgTable(
   {
     id: uuid().defaultRandom().primaryKey().notNull(),
     formName: varchar('formName', { length: 100 }).notNull(),
-    webhookUrl: text('webhookUrl'),
-    webhookEnabled: boolean('webhookEnabled').default(false).notNull(),
     notificationEmails: text('notificationEmails'),
     createdAt: timestamp('createdAt', { precision: 3, mode: 'string' })
       .default(sql`CURRENT_TIMESTAMP`)
@@ -98,6 +96,77 @@ export const formSettings = pgTable(
   ]
 )
 
+// ============================================================================
+// Webhooks (endpoint registry, event subscriptions, delivery log)
+// ============================================================================
+
+export const webhooks = pgTable('Webhooks', {
+  id: uuid().defaultRandom().primaryKey().notNull(),
+  name: varchar('name', { length: 200 }).notNull(),
+  url: text('url').notNull(),
+  secret: text('secret').notNull(),
+  enabled: boolean('enabled').default(true).notNull(),
+  createdAt: timestamp('createdAt', { precision: 3, mode: 'string' })
+    .default(sql`CURRENT_TIMESTAMP`)
+    .notNull(),
+  updatedAt: timestamp('updatedAt', { precision: 3, mode: 'string' })
+    .default(sql`CURRENT_TIMESTAMP`)
+    .notNull()
+})
+
+export const webhookSubscriptions = pgTable(
+  'WebhookSubscriptions',
+  {
+    id: uuid().defaultRandom().primaryKey().notNull(),
+    webhookId: uuid('webhookId')
+      .notNull()
+      .references(() => webhooks.id, { onDelete: 'cascade' }),
+    event: varchar('event', { length: 200 }).notNull(),
+    createdAt: timestamp('createdAt', { precision: 3, mode: 'string' })
+      .default(sql`CURRENT_TIMESTAMP`)
+      .notNull()
+  },
+  (table) => [
+    uniqueIndex('WebhookSubscriptions_webhookId_event_key').using(
+      'btree',
+      table.webhookId.asc().nullsLast().op('uuid_ops'),
+      table.event.asc().nullsLast().op('text_ops')
+    ),
+    index('WebhookSubscriptions_event_idx').using(
+      'btree',
+      table.event.asc().nullsLast().op('text_ops')
+    )
+  ]
+)
+
+export const webhookDeliveries = pgTable(
+  'WebhookDeliveries',
+  {
+    id: uuid().defaultRandom().primaryKey().notNull(),
+    webhookId: uuid('webhookId')
+      .notNull()
+      .references(() => webhooks.id, { onDelete: 'cascade' }),
+    event: varchar('event', { length: 200 }).notNull(),
+    eventId: varchar('eventId', { length: 64 }).notNull(),
+    attempt: integer('attempt').notNull(),
+    success: boolean('success').notNull(),
+    statusCode: integer('statusCode'),
+    durationMs: integer('durationMs').notNull(),
+    error: text('error'),
+    createdAt: timestamp('createdAt', { precision: 3, mode: 'string' })
+      .default(sql`CURRENT_TIMESTAMP`)
+      .notNull()
+  },
+  (table) => [
+    index('WebhookDeliveries_webhookId_createdAt_idx').using(
+      'btree',
+      table.webhookId.asc().nullsLast().op('uuid_ops'),
+      table.createdAt.desc().nullsLast()
+    ),
+    index('WebhookDeliveries_createdAt_idx').using('btree', table.createdAt.desc().nullsLast())
+  ]
+)
+
 // ============================================================================
 // Entity Versions
 // ============================================================================

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

@@ -8,5 +8,7 @@
 //   console.log('Post created', { userId: user.id, entityId, data })
 // })
 import { registerAuditHooks } from '@admin/actions/audit/register'
+import { registerWebhookHooks } from '@admin/actions/webhooks/register'
 
 registerAuditHooks()
+registerWebhookHooks()

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

@@ -42,6 +42,8 @@ function getAdminActionFromLifecycleEvent(
   if (event === 'afterDelete') return 'delete'
   if (event === 'afterPublish') return 'publish'
   if (event === 'afterUnpublish') return 'unpublish'
+  if (event === 'afterRestore') return 'restore'
+  if (event === 'afterReorder') return 'reorder'
   return null
 }
 
@@ -76,7 +78,7 @@ function toAdminEventContext(
   if (!action) return null
 
   return {
-    category: context.schemaType === 'form' ? 'form' : 'entity',
+    category: context.auditCategory ?? (context.schemaType === 'form' ? 'form' : 'entity'),
     action,
     targetType: context.entityType,
     targetId: context.entityId ?? null,

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

@@ -16,6 +16,10 @@ export type LifecycleHookEvent =
   | 'afterPublish'
   | 'beforeUnpublish'
   | 'afterUnpublish'
+  | 'beforeRestore'
+  | 'afterRestore'
+  | 'beforeReorder'
+  | 'afterReorder'
 
 export type BeforeLifecycleHookEvent = Extract<LifecycleHookEvent, `before${string}`>
 export type AfterLifecycleHookEvent = Extract<LifecycleHookEvent, `after${string}`>
@@ -23,7 +27,8 @@ export type AfterLifecycleHookEvent = Extract<LifecycleHookEvent, `after${string
 export interface LifecycleHookContext {
   user: User | null
   entityType: string
-  schemaType?: 'entity' | 'form' | undefined
+  schemaType?: 'entity' | 'form' | 'single' | undefined
+  auditCategory?: AuditLogCategory | undefined
   timestamp: string
   entityId?: string | undefined
   input?: Record<string, unknown> | undefined

package/dist/assets/adapters/next/templates/init/pages/auth-gate-rsc.tsx

@@ -8,7 +8,7 @@ export async function AuthGateRsc({ children }: { children: React.ReactNode }) {
   return (
     <SidebarProvider className="min-h-svh">
       <AdminSidebar />
-      <div className="relative flex min-w-0 flex-1 flex-col [--admin-shell-content-left:0px] md:[--admin-shell-content-left:var(--sidebar-width)] md:peer-data-[state=collapsed]:[--admin-shell-content-left:var(--sidebar-width-icon)]">
+      <div className="relative flex min-w-0 flex-1 flex-col [--admin-shell-content-left:0px] md:[--admin-shell-content-left:var(--sidebar-width)] md:peer-data-[state=collapsed]:[--admin-shell-content-left:var(--sidebar-width-icon)] pb-14">
         {children}
       </div>
     </SidebarProvider>

package/dist/assets/adapters/next/templates/init/pages/media/media-page-content.tsx

@@ -237,7 +237,7 @@ export function MediaPageContent() {
               selectedIds={selected}
               isSelectMode={isSelectMode}
               onItemClick={handleItemClick}
-              className="lg:grid-cols-10 pb-12 pt-px px-px"
+              className="lg:grid-cols-12 pb-12 pt-px px-px"
             />
             {total > DEFAULT_MEDIA_PAGE_SIZE ? (
               <MediaGridPagination

package/dist/assets/adapters/next/templates/init/pages/media/media-page-skeleton.tsx

@@ -1,7 +1,7 @@
 export function MediaPageSkeleton() {
   return (
     <div className="flex items-center justify-center h-48">
-      <div className="text-muted-foreground">Loading Media...</div>
+      <div className="text-muted-foreground">Loading Media…</div>
     </div>
   )
 }

package/dist/assets/adapters/next/templates/init/pages/settings/audit-log/audit-log-columns.tsx

@@ -0,0 +1,150 @@
+'use client'
+
+import type { AuditLogEntry, AuditLogSortField } from '@admin/actions/audit'
+import { SortIndicator } from '@admin/components/shared/sort-indicator'
+import { Badge } from '@admin/components/ui/badge'
+import { Button } from '@admin/components/ui/button'
+import type { ColumnDef } from '@tanstack/react-table'
+
+export const AUDIT_LOG_SORT_FIELDS = [
+  'createdAt',
+  'event',
+  'target',
+  'actor',
+  'sourceType'
+] as const satisfies AuditLogSortField[]
+
+function formatDateTime(value: string): string {
+  const date = new Date(value)
+  if (Number.isNaN(date.getTime())) return value
+
+  return new Intl.DateTimeFormat('en-US', {
+    month: 'short',
+    day: '2-digit',
+    year: 'numeric',
+    hour: 'numeric',
+    minute: '2-digit'
+  }).format(date)
+}
+
+function formatEventLabel(auditLog: AuditLogEntry): string {
+  return `${auditLog.category}.${auditLog.action}`
+}
+
+function SortableAuditLogHeader({
+  column,
+  label
+}: {
+  column: {
+    getIsSorted: () => false | 'asc' | 'desc'
+    toggleSorting: (desc?: boolean) => void
+  }
+  label: string
+}) {
+  const sortDirection = column.getIsSorted()
+  const sortLabel =
+    sortDirection === 'asc'
+      ? 'sorted ascending'
+      : sortDirection === 'desc'
+        ? 'sorted descending'
+        : 'not sorted'
+
+  return (
+    <Button
+      variant="ghost"
+      onClick={() => column.toggleSorting(column.getIsSorted() === 'asc')}
+      className="w-full min-w-0 justify-start overflow-hidden px-0! border-none rounded-none bg-transparent! scale-100! group"
+      aria-label={`Sort by ${label}, ${sortLabel}`}
+      aria-sort={
+        sortDirection === 'asc' ? 'ascending' : sortDirection === 'desc' ? 'descending' : 'none'
+      }
+    >
+      <span className="truncate">{label}</span>
+      <SortIndicator direction={sortDirection} />
+    </Button>
+  )
+}
+
+export function createAuditLogColumns(): ColumnDef<AuditLogEntry>[] {
+  return [
+    {
+      id: 'event',
+      size: 160,
+      header: ({ column }) => <SortableAuditLogHeader column={column} label="Event" />,
+      cell: ({ row }) => <Badge variant="secondary">{formatEventLabel(row.original)}</Badge>
+    },
+    {
+      id: 'target',
+      size: 240,
+      header: ({ column }) => <SortableAuditLogHeader column={column} label="Target" />,
+      cell: ({ row }) => (
+        <div className="flex min-w-0 flex-col">
+          <span className="truncate font-medium">
+            {row.original.targetLabel ?? row.original.targetId ?? 'Unknown'}
+          </span>
+          <span className="truncate text-xs text-muted-foreground">{row.original.targetType}</span>
+        </div>
+      )
+    },
+    {
+      id: 'actor',
+      size: 220,
+      header: ({ column }) => <SortableAuditLogHeader column={column} label="Actor" />,
+      cell: ({ row }) => (
+        <div className="flex min-w-0 flex-col">
+          <span className="truncate">
+            {row.original.actorEmail ?? row.original.actorName ?? 'Unknown'}
+          </span>
+          <span className="truncate text-xs text-muted-foreground">
+            {row.original.actorRole ?? 'No role'}
+          </span>
+        </div>
+      )
+    },
+    {
+      accessorKey: 'createdAt',
+      id: 'createdAt',
+      size: 180,
+      header: ({ column }) => <SortableAuditLogHeader column={column} label="Time" />,
+      cell: ({ row }) => (
+        <span className="whitespace-nowrap text-muted-foreground">
+          {formatDateTime(row.original.createdAt)}
+        </span>
+      )
+    },
+    {
+      accessorKey: 'sourceType',
+      id: 'sourceType',
+      size: 180,
+      header: ({ column }) => <SortableAuditLogHeader column={column} label="Source" />,
+      cell: ({ row }) => (
+        <div className="text-muted-foreground">
+          <div className="truncate">{row.original.sourceType}</div>
+          <div className="truncate text-xs">{row.original.ipAddress ?? 'No IP'}</div>
+        </div>
+      )
+    },
+    {
+      accessorKey: 'changedFields',
+      id: 'changedFields',
+      size: 180,
+      enableSorting: false,
+      header: 'Fields',
+      cell: ({ row }) =>
+        row.original.changedFields.length > 0 ? (
+          <div className="flex flex-wrap gap-1">
+            {row.original.changedFields.slice(0, 3).map((field) => (
+              <Badge key={field} variant="outline">
+                {field}
+              </Badge>
+            ))}
+            {row.original.changedFields.length > 3 ? (
+              <Badge variant="outline">+{row.original.changedFields.length - 3}</Badge>
+            ) : null}
+          </div>
+        ) : (
+          <span className="text-muted-foreground">None</span>
+        )
+    }
+  ]
+}

package/dist/assets/adapters/next/templates/init/pages/settings/audit-log/audit-log-page-content.tsx

@@ -0,0 +1,137 @@
+'use client'
+
+import type { AuditLogEntry } from '@admin/actions/audit'
+import { AUDIT_LOG_ACTIONS, AUDIT_LOG_CATEGORIES } from '@admin/actions/audit'
+import { EntityFiltersBar } from '@admin/components/shared/entity-filters-bar'
+import { PageHeader } from '@admin/components/shared/page-header'
+import { useIsFetching } from '@tanstack/react-query'
+import { parseAsInteger, parseAsString, useQueryState, useQueryStates } from 'nuqs'
+import * as React from 'react'
+import { createAuditLogColumns } from './audit-log-columns'
+import { AuditLogDetailDrawer } from './audit-log-detail-drawer'
+import { AuditLogTable } from './audit-log-table'
+
+const filterParsers = {
+  category: parseAsString.withDefault(''),
+  action: parseAsString.withDefault(''),
+  createdAtFrom: parseAsString.withDefault(''),
+  createdAtTo: parseAsString.withDefault('')
+} as const
+
+function formatFilterLabel(value: string): string {
+  return value
+    .split('_')
+    .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
+    .join(' ')
+}
+
+const categorySelectOptions = AUDIT_LOG_CATEGORIES.map((value) => ({
+  label: formatFilterLabel(value),
+  value
+}))
+const actionSelectOptions = AUDIT_LOG_ACTIONS.map((value) => ({
+  label: formatFilterLabel(value),
+  value
+}))
+
+export function AuditLogPageContent() {
+  const isSearchFetching = useIsFetching({ queryKey: ['audit-log'] }) > 0
+  const [search, setSearch] = useQueryState('q', parseAsString.withDefault(''))
+  const [, setPageIndex] = useQueryState('page', parseAsInteger.withDefault(0))
+  const [filterValues, setFilters] = useQueryStates(filterParsers)
+  const category = filterValues.category
+  const action = filterValues.action
+  const createdAtFrom = filterValues.createdAtFrom
+  const createdAtTo = filterValues.createdAtTo
+
+  const [selectedAuditLog, setSelectedAuditLog] = React.useState<AuditLogEntry | null>(null)
+  const columns = React.useMemo(() => createAuditLogColumns(), [])
+
+  const activeFilterCount = [search, category, action, createdAtFrom || createdAtTo].filter(
+    Boolean
+  ).length
+
+  function handleSearch(value: string | null) {
+    React.startTransition(() => {
+      void setPageIndex(0)
+      void setSearch(value)
+    })
+  }
+
+  function handleClearAll() {
+    React.startTransition(() => {
+      void setPageIndex(0)
+      void setSearch(null)
+      void setFilters({
+        category: null,
+        action: null,
+        createdAtFrom: null,
+        createdAtTo: null
+      })
+    })
+  }
+
+  const filters = [
+    {
+      key: 'category',
+      label: 'Category',
+      type: 'select' as const,
+      value: category,
+      options: categorySelectOptions
+    },
+    {
+      key: 'action',
+      label: 'Action',
+      type: 'select' as const,
+      value: action,
+      options: actionSelectOptions
+    },
+    {
+      key: 'createdAt',
+      label: 'Created',
+      type: 'date-range' as const,
+      from: createdAtFrom,
+      to: createdAtTo
+    }
+  ]
+
+  return (
+    <React.Fragment>
+      <PageHeader title="Audit Log" />
+
+      <EntityFiltersBar
+        filters={filters}
+        activeFilterCount={activeFilterCount}
+        onFilterChange={(updates) => {
+          React.startTransition(() => {
+            void setPageIndex(0)
+            void setFilters(updates)
+          })
+        }}
+        onClearAll={handleClearAll}
+        search={search}
+        searchPlaceholder="Search audit logs..."
+        isPending={isSearchFetching}
+        onSearch={handleSearch}
+      />
+      <main className="space-y-4 px-4 pb-4 flex-1">
+        <AuditLogTable
+          columns={columns}
+          search={search}
+          category={category}
+          action={action}
+          createdAtFrom={createdAtFrom}
+          createdAtTo={createdAtTo}
+          onRowClick={setSelectedAuditLog}
+        />
+      </main>
+      <AuditLogDetailDrawer
+        auditLog={selectedAuditLog}
+        open={!!selectedAuditLog}
+        onOpenChange={(open) => {
+          if (!open) setSelectedAuditLog(null)
+        }}
+      />
+    </React.Fragment>
+  )
+}

package/dist/assets/adapters/next/templates/init/pages/{audit-log → settings/audit-log}/audit-log-page-skeleton.tsx

@@ -1,7 +1,7 @@
 export function AuditLogPageSkeleton() {
   return (
     <div className="flex items-center justify-center h-48">
-      <div className="text-muted-foreground">Loading Audit Logs...</div>
+      <div className="text-muted-foreground">Loading Audit Logs…</div>
     </div>
   )
 }