coulomb/inter-hub
2
0
Fork 0
generated from coulomb/repo-seed
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(WP-0014): pre-flight compilation fixes, Tailwind pipeline, and admin seed

Browse Source 
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:
Bernd Worsch
2026-04-04 09:55:12 +00:00
parent ffd5fbb900
commit f1978c3888
147 changed files with 2710 additions and 2075 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Web/Controller/Api/V2/Auth.hs
View File

@@ -7,9 +7,9 @@ import Generated.Types
import Data.Aeson (object, (.=))
import qualified Data.Text as T
import qualified Data.Text.Encoding as TE
import qualified Crypto.Hash.SHA256 as SHA256 -- cryptohash-sha256: hash :: ByteString -> ByteString
import qualified "cryptohash-sha256" Crypto.Hash.SHA256 as SHA256
import qualified Data.ByteString.Base16 as Base16
import Network.Wai (requestHeaders)
import Network.Wai (requestHeaders, responseLBS)
-- | Extract Bearer token from Authorization header and validate it
-- against the api_keys table. Returns the ApiConsumer on success,

1
Web/Controller/Api/V2/OpenApi.hs
View File

@@ -18,6 +18,7 @@ import qualified Data.ByteString.Lazy as LBS
import Application.Helper.TypeRegistry
( activeWidgetTypes, activeEventTypes, activeAnnotationCategories )
import Network.HTTP.Types (status200)
import Network.Wai (responseLBS)
instance Controller ApiV2OpenApiController where

12
Web/Controller/Api/V2/Registries.hs
View File

