[FEAT] UpdateNode type and json instance

src/Gargantext/Components/Forest/Tree.purs

@@ -13,7 +13,7 @@ import Reactix.DOM.HTML as H
 import Record as Record
 import Record.Extra as RecordE
 
-import Gargantext.Components.Forest.Tree.Node.Action (Action(..), CreateValue(..), FTree, ID, LNode(..), NTree(..), Reload, RenameValue(..), Tree, createNode, deleteNode, loadNode, renameNode)
+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.Upload (uploadFile)
 import Gargantext.Components.Forest.Tree.Node.Box (nodeMainSpan)
 import Gargantext.Ends (Frontends)
@@ -209,7 +209,7 @@ performAction p@{ openNodes: (_ /\ setOpenNodes)
                 , session
                 , tree: (NTree (LNode {id}) _) } (CreateSubmit name nodeType) = do
   -- task <- createNodeAsync session id $ CreateValue {name, nodeType}
-  task <- createNode session id $ CreateValue {name, nodeType}
+  task <- addNode session id $ AddNodeValue {name, nodeType}
   -- liftEffect $ setAsyncTasks $ A.cons task
   liftEffect do
     setOpenNodes (Set.insert (mkNodeId session id))

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

@@ -60,18 +60,18 @@ type UploadFile =
   , name     :: String
   }
 
-createNode :: Session -> ID -> CreateValue -> Aff (Array ID)
-createNode session parentId = post session $ NodeAPI GT.Node (Just parentId) ""
+addNode :: Session -> ID -> AddNodeValue -> Aff (Array ID)
+addNode session parentId = post session $ NodeAPI GT.Node (Just parentId) ""
 
-createNodeAsync :: Session
+addNodeAsync :: Session
                 -> ID
-                -> CreateValue
+                -> AddNodeValue
                 -> Aff GT.AsyncTaskWithType
-createNodeAsync session parentId q = do
+addNodeAsync session parentId q = do
   task <- post session p q
-  pure $ GT.AsyncTaskWithType {task, typ: GT.CreateNode}
+  pure $ GT.AsyncTaskWithType {task, typ: GT.AddNode}
   where
-    p = GR.NodeAPI GT.Node (Just parentId) (GT.asyncTaskTypePath GT.CreateNode)
+    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"
@@ -87,29 +87,53 @@ updateNode :: Session -> ID -> Aff ID
 updateNode session nodeId = post session 
 -}
 
+-----------------------------------------------------------------------
 newtype RenameValue = RenameValue
-  { name :: Name
-  }
+  { name :: Name }
 
 instance encodeJsonRenameValue :: EncodeJson RenameValue where
   encodeJson (RenameValue {name})
      = "r_name" := name
     ~> jsonEmptyObject
 
-newtype CreateValue = CreateValue
+-----------------------------------------------------------------------
+newtype AddNodeValue = AddNodeValue
   { name     :: Name
   , nodeType :: GT.NodeType
   }
 
-instance encodeJsonCreateValue :: EncodeJson CreateValue where
-  encodeJson (CreateValue {name, 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 }
+                      | UpdateNodeParamsTexts { method :: Int }
+
+instance encodeJsonUpdateNodeParams :: EncodeJson UpdateNodeParams
+  where
+    encodeJson (UpdateNodeParamsList { method })
+      = "method" := method
+      ~> jsonEmptyObject
+    encodeJson (UpdateNodeParamsGraph { method })
+      = "method" := method
+      ~> jsonEmptyObject
+    encodeJson (UpdateNodeParamsTexts { method })
+      = "method" := method
+      ~> jsonEmptyObject
+
+
+-----------------------------------------------------------------------
+
+
 data NTree a = NTree a (Array (NTree a))
 type FTree = NTree LNode
-type Tree = { tree :: FTree, asyncTasks :: Array GT.AsyncTaskWithType }
+type Tree = { tree       :: FTree
+            , asyncTasks :: Array GT.AsyncTaskWithType
+            }
 
 instance ntreeFunctor :: Functor NTree where
   map f (NTree x ary) = NTree (f x) (map (map f) ary)
@@ -129,7 +153,8 @@ instance decodeJsonLNode :: DecodeJson LNode where
     nodeType <- obj .: "type"
     pure $ LNode { id : id_
                  , name
-                 , nodeType}
+                 , nodeType
+                 }
 
 instance decodeJsonFTree :: DecodeJson (NTree LNode) where
   decodeJson json = do

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

