Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
haskell-gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
195
Issues
195
List
Board
Labels
Milestones
Merge Requests
12
Merge Requests
12
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gargantext
haskell-gargantext
Commits
593df28a
Commit
593df28a
authored
Oct 23, 2019
by
Alexandre Delanoë
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[FEAT][FOREST][WIP] which folder at root of the user.
parent
eeeb82c8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
44 additions
and
2 deletions
+44
-2
Config.hs
src/Gargantext/Database/Config.hs
+3
-0
Node.hs
src/Gargantext/Database/Schema/Node.hs
+35
-1
Tree.hs
src/Gargantext/Database/Tree.hs
+1
-1
Node.hs
src/Gargantext/Database/Types/Node.hs
+5
-0
No files found.
src/Gargantext/Database/Config.hs
View file @
593df28a
...
@@ -43,6 +43,9 @@ nodeTypeId n =
...
@@ -43,6 +43,9 @@ nodeTypeId n =
case
n
of
case
n
of
NodeUser
->
1
NodeUser
->
1
NodeFolder
->
2
NodeFolder
->
2
NodeFolderPrivate
->
20
NodeFolderShared
->
21
NodeFolderPublic
->
22
NodeCorpusV3
->
3
NodeCorpusV3
->
3
NodeCorpus
->
30
NodeCorpus
->
30
NodeAnnuaire
->
31
NodeAnnuaire
->
31
...
...
src/Gargantext/Database/Schema/Node.hs
View file @
593df28a
...
@@ -582,6 +582,7 @@ data NewNode = NewNode { _newNodeId :: NodeId
...
@@ -582,6 +582,7 @@ data NewNode = NewNode { _newNodeId :: NodeId
,
_newNodeChildren
::
[
NodeId
]
}
,
_newNodeChildren
::
[
NodeId
]
}
postNode
::
HasNodeError
err
=>
UserId
->
Maybe
ParentId
->
Node'
->
Cmd
err
NewNode
postNode
::
HasNodeError
err
=>
UserId
->
Maybe
ParentId
->
Node'
->
Cmd
err
NewNode
postNode
uid
pid
(
Node'
nt
txt
v
[]
)
=
do
postNode
uid
pid
(
Node'
nt
txt
v
[]
)
=
do
pids
<-
mkNodeR
[
node2table
uid
pid
(
Node'
nt
txt
v
[]
)]
pids
<-
mkNodeR
[
node2table
uid
pid
(
Node'
nt
txt
v
[]
)]
case
pids
of
case
pids
of
...
@@ -597,6 +598,7 @@ postNode uid pid (Node' NodeAnnuaire txt v ns) = do
...
@@ -597,6 +598,7 @@ postNode uid pid (Node' NodeAnnuaire txt v ns) = do
NewNode
pid'
_
<-
postNode
uid
pid
(
Node'
NodeAnnuaire
txt
v
[]
)
NewNode
pid'
_
<-
postNode
uid
pid
(
Node'
NodeAnnuaire
txt
v
[]
)
pids
<-
mkNodeR
(
concat
$
map
(
\
n
->
[
childWith
uid
pid'
n
])
ns
)
pids
<-
mkNodeR
(
concat
$
map
(
\
n
->
[
childWith
uid
pid'
n
])
ns
)
pure
$
NewNode
pid'
pids
pure
$
NewNode
pid'
pids
postNode
_
_
(
Node'
_
_
_
_
)
=
nodeError
NotImplYet
postNode
_
_
(
Node'
_
_
_
_
)
=
nodeError
NotImplYet
...
@@ -614,7 +616,39 @@ mkNodeWithParent NodeUser Nothing uId name =
...
@@ -614,7 +616,39 @@ mkNodeWithParent NodeUser Nothing uId name =
where
where
hd
=
HyperdataUser
.
Just
.
pack
$
show
EN
hd
=
HyperdataUser
.
Just
.
pack
$
show
EN
mkNodeWithParent
_
Nothing
_
_
=
nodeError
HasParent
mkNodeWithParent
_
Nothing
_
_
=
nodeError
HasParent
mkNodeWithParent
_
_
_
_
=
nodeError
NotImplYet
------------------------------------------------------------------------
mkNodeWithParent
NodeFolder
(
Just
i
)
uId
name
=
insertNodesWithParentR
(
Just
i
)
[
node
NodeFolder
name
hd
Nothing
uId
]
where
hd
=
HyperdataFolder
.
Just
.
pack
$
show
EN
mkNodeWithParent
NodeFolderPrivate
(
Just
i
)
uId
_
=
insertNodesWithParentR
(
Just
i
)
[
node
NodeFolderPrivate
"Private"
hd
Nothing
uId
]
where
hd
=
HyperdataFolder
.
Just
.
pack
$
show
EN
mkNodeWithParent
NodeFolderShared
(
Just
i
)
uId
_
=
insertNodesWithParentR
(
Just
i
)
[
node
NodeFolderShared
"Shared"
hd
Nothing
uId
]
where
hd
=
HyperdataFolder
.
Just
.
pack
$
show
EN
mkNodeWithParent
NodeFolderPublic
(
Just
i
)
uId
_
=
insertNodesWithParentR
(
Just
i
)
[
node
NodeFolderPublic
"Public"
hd
Nothing
uId
]
where
hd
=
HyperdataFolder
.
Just
.
pack
$
show
EN
------------------------------------------------------------------------
mkNodeWithParent
NodeCorpus
(
Just
i
)
uId
name
=
insertNodesWithParentR
(
Just
i
)
[
node
NodeCorpus
name
hd
Nothing
uId
]
where
hd
=
defaultCorpus
mkNodeWithParent
_
_
_
_
=
nodeError
NotImplYet
mkRoot
::
HasNodeError
err
=>
Username
->
UserId
->
Cmd
err
[
RootId
]
mkRoot
::
HasNodeError
err
=>
Username
->
UserId
->
Cmd
err
[
RootId
]
...
...
src/Gargantext/Database/Tree.hs
View file @
593df28a
...
@@ -106,7 +106,7 @@ dbTree rootId = map (\(nId, tId, pId, n) -> DbTreeNode nId tId pId n) <$> runPGS
...
@@ -106,7 +106,7 @@ dbTree rootId = map (\(nId, tId, pId, n) -> DbTreeNode nId tId pId n) <$> runPGS
FROM nodes AS c
FROM nodes AS c
INNER JOIN tree AS s ON c.parent_id = s.id
INNER JOIN tree AS s ON c.parent_id = s.id
WHERE c.typename IN (2,3,5,30,31,40,7,9,90)
WHERE c.typename IN (2,
20,21,22,
3,5,30,31,40,7,9,90)
)
)
SELECT * from tree;
SELECT * from tree;
|]
(
Only
rootId
)
|]
(
Only
rootId
)
...
...
src/Gargantext/Database/Types/Node.hs
View file @
593df28a
...
@@ -437,10 +437,15 @@ $(deriveJSON (unPrefix "hd_") ''HyperData)
...
@@ -437,10 +437,15 @@ $(deriveJSON (unPrefix "hd_") ''HyperData)
instance
Hyperdata
HyperData
instance
Hyperdata
HyperData
------------------------------------------------------------------------
------------------------------------------------------------------------
-- | Then a Node can be either a Folder or a Corpus or a Document
-- | Then a Node can be either a Folder or a Corpus or a Document
data
NodeType
=
NodeUser
data
NodeType
=
NodeUser
|
NodeFolderPrivate
|
NodeFolderShared
|
NodeFolderPublic
|
NodeFolder
|
NodeFolder
|
NodeCorpus
|
NodeCorpusV3
|
NodeTexts
|
NodeDocument
|
NodeCorpus
|
NodeCorpusV3
|
NodeTexts
|
NodeDocument
|
NodeAnnuaire
|
NodeContact
|
NodeAnnuaire
|
NodeContact
|
NodeGraph
|
NodePhylo
|
NodeGraph
|
NodePhylo
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment