[DESIGN|REFACT] move

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

@@ -16,6 +16,7 @@ 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 Reactix.DOM.HTML as H
 
 

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

 module Gargantext.Components.Forest.Tree.Node.Action.Move
   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 Data.Tuple.Nested ((/\))
 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 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.Types as GT
 import Reactix.DOM.HTML as H
 
--- 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
+moveNode p@{subTreeOut, dispatch} = pure $ panel [subTreeView p] button
+  where
+    ( subTreeOutParams /\ _ ) = subTreeOut
+    button = case subTreeOutParams of
+      Nothing   -> H.div {} []
+      Just sbto -> submitButton (MoveNode inId outId) dispatch
+        where
+          (SubTreeOut { in:inId, out:outId}) = sbto
 

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

@@ -27,7 +27,7 @@ import Gargantext.Components.Forest.Tree.Node.Action.Merge (mergeNode)
 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, SubTreeOut)
+import Gargantext.Components.Forest.Tree.Node.Tools.SubTree (SubTreeOut)
 import Gargantext.Sessions (Session)
 import Gargantext.Types (Name, ID)
 import Gargantext.Types as GT
@@ -249,6 +249,7 @@ panelActionCpt = R.hooksComponent "G.C.F.T.N.B.panelAction" cpt
       pure $ fragmentPT $ "Config " <> show nodeType
 
 -----------
+    -- Functions using SubTree
     cpt {action: Merge {subTreeParams}, dispatch, id, nodeType, session} _ = do
       subTreeOut :: R.State (Maybe SubTreeOut) <- R.useState' Nothing
       mergeNode {dispatch, id, nodeType, session, subTreeParams, subTreeOut}
@@ -265,12 +266,13 @@ panelActionCpt = R.hooksComponent "G.C.F.T.N.B.panelAction" cpt
     cpt {action : Share, dispatch, id, name } _ = do
       isOpen <- R.useState' true
       pure $ H.div {} [ textInputBox { boxAction: Share.shareAction
-                                   , boxName: "Share"
-                                   , dispatch
-                                   , id
-                                   , text: "username"
-                                   , isOpen
-                                   } ]
+                                     , boxName: "Share"
+                                     , dispatch
+                                     , id
+                                     , text: "username"
+                                     , isOpen
+                                     } 
+                      ]
     cpt props@{action: SearchBox, id, session, dispatch, nodePopup} _ =
       actionSearch session (Just id) dispatch nodePopup
 

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

@@ -3,6 +3,7 @@ module Gargantext.Components.Forest.Tree.Node.Tools.SubTree where
 import DOM.Simple.Console (log2)
 import Data.Array as A
 import Data.Maybe (Maybe(..))
+import Data.Tuple.Nested ((/\))
 import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Eq (genericEq)
 import Effect.Uncurried (mkEffectFn1)
@@ -11,7 +12,7 @@ import Gargantext.Components.Forest.Tree.Node.Action (Props, Action(..))
 import Gargantext.Components.Forest.Tree.Node.Settings (SubTreeParams(..))
 import Gargantext.Components.Forest.Tree.Node.Tools.FTree (FTree, LNode(..), NTree(..))
 import Gargantext.Hooks.Loader (useLoader)
-import Gargantext.Prelude (discard, map, pure, show, unit, ($), (&&), (/=), (<>), class Eq)
+import Gargantext.Prelude (discard, map, pure, show, unit, ($), (&&), (/=), (<>), class Eq, const)
 import Gargantext.Routes as GR
 import Gargantext.Sessions (Session(..), get)
 import Gargantext.Types as GT
@@ -98,6 +99,7 @@ subTreeTreeViewCpt = R.hooksComponent "G.C.F.T.N.A.U.subTreeTreeViewCpt" cpt
                         ) ary
           , subTreeParams
           , dispatch
+          , subTreeOut
           } _ = do
       pure $ {- H.div {} [ H.h5 { className: GT.fldr nodeType true} []
       , -} H.div { className: "node" } 
@@ -117,14 +119,10 @@ subTreeTreeViewCpt = R.hooksComponent "G.C.F.T.N.A.U.subTreeTreeViewCpt" cpt
         validNodeType = (A.elem nodeType valitypes) && (id /= sourceId)
 
         clickable = if validNodeType then "clickable" else ""
-
-        onClick _ = mkEffectFn1
-                  $ \_ -> case validNodeType of
-                               false -> launchAff $ dispatch NoAction
-                               true  -> do
-                                 log2 "[subTreeTreeViewCpt] from" id
-                                 log2 "[subTreeTreeViewCpt]   to" sourceId
-                                 launchAff $ dispatch (MoveNode id sourceId)
-
+        sbto@( subTreeOutParams /\ setSubTreeOut) = subTreeOut
+        onClick _ = mkEffectFn1 $ \_ -> case validNodeType of
+                         false -> setSubTreeOut (const Nothing)
+                         true  -> setSubTreeOut (const $ Just $ SubTreeOut { in: id, out:sourceId})
+         
 --------------------------------------------------------------------------------------------