betterstart-cli 0.0.27 → 0.0.29

package/dist/assets/adapters/next/templates/init/components/shared/media/media-url-importer.tsx

@@ -1,5 +1,6 @@
 'use client'
 
+import { Card, CardContent } from '@admin/components/ui/card'
 import {
   InputGroup,
   InputGroupAddon,
@@ -88,52 +89,49 @@ export function MediaUrlImporter({ onImportFromUrl, accept, className }: MediaUr
   }, [isImporting, onImportFromUrl, urlValue])
 
   return (
-    <div
-      className={cn(
-        'flex items-center justify-center transition-colors rounded-sm border bg-input border-border overflow-hidden h-full flex-col p-5 gap-5',
-        className
-      )}
-    >
-      <div className="flex w-full flex-col items-center gap-0.5 text-center">
-        <p className="text-sm font-medium">Import from URL</p>
-        <p className="text-sm text-muted-foreground">{urlHelpText}</p>
-      </div>
-
-      <InputGroup className="bg-background mx-auto max-w-2xl">
-        <InputGroupInput
-          type="url"
-          name="url"
-          aria-label="Media URL"
-          value={urlValue}
-          placeholder={urlPlaceholder}
-          autoComplete="off"
-          spellCheck={false}
-          onChange={(event) => {
-            setUrlValue(event.target.value)
-            if (urlError) setUrlError(null)
-          }}
-          onKeyDown={(event) => {
-            if (event.key === 'Enter') {
-              event.preventDefault()
-              void handleImport()
-            }
-          }}
-          disabled={isImporting}
-        />
-
-        <InputGroupAddon align="inline-end">
-          <InputGroupButton
-            type="button"
-            variant="outline"
-            size="sm"
-            onClick={() => void handleImport()}
-            disabled={isImporting}
-          >
-            {isImporting ? <LoaderCircle className="animate-spin" /> : <Upload />}
-            Import
-          </InputGroupButton>
-        </InputGroupAddon>
-      </InputGroup>
-    </div>
+    <Card className={cn('flex items-center justify-center', className)}>
+      <CardContent className="w-full h-full">
+        <div className="flex w-full flex-col h-full justify-center items-center gap-3 text-center">
+          <InputGroup className="bg-background mx-auto max-w-2xl">
+            <InputGroupInput
+              type="url"
+              name="url"
+              aria-label="Media URL"
+              value={urlValue}
+              placeholder={urlPlaceholder}
+              autoComplete="off"
+              spellCheck={false}
+              onChange={(event) => {
+                setUrlValue(event.target.value)
+                if (urlError) setUrlError(null)
+              }}
+              onKeyDown={(event) => {
+                if (event.key === 'Enter') {
+                  event.preventDefault()
+                  void handleImport()
+                }
+              }}
+              disabled={isImporting}
+            />
+            <InputGroupAddon align="inline-end">
+              <InputGroupButton
+                type="button"
+                variant="outline"
+                onClick={() => void handleImport()}
+                disabled={isImporting}
+                className="h-full px-5"
+              >
+                {isImporting ? <LoaderCircle className="animate-spin" /> : <Upload />}
+                Import
+              </InputGroupButton>
+            </InputGroupAddon>
+          </InputGroup>
+
+          <div className="flex w-full flex-col items-center text-center">
+            <p className="text-sm text-muted-foreground">{urlHelpText}</p>
+          </div>
+        </div>
+      </CardContent>
+    </Card>
   )
 }

package/dist/assets/adapters/next/templates/init/components/shared/page-header.tsx

@@ -23,7 +23,7 @@ export function PageHeader({
 
   return (
     <>
-      <header className="fixed top-0 border-t right-0 left-(--admin-shell-content-left) z-20 grid h-14 grid-cols-[minmax(0,1fr)_auto_minmax(0,1fr)] items-center border-b border-border/80 px-4 bg-sidebar transition-[left] duration-200 ease-linear">
+      <header className="fixed z-200 top-0 border-t right-0 left-(--admin-shell-content-left) grid h-14 grid-cols-[minmax(0,1fr)_auto_minmax(0,1fr)] items-center border-b border-border/80 px-4 bg-sidebar transition-[left] duration-200 ease-linear">
         <div className="flex w-full items-center justify-start gap-2">
           {hasBackButton && (
             <Button variant="ghost" size="icon" onClick={() => router.back()}>

package/dist/assets/adapters/next/templates/init/data/webhook-events.ts

@@ -0,0 +1,5 @@
+import type { WebhookEventSource } from '@admin/types/webhooks'
+
+export type { WebhookEventSource } from '@admin/types/webhooks'
+
+export const webhookEventSources: WebhookEventSource[] = []

package/dist/assets/adapters/next/templates/init/hooks/use-table-utils.ts

@@ -174,15 +174,35 @@ export function useTableUtils<TData extends RowData>({
     setColumnSizing((current) => {
       const next: ColumnSizingState = {}
       let changed = Object.keys(current).length !== baseColumns.length
+      const targetTotal = Math.round(Math.max(containerWidth, fixedTotal + flexibleMinTotal))
+      const flexibleSizing = flexibleColumns.map((column) => {
+        const columnShrinkRoom = Math.max(column.size - column.minSize, 0)
+        const shrink = shrinkRoom > 0 ? shrinkNeeded * (columnShrinkRoom / shrinkRoom) : 0
+        const grow = extraPerColumn
+        return {
+          id: column.id,
+          size: Math.round(column.size + grow - shrink)
+        }
+      })
+      const flexibleSizingById = new Map(flexibleSizing.map((column) => [column.id, column.size]))
+      const roundedFixedTotal = baseColumns
+        .filter((column) => !flexibleColumnIds.has(column.id))
+        .reduce((total, column) => total + Math.round(column.size), 0)
+      const roundedFlexibleTotal = flexibleSizing.reduce((total, column) => total + column.size, 0)
+      const roundingDelta = targetTotal - roundedFixedTotal - roundedFlexibleTotal
+      const lastFlexibleColumn = flexibleSizing.at(-1)
+
+      if (lastFlexibleColumn) {
+        flexibleSizingById.set(
+          lastFlexibleColumn.id,
+          Math.max(lastFlexibleColumn.size + roundingDelta, 0)
+        )
+      }
 
       for (const column of baseColumns) {
-        const columnShrinkRoom = Math.max(column.size - column.minSize, 0)
-        const shrink =
-          flexibleColumnIds.has(column.id) && shrinkRoom > 0
-            ? shrinkNeeded * (columnShrinkRoom / shrinkRoom)
-            : 0
-        const grow = flexibleColumnIds.has(column.id) ? extraPerColumn : 0
-        const size = Math.round(column.size + grow - shrink)
+        const size = flexibleColumnIds.has(column.id)
+          ? (flexibleSizingById.get(column.id) ?? Math.round(column.size))
+          : Math.round(column.size)
         next[column.id] = size
         if (current[column.id] !== size) {
           changed = true

package/dist/assets/adapters/next/templates/init/hooks/use-webhooks.ts

@@ -0,0 +1,211 @@
+'use client'
+
+import type { FormSettingsData } from '@admin/actions/forms'
+import { getAllFormSettings } from '@admin/actions/forms'
+import type {
+  WebhookDeliveriesPage,
+  WebhookDeliveriesQuery,
+  WebhookSubscriptionEntry,
+  WebhooksPage,
+  WebhooksQuery
+} from '@admin/actions/webhooks'
+import {
+  getWebhookDeliveries,
+  getWebhookSubscriptions,
+  getWebhooks,
+  sendTestWebhook,
+  updateWebhook
+} from '@admin/actions/webhooks'
+import { type UseQueryResult, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+import { toast } from 'sonner'
+
+export function useWebhooks(
+  search?: string,
+  enabled?: string,
+  lastDelivery?: string,
+  createdAtFrom?: string,
+  createdAtTo?: string,
+  page?: number,
+  pageSize?: number,
+  orderBy?: string,
+  orderDirection?: 'asc' | 'desc',
+  options?: { enabled?: boolean }
+): UseQueryResult<WebhooksPage, Error> {
+  const safePage = Number.isFinite(page ?? 0) && (page ?? 0) > 0 ? (page ?? 0) : 0
+  const safePageSize =
+    pageSize === -1 || (Number.isFinite(pageSize ?? 20) && (pageSize ?? 20) > 0)
+      ? (pageSize ?? 20)
+      : 20
+
+  return useQuery({
+    queryKey: [
+      'webhooks',
+      search ?? '',
+      enabled ?? '',
+      lastDelivery ?? '',
+      createdAtFrom ?? '',
+      createdAtTo ?? '',
+      safePage,
+      safePageSize,
+      orderBy ?? '',
+      orderDirection ?? ''
+    ],
+    queryFn: () => {
+      const filters: WebhooksQuery = {}
+      if (search) filters.search = search
+      if (enabled === 'enabled') filters.enabled = true
+      if (enabled === 'disabled') filters.enabled = false
+      if (lastDelivery === 'delivered' || lastDelivery === 'failed' || lastDelivery === 'never') {
+        filters.lastDelivery = lastDelivery
+      }
+      if (createdAtFrom) filters.createdAtFrom = createdAtFrom
+      if (createdAtTo) filters.createdAtTo = createdAtTo
+      if (safePageSize !== -1) {
+        filters.limit = safePageSize
+        filters.offset = safePage * safePageSize
+      }
+      if (orderBy) filters.orderBy = orderBy
+      if (orderDirection) filters.orderDirection = orderDirection
+      return getWebhooks(Object.keys(filters).length > 0 ? filters : undefined)
+    },
+    enabled: options?.enabled ?? true
+  })
+}
+
+export function useWebhookOptions(): UseQueryResult<WebhooksPage, Error> {
+  return useQuery({
+    queryKey: ['webhooks', 'options'],
+    queryFn: () => getWebhooks()
+  })
+}
+
+export function useToggleWebhookEnabled() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async (input: { id: string; enabled: boolean }) => {
+      const result = await updateWebhook(input.id, { enabled: input.enabled })
+      if (!result.success) {
+        throw new Error(result.error || 'Failed to update webhook')
+      }
+
+      return result
+    },
+    onMutate: async (input) => {
+      await queryClient.cancelQueries({ queryKey: ['webhooks'] })
+      const previous = queryClient.getQueriesData<WebhooksPage>({
+        queryKey: ['webhooks']
+      })
+      queryClient.setQueriesData<WebhooksPage>({ queryKey: ['webhooks'] }, (page) =>
+        page
+          ? {
+              ...page,
+              webhooks: page.webhooks.map((webhook) =>
+                webhook.id === input.id ? { ...webhook, enabled: input.enabled } : webhook
+              )
+            }
+          : page
+      )
+      return { previous }
+    },
+    onError: (error: Error, _input, context) => {
+      for (const [queryKey, data] of context?.previous ?? []) {
+        queryClient.setQueryData(queryKey, data)
+      }
+      toast.error(error.message || 'Failed to update webhook')
+    },
+    onSettled: async () => {
+      await queryClient.invalidateQueries({ queryKey: ['webhooks'] })
+    }
+  })
+}
+
+export function useSendTestWebhook() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async (id: string) => {
+      const result = await sendTestWebhook(id)
+      if (!result.success) {
+        throw new Error(result.error || 'Test webhook failed')
+      }
+
+      return result
+    },
+    onSuccess: async (result) => {
+      toast.success(
+        result.statusCode ? `Test delivered (status ${result.statusCode})` : 'Test delivered'
+      )
+      await queryClient.invalidateQueries({ queryKey: ['webhook-deliveries'] })
+      await queryClient.invalidateQueries({ queryKey: ['webhooks'] })
+    },
+    onError: async (error: Error) => {
+      toast.error(error.message || 'Test webhook failed')
+      await queryClient.invalidateQueries({ queryKey: ['webhook-deliveries'] })
+      await queryClient.invalidateQueries({ queryKey: ['webhooks'] })
+    }
+  })
+}
+
+export function useWebhookSubscriptions() {
+  return useQuery<WebhookSubscriptionEntry[]>({
+    queryKey: ['webhook-subscriptions'],
+    queryFn: () => getWebhookSubscriptions()
+  })
+}
+
+export function useWebhookDeliveries(
+  search?: string,
+  status?: string,
+  endpoint?: string,
+  createdAtFrom?: string,
+  createdAtTo?: string,
+  page?: number,
+  pageSize?: number,
+  orderBy?: string,
+  orderDirection?: 'asc' | 'desc'
+): UseQueryResult<WebhookDeliveriesPage, Error> {
+  const safePage = Number.isFinite(page ?? 0) && (page ?? 0) > 0 ? (page ?? 0) : 0
+  const safePageSize =
+    pageSize === -1 || (Number.isFinite(pageSize ?? 20) && (pageSize ?? 20) > 0)
+      ? (pageSize ?? 20)
+      : 20
+
+  return useQuery({
+    queryKey: [
+      'webhook-deliveries',
+      search ?? '',
+      status ?? '',
+      endpoint ?? '',
+      createdAtFrom ?? '',
+      createdAtTo ?? '',
+      safePage,
+      safePageSize,
+      orderBy ?? '',
+      orderDirection ?? ''
+    ],
+    queryFn: () => {
+      const filters: WebhookDeliveriesQuery = {}
+      if (search) filters.search = search
+      if (status === 'success') filters.success = true
+      if (status === 'failed') filters.success = false
+      if (endpoint) filters.webhookId = endpoint
+      if (createdAtFrom) filters.createdAtFrom = createdAtFrom
+      if (createdAtTo) filters.createdAtTo = createdAtTo
+      if (safePageSize !== -1) {
+        filters.limit = safePageSize
+        filters.offset = safePage * safePageSize
+      }
+      if (orderBy) filters.orderBy = orderBy
+      if (orderDirection) filters.orderDirection = orderDirection
+      return getWebhookDeliveries(Object.keys(filters).length > 0 ? filters : undefined)
+    }
+  })
+}
+
+export function useFormSettingsList() {
+  return useQuery<FormSettingsData[]>({
+    queryKey: ['form-settings'],
+    queryFn: () => getAllFormSettings()
+  })
+}

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

@@ -13,6 +13,8 @@ export const AUDIT_LOG_ACTIONS = [
   'delete',
   'publish',
   'unpublish',
+  'restore',
+  'reorder',
   'cleanup'
 ] as const
 export const AUDIT_LOG_SOURCE_TYPES = ['admin_ui', 'server_action', 'system_job'] as const

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

@@ -1,6 +1,5 @@
 export { getAllFormSettings } from './get-all-form-settings'
 export { getFormSettings } from './get-form-settings'
-export { testFormWebhook } from './test-form-webhook'
 export type {
   FormSettingsData,
   FormSettingsResult,

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

@@ -1,16 +1,12 @@
 export interface FormSettingsData {
   id: string
   formName: string
-  webhookUrl: string | null
-  webhookEnabled: boolean
   notificationEmails: string | null
   createdAt: string
   updatedAt: string
 }
 
 export interface UpsertFormSettingsInput {
-  webhookUrl?: string | null
-  webhookEnabled?: boolean
   notificationEmails?: string | null
 }
 

package/dist/assets/adapters/next/templates/init/lib/actions/forms/upsert-form-settings.ts

@@ -18,8 +18,6 @@ export async function upsertFormSettings(
       .insert(formSettings)
       .values({
         formName,
-        webhookUrl: data.webhookUrl ?? null,
-        webhookEnabled: data.webhookEnabled ?? false,
         notificationEmails: data.notificationEmails ?? null
       })
       .onConflictDoUpdate({

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

@@ -0,0 +1,55 @@
+'use server'
+
+import { requireRole, UserRole } from '@admin/auth/middleware'
+import db from '@admin/db'
+import { webhookSubscriptions, webhooks } from '@admin/db/schema'
+import { generateWebhookSecret } from '@admin/utils/webhook/signature'
+import { updateTag } from 'next/cache'
+import type { CreateWebhookInput, WebhookResult } from './types'
+import { webhooksCacheTags } from './types'
+
+export async function createWebhook(input: CreateWebhookInput): Promise<WebhookResult> {
+  await requireRole([UserRole.ADMIN])
+
+  try {
+    const created = await db.transaction(async (tx) => {
+      const [row] = await tx
+        .insert(webhooks)
+        .values({
+          name: input.name,
+          url: input.url,
+          secret: generateWebhookSecret(),
+          enabled: input.enabled
+        })
+        .returning()
+
+      if (input.events.length > 0) {
+        await tx
+          .insert(webhookSubscriptions)
+          .values(input.events.map((event) => ({ webhookId: row.id, event })))
+      }
+
+      return row
+    })
+
+    updateTag(webhooksCacheTags.endpoints)
+    updateTag(webhooksCacheTags.subscriptions)
+    return {
+      success: true,
+      webhook: {
+        id: created.id,
+        name: created.name,
+        url: created.url,
+        enabled: created.enabled,
+        createdAt: created.createdAt,
+        updatedAt: created.updatedAt
+      }
+    }
+  } catch (error) {
+    console.error('Error creating webhook:', error)
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : 'Failed to create webhook'
+    }
+  }
+}

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

@@ -0,0 +1,26 @@
+'use server'
+
+import { requireRole, UserRole } from '@admin/auth/middleware'
+import db from '@admin/db'
+import { webhooks } from '@admin/db/schema'
+import { eq } from 'drizzle-orm'
+import { updateTag } from 'next/cache'
+import type { WebhookResult } from './types'
+import { webhooksCacheTags } from './types'
+
+export async function deleteWebhook(id: string): Promise<WebhookResult> {
+  await requireRole([UserRole.ADMIN])
+
+  try {
+    await db.delete(webhooks).where(eq(webhooks.id, id))
+    updateTag(webhooksCacheTags.endpoints)
+    updateTag(webhooksCacheTags.subscriptions)
+    return { success: true }
+  } catch (error) {
+    console.error('Error deleting webhook:', error)
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : 'Failed to delete webhook'
+    }
+  }
+}

package/dist/assets/adapters/next/templates/init/lib/actions/webhooks/dispatch.ts

@@ -0,0 +1,135 @@
+import db from '@admin/db'
+import { webhookDeliveries } from '@admin/db/schema'
+import { createWebhookEventId, signWebhookPayload } from '@admin/utils/webhook/signature'
+import { and, desc, eq, notInArray } from 'drizzle-orm'
+import { after } from 'next/server'
+import type { ActiveWebhookEndpoint } from './internal-get-active-endpoints'
+import { getActiveEndpointsForEvent } from './internal-get-active-endpoints'
+
+const MAX_ATTEMPTS = 3
+const RETRY_DELAYS_MS = [1_000, 5_000]
+const REQUEST_TIMEOUT_MS = 10_000
+const DELIVERY_LOG_LIMIT = 100
+
+export function emitWebhookEvent(event: string, data: unknown): void {
+  const eventId = createWebhookEventId()
+  const body = JSON.stringify({
+    id: eventId,
+    event,
+    timestamp: new Date().toISOString(),
+    data
+  })
+
+  // A missing request scope must never crash the mutation that emitted the event.
+  try {
+    after(() => deliverWebhookEvent(eventId, event, body))
+  } catch (error) {
+    console.error('Webhook dispatch skipped (no request scope):', {
+      event,
+      error
+    })
+  }
+}
+
+async function deliverWebhookEvent(eventId: string, event: string, body: string): Promise<void> {
+  try {
+    const endpoints = await getActiveEndpointsForEvent(event)
+    if (endpoints.length === 0) return
+
+    await Promise.allSettled(
+      endpoints.map((endpoint) => deliverToEndpoint(endpoint, eventId, event, body))
+    )
+  } catch (error) {
+    console.error('Webhook delivery failed:', { event, error })
+  }
+}
+
+async function deliverToEndpoint(
+  endpoint: ActiveWebhookEndpoint,
+  eventId: string,
+  event: string,
+  body: string
+): Promise<void> {
+  for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
+    const startedAt = Date.now()
+    let statusCode: number | null = null
+    let errorMessage: string | null = null
+
+    try {
+      const timestamp = Math.floor(Date.now() / 1000).toString()
+      const response = await fetch(endpoint.url, {
+        method: 'POST',
+        headers: {
+          'content-type': 'application/json',
+          'x-webhook-id': eventId,
+          'x-webhook-timestamp': timestamp,
+          'x-webhook-signature': signWebhookPayload(endpoint.secret, timestamp, body)
+        },
+        body,
+        signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS)
+      })
+      statusCode = response.status
+      if (!response.ok) errorMessage = `Webhook returned status ${response.status}`
+    } catch (error) {
+      errorMessage = error instanceof Error ? error.message : 'Webhook request failed'
+    }
+
+    await recordWebhookDelivery({
+      webhookId: endpoint.id,
+      event,
+      eventId,
+      attempt,
+      success: errorMessage === null,
+      statusCode,
+      durationMs: Date.now() - startedAt,
+      error: errorMessage
+    })
+
+    if (errorMessage === null) return
+    if (attempt < MAX_ATTEMPTS) {
+      await new Promise((resolve) => setTimeout(resolve, RETRY_DELAYS_MS[attempt - 1]))
+    }
+  }
+}
+
+export async function recordWebhookDelivery(entry: {
+  webhookId: string
+  event: string
+  eventId: string
+  attempt: number
+  success: boolean
+  statusCode: number | null
+  durationMs: number
+  error: string | null
+}): Promise<void> {
+  try {
+    await db.insert(webhookDeliveries).values(entry)
+    await pruneWebhookDeliveries(entry.webhookId)
+  } catch (error) {
+    console.error('Failed to record webhook delivery:', {
+      event: entry.event,
+      error
+    })
+  }
+}
+
+async function pruneWebhookDeliveries(webhookId: string): Promise<void> {
+  const keepRows = await db
+    .select({ id: webhookDeliveries.id })
+    .from(webhookDeliveries)
+    .where(eq(webhookDeliveries.webhookId, webhookId))
+    .orderBy(desc(webhookDeliveries.createdAt))
+    .limit(DELIVERY_LOG_LIMIT)
+
+  if (keepRows.length < DELIVERY_LOG_LIMIT) return
+
+  await db.delete(webhookDeliveries).where(
+    and(
+      eq(webhookDeliveries.webhookId, webhookId),
+      notInArray(
+        webhookDeliveries.id,
+        keepRows.map((row) => row.id)
+      )
+    )
+  )
+}