[REFACT] subtree (WIP)

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

@@ -3,11 +3,14 @@ module Gargantext.Components.Forest.Tree.Node.Action.CopyFrom where
 import DOM.Simple.Console (log2)
 import Data.Array as A
 import Data.Maybe (Maybe(..))
+import Data.Generic.Rep (class Generic)
+import Data.Generic.Rep.Eq (genericEq)
 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.FTree (FTree, LNode(..), NTree(..))
 import Gargantext.Hooks.Loader (useLoader)
-import Gargantext.Prelude (discard, map, pure, show, unit, ($), (&&), (/=), (<>))
+import Gargantext.Prelude (discard, map, pure, show, unit, ($), (&&), (/=), (<>), class Eq)
 import Gargantext.Routes as GR
 import Gargantext.Sessions (Session(..), get)
 import Gargantext.Types as GT
@@ -19,19 +22,30 @@ import Reactix.DOM.HTML as H
 getNodeTree :: Session -> GT.ID -> Aff FTree
 getNodeTree session nodeId = get session $ GR.NodeAPI GT.Tree (Just nodeId) ""
 
-copyFromCorpusView :: Record Props -> R.Element
+------------------------------------------------------------------------
+
+type SubTreeParamsProps =
+  ( subTreeParams :: SubTreeParams
+  | Props
+  )
+
+
+copyFromCorpusView :: Record SubTreeParamsProps -> R.Element
 copyFromCorpusView props = R.createElement copyFromCorpusViewCpt props []
 
-copyFromCorpusViewCpt :: R.Component Props
+copyFromCorpusViewCpt :: R.Component SubTreeParamsProps
 copyFromCorpusViewCpt = R.hooksComponent "G.C.F.T.N.A.U.copyFromCorpusView" cpt
   where
