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 ()
|
||||
import Data.Aeson (Value(..), encode, decode)
|
||||
import qualified Data.Vector as V
|
||||
import qualified Data.ByteString.Lazy.Char8 as BL
|
||||
@@ -20,7 +21,7 @@ data EditView = EditView
|
||||
instance View EditView where
|
||||
html EditView { .. } = [hsx|
|
||||
<div class="mb-4">
|
||||
<a href={ShowHubCapabilityManifestAction { hubCapabilityManifestId = manifest.id }}
|
||||
<a href={ShowHubCapabilityManifestAction (manifest.id)}
|
||||
class="text-sm text-gray-500 hover:text-gray-700">
|
||||
← {hub.name} Manifest
|
||||
</a>
|
||||
@@ -30,26 +31,23 @@ instance View EditView where
|
||||
Declare the type names this hub owns. After saving, activate the manifest to register them.
|
||||
</p>
|
||||
|
||||
{if manifest.status /= "draft"
|
||||
then [hsx|
|
||||
<div class="mb-6 bg-amber-50 border border-amber-200 rounded p-4 text-sm text-amber-800">
|
||||
This manifest is <strong>{manifest.status}</strong> and is read-only.
|
||||
Retire it first to create a new draft amendment.
|
||||
</div>
|
||||
|]
|
||||
else [hsx||]}
|
||||
{renderReadOnlyWarning manifest}
|
||||
|
||||
<form method="POST" action={UpdateHubCapabilityManifestAction { hubCapabilityManifestId = manifest.id }}>
|
||||
<form method="POST" action={UpdateHubCapabilityManifestAction (manifest.id)}>
|
||||
<div class="space-y-6 max-w-2xl">
|
||||
<div class="bg-white rounded-lg border border-gray-200 p-5 space-y-4">
|
||||
<h2 class="text-sm font-semibold text-gray-700">Manifest Details</h2>
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">Capability Description</label>
|
||||
{(textareaField #capabilityDescription) { fieldClass = "w-full border border-gray-300 rounded px-3 py-2 text-sm" }}
|
||||
<textarea name="capabilityDescription"
|
||||
class="w-full border border-gray-300 rounded px-3 py-2 text-sm"
|
||||
rows="3">{fromMaybe "" manifest.capabilityDescription}</textarea>
|
||||
</div>
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">Contact</label>
|
||||
{(textField #contact) { fieldClass = "w-full border border-gray-300 rounded px-3 py-2 text-sm" }}
|
||||
<input type="text" name="contact"
|
||||
class="w-full border border-gray-300 rounded px-3 py-2 text-sm"
|
||||
value={fromMaybe "" manifest.contact} />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -64,17 +62,20 @@ instance View EditView where
|
||||
{if manifest.status /= "draft" then ("disabled" :: Text) else ""}>
|
||||
Save
|
||||
</button>
|
||||
{if manifest.status == "draft" then [hsx|
|
||||
<a href={ActivateManifestAction { hubCapabilityManifestId = manifest.id }}
|
||||
class="text-sm bg-green-600 text-white px-4 py-2 rounded hover:bg-green-700">
|
||||
Save & Activate
|
||||
</a>
|
||||
|] else [hsx||]}
|
||||
{if manifest.status == "draft" then renderActivateLink manifest.id else mempty}
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|]
|
||||
|
||||
renderActivateLink :: Id HubCapabilityManifest -> Html
|
||||
renderActivateLink mid = [hsx|
|
||||
<a href={ActivateManifestAction (mid)}
|
||||
class="text-sm bg-green-600 text-white px-4 py-2 rounded hover:bg-green-700">
|
||||
Save & Activate
|
||||
</a>
|
||||
|]
|
||||
|
||||
-- | Render a JSON array text area with available registry options shown below.
|
||||
typeArraySection :: Text -> Text -> Value -> [WidgetTypeRegistry] -> Html
|
||||
typeArraySection title fieldName val entries = [hsx|
|
||||
@@ -121,6 +122,16 @@ typeArraySection3 title fieldName val entries = [hsx|
|
||||
</div>
|
||||
|]
|
||||
|
||||
renderReadOnlyWarning :: HubCapabilityManifest -> Html
|
||||
renderReadOnlyWarning manifest
|
||||
| manifest.status /= "draft" = [hsx|
|
||||
<div class="mb-6 bg-amber-50 border border-amber-200 rounded p-4 text-sm text-amber-800">
|
||||
This manifest is <strong>{manifest.status}</strong> and is read-only.
|
||||
Retire it first to create a new draft amendment.
|
||||
</div>
|
||||
|]
|
||||
| otherwise = mempty
|
||||
|
||||
valueText :: Value -> Text
|
||||
valueText v = cs (BL.unpack (encode v))
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ import Web.Types
|
||||
import Generated.Types
|
||||
import IHP.Prelude
|
||||
import IHP.ViewPrelude
|
||||
import Web.Routes ()
|
||||
import Data.Aeson (Value(..))
|
||||
import qualified Data.Vector as V
|
||||
|
||||
@@ -56,7 +57,7 @@ renderRow hubs m = [hsx|
|
||||
<td class="px-4 py-3 text-gray-500 text-xs">{jsonCount m.declaredPolicyScopes}</td>
|
||||
<td class="px-4 py-3 text-gray-400 text-xs">{maybe "—" show m.activatedAt}</td>
|
||||
<td class="px-4 py-3 text-right text-xs">
|
||||
<a href={ShowHubCapabilityManifestAction { hubCapabilityManifestId = m.id }}
|
||||
<a href={ShowHubCapabilityManifestAction (m.id)}
|
||||
class="text-indigo-600 hover:text-indigo-800">View</a>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -4,6 +4,7 @@ import Web.Types
|
||||
import Generated.Types
|
||||
import IHP.Prelude
|
||||
import IHP.ViewPrelude
|
||||
import Web.Routes ()
|
||||
|
||||
data NewView = NewView
|
||||
{ manifest :: !HubCapabilityManifest
|
||||
@@ -23,33 +24,18 @@ instance View NewView where
|
||||
annotation categories, and policy scopes it owns. Create a draft, declare your types,
|
||||
then activate to register them with the framework.
|
||||
</div>
|
||||
<form method="POST" action={CreateHubCapabilityManifestAction}>
|
||||
<div class="bg-white rounded-lg border border-gray-200 p-6 max-w-lg space-y-4">
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">Hub</label>
|
||||
{selectField #hubId (hubOptions hubs)}
|
||||
</div>
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">
|
||||
Capability Description <span class="text-gray-400 text-xs">(optional)</span>
|
||||
</label>
|
||||
{(textareaField #capabilityDescription) { fieldClass = "w-full border border-gray-300 rounded px-3 py-2 text-sm" }}
|
||||
</div>
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">
|
||||
Contact <span class="text-gray-400 text-xs">(team or person)</span>
|
||||
</label>
|
||||
{(textField #contact) { fieldClass = "w-full border border-gray-300 rounded px-3 py-2 text-sm" }}
|
||||
</div>
|
||||
<div class="pt-2">
|
||||
<button type="submit"
|
||||
class="bg-indigo-600 text-white text-sm px-4 py-2 rounded hover:bg-indigo-700">
|
||||
Create Draft
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
<div class="bg-white rounded-lg border border-gray-200 p-6 max-w-lg">
|
||||
{renderManifestForm manifest hubs}
|
||||
</div>
|
||||
|]
|
||||
|
||||
renderManifestForm :: HubCapabilityManifest -> [Hub] -> Html
|
||||
renderManifestForm manifest hubs = formFor manifest [hsx|
|
||||
{selectField #hubId (hubOptions hubs)}
|
||||
{(textareaField #capabilityDescription) { fieldLabel = "Capability Description" }}
|
||||
{(textField #contact) { fieldLabel = "Contact (team or person)" }}
|
||||
{submitButton { label = "Create Draft" }}
|
||||
|]
|
||||
|
||||
hubOptions :: [Hub] -> [(Text, Id Hub)]
|
||||
hubOptions hubs = map (\h -> (h.name <> " (" <> h.hubKind <> ")", h.id)) hubs
|
||||
|
||||
@@ -4,6 +4,7 @@ import Web.Types
|
||||
import Generated.Types
|
||||
import IHP.Prelude
|
||||
import IHP.ViewPrelude
|
||||
import Web.Routes ()
|
||||
import Data.Aeson (Value(..), encode)
|
||||
import qualified Data.Vector as V
|
||||
import qualified Data.ByteString.Lazy.Char8 as BL
|
||||
@@ -26,30 +27,7 @@ instance View ShowView where
|
||||
{statusBadge manifest.status}
|
||||
</div>
|
||||
|
||||
{if manifest.status == "draft"
|
||||
then [hsx|
|
||||
<div class="mb-4 flex gap-2">
|
||||
<a href={EditHubCapabilityManifestAction { hubCapabilityManifestId = manifest.id }}
|
||||
class="text-sm border border-indigo-300 text-indigo-700 px-3 py-1.5 rounded hover:bg-indigo-50">
|
||||
Edit Draft
|
||||
</a>
|
||||
<a href={ActivateManifestAction { hubCapabilityManifestId = manifest.id }}
|
||||
class="text-sm bg-green-600 text-white px-3 py-1.5 rounded hover:bg-green-700">
|
||||
Activate
|
||||
</a>
|
||||
</div>
|
||||
|]
|
||||
else if manifest.status == "active"
|
||||
then [hsx|
|
||||
<div class="mb-4">
|
||||
<a href={RetireManifestAction { hubCapabilityManifestId = manifest.id }}
|
||||
data-confirm="Retire this manifest? The hub's types will remain registered."
|
||||
class="text-sm border border-gray-300 text-gray-600 px-3 py-1.5 rounded hover:bg-gray-50">
|
||||
Retire
|
||||
</a>
|
||||
</div>
|
||||
|]
|
||||
else [hsx||]}
|
||||
{manifestActions manifest}
|
||||
|
||||
<div class="grid grid-cols-2 gap-4 mb-6">
|
||||
<div class="bg-white rounded-lg border border-gray-200 p-4">
|
||||
@@ -62,12 +40,8 @@ instance View ShowView where
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{forEach (maybeText manifest.capabilityDescription) (\d -> [hsx|
|
||||
<p class="text-sm text-gray-600 mb-4">{d}</p>
|
||||
|])}
|
||||
{forEach (maybeText manifest.contact) (\c -> [hsx|
|
||||
<p class="text-xs text-gray-400 mb-6">Contact: {c}</p>
|
||||
|])}
|
||||
{forEach (maybeText manifest.capabilityDescription) renderCapabilityDesc}
|
||||
{forEach (maybeText manifest.contact) renderContactLine}
|
||||
|
||||
<div class="grid grid-cols-2 gap-4">
|
||||
{jsonArraySection "Declared Widget Types" manifest.declaredWidgetTypes}
|
||||
@@ -77,6 +51,37 @@ instance View ShowView where
|
||||
</div>
|
||||
|]
|
||||
|
||||
manifestActions :: HubCapabilityManifest -> Html
|
||||
manifestActions manifest
|
||||
| manifest.status == "draft" = [hsx|
|
||||
<div class="mb-4 flex gap-2">
|
||||
<a href={EditHubCapabilityManifestAction (manifest.id)}
|
||||
class="text-sm border border-indigo-300 text-indigo-700 px-3 py-1.5 rounded hover:bg-indigo-50">
|
||||
Edit Draft
|
||||
</a>
|
||||
<a href={ActivateManifestAction (manifest.id)}
|
||||
class="text-sm bg-green-600 text-white px-3 py-1.5 rounded hover:bg-green-700">
|
||||
Activate
|
||||
</a>
|
||||
</div>
|
||||
|]
|
||||
| manifest.status == "active" = [hsx|
|
||||
<div class="mb-4">
|
||||
<a href={RetireManifestAction (manifest.id)}
|
||||
data-confirm="Retire this manifest? The hub's types will remain registered."
|
||||
class="text-sm border border-gray-300 text-gray-600 px-3 py-1.5 rounded hover:bg-gray-50">
|
||||
Retire
|
||||
</a>
|
||||
</div>
|
||||
|]
|
||||
| otherwise = mempty
|
||||
|
||||
renderCapabilityDesc :: Text -> Html
|
||||
renderCapabilityDesc d = [hsx|<p class="text-sm text-gray-600 mb-4">{d}</p>|]
|
||||
|
||||
renderContactLine :: Text -> Html
|
||||
renderContactLine c = [hsx|<p class="text-xs text-gray-400 mb-6">Contact: {c}</p>|]
|
||||
|
||||
jsonArraySection :: Text -> Value -> Html
|
||||
jsonArraySection title val = [hsx|
|
||||
<div class="bg-white rounded-lg border border-gray-200 p-4">
|
||||
|
||||
Reference in New Issue
Block a user