kfm/acms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add string?-typed fields

Browse Source
This commit is contained in:
Alexander Foremny
2024-06-06 15:20:13 +02:00
parent c7d0139116
commit d39c1665f8
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backend/app/Main.hs
View File

@@ -91,6 +91,7 @@ fromAutoTypes path (U.Object ps) =
] ]
where where
toProperty k (U.Scalar "string") = "string" :: String toProperty k (U.Scalar "string") = "string" :: String
toProperty k (U.Option (Just (U.Scalar "string"))) = "string?" :: String
watch :: TMVar Repo -> FilePath -> G.RefName -> IO () watch :: TMVar Repo -> FilePath -> G.RefName -> IO ()
watch repoT root ref = do watch repoT root ref = do

17
frontend/app/Schema.hs
View File

@@ -100,11 +100,18 @@ schemaForm schema =
fmap mergeJson . sequence $ fmap mergeJson . sequence $
case schema.type_ of case schema.type_ of
Object properties -> Object properties ->
( \(AK.fromString -> k, "string") -> ( \(AK.fromString -> k, v) ->
A.Object . AM.singleton k case v of
<$> ( F.mapValues (getO k) (setO k) $ "string" ->
jsonString (AK.toString k) A.Object . AM.singleton k
) <$> ( F.mapValues (getO k) (setO k) $
jsonString (AK.toString k)
)
"string?" ->
A.Object . AM.singleton k
<$> ( F.mapValues (getO k) (setO k) $
jsonString (AK.toString k)
)
) )
<$> (M.toList properties) <$> (M.toList properties)