-    cpt { dispatch
+    cpt params@{ dispatch
         , id
         , nodeType
         , session
+        , subTreeParams
         } _ =
       do
-        useLoader session loadCorporaTree $
+        let SubTreeParams {showtypes} = subTreeParams
+
+        useLoader session (loadSubTree showtypes) $
           \tree ->
             copyFromCorpusViewLoaded { dispatch
                                      , id
@@ -85,20 +99,15 @@ copyFromCorpusTreeViewCpt = R.hooksComponent "G.C.F.T.N.A.U.copyFromCorpusTreeVi
             log2 "[copyFromCorpusTreeViewCpt] issue copy into" id
             log2 "[copyFromCorpusTreeViewCpt] issue copy from" sourceId
 
-loadCorporaTree :: Session -> Aff FTree
-loadCorporaTree session = getCorporaTree session treeId
+--------------------------------------------------------------------------------------------
+loadSubTree :: Array GT.NodeType -> Session -> Aff FTree
+loadSubTree nodetypes session = getSubTree session treeId nodetypes
   where
     Session { treeId } = session
 
-getCorporaTree :: Session -> Int -> Aff FTree
-getCorporaTree session treeId = get session $ GR.NodeAPI GT.Tree (Just treeId) nodeTypes
+getSubTree :: Session -> Int -> Array GT.NodeType -> Aff FTree
+getSubTree session treeId showtypes = get session $ GR.NodeAPI GT.Tree (Just treeId) nodeTypes
   where
-    nodeTypes     = A.foldl (\a b -> a <> "type=" <> show b <> "&") "?" typesList
-    typesList = [ GT.FolderPrivate
-                , GT.FolderShared
-                , GT.Team
-                , GT.FolderPublic
-                , GT.Folder
-                , GT.Corpus
-                , GT.NodeList
-                ]
+    nodeTypes     = A.foldl (\a b -> a <> "type=" <> show b <> "&") "?" showtypes
+
+

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

@@ -19,7 +19,7 @@ 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.Box.Types (NodePopupProps, NodePopupS)
-import Gargantext.Components.Forest.Tree.Node.Settings (NodeAction(..), SettingsBox(..), glyphiconNodeAction, settingsBox)
+import Gargantext.Components.Forest.Tree.Node.Settings (NodeAction(..), SettingsBox(..), glyphiconNodeAction, settingsBox, SubTreeParams(..))
 import Gargantext.Components.Forest.Tree.Node.Tools (textInputBox, fragmentPT)
 import Gargantext.Prelude (Unit, bind, const, map, pure, show, ($), (<>), (==), (<))
 import Gargantext.Sessions (Session)
@@ -238,8 +238,8 @@ panelActionCpt = R.hooksComponent "G.C.F.T.N.B.panelAction" cpt
     cpt {action: Config , dispatch, id, nodeType, session} _ = do
       pure $ fragmentPT $ "Config " <> show nodeType
 
-    cpt {action: CopyFromCorpus, dispatch, id, nodeType, session} _ = do
-      pure $ copyFromCorpusView {dispatch, id, nodeType, session}
+    cpt {action: Merge {subTreeParams}, dispatch, id, nodeType, session} _ = do
+      pure $ copyFromCorpusView {dispatch, id, nodeType, session, subTreeParams}
 
     cpt {action: Link _} _ = pure $ fragmentPT $ "Soon, you will be able "
                                  <> "to link the corpus with your Annuaire"

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

 module Gargantext.Components.Forest.Tree.Node.Settings where
 
-import Prelude (class Eq, class Show, show, (&&), (<>), (==))
+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 Data.Array (foldl)
 import Gargantext.Types
 
@@ -17,11 +20,26 @@ data Status a = IsBeta a | IsProd a
 data NodeAction = Documentation NodeType
                 | SearchBox
                 | Download | Upload | Refresh | Config
-                | Move     | Clone  | Delete
-                | Share    | Link NodeType
+                | Delete
+                | Share
                 | Add    (Array NodeType)
-                | CopyFromCorpus
+                | Merge { subTreeParams :: SubTreeParams }
+                | Move
+                | Clone
+                | Link NodeType
 
+------------------------------------------------------------------------
+-- 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)
@@ -33,9 +51,9 @@ instance eqNodeAction :: Eq NodeAction where
   eq Clone Clone       = true
   eq Delete Delete     = true
   eq Share Share       = true
-  eq (Link x) (Link y) = (x == y)
-  eq (Add  x) (Add  y) = (x == y)
-  eq CopyFromCorpus CopyFromCorpus = true
+  eq (Link x) (Link y)   = x == y
+  eq (Add  x) (Add  y)   = x == y
+  eq (Merge x) (Merge y) = x == y
   eq Config Config     = true
   eq _ _               = false
 
@@ -52,7 +70,7 @@ instance showNodeAction :: Show NodeAction where
   show Config            = "Config"
   show (Link x)          = "Link to " <> show x
   show (Add xs)          = foldl (\a b -> a <> show b) "Add " xs
-  show CopyFromCorpus    = "Copy from corpus"
+  show (Merge t)         = "Merge with subtree" <> show t
 
 
 glyphiconNodeAction :: NodeAction -> String
@@ -63,7 +81,7 @@ glyphiconNodeAction SearchBox         = "search"
 glyphiconNodeAction Upload            = "upload"
 glyphiconNodeAction (Link _)          = "arrows-h"
 glyphiconNodeAction Download          = "download"
-glyphiconNodeAction CopyFromCorpus    = "random"
+glyphiconNodeAction (Merge _)         = "random"
 glyphiconNodeAction Refresh           = "refresh"
 glyphiconNodeAction Config            = "wrench"
 glyphiconNodeAction Share             = "user-plus"
@@ -191,7 +209,17 @@ settingsBox NodeList =
                           , Config
                           , Download
                           , Upload
-                          , CopyFromCorpus
+                          , Merge {subTreeParams : SubTreeParams { showtypes: [ FolderPrivate
+                                                                , FolderShared
+                                                                , Team
+                                                                , FolderPublic
+                                                                , Folder
+                                                                , Corpus
+                                                                , NodeList
+                                                                ]
+                                                    , valitypes: [ NodeList ]
+                                                    }
+                                   }
                           , Delete
                           ]
               }
@@ -207,7 +235,7 @@ settingsBox Dashboard =
 
 settingsBox Annuaire =
   SettingsBox { show : true
-              , edit : false
+              , edit : true
               , doc  : Documentation Annuaire
               , buttons : [ Upload
                           , Move