[REFACT] types of subtree

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

@@ -5,19 +5,19 @@ import Effect.Aff (Aff)
 import Gargantext.Prelude (class Show, Unit)
 import Gargantext.Sessions (Session)
 import Gargantext.Types  as GT
-import Gargantext.Components.Forest.Tree.Node.Settings (NodeAction(..), glyphiconNodeAction, SubTreeParams(..))
+import Gargantext.Components.Forest.Tree.Node.Tools.SubTree.Types (SubTreeOut, SubTreeParams(..))
+import Gargantext.Components.Forest.Tree.Node.Settings (NodeAction(..), glyphiconNodeAction)
 import Gargantext.Components.Forest.Tree.Node.Action.Upload.Types (FileType, UploadFileContents)
 import Gargantext.Components.Forest.Tree.Node.Action.Update.Types (UpdateNodeParams)
 
-{-
-type UpdateNodeProps =
-  ( id       :: GT.ID
-  , dispatch :: Action -> Aff Unit
-  , name     :: GT.Name
-  , nodeType :: NodeType
-  , params   :: UpdateNodeParams
+
+type Props =
+  ( dispatch :: Action -> Aff Unit
+  , id       :: Int
+  , nodeType :: GT.NodeType
+  , session  :: Session
   )
-  -}
+
 
 data Action = AddNode     String GT.NodeType
             | DeleteNode
@@ -28,11 +28,17 @@ data Action = AddNode     String GT.NodeType
             | UploadFile  GT.NodeType FileType (Maybe String) UploadFileContents
             | DownloadNode
             | RefreshTree
-            | MoveNode    GT.NodeID GT.NodeID
-            | MergeNode    GT.NodeID GT.NodeID
-            | LinkNode    GT.NodeID GT.NodeID
+
+            | MoveNode  GT.ID GT.ID
+            | MergeNode GT.ID GT.ID
+            | LinkNode  GT.ID GT.ID
+
+--            | MoveNode    (Maybe SubTreeOut)
+--            | MergeNode   (Maybe SubTreeOut)
+--            | LinkNode    (Maybe SubTreeOut)
             | NoAction
 
+
 instance showShow :: Show Action where
   show (AddNode     _ _    )= "AddNode"
   show  DeleteNode          = "DeleteNode"
@@ -48,12 +54,6 @@ instance showShow :: Show Action where
   show (LinkNode _ _)       = "LinkNode"
   show NoAction             = "NoAction"
 
-type Props =
-  ( dispatch :: Action -> Aff Unit
-  , id       :: Int
-  , nodeType :: GT.NodeType
-  , session  :: Session
-  )
 -----------------------------------------------------------------------
 icon :: Action -> String
 icon (AddNode    _ _)     = glyphiconNodeAction (Add [])

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

@@ -6,7 +6,8 @@ import Data.Tuple.Nested ((/\))
 import Effect.Aff (Aff)
 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 (SubTreeParamsIn, subTreeView, SubTreeOut(..))
+import Gargantext.Components.Forest.Tree.Node.Tools.SubTree (subTreeView, SubTreeParamsIn)
+import Gargantext.Components.Forest.Tree.Node.Tools.SubTree.Types (SubTreeOut(..))
 import Gargantext.Prelude
 import Gargantext.Routes (SessionRoute(..))
 import Gargantext.Sessions (Session, put_)

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

@@ -6,7 +6,8 @@ import Data.Tuple.Nested ((/\))
 import Effect.Aff (Aff)
 import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
 import Gargantext.Components.Forest.Tree.Node.Tools (submitButton, panel, checkbox, checkboxes)
-import Gargantext.Components.Forest.Tree.Node.Tools.SubTree (SubTreeParamsIn, subTreeView, SubTreeOut(..))
+import Gargantext.Components.Forest.Tree.Node.Tools.SubTree (subTreeView, SubTreeParamsIn)
+import Gargantext.Components.Forest.Tree.Node.Tools.SubTree.Types (SubTreeOut(..))
 import Gargantext.Prelude
 import Gargantext.Routes (SessionRoute(..))
 import Gargantext.Sessions (Session, put_)

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

@@ -6,7 +6,8 @@ import Data.Tuple.Nested ((/\))
 import Effect.Aff (Aff)
 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 (SubTreeParamsIn, subTreeView, SubTreeOut(..))
+import Gargantext.Components.Forest.Tree.Node.Tools.SubTree (subTreeView, SubTreeParamsIn)
+import Gargantext.Components.Forest.Tree.Node.Tools.SubTree.Types (SubTreeOut(..))
 import Gargantext.Prelude
 import Gargantext.Routes (SessionRoute(..))
 import Gargantext.Sessions (Session, put_)
@@ -22,11 +23,13 @@ moveNode :: Record SubTreeParamsIn -> R.Hooks R.Element
 moveNode p@{dispatch, subTreeParams, id, nodeType, session} = do
   subTreeOut@(subTreeOutParams /\ setSubTreeOut) :: R.State (Maybe SubTreeOut)
     <- R.useState' Nothing
+
   let button = case subTreeOutParams of
         Nothing   -> H.div {} []
         Just sbto -> submitButton (MoveNode inId outId) dispatch
           where
             (SubTreeOut { in:inId, out:outId}) = sbto
+
   pure $ panel [ subTreeView { subTreeOut
                              , dispatch
                              , subTreeParams

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

@@ -4,6 +4,7 @@ import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Show (genericShow)
 import Data.Generic.Rep.Eq   (genericEq)
 import Gargantext.Prelude (class Eq, class Show, show, (&&), (<>), (==))
+import Gargantext.Components.Forest.Tree.Node.Tools.SubTree.Types (SubTreeParams(..))
 import Data.Array (foldl)
 import Gargantext.Types
 
@@ -24,19 +25,8 @@ data NodeAction = Documentation NodeType
                 | Move  { subTreeParams :: SubTreeParams }
                 | Link  { subTreeParams :: SubTreeParams }
                 | Clone
-------------------------------------------------------------------------
--- TODO move elsewhere
-data SubTreeParams = SubTreeParams { showtypes :: Array NodeType
-                                   , valitypes :: Array NodeType
-                                   }
-
-derive instance eqSubTreeParams      :: Eq SubTreeParams
-derive instance genericSubTreeParams :: Generic SubTreeParams _
-instance showSubTreeParams           :: Show SubTreeParams where
-  show = genericShow
 
 ------------------------------------------------------------------------
-
 instance eqNodeAction :: Eq NodeAction where
   eq (Documentation x) (Documentation y) = true && (x == y)
   eq SearchBox SearchBox = true

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

@@ -6,7 +6,7 @@ import Data.Tuple.Nested ((/\))
 import Effect.Uncurried (mkEffectFn1)
 import Effect.Aff (Aff)
 import Gargantext.Components.Forest.Tree.Node.Action (Props)
-import Gargantext.Components.Forest.Tree.Node.Settings (SubTreeParams(..))
+import Gargantext.Components.Forest.Tree.Node.Tools.SubTree.Types (SubTreeParams(..), SubTreeOut(..))
 import Gargantext.Components.Forest.Tree.Node.Tools.FTree (FTree, LNode(..), NTree(..))
 import Gargantext.Components.Forest.Tree.Node.Tools (nodeText)
 import Gargantext.Hooks.Loader (useLoader)
@@ -17,16 +17,11 @@ import Gargantext.Types as GT
 import Reactix as R
 import Reactix.DOM.HTML as H
 
-
-
 type SubTreeParamsIn =
   ( subTreeParams :: SubTreeParams
   | Props
   )
-------------------------------------------------------------------------
-data SubTreeOut = SubTreeOut { in  :: GT.ID
-                             , out :: GT.ID
-                             }
+
 ------------------------------------------------------------------------
 type SubTreeParamsProps =
   ( subTreeOut    :: R.State (Maybe SubTreeOut)

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

+module Gargantext.Components.Forest.Tree.Node.Tools.SubTree.Types where
+
+import Data.Generic.Rep (class Generic)
+import Data.Generic.Rep.Eq   (genericEq)
+import Data.Generic.Rep.Show (genericShow)
+import Gargantext.Prelude (class Eq, class Show)
+import Gargantext.Types  as GT
+import Reactix as R
+
+data SubTreeOut = SubTreeOut { in  :: GT.ID
+                             , out :: GT.ID
+                             }
+
+------------------------------------------------------------------------
+data SubTreeParams = SubTreeParams { showtypes :: Array GT.NodeType
+                                   , valitypes :: Array GT.NodeType
+                                   }
+
+derive instance eqSubTreeParams      :: Eq SubTreeParams
+derive instance genericSubTreeParams :: Generic SubTreeParams _
+instance showSubTreeParams           :: Show SubTreeParams where
+  show = genericShow
+------------------------------------------------------------------------
+
+