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

[Hyperdata] Folder == Corpus for now.

parent 5722575b
dev 104-dev-john-snow-nlp 141-dev-node-stories-db-optimization 234-dev-doc-table-score 267-dev-fix-nginx-config-for-frames 37-servant-job-flatten-breaks-the-swagger-documentation 67-dev-ci 70-dev-searx-parser 90-dev-hal-box-fix dev-9.0-upgrade dev-annuaire-file-upload dev-big-file-upload dev-cache-optimization dev-cbor dev-charts-update-economy dev-code dev-community dev-dashoard-charts dev-debian-install-script dev-debug dev-debug-invitation dev-default-extensions dev-distributional dev-doc-annotation-issue dev-doc-table-cache-issue dev-doc-table-optimization dev-doc-table-score dev-fib dev-file-name dev-file-upload dev-flow dev-gargantext-ini-fix dev-getting-started-readme dev-graph dev-graph-explorer-gexf dev-graph-screenshot dev-hash dev-hyperdata dev-ihaskell-codebook dev-indexation dev-ini-fixes dev-kawen dev-lastmod-cache-tmp dev-list-charts dev-list-downloadable dev-list-downloadable-with-content-type dev-login dev-logs dev-lts-16.26-upgrade dev-maplist dev-merge dev-metrics dev-ngrams-groups dev-ngrams-score-recomputation dev-ngrams-table-online dev-node-board-add-text-cells dev-password dev-phylo dev-phylo-accuracy dev-phylo-merge dev-phylo-quality dev-phylo-strict dev-phylo-uniform_accuracy dev-public dev-public-node-api dev-query dev-readme-update dev-refact dev-refact-graph dev-refactor-metrics dev-small-fixes dev-social-list dev-sql-run-insert-deprecation-fix dev-stack-upgrade dev-swagger dev-term-list-fix dev-test dev-textflow dev-tokens-lemma dev-tree-reload dev-user-contact dev-version dev-websockets gitlab-ci-build-nix lists-endpoint-accept-json master ngrams-replace ngrams-replace-dev-merge nothunks phylo_paper pin-shell stable testing update-build-shell-nix-merge update-build-shell.nix
No related merge requests found
......@@ -401,10 +401,10 @@ nodeUserW maybeName maybeHyperdata = node NodeUser name user Nothing
name = maybe "User" identity maybeName
user = maybe defaultUser identity maybeHyperdata
------------------------------------------------------------------------
defaultFolder :: HyperdataFolder
defaultFolder = HyperdataFolder (Just "Markdown Description")
defaultFolder :: HyperdataCorpus
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)
where
name = maybe "Folder" identity maybeName
......@@ -626,27 +626,27 @@ mkNodeWithParent _ Nothing _ _ = nodeError HasParent
mkNodeWithParent NodeFolder (Just i) uId name =
insertNodesWithParentR (Just i) [node NodeFolder name hd Nothing uId]
where
hd = HyperdataFolder . Just . pack $ show EN
hd = defaultFolder
mkNodeWithParent NodeFolderPrivate (Just i) uId _ =
insertNodesWithParentR (Just i) [node NodeFolderPrivate "Private" hd Nothing uId]
where
hd = HyperdataFolder . Just . pack $ show EN
hd = defaultFolder
mkNodeWithParent NodeFolderShared (Just i) uId _ =
insertNodesWithParentR (Just i) [node NodeFolderShared "Shared" hd Nothing uId]
where
hd = HyperdataFolder . Just . pack $ show EN
hd = defaultFolder
mkNodeWithParent NodeFolderPublic (Just i) uId _ =
insertNodesWithParentR (Just i) [node NodeFolderPublic "Public" hd Nothing uId]
where
hd = HyperdataFolder . Just . pack $ show EN
hd = defaultFolder
mkNodeWithParent NodeTeam (Just i) uId _ =
insertNodesWithParentR (Just i) [node NodeTeam "Team" hd Nothing uId]
where
hd = HyperdataFolder . Just . pack $ show EN
hd = defaultFolder
------------------------------------------------------------------------
......
......@@ -299,13 +299,9 @@ $(deriveJSON (unPrefix "hyperdataUser_") ''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
deriving (Generic)
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