generated from coulomb/repo-seed
fix(WP-0014): pre-flight compilation fixes, Tailwind pipeline, and admin seed
A2 — Compilation fixes: - Remove inline FK constraints from Schema.sql; IHP schema compiler cannot parse them. Add 1744329600-restore-fk-constraints.sql migration to restore referential integrity at the DB level. - Rename `#label` → `#label_` throughout to avoid clash with Haskell built-in. - Fix `hub.id == hid` UUID comparisons to use `toUUID hub.id`. - Replace non-existent `setStatus`/`respondJson` calls with `renderJsonWithStatusCode` throughout Api controllers. - Fix qualified package import for `cryptohash-sha256` in Auth.hs. - Add `CanSelect (Text, Text)` instance in Helper.View. - Refactor HSX inline lambdas to named helper functions in 100+ views (GHC cannot infer types for anonymous functions inside quasi-quoted HSX). - Fix missing imports (IHP.QueryBuilder, IHP.Fetch, Web.Routes, Only, etc.) across helpers and controllers. - Remove duplicate `diffUTCTime` definition in BottleneckDetector. - Change `createEventForHub` return type from `IO ResponseReceived` to `IO ()`. - Seed type-registry vocabulary via 1744502400-seed-type-registries.sql (moved from Schema.sql where IHP does not execute INSERT statements). A3 — Tailwind build pipeline: - Add `tailwindcss` to flake.nix native packages. - Uncomment `tailwind.exec` process in devenv shell config. - Add tailwind/tailwind.config.js (scans Web/View/**/*.hs). - Add tailwind/app.css with @tailwind directives. A4 — Admin user seed: - Add 1744416000-seed-admin-user.sql: inserts admin@inter-hub.local with bcrypt-hashed password admin1234! (cost 10). - Add .env.example documenting all required environment variables and default admin credentials. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -4,6 +4,7 @@ import Web.Types
|
||||
import Generated.Types
|
||||
import IHP.Prelude
|
||||
import IHP.ViewPrelude
|
||||
import Web.Routes ()
|
||||
|
||||
data EditView = EditView
|
||||
{ consumer :: !ApiConsumer
|
||||
@@ -15,31 +16,31 @@ instance View EditView where
|
||||
<div class="max-w-lg">
|
||||
<h1 class="text-2xl font-semibold mb-6">Edit API Consumer</h1>
|
||||
<form method="POST" action={UpdateApiConsumerAction consumer.id} class="space-y-4">
|
||||
{hiddenField #id}
|
||||
<input type="hidden" name="id" value={show consumer.id} />
|
||||
<input type="hidden" name="_method" value="PATCH"/>
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">Name *</label>
|
||||
{textField #name}
|
||||
<input type="text" name="name" value={consumer.name} class="border rounded px-3 py-2 text-sm w-full" />
|
||||
</div>
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">Description</label>
|
||||
{textareaField #description}
|
||||
<textarea name="description" class="border rounded px-3 py-2 text-sm w-full" rows="3">{maybe "" id consumer.description}</textarea>
|
||||
</div>
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">Linked Hub Manifest (optional)</label>
|
||||
<select name="hubCapabilityManifestId" class="border rounded px-3 py-2 text-sm w-full">
|
||||
<option value="">— none —</option>
|
||||
{forEach manifests manifestOption}
|
||||
{forEach manifests (manifestOption consumer.hubCapabilityManifestId)}
|
||||
</select>
|
||||
</div>
|
||||
<div class="grid grid-cols-2 gap-4">
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">Rate Limit (req/min)</label>
|
||||
{numberField #rateLimitPerMinute}
|
||||
<input type="number" name="rateLimitPerMinute" value={show consumer.rateLimitPerMinute} class="border rounded px-3 py-2 text-sm w-full" />
|
||||
</div>
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">Quota (req/day)</label>
|
||||
{numberField #quotaPerDay}
|
||||
<input type="number" name="quotaPerDay" value={show consumer.quotaPerDay} class="border rounded px-3 py-2 text-sm w-full" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="pt-2 flex gap-3">
|
||||
@@ -52,9 +53,8 @@ instance View EditView where
|
||||
</div>
|
||||
|]
|
||||
where
|
||||
manifestOption m = [hsx|
|
||||
<option value={show m.id}
|
||||
{if consumer.hubCapabilityManifestId == Just m.id then "selected" else "" :: Text}>
|
||||
manifestOption selectedId m = [hsx|
|
||||
<option value={show m.id} selected={selectedId == Just (toUUID m.id)}>
|
||||
Manifest {show m.id} ({m.status})
|
||||
</option>
|
||||
|]
|
||||
|
||||
@@ -4,6 +4,7 @@ import Web.Types
|
||||
import Generated.Types
|
||||
import IHP.Prelude
|
||||
import IHP.ViewPrelude
|
||||
import Web.Routes ()
|
||||
|
||||
data IndexView = IndexView { consumers :: ![ApiConsumer] }
|
||||
|
||||
@@ -57,9 +58,7 @@ instance View IndexView where
|
||||
<td class="px-4 py-3 text-gray-600">{show consumer.rateLimitPerMinute}/min</td>
|
||||
<td class="px-4 py-3 text-gray-600">{show consumer.quotaPerDay}</td>
|
||||
<td class="px-4 py-3">
|
||||
{if consumer.isActive
|
||||
then [hsx|<span class="bg-green-100 text-green-700 text-xs px-2 py-0.5 rounded-full">active</span>|]
|
||||
else [hsx|<span class="bg-gray-100 text-gray-500 text-xs px-2 py-0.5 rounded-full">inactive</span>|]}
|
||||
{renderConsumerStatus consumer.isActive}
|
||||
</td>
|
||||
<td class="px-4 py-3 text-right">
|
||||
<a href={EditApiConsumerAction consumer.id} class="text-gray-400 hover:text-gray-700 text-sm mr-3">Edit</a>
|
||||
@@ -67,3 +66,7 @@ instance View IndexView where
|
||||
</td>
|
||||
</tr>
|
||||
|]
|
||||
|
||||
renderConsumerStatus :: Bool -> Html
|
||||
renderConsumerStatus True = [hsx|<span class="bg-green-100 text-green-700 text-xs px-2 py-0.5 rounded-full">active</span>|]
|
||||
renderConsumerStatus False = [hsx|<span class="bg-gray-100 text-gray-500 text-xs px-2 py-0.5 rounded-full">inactive</span>|]
|
||||
|
||||
@@ -4,6 +4,7 @@ import Web.Types
|
||||
import Generated.Types
|
||||
import IHP.Prelude
|
||||
import IHP.ViewPrelude
|
||||
import Web.Routes ()
|
||||
|
||||
data NewView = NewView
|
||||
{ consumer :: !ApiConsumer
|
||||
@@ -15,14 +16,14 @@ instance View NewView where
|
||||
<div class="max-w-lg">
|
||||
<h1 class="text-2xl font-semibold mb-6">New API Consumer</h1>
|
||||
<form method="POST" action={CreateApiConsumerAction} class="space-y-4">
|
||||
{hiddenField #id}
|
||||
<input type="hidden" name="id" value={show consumer.id} />
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">Name *</label>
|
||||
{textField #name}
|
||||
<input type="text" name="name" value={consumer.name} class="border rounded px-3 py-2 text-sm w-full" />
|
||||
</div>
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">Description</label>
|
||||
{textareaField #description}
|
||||
<textarea name="description" class="border rounded px-3 py-2 text-sm w-full" rows="3">{maybe "" id consumer.description}</textarea>
|
||||
</div>
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">Linked Hub Manifest (optional)</label>
|
||||
@@ -35,11 +36,11 @@ instance View NewView where
|
||||
<div class="grid grid-cols-2 gap-4">
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">Rate Limit (req/min)</label>
|
||||
{numberField #rateLimitPerMinute}
|
||||
<input type="number" name="rateLimitPerMinute" value={maybe "" show consumer.rateLimitPerMinute} class="border rounded px-3 py-2 text-sm w-full" />
|
||||
</div>
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">Quota (req/day)</label>
|
||||
{numberField #quotaPerDay}
|
||||
<input type="number" name="quotaPerDay" value={maybe "" show consumer.quotaPerDay} class="border rounded px-3 py-2 text-sm w-full" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="pt-2 flex gap-3">
|
||||
|
||||
@@ -4,6 +4,7 @@ import Web.Types
|
||||
import Generated.Types
|
||||
import IHP.Prelude
|
||||
import IHP.ViewPrelude
|
||||
import Web.Routes ()
|
||||
|
||||
data ShowView = ShowView
|
||||
{ consumer :: !ApiConsumer
|
||||
@@ -35,9 +36,7 @@ instance View ShowView where
|
||||
<div class="grid grid-cols-3 gap-4 mb-8">
|
||||
<div class="bg-white border rounded p-4">
|
||||
<div class="text-xs text-gray-500 uppercase tracking-wide mb-1">Status</div>
|
||||
{if consumer.isActive
|
||||
then [hsx|<span class="bg-green-100 text-green-700 text-sm font-medium px-2 py-0.5 rounded">active</span>|]
|
||||
else [hsx|<span class="bg-gray-100 text-gray-500 text-sm font-medium px-2 py-0.5 rounded">inactive</span>|]}
|
||||
{renderConsumerStatusDetail consumer.isActive}
|
||||
</div>
|
||||
<div class="bg-white border rounded p-4">
|
||||
<div class="text-xs text-gray-500 uppercase tracking-wide mb-1">Rate Limit</div>
|
||||
@@ -59,9 +58,7 @@ instance View ShowView where
|
||||
New Key
|
||||
</a>
|
||||
</div>
|
||||
{if null apiKeys
|
||||
then [hsx|<p class="text-sm text-gray-400">No keys yet.</p>|]
|
||||
else keysTable}
|
||||
{if null apiKeys then noKeysMsg else keysTable}
|
||||
</div>
|
||||
|
||||
<div>
|
||||
@@ -72,9 +69,7 @@ instance View ShowView where
|
||||
New Subscription
|
||||
</a>
|
||||
</div>
|
||||
{if null webhooks
|
||||
then [hsx|<p class="text-sm text-gray-400">No webhooks yet.</p>|]
|
||||
else webhooksTable}
|
||||
{if null webhooks then noWebhooksMsg else webhooksTable}
|
||||
</div>
|
||||
|]
|
||||
where
|
||||
@@ -113,16 +108,10 @@ instance View ShowView where
|
||||
<td class="px-4 py-2 text-gray-500">{if k.scopes == "" then "–" else k.scopes}</td>
|
||||
<td class="px-4 py-2 text-gray-500">{maybe "never" show k.expiresAt}</td>
|
||||
<td class="px-4 py-2">
|
||||
{if isJust k.revokedAt
|
||||
then [hsx|<span class="text-red-500 text-xs">revoked</span>|]
|
||||
else [hsx|<span class="text-green-600 text-xs">active</span>|]}
|
||||
{renderKeyStatus (isJust k.revokedAt)}
|
||||
</td>
|
||||
<td class="px-4 py-2 text-right">
|
||||
{if isNothing k.revokedAt
|
||||
then [hsx|<a href={RevokeApiKeyAction k.id} data-method="post"
|
||||
data-confirm="Revoke this key? This cannot be undone."
|
||||
class="text-red-500 hover:text-red-700 text-xs">Revoke</a>|]
|
||||
else mempty}
|
||||
{renderRevokeLink k}
|
||||
</td>
|
||||
</tr>
|
||||
|]
|
||||
@@ -146,9 +135,7 @@ instance View ShowView where
|
||||
<td class="px-4 py-2 font-mono text-xs">{wh.eventType}</td>
|
||||
<td class="px-4 py-2 text-gray-500 text-xs truncate max-w-xs">{wh.targetUrl}</td>
|
||||
<td class="px-4 py-2">
|
||||
{if wh.isActive
|
||||
then [hsx|<span class="text-green-600 text-xs">active</span>|]
|
||||
else [hsx|<span class="text-gray-400 text-xs">paused</span>|]}
|
||||
{renderWebhookStatus wh.isActive}
|
||||
</td>
|
||||
<td class="px-4 py-2 text-right">
|
||||
<a href={ToggleWebhookSubscriptionAction wh.id} data-method="post"
|
||||
@@ -159,3 +146,28 @@ instance View ShowView where
|
||||
</td>
|
||||
</tr>
|
||||
|]
|
||||
|
||||
noKeysMsg :: Html
|
||||
noKeysMsg = [hsx|<p class="text-sm text-gray-400">No keys yet.</p>|]
|
||||
|
||||
noWebhooksMsg :: Html
|
||||
noWebhooksMsg = [hsx|<p class="text-sm text-gray-400">No webhooks yet.</p>|]
|
||||
|
||||
renderWebhookStatus :: Bool -> Html
|
||||
renderWebhookStatus True = [hsx|<span class="text-green-600 text-xs">active</span>|]
|
||||
renderWebhookStatus False = [hsx|<span class="text-gray-400 text-xs">paused</span>|]
|
||||
|
||||
renderConsumerStatusDetail :: Bool -> Html
|
||||
renderConsumerStatusDetail True = [hsx|<span class="bg-green-100 text-green-700 text-sm font-medium px-2 py-0.5 rounded">active</span>|]
|
||||
renderConsumerStatusDetail False = [hsx|<span class="bg-gray-100 text-gray-500 text-sm font-medium px-2 py-0.5 rounded">inactive</span>|]
|
||||
|
||||
renderKeyStatus :: Bool -> Html
|
||||
renderKeyStatus True = [hsx|<span class="text-red-500 text-xs">revoked</span>|]
|
||||
renderKeyStatus False = [hsx|<span class="text-green-600 text-xs">active</span>|]
|
||||
|
||||
renderRevokeLink :: ApiKey -> Html
|
||||
renderRevokeLink k
|
||||
| isNothing k.revokedAt = [hsx|<a href={RevokeApiKeyAction k.id} data-method="post"
|
||||
data-confirm="Revoke this key? This cannot be undone."
|
||||
class="text-red-500 hover:text-red-700 text-xs">Revoke</a>|]
|
||||
| otherwise = mempty
|
||||
|
||||
Reference in New Issue
Block a user