@@ -16,28 +16,28 @@ instance Controller ApiV2RegistriesController where
action ApiV2ListWidgetTypesAction = do
types <- query @WidgetTypeRegistry
|> filterWhere (#status, "active")
|> orderByAsc #label
|> orderByAsc #label_
|> fetch
renderJson $ map wtToJson types
action ApiV2ListEventTypesAction = do
types <- query @EventTypeRegistry
|> filterWhere (#status, "active")
|> orderByAsc #label
|> orderByAsc #label_
|> fetch
renderJson $ map etToJson types
action ApiV2ListAnnotationCategoriesAction = do
cats <- query @AnnotationCategoryRegistry
|> filterWhere (#status, "active")
|> orderByAsc #label
|> orderByAsc #label_
|> fetch
renderJson $ map acToJson cats
wtToJson :: WidgetTypeRegistry -> Value
wtToJson r = object
[ "name" .= r.name
, "label" .= r.label
, "label" .= r.label_
, "description" .= r.description
, "ownerHubId" .= r.ownerHubId
, "status" .= r.status
@@ -46,7 +46,7 @@ wtToJson r = object
etToJson :: EventTypeRegistry -> Value
etToJson r = object
[ "name" .= r.name
, "label" .= r.label
, "label" .= r.label_
, "description" .= r.description
, "ownerHubId" .= r.ownerHubId
, "status" .= r.status
@@ -55,7 +55,7 @@ etToJson r = object
acToJson :: AnnotationCategoryRegistry -> Value
acToJson r = object
[ "name" .= r.name
, "label" .= r.label
, "label" .= r.label_
, "description" .= r.description
, "ownerHubId" .= r.ownerHubId
, "status" .= r.status

1
Web/Controller/Api/V2/Sdk.hs
View File

@@ -12,6 +12,7 @@ import qualified Data.Text as T
import qualified Data.Text.Encoding as TE
import qualified Data.ByteString.Lazy as LBS
import Network.HTTP.Types (status200)
import Network.Wai (responseLBS)
import Application.Helper.TypeRegistry
( activeWidgetTypes, activeEventTypes, activeAnnotationCategories )

35
Web/Controller/ApiInteractionEvents.hs
View File

@@ -6,7 +6,9 @@ import IHP.Prelude
import IHP.ControllerPrelude
import Data.Aeson (object, (.=))
import qualified Data.Text as T
import Network.Wai (requestMethod, requestHeaders)
import Network.Wai (requestMethod, requestHeaders, responseLBS, ResponseReceived)
import Network.HTTP.Types (status201, status401, status403, status405, status422)
import IHP.Controller.Render (renderJson, renderJsonWithStatusCode)
import Application.Helper.TypeRegistry (validateEventType)
instance Controller ApiInteractionEventsController where
@@ -14,8 +16,7 @@ instance Controller ApiInteractionEventsController where
action CreateApiInteractionEventAction = do
-- Method guard — only POST accepted.
when (requestMethod ?request /= "POST") do
setStatus 405
respondJson (object ["error" .= ("Method not allowed" :: Text)])
renderJsonWithStatusCode status405 (object ["error" .= ("Method not allowed" :: Text)])
-- Bearer token auth — validate against hub.api_key.
let authHeader = lookup "Authorization" (requestHeaders ?request)
@@ -27,19 +28,17 @@ instance Controller ApiInteractionEventsController where
case mApiKey of
Nothing -> do
setStatus 401
respondJson (object ["error" .= ("Authorization: Bearer <hub-api-key> required" :: Text)])
renderJsonWithStatusCode status401 (object ["error" .= ("Authorization: Bearer <hub-api-key> required" :: Text)])
Just apiKey -> do
mHub <- query @Hub
|> filterWhere (#apiKey, Just apiKey)
|> fetchOneOrNothing
case mHub of
Nothing -> do
setStatus 401
respondJson (object ["error" .= ("Invalid or unknown API key" :: Text)])
renderJsonWithStatusCode status401 (object ["error" .= ("Invalid or unknown API key" :: Text)])
Just hub -> createEventForHub hub
createEventForHub :: (?context :: ControllerContext, ?modelContext :: ModelContext, ?respond :: Respond, ?request :: Request) => Hub -> IO ResponseReceived
createEventForHub :: (?context :: ControllerContext, ?modelContext :: ModelContext, ?respond :: Respond, ?request :: Request) => Hub -> IO ()
createEventForHub hub = do
-- Validate required fields per contract v1.0
widgetIdText <- paramOrNothing @Text "widget_id"
@@ -53,8 +52,7 @@ createEventForHub hub = do
]
unless (null missing) do
setStatus 422
respondJson (object
renderJsonWithStatusCode status422 (object
[ "error" .= ("Missing required fields" :: Text)
, "missing" .= missing
])
@@ -65,8 +63,7 @@ createEventForHub hub = do
evTypeResult <- liftIO $ validateEventType evType
case evTypeResult of
Left _ -> do
setStatus 422
respondJson (object
renderJsonWithStatusCode status422 (object
[ "error" .= ("Unacceptable event_type" :: Text)
, "hint" .= ("Register the event type in the Type Registry before submitting" :: Text)
])
@@ -75,19 +72,16 @@ createEventForHub hub = do
-- Resolve widget — must belong to this hub.
case readMay wIdText of
Nothing -> do
setStatus 422
respondJson (object ["error" .= ("widget_id must be a valid UUID" :: Text)])
renderJsonWithStatusCode status422 (object ["error" .= ("widget_id must be a valid UUID" :: Text)])
Just rawId -> do
let wId = Id rawId :: Id Widget
mWidget <- fetchOneOrNothing wId
case mWidget of
Nothing -> do
setStatus 422
respondJson (object ["error" .= ("Widget not found" :: Text)])
renderJsonWithStatusCode status422 (object ["error" .= ("Widget not found" :: Text)])
Just widget -> do
when (widget.hubId /= hub.id) do
setStatus 403
respondJson (object ["error" .= ("Widget does not belong to this hub" :: Text)])
when (widget.hubId /= toUUID hub.id) do
renderJsonWithStatusCode status403 (object ["error" .= ("Widget does not belong to this hub" :: Text)])
event <- newRecord @InteractionEvent
|> set #widgetId widget.id
@@ -95,8 +89,7 @@ createEventForHub hub = do
|> set #actorType "external_adapter"
|> createRecord
setStatus 201
respondJson (object
renderJsonWithStatusCode status201 (object
[ "id" .= event.id
, "widget_id" .= event.widgetId
, "event_type" .= event.eventType

21
Web/Controller/HubRegistry.hs
View File

@@ -10,27 +10,6 @@ import Generated.Types
import IHP.Prelude
import IHP.ControllerPrelude
-- | Aggregated row for the hub registry index.
data HubRegistryRow = HubRegistryRow
{ hub :: !Hub
, mManifest :: !(Maybe HubCapabilityManifest)
, mLatestSnapshot :: !(Maybe HubHealthSnapshot)
}
-- | GAAF compliance status derived from manifest and registry.
data GaafStatus
= GaafCompliant -- active manifest, all declared types registered
| GaafNoManifest -- hub has no active manifest
| GaafDraftOnly -- hub has a draft but no active manifest
deriving (Eq, Show)
gaafStatus :: Maybe HubCapabilityManifest -> GaafStatus
gaafStatus Nothing = GaafNoManifest
gaafStatus (Just m)
| m.status == "active" = GaafCompliant
| m.status == "draft" = GaafDraftOnly
| otherwise = GaafNoManifest
instance Controller HubRegistryController where
beforeAction = ensureIsUser

20
Web/Controller/InteractionEvents.hs
View File

@@ -4,8 +4,12 @@ import Web.Types
import Generated.Types
import IHP.Prelude
import IHP.ControllerPrelude
import Data.Aeson (object, (.=))
import Data.Aeson (object, (.=), decode, Value)
import qualified Data.Aeson as A
import qualified Data.Text as T
import qualified Data.ByteString.Lazy.Char8 as LBSC
import IHP.Controller.Render (renderJson, renderJsonWithStatusCode)
import Network.HTTP.Types (status422)
-- Valid canonical event types
validEventTypes :: [Text]
@@ -20,11 +24,7 @@ instance Controller InteractionEventsController where
action CreateInteractionEventAction { widgetId } = do
eventType <- param @Text "event_type"
unless (eventType `elem` validEventTypes) do
respondJson (object ["error" .= ("unknown event_type" :: Text), "valid" .= validEventTypes])
-- IHP stops here; the above respondJson sends 200 but we need 422
-- Use renderWithStatus for proper 422:
setStatus 422
respondJson (object ["error" .= ("unknown event_type" :: Text)])
renderJsonWithStatusCode status422 (object ["error" .= ("unknown event_type" :: Text), "valid" .= validEventTypes])
mUser <- currentUserOrNothing
let actorId = fmap (.id) mUser
@@ -34,20 +34,20 @@ instance Controller InteractionEventsController where
viewContextRef <- paramOrNothing @Text "view_context_ref"
metadataRaw <- paramOrDefault @Text "{}" "metadata"
let metadata = case readMay @Value (cs metadataRaw) of
let metadata = case decode (LBSC.pack (cs metadataRaw)) of
Just v -> v
Nothing -> object []
Nothing -> object [] :: A.Value
event <- newRecord @InteractionEvent
|> set #widgetId widgetId
|> set #eventType eventType
|> set #actorId (fmap (Id . unId) actorId)
|> set #actorId (fmap toUUID actorId)
|> set #actorType actorTypeParam
|> set #viewContextRef viewContextRef
|> set #metadata metadata
|> createRecord
respondJson (object
renderJson (object
[ "id" .= event.id
, "widget_id" .= event.widgetId
, "event_type" .= event.eventType

24
Web/Controller/TypeRegistries.hs
View File

@@ -16,7 +16,7 @@ instance Controller TypeRegistriesController where
action WidgetTypeRegistryAction = do
entries <- query @WidgetTypeRegistry
|> orderByAsc #label
|> orderByAsc #label_
|> fetch
hubs <- query @Hub |> fetch
render WidgetTypesView { entries, hubs }
@@ -39,7 +39,7 @@ instance Controller TypeRegistriesController where
entry
|> fill @'["name", "label", "description", "ownerHubId"]
|> validateField #name nonEmpty
|> validateField #label nonEmpty
|> validateField #label_ nonEmpty
|> ifValid \case
Left entry -> render NewWidgetTypeView { entry, hubs }
Right entry -> do
@@ -58,7 +58,7 @@ instance Controller TypeRegistriesController where
-- name is immutable after creation
entry
|> fill @'["label", "description", "ownerHubId"]
|> validateField #label nonEmpty
|> validateField #label_ nonEmpty
|> ifValid \case
Left entry -> render EditWidgetTypeView { entry, hubs }
Right entry -> do
@@ -83,7 +83,7 @@ instance Controller TypeRegistriesController where
action EventTypeRegistryAction = do
entries <- query @EventTypeRegistry
|> orderByAsc #label
|> orderByAsc #label_
|> fetch
hubs <- query @Hub |> fetch
render EventTypesView { entries, hubs }
@@ -106,7 +106,7 @@ instance Controller TypeRegistriesController where
entry
|> fill @'["name", "label", "description", "ownerHubId"]
|> validateField #name nonEmpty
|> validateField #label nonEmpty
|> validateField #label_ nonEmpty
|> ifValid \case
Left entry -> render NewEventTypeView { entry, hubs }
Right entry -> do
@@ -124,7 +124,7 @@ instance Controller TypeRegistriesController where
hubs <- query @Hub |> fetch
entry
|> fill @'["label", "description", "ownerHubId"]
|> validateField #label nonEmpty
|> validateField #label_ nonEmpty
|> ifValid \case
Left entry -> render EditEventTypeView { entry, hubs }
Right entry -> do
@@ -149,7 +149,7 @@ instance Controller TypeRegistriesController where
action AnnotationCategoryRegistryAction = do
entries <- query @AnnotationCategoryRegistry
|> orderByAsc #label
|> orderByAsc #label_
|> fetch
hubs <- query @Hub |> fetch
render AnnotationCategoriesView { entries, hubs }
@@ -172,7 +172,7 @@ instance Controller TypeRegistriesController where
entry
|> fill @'["name", "label", "description", "ownerHubId"]
|> validateField #name nonEmpty
|> validateField #label nonEmpty
|> validateField #label_ nonEmpty
|> ifValid \case
Left entry -> render NewAnnotationCategoryView { entry, hubs }
Right entry -> do
@@ -190,7 +190,7 @@ instance Controller TypeRegistriesController where
hubs <- query @Hub |> fetch
entry
|> fill @'["label", "description", "ownerHubId"]
|> validateField #label nonEmpty
|> validateField #label_ nonEmpty
|> ifValid \case
Left entry -> render EditAnnotationCategoryView { entry, hubs }
Right entry -> do
@@ -215,7 +215,7 @@ instance Controller TypeRegistriesController where
action PolicyScopeRegistryAction = do
entries <- query @PolicyScopeRegistry
|> orderByAsc #label
|> orderByAsc #label_
|> fetch
hubs <- query @Hub |> fetch
render PolicyScopesView { entries, hubs }
@@ -238,7 +238,7 @@ instance Controller TypeRegistriesController where
entry
|> fill @'["name", "label", "description", "ownerHubId"]
|> validateField #name nonEmpty
|> validateField #label nonEmpty
|> validateField #label_ nonEmpty
|> ifValid \case
Left entry -> render NewPolicyScopeView { entry, hubs }
Right entry -> do
@@ -256,7 +256,7 @@ instance Controller TypeRegistriesController where
hubs <- query @Hub |> fetch
entry
|> fill @'["label", "description", "ownerHubId"]
|> validateField #label nonEmpty
|> validateField #label_ nonEmpty
|> ifValid \case
Left entry -> render EditPolicyScopeView { entry, hubs }
Right entry -> do