Commit ce9814b9 authored by Alexandre Delanoë's avatar Alexandre Delanoë

[Hyperdata] Folder == Corpus for now.

parent 5722575b
Pipeline #714 failed with stage
...@@ -401,10 +401,10 @@ nodeUserW maybeName maybeHyperdata = node NodeUser name user Nothing ...@@ -401,10 +401,10 @@ nodeUserW maybeName maybeHyperdata = node NodeUser name user Nothing
name = maybe "User" identity maybeName name = maybe "User" identity maybeName
user = maybe defaultUser identity maybeHyperdata user = maybe defaultUser identity maybeHyperdata
------------------------------------------------------------------------ ------------------------------------------------------------------------
defaultFolder :: HyperdataFolder defaultFolder :: HyperdataCorpus
defaultFolder = HyperdataFolder (Just "Markdown Description") defaultFolder = defaultCorpus
nodeFolderW :: Maybe Name -> Maybe HyperdataFolder -> ParentId -> UserId -> NodeWrite nodeFolderW :: Maybe Name -> Maybe HyperdataCorpus -> ParentId -> UserId -> NodeWrite
nodeFolderW maybeName maybeFolder pid = node NodeFolder name folder (Just pid) nodeFolderW maybeName maybeFolder pid = node NodeFolder name folder (Just pid)
where where
name = maybe "Folder" identity maybeName name = maybe "Folder" identity maybeName
...@@ -626,27 +626,27 @@ mkNodeWithParent _ Nothing _ _ = nodeError HasParent ...@@ -626,27 +626,27 @@ mkNodeWithParent _ Nothing _ _ = nodeError HasParent
mkNodeWithParent NodeFolder (Just i) uId name = mkNodeWithParent NodeFolder (Just i) uId name =
insertNodesWithParentR (Just i) [node NodeFolder name hd Nothing uId] insertNodesWithParentR (Just i) [node NodeFolder name hd Nothing uId]
where where
hd = HyperdataFolder . Just . pack $ show EN hd = defaultFolder
mkNodeWithParent NodeFolderPrivate (Just i) uId _ = mkNodeWithParent NodeFolderPrivate (Just i) uId _ =
insertNodesWithParentR (Just i) [node NodeFolderPrivate "Private" hd Nothing uId] insertNodesWithParentR (Just i) [node NodeFolderPrivate "Private" hd Nothing uId]
where where
hd = HyperdataFolder . Just . pack $ show EN hd = defaultFolder
mkNodeWithParent NodeFolderShared (Just i) uId _ = mkNodeWithParent NodeFolderShared (Just i) uId _ =
insertNodesWithParentR (Just i) [node NodeFolderShared "Shared" hd Nothing uId] insertNodesWithParentR (Just i) [node NodeFolderShared "Shared" hd Nothing uId]
where where
hd = HyperdataFolder . Just . pack $ show EN hd = defaultFolder
mkNodeWithParent NodeFolderPublic (Just i) uId _ = mkNodeWithParent NodeFolderPublic (Just i) uId _ =
insertNodesWithParentR (Just i) [node NodeFolderPublic "Public" hd Nothing uId] insertNodesWithParentR (Just i) [node NodeFolderPublic "Public" hd Nothing uId]
where where
hd = HyperdataFolder . Just . pack $ show EN hd = defaultFolder
mkNodeWithParent NodeTeam (Just i) uId _ = mkNodeWithParent NodeTeam (Just i) uId _ =
insertNodesWithParentR (Just i) [node NodeTeam "Team" hd Nothing uId] insertNodesWithParentR (Just i) [node NodeTeam "Team" hd Nothing uId]
where where
hd = HyperdataFolder . Just . pack $ show EN hd = defaultFolder
------------------------------------------------------------------------ ------------------------------------------------------------------------
......
...@@ -299,13 +299,9 @@ $(deriveJSON (unPrefix "hyperdataUser_") ''HyperdataUser) ...@@ -299,13 +299,9 @@ $(deriveJSON (unPrefix "hyperdataUser_") ''HyperdataUser)
instance Hyperdata HyperdataUser instance Hyperdata HyperdataUser
------------------------------------------------------------------------ ------------------------------------------------------------------------
data HyperdataFolder = HyperdataFolder { hyperdataFolder_desc :: !(Maybe Text)
} deriving (Show, Generic)
$(deriveJSON (unPrefix "hyperdataFolder_") ''HyperdataFolder)
instance Hyperdata HyperdataFolder
------------------------------------------------------------------------ ------------------------------------------------------------------------
------------------------------------------------------------------------
------------------------------------------------------------------------
data CodeType = JSON | Markdown | Haskell data CodeType = JSON | Markdown | Haskell
deriving (Generic) deriving (Generic)
instance ToJSON CodeType instance ToJSON CodeType
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment