Merge branch 'dev' into dev-merge

src/Gargantext/Database/Action/Node.hs

@@ -56,8 +56,8 @@ 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 NodeFrameNotebook i u n =
+  mkNodeWithParent_ConfigureHyperdata NodeFrameNotebook i u n
 
 
 
@@ -78,8 +78,8 @@ 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 NodeFrameNotebook (Just i) uId name =
+  insertNode NodeFrameNotebook  (Just "Notebook") (Just $ DefaultFrameCode $ HyperdataFrame "Notebook" name) i uId
 
 mkNodeWithParent_ConfigureHyperdata    _ _ _ _ = nodeError NotImplYet
 

src/Gargantext/Database/Admin/Config.hs

@@ -70,7 +70,7 @@ nodeTypeId n =
 
     NodeFrameWrite  -> 991
     NodeFrameCalc   -> 992
-    NodeFrameCode   -> 993
+    NodeFrameNotebook   -> 993
 
 --  Cooccurrences -> 9
 --

src/Gargantext/Database/Admin/Types/Hyperdata/Default.hs

@@ -115,6 +115,6 @@ defaultHyperdata NodeDashboard      = DefaultDashboard defaultHyperdataDashboard
 
 defaultHyperdata NodeFrameWrite     = DefaultFrameWrite defaultHyperdataFrame
 defaultHyperdata NodeFrameCalc      = DefaultFrameCalc  defaultHyperdataFrame
-defaultHyperdata NodeFrameCode      = DefaultFrameCalc  defaultHyperdataFrame
+defaultHyperdata NodeFrameNotebook      = DefaultFrameCalc  defaultHyperdataFrame
 
 defaultHyperdata NodeFile           = DefaultFile defaultHyperdataFile

src/Gargantext/Database/Admin/Types/Node.hs

@@ -257,7 +257,7 @@ data NodeType = NodeUser
 -}
 
               -- Optional Nodes
-              | NodeFrameWrite | NodeFrameCalc | NodeFrameCode
+              | NodeFrameWrite | NodeFrameCalc | NodeFrameNotebook
               | NodeFile
 
   deriving (Show, Read, Eq, Generic, Bounded, Enum)
@@ -292,7 +292,7 @@ defaultName NodePhylo         = "Phylo"
 
 defaultName NodeFrameWrite    = "Frame Write"
 defaultName NodeFrameCalc     = "Frame Calc"
-defaultName NodeFrameCode     = "Frame Code"
+defaultName NodeFrameNotebook     = "Frame Code"
 
 defaultName NodeFile          = "File"