[Revert]

gargantext.cabal

@@ -5,7 +5,11 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           gargantext
+<<<<<<< HEAD
 version:        0.0.6.9.9.5.7
+=======
+version: 0.0.6.9.9.5.6
+>>>>>>> parent of b002b07b ([DOC] NodeFrameWrite -> Notes)
 synopsis:       Search, map, share
 description:    Please see README.md
 category:       Data

src/Gargantext/API/Node/DocumentsFromWriteNodes.hs

@@ -90,7 +90,7 @@ documentsFromWriteNodes uId nId Params { selection, lang, paragraphs } jobHandle
       markFailed (Just msg) jobHandle
       panic msg
 
-  frameWriteIds <- getChildrenByType nId Notes
+  frameWriteIds <- getChildrenByType nId NodeFrameWrite
 
   -- https://write.frame.gargantext.org/<frame_id>/download
   frameWrites <- mapM (\id -> getNodeWith id (Proxy :: Proxy HyperdataFrame)) frameWriteIds

src/Gargantext/Database/Action/Node.hs

@@ -51,8 +51,8 @@ mkNodeWithParent NodeUser Nothing uId name =
 
 mkNodeWithParent _ Nothing _ _ = nodeError HasParent
 ------------------------------------------------------------------------
-mkNodeWithParent Notes i u n =
-  mkNodeWithParent_ConfigureHyperdata Notes i u n
+mkNodeWithParent NodeFrameWrite i u n =
+  mkNodeWithParent_ConfigureHyperdata NodeFrameWrite i u n
 
 mkNodeWithParent NodeFrameCalc i u n =
   mkNodeWithParent_ConfigureHyperdata NodeFrameCalc i u n
@@ -76,8 +76,8 @@ mkNodeWithParent_ConfigureHyperdata :: (HasNodeError err, HasDBid NodeType)
                                     -> UserId
                                     -> Name
                                     -> Cmd err [NodeId]
-mkNodeWithParent_ConfigureHyperdata Notes (Just i) uId name =
-  mkNodeWithParent_ConfigureHyperdata' Notes (Just i) uId name
+mkNodeWithParent_ConfigureHyperdata NodeFrameWrite (Just i) uId name =
+  mkNodeWithParent_ConfigureHyperdata' NodeFrameWrite (Just i) uId name
 
 mkNodeWithParent_ConfigureHyperdata NodeFrameCalc (Just i) uId name =
   mkNodeWithParent_ConfigureHyperdata' NodeFrameCalc (Just i) uId name
@@ -102,7 +102,7 @@ mkNodeWithParent_ConfigureHyperdata' :: (HasNodeError err, HasDBid NodeType)
                                     -> Cmd err [NodeId]
 mkNodeWithParent_ConfigureHyperdata' nt (Just i) uId name = do
   maybeNodeId <- case nt of
-     Notes -> insertNode Notes (Just name)   Nothing i uId
+     NodeFrameWrite -> insertNode NodeFrameWrite (Just name)   Nothing i uId
      NodeFrameCalc  -> insertNode NodeFrameCalc  (Just name)   Nothing i uId
      NodeFrameVisio -> insertNode NodeFrameVisio (Just name)   Nothing i uId
      _              -> nodeError NeedsConfiguration
@@ -112,7 +112,7 @@ mkNodeWithParent_ConfigureHyperdata' nt (Just i) uId name = do
     [n] -> do
       cfg <- view hasConfig
       u <- case nt of
-            Notes -> pure $ _gc_frame_write_url cfg
+            NodeFrameWrite -> pure $ _gc_frame_write_url cfg
             NodeFrameCalc  -> pure $ _gc_frame_calc_url  cfg
             NodeFrameVisio -> pure $ _gc_frame_visio_url  cfg
             _              -> nodeError NeedsConfiguration

src/Gargantext/Database/Admin/Config.hs

@@ -76,7 +76,7 @@ nodeTypeId n =
 
     NodeFile        -> 101
 
-    Notes    -> 991
+    NodeFrameWrite    -> 991
     NodeFrameCalc     -> 992
     NodeFrameNotebook -> 993
     NodeFrameVisio    -> 994

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

@@ -115,7 +115,7 @@ defaultHyperdata NodeGraph          = DefaultGraph     defaultHyperdataGraph
 defaultHyperdata NodePhylo          = DefaultPhylo     defaultHyperdataPhylo
 defaultHyperdata NodeDashboard      = DefaultDashboard defaultHyperdataDashboard
 
-defaultHyperdata Notes     = DefaultFrameWrite defaultHyperdataFrame
+defaultHyperdata NodeFrameWrite     = DefaultFrameWrite defaultHyperdataFrame
 defaultHyperdata NodeFrameCalc      = DefaultFrameCalc  defaultHyperdataFrame
 defaultHyperdata NodeFrameVisio     = DefaultFrameVisio defaultHyperdataFrame
 defaultHyperdata NodeFrameNotebook      = DefaultFrameCalc  defaultHyperdataFrame

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

@@ -355,12 +355,11 @@ data NodeType = NodeUser
 -}
 
               -- Optional Nodes
-              | Notes | NodeFrameCalc | NodeFrameVisio | NodeFrameNotebook
+              | NodeFrameWrite | NodeFrameCalc | NodeFrameVisio | NodeFrameNotebook
               | NodeFile
 
   deriving (Show, Read, Eq, Generic, Bounded, Enum)
 
-
 instance GQLType NodeType
 instance FromJSON NodeType
 instance ToJSON NodeType
@@ -405,7 +404,7 @@ defaultName NodeDashboard     = "Board"
 defaultName NodeGraph         = "Graph"
 defaultName NodePhylo         = "Phylo"
 
-defaultName Notes    = "Note"
+defaultName NodeFrameWrite    = "Note"
 defaultName NodeFrameCalc     = "Calc"
 defaultName NodeFrameVisio    = "Visio"
 defaultName NodeFrameNotebook = "Code"