Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
haskell-gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
Przemyslaw Kaminski
haskell-gargantext
Commits
284dda0b
Commit
284dda0b
authored
Oct 29, 2020
by
Alexandre Delanoë
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[FEAT] NodeFrameCode
parent
cd85c0e3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
3 deletions
+17
-3
Node.hs
src/Gargantext/Database/Action/Node.hs
+11
-2
Config.hs
src/Gargantext/Database/Admin/Config.hs
+1
-0
Default.hs
src/Gargantext/Database/Admin/Types/Hyperdata/Default.hs
+3
-0
Node.hs
src/Gargantext/Database/Admin/Types/Node.hs
+2
-1
No files found.
src/Gargantext/Database/Action/Node.hs
View file @
284dda0b
...
...
@@ -22,6 +22,7 @@ module Gargantext.Database.Action.Node
import
Gargantext.Core.Types
(
Name
)
import
Gargantext.Database.Admin.Types.Hyperdata
import
Gargantext.Database.Admin.Types.Hyperdata.Default
import
Gargantext.Database.Admin.Types.Node
import
Gargantext.Database.Query.Table.Node
import
Gargantext.Database.Query.Table.Node.Error
...
...
@@ -55,6 +56,11 @@ mkNodeWithParent NodeFrameWrite i u n =
mkNodeWithParent
NodeFrameCalc
i
u
n
=
mkNodeWithParent_ConfigureHyperdata
NodeFrameCalc
i
u
n
mkNodeWithParent
NodeFrameCode
i
u
n
=
mkNodeWithParent_ConfigureHyperdata
NodeFrameCode
i
u
n
mkNodeWithParent
nt
(
Just
pId
)
uId
name
=
insertNode
nt
(
Just
name
)
Nothing
pId
uId
-- mkNodeWithParent _ _ _ _ = errorWith "[G.D.A.Node.mkNodeWithParent] nees parent"
...
...
@@ -72,6 +78,9 @@ mkNodeWithParent_ConfigureHyperdata NodeFrameWrite (Just i) uId name =
mkNodeWithParent_ConfigureHyperdata
NodeFrameCalc
(
Just
i
)
uId
name
=
mkNodeWithParent_ConfigureHyperdata'
NodeFrameCalc
(
Just
i
)
uId
name
mkNodeWithParent_ConfigureHyperdata
NodeFrameCode
(
Just
i
)
uId
name
=
insertNode
NodeFrameCode
(
Just
"Code"
)
(
Just
$
DefaultFrameCode
$
HyperdataFrame
"code"
name
)
i
uId
mkNodeWithParent_ConfigureHyperdata
_
_
_
_
=
nodeError
NotImplYet
...
...
@@ -84,8 +93,8 @@ mkNodeWithParent_ConfigureHyperdata' :: (HasNodeError err)
->
Cmd
err
[
NodeId
]
mkNodeWithParent_ConfigureHyperdata'
nt
(
Just
i
)
uId
name
=
do
maybeNodeId
<-
case
nt
of
NodeFrameWrite
->
insertNode
NodeFrameWrite
(
Just
name
)
Nothing
i
uId
NodeFrameCalc
->
insertNode
NodeFrameCalc
(
Just
name
)
Nothing
i
uId
NodeFrameWrite
->
insertNode
NodeFrameWrite
(
Just
name
)
Nothing
i
uId
NodeFrameCalc
->
insertNode
NodeFrameCalc
(
Just
name
)
Nothing
i
uId
_
->
nodeError
NeedsConfiguration
case
maybeNodeId
of
...
...
src/Gargantext/Database/Admin/Config.hs
View file @
284dda0b
...
...
@@ -70,6 +70,7 @@ nodeTypeId n =
NodeFrameWrite
->
991
NodeFrameCalc
->
992
NodeFrameCode
->
993
-- Cooccurrences -> 9
--
...
...
src/Gargantext/Database/Admin/Types/Hyperdata/Default.hs
View file @
284dda0b
...
...
@@ -52,6 +52,7 @@ data DefaultHyperdata =
|
DefaultFrameWrite
HyperdataFrame
|
DefaultFrameCalc
HyperdataFrame
|
DefaultFrameCode
HyperdataFrame
|
DefaultFile
HyperdataFile
...
...
@@ -83,6 +84,7 @@ instance ToJSON DefaultHyperdata where
toJSON
(
DefaultFrameWrite
x
)
=
toJSON
x
toJSON
(
DefaultFrameCalc
x
)
=
toJSON
x
toJSON
(
DefaultFrameCode
x
)
=
toJSON
x
toJSON
(
DefaultFile
x
)
=
toJSON
x
...
...
@@ -113,5 +115,6 @@ defaultHyperdata NodeDashboard = DefaultDashboard defaultHyperdataDashboard
defaultHyperdata
NodeFrameWrite
=
DefaultFrameWrite
defaultHyperdataFrame
defaultHyperdata
NodeFrameCalc
=
DefaultFrameCalc
defaultHyperdataFrame
defaultHyperdata
NodeFrameCode
=
DefaultFrameCalc
defaultHyperdataFrame
defaultHyperdata
NodeFile
=
DefaultFile
defaultHyperdataFile
src/Gargantext/Database/Admin/Types/Node.hs
View file @
284dda0b
...
...
@@ -257,7 +257,7 @@ data NodeType = NodeUser
-}
-- Optional Nodes
|
NodeFrameWrite
|
NodeFrameCalc
|
NodeFrameWrite
|
NodeFrameCalc
|
NodeFrameCode
|
NodeFile
deriving
(
Show
,
Read
,
Eq
,
Generic
,
Bounded
,
Enum
)
...
...
@@ -292,6 +292,7 @@ defaultName NodePhylo = "Phylo"
defaultName
NodeFrameWrite
=
"Frame Write"
defaultName
NodeFrameCalc
=
"Frame Calc"
defaultName
NodeFrameCode
=
"Frame Code"
defaultName
NodeFile
=
"File"
...
...
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