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
2afd7bfd
Commit
2afd7bfd
authored
Jun 05, 2023
by
Alexandre Delanoë
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "[DOC] NodeFrameCalc -> Calc only"
This reverts commit
b7e406b1
.
parent
343c70ee
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
Node.hs
src/Gargantext/Database/Action/Node.hs
+6
-6
Config.hs
src/Gargantext/Database/Admin/Config.hs
+1
-1
Default.hs
src/Gargantext/Database/Admin/Types/Hyperdata/Default.hs
+1
-1
Node.hs
src/Gargantext/Database/Admin/Types/Node.hs
+2
-2
No files found.
src/Gargantext/Database/Action/Node.hs
View file @
2afd7bfd
...
@@ -54,8 +54,8 @@ mkNodeWithParent _ Nothing _ _ = nodeError HasParent
...
@@ -54,8 +54,8 @@ mkNodeWithParent _ Nothing _ _ = nodeError HasParent
mkNodeWithParent
Notes
i
u
n
=
mkNodeWithParent
Notes
i
u
n
=
mkNodeWithParent_ConfigureHyperdata
Notes
i
u
n
mkNodeWithParent_ConfigureHyperdata
Notes
i
u
n
mkNodeWithParent
Calc
i
u
n
=
mkNodeWithParent
NodeFrame
Calc
i
u
n
=
mkNodeWithParent_ConfigureHyperdata
Calc
i
u
n
mkNodeWithParent_ConfigureHyperdata
NodeFrame
Calc
i
u
n
mkNodeWithParent
NodeFrameVisio
i
u
n
=
mkNodeWithParent
NodeFrameVisio
i
u
n
=
mkNodeWithParent_ConfigureHyperdata
NodeFrameVisio
i
u
n
mkNodeWithParent_ConfigureHyperdata
NodeFrameVisio
i
u
n
...
@@ -79,8 +79,8 @@ mkNodeWithParent_ConfigureHyperdata :: (HasNodeError err, HasDBid NodeType)
...
@@ -79,8 +79,8 @@ mkNodeWithParent_ConfigureHyperdata :: (HasNodeError err, HasDBid NodeType)
mkNodeWithParent_ConfigureHyperdata
Notes
(
Just
i
)
uId
name
=
mkNodeWithParent_ConfigureHyperdata
Notes
(
Just
i
)
uId
name
=
mkNodeWithParent_ConfigureHyperdata'
Notes
(
Just
i
)
uId
name
mkNodeWithParent_ConfigureHyperdata'
Notes
(
Just
i
)
uId
name
mkNodeWithParent_ConfigureHyperdata
Calc
(
Just
i
)
uId
name
=
mkNodeWithParent_ConfigureHyperdata
NodeFrame
Calc
(
Just
i
)
uId
name
=
mkNodeWithParent_ConfigureHyperdata'
Calc
(
Just
i
)
uId
name
mkNodeWithParent_ConfigureHyperdata'
NodeFrame
Calc
(
Just
i
)
uId
name
mkNodeWithParent_ConfigureHyperdata
NodeFrameVisio
(
Just
i
)
uId
name
=
mkNodeWithParent_ConfigureHyperdata
NodeFrameVisio
(
Just
i
)
uId
name
=
mkNodeWithParent_ConfigureHyperdata'
NodeFrameVisio
(
Just
i
)
uId
name
mkNodeWithParent_ConfigureHyperdata'
NodeFrameVisio
(
Just
i
)
uId
name
...
@@ -103,7 +103,7 @@ mkNodeWithParent_ConfigureHyperdata' :: (HasNodeError err, HasDBid NodeType)
...
@@ -103,7 +103,7 @@ mkNodeWithParent_ConfigureHyperdata' :: (HasNodeError err, HasDBid NodeType)
mkNodeWithParent_ConfigureHyperdata'
nt
(
Just
i
)
uId
name
=
do
mkNodeWithParent_ConfigureHyperdata'
nt
(
Just
i
)
uId
name
=
do
maybeNodeId
<-
case
nt
of
maybeNodeId
<-
case
nt
of
Notes
->
insertNode
Notes
(
Just
name
)
Nothing
i
uId
Notes
->
insertNode
Notes
(
Just
name
)
Nothing
i
uId
Calc
->
insertNode
Calc
(
Just
name
)
Nothing
i
uId
NodeFrameCalc
->
insertNode
NodeFrame
Calc
(
Just
name
)
Nothing
i
uId
NodeFrameVisio
->
insertNode
NodeFrameVisio
(
Just
name
)
Nothing
i
uId
NodeFrameVisio
->
insertNode
NodeFrameVisio
(
Just
name
)
Nothing
i
uId
_
->
nodeError
NeedsConfiguration
_
->
nodeError
NeedsConfiguration
...
@@ -113,7 +113,7 @@ mkNodeWithParent_ConfigureHyperdata' nt (Just i) uId name = do
...
@@ -113,7 +113,7 @@ mkNodeWithParent_ConfigureHyperdata' nt (Just i) uId name = do
cfg
<-
view
hasConfig
cfg
<-
view
hasConfig
u
<-
case
nt
of
u
<-
case
nt
of
Notes
->
pure
$
_gc_frame_write_url
cfg
Notes
->
pure
$
_gc_frame_write_url
cfg
Calc
->
pure
$
_gc_frame_calc_url
cfg
NodeFrame
Calc
->
pure
$
_gc_frame_calc_url
cfg
NodeFrameVisio
->
pure
$
_gc_frame_visio_url
cfg
NodeFrameVisio
->
pure
$
_gc_frame_visio_url
cfg
_
->
nodeError
NeedsConfiguration
_
->
nodeError
NeedsConfiguration
let
let
...
...
src/Gargantext/Database/Admin/Config.hs
View file @
2afd7bfd
...
@@ -77,7 +77,7 @@ nodeTypeId n =
...
@@ -77,7 +77,7 @@ nodeTypeId n =
NodeFile
->
101
NodeFile
->
101
Notes
->
991
Notes
->
991
Calc
->
992
NodeFrame
Calc
->
992
NodeFrameNotebook
->
993
NodeFrameNotebook
->
993
NodeFrameVisio
->
994
NodeFrameVisio
->
994
...
...
src/Gargantext/Database/Admin/Types/Hyperdata/Default.hs
View file @
2afd7bfd
...
@@ -116,7 +116,7 @@ defaultHyperdata NodePhylo = DefaultPhylo defaultHyperdataPhylo
...
@@ -116,7 +116,7 @@ defaultHyperdata NodePhylo = DefaultPhylo defaultHyperdataPhylo
defaultHyperdata
NodeDashboard
=
DefaultDashboard
defaultHyperdataDashboard
defaultHyperdata
NodeDashboard
=
DefaultDashboard
defaultHyperdataDashboard
defaultHyperdata
Notes
=
DefaultFrameWrite
defaultHyperdataFrame
defaultHyperdata
Notes
=
DefaultFrameWrite
defaultHyperdataFrame
defaultHyperdata
Calc
=
DefaultFrameCalc
defaultHyperdataFrame
defaultHyperdata
NodeFrame
Calc
=
DefaultFrameCalc
defaultHyperdataFrame
defaultHyperdata
NodeFrameVisio
=
DefaultFrameVisio
defaultHyperdataFrame
defaultHyperdata
NodeFrameVisio
=
DefaultFrameVisio
defaultHyperdataFrame
defaultHyperdata
NodeFrameNotebook
=
DefaultFrameCalc
defaultHyperdataFrame
defaultHyperdata
NodeFrameNotebook
=
DefaultFrameCalc
defaultHyperdataFrame
...
...
src/Gargantext/Database/Admin/Types/Node.hs
View file @
2afd7bfd
...
@@ -355,7 +355,7 @@ data NodeType = NodeUser
...
@@ -355,7 +355,7 @@ data NodeType = NodeUser
-}
-}
-- Optional Nodes
-- Optional Nodes
|
Notes
|
Calc
|
NodeFrameVisio
|
NodeFrameNotebook
|
Notes
|
NodeFrame
Calc
|
NodeFrameVisio
|
NodeFrameNotebook
|
NodeFile
|
NodeFile
deriving
(
Show
,
Read
,
Eq
,
Generic
,
Bounded
,
Enum
)
deriving
(
Show
,
Read
,
Eq
,
Generic
,
Bounded
,
Enum
)
...
@@ -406,7 +406,7 @@ defaultName NodeGraph = "Graph"
...
@@ -406,7 +406,7 @@ defaultName NodeGraph = "Graph"
defaultName
NodePhylo
=
"Phylo"
defaultName
NodePhylo
=
"Phylo"
defaultName
Notes
=
"Note"
defaultName
Notes
=
"Note"
defaultName
Calc
=
"Calc"
defaultName
NodeFrame
Calc
=
"Calc"
defaultName
NodeFrameVisio
=
"Visio"
defaultName
NodeFrameVisio
=
"Visio"
defaultName
NodeFrameNotebook
=
"Code"
defaultName
NodeFrameNotebook
=
"Code"
...
...
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