Commit ccb4b7f9 authored by Alexandre Delanoë's avatar Alexandre Delanoë

[RENAME] NodeFrames renamed

parent b92a2778
...@@ -5,7 +5,7 @@ cabal-version: 1.12 ...@@ -5,7 +5,7 @@ cabal-version: 1.12
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
name: gargantext name: gargantext
version: 0.0.6.9.9.6.1 version: 0.0.6.9.9.6.1
synopsis: Search, map, share synopsis: Search, map, share
description: Please see README.md description: Please see README.md
category: Data category: Data
......
...@@ -90,7 +90,7 @@ documentsFromWriteNodes uId nId Params { selection, lang, paragraphs } jobHandle ...@@ -90,7 +90,7 @@ documentsFromWriteNodes uId nId Params { selection, lang, paragraphs } jobHandle
markFailed (Just msg) jobHandle markFailed (Just msg) jobHandle
panic msg panic msg
frameWriteIds <- getChildrenByType nId NodeFrameWrite frameWriteIds <- getChildrenByType nId Notes
-- https://write.frame.gargantext.org/<frame_id>/download -- https://write.frame.gargantext.org/<frame_id>/download
frameWrites <- mapM (\id -> getNodeWith id (Proxy :: Proxy HyperdataFrame)) frameWriteIds frameWrites <- mapM (\id -> getNodeWith id (Proxy :: Proxy HyperdataFrame)) frameWriteIds
...@@ -142,7 +142,7 @@ hyperdataDocumentFromFrameWrite lang paragraphSize (node, contents) = ...@@ -142,7 +142,7 @@ hyperdataDocumentFromFrameWrite lang paragraphSize (node, contents) =
day' = maybe Defaults.day (\(Date { day }) -> fromIntegral day) date day' = maybe Defaults.day (\(Date { day }) -> fromIntegral day) date
--} --}
in 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_doi = Nothing
, _hd_url = Nothing , _hd_url = Nothing
, _hd_uniqId = Nothing , _hd_uniqId = Nothing
......
...@@ -51,11 +51,11 @@ mkNodeWithParent NodeUser Nothing uId name = ...@@ -51,11 +51,11 @@ mkNodeWithParent NodeUser Nothing uId name =
mkNodeWithParent _ Nothing _ _ = nodeError HasParent mkNodeWithParent _ Nothing _ _ = nodeError HasParent
------------------------------------------------------------------------ ------------------------------------------------------------------------
mkNodeWithParent NodeFrameWrite i u n = mkNodeWithParent Notes i u n =
mkNodeWithParent_ConfigureHyperdata NodeFrameWrite i u n mkNodeWithParent_ConfigureHyperdata Notes i u n
mkNodeWithParent NodeFrameCalc i u n = mkNodeWithParent Calc i u n =
mkNodeWithParent_ConfigureHyperdata NodeFrameCalc i u n mkNodeWithParent_ConfigureHyperdata 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
...@@ -76,11 +76,11 @@ mkNodeWithParent_ConfigureHyperdata :: (HasNodeError err, HasDBid NodeType) ...@@ -76,11 +76,11 @@ mkNodeWithParent_ConfigureHyperdata :: (HasNodeError err, HasDBid NodeType)
-> UserId -> UserId
-> Name -> Name
-> Cmd err [NodeId] -> Cmd err [NodeId]
mkNodeWithParent_ConfigureHyperdata NodeFrameWrite (Just i) uId name = mkNodeWithParent_ConfigureHyperdata Notes (Just i) uId name =
mkNodeWithParent_ConfigureHyperdata' NodeFrameWrite (Just i) uId name mkNodeWithParent_ConfigureHyperdata' Notes (Just i) uId name
mkNodeWithParent_ConfigureHyperdata NodeFrameCalc (Just i) uId name = mkNodeWithParent_ConfigureHyperdata Calc (Just i) uId name =
mkNodeWithParent_ConfigureHyperdata' NodeFrameCalc (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 =
mkNodeWithParent_ConfigureHyperdata' NodeFrameVisio (Just i) uId name mkNodeWithParent_ConfigureHyperdata' NodeFrameVisio (Just i) uId name
...@@ -102,8 +102,8 @@ mkNodeWithParent_ConfigureHyperdata' :: (HasNodeError err, HasDBid NodeType) ...@@ -102,8 +102,8 @@ mkNodeWithParent_ConfigureHyperdata' :: (HasNodeError err, HasDBid NodeType)
-> Cmd err [NodeId] -> Cmd err [NodeId]
mkNodeWithParent_ConfigureHyperdata' nt (Just i) uId name = do mkNodeWithParent_ConfigureHyperdata' nt (Just i) uId name = do
maybeNodeId <- case nt of maybeNodeId <- case nt of
NodeFrameWrite -> insertNode NodeFrameWrite (Just name) Nothing i uId Notes -> insertNode Notes (Just name) Nothing i uId
NodeFrameCalc -> insertNode NodeFrameCalc (Just name) Nothing i uId Calc -> insertNode 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
...@@ -112,8 +112,8 @@ mkNodeWithParent_ConfigureHyperdata' nt (Just i) uId name = do ...@@ -112,8 +112,8 @@ mkNodeWithParent_ConfigureHyperdata' nt (Just i) uId name = do
[n] -> do [n] -> do
cfg <- view hasConfig cfg <- view hasConfig
u <- case nt of u <- case nt of
NodeFrameWrite -> pure $ _gc_frame_write_url cfg Notes -> pure $ _gc_frame_write_url cfg
NodeFrameCalc -> pure $ _gc_frame_calc_url cfg 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
......
...@@ -76,8 +76,8 @@ nodeTypeId n = ...@@ -76,8 +76,8 @@ nodeTypeId n =
NodeFile -> 101 NodeFile -> 101
NodeFrameWrite -> 991 Notes -> 991
NodeFrameCalc -> 992 Calc -> 992
NodeFrameNotebook -> 993 NodeFrameNotebook -> 993
NodeFrameVisio -> 994 NodeFrameVisio -> 994
......
...@@ -115,8 +115,8 @@ defaultHyperdata NodeGraph = DefaultGraph defaultHyperdataGraph ...@@ -115,8 +115,8 @@ defaultHyperdata NodeGraph = DefaultGraph defaultHyperdataGraph
defaultHyperdata NodePhylo = DefaultPhylo defaultHyperdataPhylo defaultHyperdata NodePhylo = DefaultPhylo defaultHyperdataPhylo
defaultHyperdata NodeDashboard = DefaultDashboard defaultHyperdataDashboard defaultHyperdata NodeDashboard = DefaultDashboard defaultHyperdataDashboard
defaultHyperdata NodeFrameWrite = DefaultFrameWrite defaultHyperdataFrame defaultHyperdata Notes = DefaultFrameWrite defaultHyperdataFrame
defaultHyperdata NodeFrameCalc = DefaultFrameCalc defaultHyperdataFrame defaultHyperdata Calc = DefaultFrameCalc defaultHyperdataFrame
defaultHyperdata NodeFrameVisio = DefaultFrameVisio defaultHyperdataFrame defaultHyperdata NodeFrameVisio = DefaultFrameVisio defaultHyperdataFrame
defaultHyperdata NodeFrameNotebook = DefaultFrameCalc defaultHyperdataFrame defaultHyperdata NodeFrameNotebook = DefaultFrameCalc defaultHyperdataFrame
......
...@@ -355,11 +355,12 @@ data NodeType = NodeUser ...@@ -355,11 +355,12 @@ data NodeType = NodeUser
-} -}
-- Optional Nodes -- Optional Nodes
| NodeFrameWrite | NodeFrameCalc | NodeFrameVisio | NodeFrameNotebook | Notes | Calc | NodeFrameVisio | NodeFrameNotebook
| NodeFile | NodeFile
deriving (Show, Read, Eq, Generic, Bounded, Enum) deriving (Show, Read, Eq, Generic, Bounded, Enum)
instance GQLType NodeType instance GQLType NodeType
instance FromJSON NodeType instance FromJSON NodeType
instance ToJSON NodeType instance ToJSON NodeType
...@@ -404,8 +405,8 @@ defaultName NodeDashboard = "Board" ...@@ -404,8 +405,8 @@ defaultName NodeDashboard = "Board"
defaultName NodeGraph = "Graph" defaultName NodeGraph = "Graph"
defaultName NodePhylo = "Phylo" defaultName NodePhylo = "Phylo"
defaultName NodeFrameWrite = "Note" defaultName Notes = "Note"
defaultName NodeFrameCalc = "Calc" defaultName Calc = "Calc"
defaultName NodeFrameVisio = "Visio" defaultName NodeFrameVisio = "Visio"
defaultName NodeFrameNotebook = "Code" defaultName NodeFrameNotebook = "Code"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment