[TREE|Action] refact

src/Gargantext/Components/Forest/Tree.purs

@@ -13,7 +13,8 @@ import Reactix.DOM.HTML as H
 import Record as Record
 import Record.Extra as RecordE
 
-import Gargantext.Components.Forest.Tree.Node.Action (Action(..), AddNodeValue(..), FTree, ID, LNode(..), NTree(..), Reload, RenameValue(..), Tree, addNode, deleteNode, loadNode, renameNode)
+import Gargantext.Components.Forest.Tree.Node.Action (Action(..), FTree, ID, LNode(..), NTree(..), Reload, RenameValue(..), Tree, deleteNode, loadNode, renameNode)
+import Gargantext.Components.Forest.Tree.Node.Action.Add (AddNodeValue(..), addNode) 
 import Gargantext.Components.Forest.Tree.Node.Action.Upload (uploadFile)
 import Gargantext.Components.Forest.Tree.Node.Box (nodeMainSpan)
 import Gargantext.Ends (Frontends)

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

@@ -43,11 +43,12 @@ readFileType "PresseRIS" = Just PresseRIS
 readFileType "WOS"       = Just WOS
 readFileType _           = Nothing
 
-data DroppedFile = DroppedFile {
-    contents :: UploadFileContents
+data DroppedFile =
+  DroppedFile { contents :: UploadFileContents
               , fileType :: Maybe FileType
               , lang     :: Maybe Lang
               }
+
 type FileHash = String
 
 type Name = String
@@ -60,18 +61,7 @@ type UploadFile =
   , name     :: String
   }
 
-addNode :: Session -> ID -> AddNodeValue -> Aff (Array ID)
-addNode session parentId = post session $ NodeAPI GT.Node (Just parentId) ""
 
-addNodeAsync :: Session
-                -> ID
-                -> AddNodeValue
-                -> Aff GT.AsyncTaskWithType
-addNodeAsync session parentId q = do
-  task <- post session p q
-  pure $ GT.AsyncTaskWithType {task, typ: GT.AddNode}
-  where
-    p = GR.NodeAPI GT.Node (Just parentId) (GT.asyncTaskTypePath GT.AddNode)
 
 renameNode :: Session -> ID -> RenameValue -> Aff (Array ID)
 renameNode session renameNodeId = put session $ NodeAPI GT.Node (Just renameNodeId) "rename"
@@ -97,17 +87,6 @@ instance encodeJsonRenameValue :: EncodeJson RenameValue where
     ~> jsonEmptyObject
 
 -----------------------------------------------------------------------
-newtype AddNodeValue = AddNodeValue
-  { name     :: Name
-  , nodeType :: GT.NodeType
-  }
-
-instance encodeJsonCreateValue :: EncodeJson AddNodeValue where
-  encodeJson (AddNodeValue {name, nodeType})
-     = "pn_name"     := name
-    ~> "pn_typename" := nodeType
-    ~> jsonEmptyObject
-
 -----------------------------------------------------------------------
 data UpdateNodeParams = UpdateNodeParamsList { method :: Int }
                       | UpdateNodeParamsGraph { method :: String }

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

 module Gargantext.Components.Forest.Tree.Node.Action.Add where
 
 import Data.Array (length, head)
+import Data.Argonaut (class DecodeJson, class EncodeJson, decodeJson, jsonEmptyObject, (.:), (:=), (~>))
 import Data.Maybe (Maybe(..), fromMaybe)
 -- import Data.Newtype (class Newtype)
 import Data.Tuple.Nested ((/\))
@@ -10,19 +11,48 @@ import Gargantext.Components.Forest.Tree.Node.Action (Action(..), ID, Name)
 import Gargantext.Components.Forest.Tree.Node (SettingsBox(..), settingsBox)
 import Gargantext.Types (NodeType(..), readNodeType)
 import Gargantext.Utils.Reactix as R2
+import Gargantext.Sessions (Session, post)
+import Gargantext.Routes as GR
+import Gargantext.Types  as GT
 import Prelude (Unit, bind, const, discard, map, pure, show, ($), (<>), (>), (<<<))
 import Reactix as R
 import Reactix.DOM.HTML as H
 
 -- START Create Node
 
-type Dispatch = Action -> Aff Unit
+addNode :: Session -> ID -> AddNodeValue -> Aff (Array ID)
+addNode session parentId = post session $ GR.NodeAPI GT.Node (Just parentId) ""
+
+addNodeAsync :: Session
+                -> ID
+                -> AddNodeValue
+                -> Aff GT.AsyncTaskWithType
+addNodeAsync session parentId q = do
+  task <- post session p q
+  pure $ GT.AsyncTaskWithType {task, typ: GT.AddNode}
+  where
+    p = GR.NodeAPI GT.Node (Just parentId) (GT.asyncTaskTypePath GT.AddNode)
+
+----------------------------------------------------------------------
+newtype AddNodeValue = AddNodeValue
+  { name     :: Name
+  , nodeType :: GT.NodeType
+  }
+
+instance encodeJsonAddNodeValue :: EncodeJson AddNodeValue where
+  encodeJson (AddNodeValue {name, nodeType})
+     = "pn_name"     := name
+    ~> "pn_typename" := nodeType
+    ~> jsonEmptyObject
 
+----------------------------------------------------------------------
+
+type Dispatch = Action -> Aff Unit
 data NodePopup = CreatePopup | NodePopup
 
 type CreateNodeProps =
   ( id       :: ID
-  , dispatch :: Dispatch
+  , dispatch :: Action -> Aff Unit
   , name     :: Name
   , nodeType :: NodeType
   , nodeTypes :: Array NodeType