@@ -28,11 +28,11 @@ type CreateNodeProps =
   , nodeTypes :: Array NodeType
   )
 
-createNodeView :: Record CreateNodeProps
+addNodeView :: Record CreateNodeProps
                -> R.Element
-createNodeView p@{ dispatch, nodeType, nodeTypes } = R.createElement el p []
+addNodeView p@{ dispatch, nodeType, nodeTypes } = R.createElement el p []
   where
-    el = R.hooksComponent "CreateNodeView" cpt
+    el = R.hooksComponent "AddNodeView" cpt
     cpt {id, name} _ = do
       nodeName <- R.useState' "Name"
       nodeType' <- R.useState' $ fromMaybe NodeUser $ head nodeTypes
@@ -103,7 +103,6 @@ createNodeView p@{ dispatch, nodeType, nodeTypes } = R.createElement el p []
 
 -- END Create Node
 
-
 showConfig :: NodeType -> R.Element
 showConfig NodeUser      = H.div {} []
 showConfig FolderPrivate = H.div {} [H.text "This folder will be private only"]
@@ -111,4 +110,3 @@ showConfig FolderShared  = H.div {} [H.text "This folder will be shared"]
 showConfig FolderPublic  = H.div {} [H.text "This folder will be public"]
 showConfig nt            = H.div {} [H.h4  {} [H.text $ "Config of " <> show nt ]]
 
-

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

@@ -18,7 +18,7 @@ import Effect.Console
 import Effect.Uncurried (mkEffectFn1)
 import Gargantext.Components.Forest.Tree.Node (NodeAction(..), SettingsBox(..), glyphiconNodeAction, settingsBox)
 import Gargantext.Components.Forest.Tree.Node.Action (Action(..), DroppedFile(..), FileType(..), ID, Name, UploadFileContents(..))
-import Gargantext.Components.Forest.Tree.Node.Action.Add (NodePopup(..), createNodeView)
+import Gargantext.Components.Forest.Tree.Node.Action.Add (NodePopup(..), addNodeView)
 import Gargantext.Components.Forest.Tree.Node.Action.Rename (renameBox)
 import Gargantext.Components.Forest.Tree.Node.Action.Upload (uploadFileView, fileTypeView, uploadTermListView, copyFromCorpusView)
 import Gargantext.Components.Forest.Tree.Node.ProgressBar (asyncProgressBar, BarType(..))
@@ -542,7 +542,7 @@ panelActionCpt = R.hooksComponent "G.C.F.T.N.B.panelAction" cpt
     cpt {action: Delete, nodeType, dispatch}              _ = actionDelete   nodeType dispatch
 
     cpt {action: Add xs, dispatch, id, name, nodePopup: p, nodeType} _ = do
-      pure $ createNodeView {dispatch, id, name, nodeType, nodeTypes: xs}
+      pure $ addNodeView {dispatch, id, name, nodeType, nodeTypes: xs}
 
     cpt {action: CopyFromCorpus, dispatch, id, nodeType, session} _ = do
       pure $ copyFromCorpusView {dispatch, id, nodeType, session}

src/Gargantext/Types.purs

@@ -457,11 +457,11 @@ modeTabType Institutes = CTabInstitutes
 modeTabType Terms      = CTabTerms
 
 modeFromString :: String -> Maybe Mode
-modeFromString "Authors" = Just Authors
-modeFromString "Sources" = Just Sources
+modeFromString "Authors"    = Just Authors
+modeFromString "Sources"    = Just Sources
 modeFromString "Institutes" = Just Institutes
-modeFromString "Terms" = Just Terms
-modeFromString _ = Nothing
+modeFromString "Terms"      = Just Terms
+modeFromString _            = Nothing
 
 -- | Async tasks
 
@@ -469,7 +469,7 @@ modeFromString _ = Nothing
 data AsyncTaskType = Form
                    | GraphT
                    | Query
-                   | CreateNode
+                   | AddNode
                    | UpdateNode
 derive instance genericAsyncTaskType :: Generic AsyncTaskType _
 
@@ -477,7 +477,7 @@ asyncTaskTypePath :: AsyncTaskType -> String
 asyncTaskTypePath Form   = "add/form/async/"
 asyncTaskTypePath Query  = "query/"
 asyncTaskTypePath GraphT = "async/"
-asyncTaskTypePath CreateNode = "async/nobody/"
+asyncTaskTypePath AddNode = "async/nobody/"
 asyncTaskTypePath UpdateNode = "async/"
 
 type AsyncTaskID = String