[REFACT|FIX] move (ok) | merge (WIP) | link (WIP)

src/Gargantext/Components/Forest/Tree.purs

@@ -14,6 +14,8 @@ import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
 import Gargantext.Components.Forest.Tree.Node.Action.Add (AddNodeValue(..), addNode)
 import Gargantext.Components.Forest.Tree.Node.Action.Delete (deleteNode)
 import Gargantext.Components.Forest.Tree.Node.Action.Move   (moveNodeReq)
+import Gargantext.Components.Forest.Tree.Node.Action.Merge  (mergeNodeReq)
+import Gargantext.Components.Forest.Tree.Node.Action.Link   (linkNodeReq)
 import Gargantext.Components.Forest.Tree.Node.Action.Rename (RenameValue(..), rename)
 import Gargantext.Components.Forest.Tree.Node.Action.Share (ShareValue(..), share)
 import Gargantext.Components.Forest.Tree.Node.Action.Update (updateRequest)
@@ -308,6 +310,17 @@ performAction DownloadNode _ = do
 performAction (MoveNode n1 n2) p@{session} = do
   void $ moveNodeReq session n1 n2
   performAction RefreshTree p
+
+performAction (MergeNode n1 n2) p@{session} = do
+  void $ mergeNodeReq session n1 n2
+  performAction RefreshTree p
+
+performAction (LinkNode n1 n2) p@{session} = do
+  void $ linkNodeReq session n1 n2
+  performAction RefreshTree p
+
+
+
 -------
 performAction RefreshTree { reload: (_ /\ setReload) } = do
   liftEffect $ setReload (_ + 1)

src/Gargantext/Components/Forest/Tree/Node/Action.purs

@@ -29,6 +29,8 @@ data Action = AddNode     String GT.NodeType
             | DownloadNode
             | RefreshTree
             | MoveNode    GT.NodeID GT.NodeID
+            | MergeNode    GT.NodeID GT.NodeID
+            | LinkNode    GT.NodeID GT.NodeID
             | NoAction
 
 instance showShow :: Show Action where
@@ -42,6 +44,8 @@ instance showShow :: Show Action where
   show  RefreshTree         = "RefreshTree"
   show  DownloadNode        = "Download"
   show (MoveNode _ _)       = "MoveNode"
+  show (MergeNode _ _)      = "MergeNode"
+  show (LinkNode _ _)       = "LinkNode"
   show NoAction             = "NoAction"
 
 type Props =
@@ -62,6 +66,9 @@ icon (UploadFile _ _ _ _) = glyphiconNodeAction Upload
 icon  RefreshTree         = glyphiconNodeAction Refresh
 icon  DownloadNode        = glyphiconNodeAction Download
 icon (MoveNode _ _)       = glyphiconNodeAction (Move { subTreeParams : SubTreeParams {showtypes:[], valitypes:[] }})
+icon (MergeNode _ _)      = glyphiconNodeAction (Merge { subTreeParams : SubTreeParams {showtypes:[], valitypes:[] }})
+icon (LinkNode _ _)       = glyphiconNodeAction (Link { subTreeParams : SubTreeParams {showtypes:[], valitypes:[] }})
+
 icon NoAction             = "hand-o-right"
 
 -- icon _             = "hand-o-right"
@@ -77,5 +84,7 @@ text (UploadFile  _ _ _ _)= "Upload File !"
 text  RefreshTree         = "Refresh Tree !"
 text DownloadNode         = "Download !"
 text (MoveNode _ _ )      = "Move !"
+text (MergeNode _ _ )     = "Merge !"
+text (LinkNode _ _ )      = "Link !"
 text NoAction             = "No Action"
 -----------------------------------------------------------------------

src/Gargantext/Components/Forest/Tree/Node/Action/Link.purs

@@ -2,28 +2,34 @@ module Gargantext.Components.Forest.Tree.Node.Action.Link
   where
 
 import Data.Argonaut as Argonaut
-import Data.Maybe (Maybe(..))
 import Data.Generic.Rep (class Generic)
-import Gargantext.Prelude
+import Data.Generic.Rep.Show (genericShow)
+import Data.Maybe (Maybe(..))
+import Data.Tuple.Nested ((/\))
 import Effect.Aff (Aff)
-import Gargantext.Types  as GT
-import Gargantext.Sessions (Session, put_)
+import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
+import Gargantext.Components.Forest.Tree.Node.Tools (submitButton, panel)
+import Gargantext.Components.Forest.Tree.Node.Tools.SubTree (SubTreeParamsProps, subTreeView, SubTreeOut(..))
+import Gargantext.Prelude
 import Gargantext.Routes (SessionRoute(..))
+import Gargantext.Sessions (Session, put_)
+import Gargantext.Types  as GT
 import Gargantext.Types (NodeType(..))
 import Gargantext.Utils.Argonaut (genericSumDecodeJson, genericSumEncodeJson, genericEnumDecodeJson, genericEnumEncodeJson)
-import Data.Generic.Rep.Show (genericShow)
-import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
 import Reactix as R
-import Gargantext.Components.Forest.Tree.Node.Tools (submitButton, panel)
-import Gargantext.Components.Forest.Tree.Node.Tools.SubTree (SubTreeParamsProps, subTreeView)
 import Reactix.DOM.HTML as H
 
--- TODO moveNodeReq
 linkNodeReq :: Session -> GT.ID -> GT.ID -> Aff (Array GT.ID)
 linkNodeReq session fromId toId =
   put_ session $ NodeAPI GT.Node (Just fromId) ("link/" <> show toId)
 
 linkNode :: Record SubTreeParamsProps -> R.Hooks R.Element
-linkNode p = do
-  pure $ subTreeView p
+linkNode p@{subTreeOut, dispatch} = pure $ panel [subTreeView p] button
+  where
+    ( subTreeOutParams /\ _ ) = subTreeOut
+    button = case subTreeOutParams of
+      Nothing   -> H.div {} []
+      Just sbto -> submitButton (LinkNode inId outId) dispatch
+        where
+          (SubTreeOut { in:inId, out:outId}) = sbto
 

src/Gargantext/Components/Forest/Tree/Node/Action/Merge.purs

@@ -2,29 +2,35 @@ module Gargantext.Components.Forest.Tree.Node.Action.Merge
   where
 
 import Data.Argonaut as Argonaut
-import Data.Maybe (Maybe(..))
 import Data.Generic.Rep (class Generic)
-import Gargantext.Prelude
-import Effect.Aff (Aff)
-import Gargantext.Types  as GT
-import Gargantext.Sessions (Session, put_)
-import Gargantext.Routes (SessionRoute(..))
-import Gargantext.Types (NodeType(..))
-import Gargantext.Utils.Argonaut (genericSumDecodeJson, genericSumEncodeJson, genericEnumDecodeJson, genericEnumEncodeJson)
 import Data.Generic.Rep.Show (genericShow)
+import Data.Maybe (Maybe(..))
+import Data.Tuple.Nested ((/\))
+import Effect.Aff (Aff)
 import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
-import Reactix as R
 import Gargantext.Components.Forest.Tree.Node.Tools (submitButton, panel)
 import Gargantext.Components.Forest.Tree.Node.Tools.SubTree (SubTreeParamsProps, subTreeView)
 import Gargantext.Components.Forest.Tree.Node.Tools.SubTree (SubTreeParamsProps, subTreeView, SubTreeOut(..))
+import Gargantext.Prelude
+import Gargantext.Routes (SessionRoute(..))
+import Gargantext.Sessions (Session, put_)
+import Gargantext.Types  as GT
+import Gargantext.Types (NodeType(..))
+import Gargantext.Utils.Argonaut (genericSumDecodeJson, genericSumEncodeJson, genericEnumDecodeJson, genericEnumEncodeJson)
+import Reactix as R
 import Reactix.DOM.HTML as H
 
-
 mergeNodeReq :: Session -> GT.ID -> GT.ID -> Aff (Array GT.ID)
 mergeNodeReq session fromId toId =
   put_ session $ NodeAPI GT.Node (Just fromId) ("merge/" <> show toId)
 
 mergeNode :: Record SubTreeParamsProps -> R.Hooks R.Element
-mergeNode p = do
-  pure $ subTreeView p
+mergeNode p@{subTreeOut, dispatch} = pure $ panel [subTreeView p] button
+  where
+    ( subTreeOutParams /\ _ ) = subTreeOut
+    button = case subTreeOutParams of
+      Nothing   -> H.div {} []
+      Just sbto -> submitButton (MergeNode inId outId) dispatch
+        where
+          (SubTreeOut { in:inId, out:outId}) = sbto
 

src/Gargantext/Components/Forest/Tree/Node/Action/Move.purs

@@ -2,16 +2,16 @@ module Gargantext.Components.Forest.Tree.Node.Action.Move
   where
 
 import Data.Maybe (Maybe(..))
-import Gargantext.Prelude
-import Effect.Aff (Aff)
 import Data.Tuple.Nested ((/\))
-import Gargantext.Sessions (Session, put_)
-import Gargantext.Routes (SessionRoute(..))
+import Effect.Aff (Aff)
 import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
-import Reactix as R
 import Gargantext.Components.Forest.Tree.Node.Tools (submitButton, panel)
 import Gargantext.Components.Forest.Tree.Node.Tools.SubTree (SubTreeParamsProps, subTreeView, SubTreeOut(..))
+import Gargantext.Prelude
+import Gargantext.Routes (SessionRoute(..))
+import Gargantext.Sessions (Session, put_)
 import Gargantext.Types as GT
+import Reactix as R
 import Reactix.DOM.HTML as H
 
 moveNodeReq :: Session -> GT.ID -> GT.ID -> Aff (Array GT.ID)