[REFACT] SubTree (WIP).

src/Gargantext/Components/Forest/Tree.purs

@@ -13,7 +13,7 @@ import Gargantext.Components.Forest.Tree.Node (nodeMainSpan)
 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   (moveNode)
+import Gargantext.Components.Forest.Tree.Node.Action.Move   (moveNodeReq)
 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)
@@ -306,7 +306,7 @@ performAction DownloadNode _ = do
     liftEffect $ log "[performAction] DownloadNode"
 -------
 performAction (MoveNode n1 n2) p@{session} = do
-  void       $ moveNode session n1 n2
+  void $ moveNodeReq session n1 n2
   performAction RefreshTree p
 -------
 performAction RefreshTree { reload: (_ /\ setReload) } = do

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

@@ -15,13 +15,15 @@ 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
 
-moveNode :: Session -> GT.ID -> GT.ID -> Aff (Array GT.ID)
-moveNode session fromId toId=
+-- TODO moveNodeReq
+moveNodeReq :: Session -> GT.ID -> GT.ID -> Aff (Array GT.ID)
+moveNodeReq session fromId toId =
   put_ session $ NodeAPI GT.Node (Just fromId) ("move/" <> show toId)
 
-
-
-
+moveNode :: Record SubTreeParamsProps -> R.Hooks R.Element
+moveNode p = do
+  pure $ subTreeView p
 

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

@@ -21,10 +21,11 @@ import Gargantext.Components.Forest.Tree.Node.Action.Search.SearchField (default
 import Gargantext.Components.Forest.Tree.Node.Action.Share as Share
 import Gargantext.Components.Forest.Tree.Node.Action.Update (update)
 import Gargantext.Components.Forest.Tree.Node.Action.Upload (actionUpload)
+import Gargantext.Components.Forest.Tree.Node.Action.Move (moveNode)
 import Gargantext.Components.Forest.Tree.Node.Box.Types (NodePopupProps, NodePopupS)
 import Gargantext.Components.Forest.Tree.Node.Settings (NodeAction(..), SettingsBox(..), glyphiconNodeAction, settingsBox)
 import Gargantext.Components.Forest.Tree.Node.Tools (textInputBox, fragmentPT)
-import Gargantext.Components.Forest.Tree.Node.Tools.SubTree (subTreeView)
+import Gargantext.Components.Forest.Tree.Node.Tools.SubTree (subTreeView, SubTreeOut)
 import Gargantext.Sessions (Session)
 import Gargantext.Types (Name, ID)
 import Gargantext.Types as GT
@@ -247,13 +248,16 @@ panelActionCpt = R.hooksComponent "G.C.F.T.N.B.panelAction" cpt
 
 -----------
     cpt {action: Merge {subTreeParams}, dispatch, id, nodeType, session} _ = do
-      pure $ subTreeView {dispatch, id, nodeType, session, subTreeParams}
+      subTreeOut :: R.State (Maybe SubTreeOut) <- R.useState' Nothing
+      pure $ subTreeView {dispatch, id, nodeType, session, subTreeParams, subTreeOut}
 
     cpt {action: Move {subTreeParams}, dispatch, id, nodeType, session} _ = do
-      pure $ subTreeView {dispatch, id, nodeType, session, subTreeParams}
+      subTreeOut :: R.State (Maybe SubTreeOut) <- R.useState' Nothing
+      moveNode {dispatch, id, nodeType, session, subTreeParams, subTreeOut}
 
     cpt {action: Link {subTreeParams}, dispatch, id, nodeType, session} _ = do
-      pure $ subTreeView {dispatch, id, nodeType, session, subTreeParams}
+      subTreeOut :: R.State (Maybe SubTreeOut) <- R.useState' Nothing
+      pure $ subTreeView {dispatch, id, nodeType, session, subTreeParams, subTreeOut}
 -----------
 
     cpt {action : Share, dispatch, id, name } _ = do

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

@@ -37,7 +37,7 @@ data SubTreeParams = SubTreeParams { showtypes :: Array NodeType
 
 derive instance eqSubTreeParams      :: Eq SubTreeParams
 derive instance genericSubTreeParams :: Generic SubTreeParams _
-instance showSubTreeParams    :: Show SubTreeParams where
+instance showSubTreeParams           :: Show SubTreeParams where
   show = genericShow
 
 ------------------------------------------------------------------------

src/Gargantext/Components/Forest/Tree/Node/Tools/SubTree.purs

@@ -19,9 +19,13 @@ import Reactix as R
 import Reactix.DOM.HTML as H
 
 
+data SubTreeOut = SubTreeOut { in  :: GT.ID
+                             , out :: GT.ID
+                             }
 ------------------------------------------------------------------------
 type SubTreeParamsProps =
   ( subTreeParams :: SubTreeParams
+  , subTreeOut    :: R.State (Maybe SubTreeOut)
   | Props
   )
 
@@ -32,23 +36,25 @@ subTreeViewCpt :: R.Component SubTreeParamsProps
 subTreeViewCpt = R.hooksComponent "G.C.F.T.N.A.U.subTreeView" cpt
   where
     cpt params@{ dispatch
-        , id
-        , nodeType
-        , session
-        , subTreeParams
-        } _ =
+               , id
+               , nodeType
+               , session
+               , subTreeParams
+               , subTreeOut
+               } _ =
       do
         let SubTreeParams {showtypes} = subTreeParams
 
         useLoader session (loadSubTree showtypes) $
           \tree ->
             subTreeViewLoaded { dispatch
-                                     , id
-                                     , nodeType
-                                     , session
-                                     , tree
-                                     , subTreeParams
-                                     }
+                              , id
+                              , nodeType
+                              , session
+                              , tree
+                              , subTreeParams
+                              , subTreeOut
+                              }
 
 loadSubTree :: Array GT.NodeType -> Session -> Aff FTree
 loadSubTree nodetypes session = getSubTree session treeId nodetypes
@@ -116,8 +122,8 @@ subTreeTreeViewCpt = R.hooksComponent "G.C.F.T.N.A.U.subTreeTreeViewCpt" cpt
                   $ \_ -> case validNodeType of
                                false -> launchAff $ dispatch NoAction
                                true  -> do
-                                 log2 "[subTreeTreeViewCpt] from" sourceId
-                                 log2 "[subTreeTreeViewCpt]   to" id
+                                 log2 "[subTreeTreeViewCpt] from" id
+                                 log2 "[subTreeTreeViewCpt]   to" sourceId
                                  launchAff $ dispatch (MoveNode id sourceId)
 
 --------------------------------------------------------------------------------------------