diff --git a/gargantext.cabal b/gargantext.cabal
index 56153b3e93b0c0e8edb26a1eaef983eb7fd72c9f..9a644b59ed3bda3dc61f559733c1c4530131f406 100644
--- a/gargantext.cabal
+++ b/gargantext.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
-- see: https://github.com/sol/hpack
name: gargantext
-version: 0.0.6.9.9.6.1
+version: 0.0.6.9.9.6.1
synopsis: Search, map, share
description: Please see README.md
category: Data
diff --git a/src/Gargantext/API/Node/DocumentsFromWriteNodes.hs b/src/Gargantext/API/Node/DocumentsFromWriteNodes.hs
index ca4598ad1910b1c314af243e42ba453dfcd9b432..fa1f4fffca48b275f9ea86095e01defa04c893c5 100644
--- a/src/Gargantext/API/Node/DocumentsFromWriteNodes.hs
+++ b/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 NodeFrameWrite
+ frameWriteIds <- getChildrenByType nId Notes
-- https://write.frame.gargantext.org/<frame_id>/download
frameWrites <- mapM (\id -> getNodeWith id (Proxy :: Proxy HyperdataFrame)) frameWriteIds
@@ -142,7 +142,7 @@ hyperdataDocumentFromFrameWrite lang paragraphSize (node, contents) =
day' = maybe Defaults.day (\(Date { day }) -> fromIntegral day) date
--}
in
- Right (List.map (\(t, ctxt) -> HyperdataDocument { _hd_bdd = Just "FrameWrite"
+ Right (List.map (\(t, ctxt) -> HyperdataDocument { _hd_bdd = Just $ cs $ show Notes
, _hd_doi = Nothing
, _hd_url = Nothing
, _hd_uniqId = Nothing
diff --git a/src/Gargantext/Database/Action/Node.hs b/src/Gargantext/Database/Action/Node.hs
index 92e1d93c399d586fcd41401b57d5f9e725a11c7e..d9d7be0ac1e71cf63de283d1e81631401543bd56 100644
--- a/src/Gargantext/Database/Action/Node.hs
+++ b/src/Gargantext/Database/Action/Node.hs
@@ -51,11 +51,11 @@ mkNodeWithParent NodeUser Nothing uId name =
mkNodeWithParent _ Nothing _ _ = nodeError HasParent
------------------------------------------------------------------------
-mkNodeWithParent NodeFrameWrite i u n =
- mkNodeWithParent_ConfigureHyperdata NodeFrameWrite i u n
+mkNodeWithParent Notes i u n =
+ mkNodeWithParent_ConfigureHyperdata Notes i u n
-mkNodeWithParent NodeFrameCalc i u n =
- mkNodeWithParent_ConfigureHyperdata NodeFrameCalc i u n
+mkNodeWithParent Calc i u n =
+ mkNodeWithParent_ConfigureHyperdata Calc i u n
mkNodeWithParent NodeFrameVisio i u n =
mkNodeWithParent_ConfigureHyperdata NodeFrameVisio i u n
@@ -76,11 +76,11 @@ mkNodeWithParent_ConfigureHyperdata :: (HasNodeError err, HasDBid NodeType)
-> UserId
-> Name
-> Cmd err [NodeId]
-mkNodeWithParent_ConfigureHyperdata NodeFrameWrite (Just i) uId name =
- mkNodeWithParent_ConfigureHyperdata' NodeFrameWrite (Just i) uId name
+mkNodeWithParent_ConfigureHyperdata Notes (Just i) uId name =
+ mkNodeWithParent_ConfigureHyperdata' Notes (Just i) uId name
-mkNodeWithParent_ConfigureHyperdata NodeFrameCalc (Just i) uId name =
- mkNodeWithParent_ConfigureHyperdata' NodeFrameCalc (Just i) uId name
+mkNodeWithParent_ConfigureHyperdata Calc (Just i) uId name =
+ mkNodeWithParent_ConfigureHyperdata' Calc (Just i) uId name
mkNodeWithParent_ConfigureHyperdata NodeFrameVisio (Just i) uId name =
mkNodeWithParent_ConfigureHyperdata' NodeFrameVisio (Just i) uId name
@@ -102,8 +102,8 @@ mkNodeWithParent_ConfigureHyperdata' :: (HasNodeError err, HasDBid NodeType)
-> 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
+ Notes -> insertNode Notes (Just name) Nothing i uId
+ Calc -> insertNode Calc (Just name) Nothing i uId
NodeFrameVisio -> insertNode NodeFrameVisio (Just name) Nothing i uId
_ -> nodeError NeedsConfiguration
@@ -112,8 +112,8 @@ mkNodeWithParent_ConfigureHyperdata' nt (Just i) uId name = do
[n] -> do
cfg <- view hasConfig
u <- case nt of
- NodeFrameWrite -> pure $ _gc_frame_write_url cfg
- NodeFrameCalc -> pure $ _gc_frame_calc_url cfg
+ Notes -> pure $ _gc_frame_write_url cfg
+ Calc -> pure $ _gc_frame_calc_url cfg
NodeFrameVisio -> pure $ _gc_frame_visio_url cfg
_ -> nodeError NeedsConfiguration
let
diff --git a/src/Gargantext/Database/Admin/Config.hs b/src/Gargantext/Database/Admin/Config.hs
index d1b9c61a1ca5deec10159054948d57e95f6a55ec..3ade268e445462aff021337a31f9b3b629a1f2c4 100644
--- a/src/Gargantext/Database/Admin/Config.hs
+++ b/src/Gargantext/Database/Admin/Config.hs
@@ -76,8 +76,8 @@ nodeTypeId n =
NodeFile -> 101
- NodeFrameWrite -> 991
- NodeFrameCalc -> 992
+ Notes -> 991
+ Calc -> 992
NodeFrameNotebook -> 993
NodeFrameVisio -> 994
diff --git a/src/Gargantext/Database/Admin/Types/Hyperdata/Default.hs b/src/Gargantext/Database/Admin/Types/Hyperdata/Default.hs
index b34bce4f31c6ab9d2785ac519f52c798d739021d..80a55b24ea58a0f622e8ab626b27d4f33556aa18 100644
--- a/src/Gargantext/Database/Admin/Types/Hyperdata/Default.hs
+++ b/src/Gargantext/Database/Admin/Types/Hyperdata/Default.hs
@@ -115,8 +115,8 @@ defaultHyperdata NodeGraph = DefaultGraph defaultHyperdataGraph
defaultHyperdata NodePhylo = DefaultPhylo defaultHyperdataPhylo
defaultHyperdata NodeDashboard = DefaultDashboard defaultHyperdataDashboard
-defaultHyperdata NodeFrameWrite = DefaultFrameWrite defaultHyperdataFrame
-defaultHyperdata NodeFrameCalc = DefaultFrameCalc defaultHyperdataFrame
+defaultHyperdata Notes = DefaultFrameWrite defaultHyperdataFrame
+defaultHyperdata Calc = DefaultFrameCalc defaultHyperdataFrame
defaultHyperdata NodeFrameVisio = DefaultFrameVisio defaultHyperdataFrame
defaultHyperdata NodeFrameNotebook = DefaultFrameCalc defaultHyperdataFrame
diff --git a/src/Gargantext/Database/Admin/Types/Node.hs b/src/Gargantext/Database/Admin/Types/Node.hs
index 1fe7dd223119d78174c94367b7e902d04cb74591..8f98e3092ae47658b0bf03694fa171c16c6a36c9 100644
--- a/src/Gargantext/Database/Admin/Types/Node.hs
+++ b/src/Gargantext/Database/Admin/Types/Node.hs
@@ -355,11 +355,12 @@ data NodeType = NodeUser
-}
-- Optional Nodes
- | NodeFrameWrite | NodeFrameCalc | NodeFrameVisio | NodeFrameNotebook
+ | Notes | Calc | NodeFrameVisio | NodeFrameNotebook
| NodeFile
deriving (Show, Read, Eq, Generic, Bounded, Enum)
+
instance GQLType NodeType
instance FromJSON NodeType
instance ToJSON NodeType
@@ -404,8 +405,8 @@ defaultName NodeDashboard = "Board"
defaultName NodeGraph = "Graph"
defaultName NodePhylo = "Phylo"
-defaultName NodeFrameWrite = "Note"
-defaultName NodeFrameCalc = "Calc"
+defaultName Notes = "Note"
+defaultName Calc = "Calc"
defaultName NodeFrameVisio = "Visio"
defaultName NodeFrameNotebook = "Code"