[Tree] update the tree state upon delete node

src/Gargantext/Components/Tree.purs

@@ -8,6 +8,7 @@ import Affjax.RequestBody (RequestBody(..))
 import Affjax.ResponseFormat as ResponseFormat
 import CSS (backgroundColor, borderRadius, boxShadow, justifyContent, marginTop)
 import Control.Monad.Cont.Trans (lift)
+import Data.Array (filter)
 import Data.Argonaut (class DecodeJson, class EncodeJson, Json, decodeJson, encodeJson, jsonEmptyObject, (.?), (:=), (~>))
 import Data.Argonaut.Core (Json)
 import Data.Either (Either(..))
@@ -42,6 +43,12 @@ data NTree a = NTree a (Array (NTree a))
 instance ntreeFunctor :: Functor NTree where
   map f (NTree x ary) = NTree (f x) (map (map f) ary)
 
+-- Keep only the nodes matching the predicate.
+-- The root of the tree is always kept.
+filterNTree :: forall a. (a -> Boolean) -> NTree a -> NTree a
+filterNTree p (NTree x ary) =
+  NTree x $ map (filterNTree p) $ filter (\(NTree a _) -> p a) ary
+
 type FTree = NTree LNode
 
 data Action =  ShowPopOver ID
@@ -58,12 +65,14 @@ data Action =  ShowPopOver ID
 
 type State = { state :: FTree }
 
+-- TODO remove
 initialState :: State
 initialState = { state: NTree (LNode {id : 3, name : "hello", nodeType : Node, open : true, popOver : false, renameNodeValue : "", createNode : false, nodeValue : "InitialNode", showRenameBox : false}) [] }
 
 mapFTree :: (FTree -> FTree) -> State -> State
 mapFTree f {state} = {state: f state}
 
+-- TODO: make it a local function
 performAction :: forall props. PerformAction State props Action
 
 performAction (ToggleFolder i) _ _ =
@@ -82,9 +91,8 @@ performAction (ToggleCreateNode id) _ _ =
   modifyState_ $ mapFTree $ showCreateNode id
 
 performAction (DeleteNode nid) _ _ = do
-  d <- lift $ deleteNode nid
-  --- TODO : Need to update state once API is called
-  pure unit
+  void $ lift $ deleteNode nid
+  modifyState_ $ mapFTree $ filterNTree (\(LNode {id}) -> id /= nid)
 
 performAction (Submit rid name) _  _  = do
   void $ lift $ renameNode rid $ RenameValue {name}
@@ -118,6 +126,7 @@ showPopOverNode :: Int -> LNode -> LNode
 showPopOverNode sid (LNode node) =
   LNode $ node {showRenameBox = toggleIf (sid == node.id) node.showRenameBox}
 
+-- TODO: DRY, NTree.map
 showCreateNode :: Int -> NTree LNode -> NTree LNode
 showCreateNode sid (NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue, createNode, nodeValue, showRenameBox}) ary) =
   NTree (LNode {id,name, nodeType, open , popOver, renameNodeValue, createNode : createNode', nodeValue, showRenameBox}) $ map (showCreateNode sid) ary
@@ -133,21 +142,21 @@ showCreateNode sid (NTree (LNode {id, name, nodeType, open, popOver, renameNodeV
 --     NTree (LNode {id,name, nodeType, open , popOver, renameNodeValue, createNode , nodeValue}) $ map (getCreateNode sid) ary
 --     createNode' = if sid == id then  nodeValue else ""
 
-
+-- TODO: DRY, NTree.map
 rename :: Int ->  String -> NTree LNode  -> NTree LNode
 rename sid v (NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue, createNode, nodeValue, showRenameBox}) ary)  =
   NTree (LNode {id,name, nodeType, open , popOver , renameNodeValue : rvalue, createNode, nodeValue, showRenameBox}) $ map (rename sid  v) ary
   where
     rvalue = if sid == id then  v   else ""
 
-
+-- TODO: DRY, NTree.map
 setNodeValue :: Int ->  String -> NTree LNode  -> NTree LNode
 setNodeValue sid v (NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue, createNode, nodeValue, showRenameBox}) ary)  =
   NTree (LNode {id,name, nodeType, open , popOver , renameNodeValue , createNode, nodeValue : nvalue, showRenameBox}) $ map (setNodeValue sid  v) ary
   where
     nvalue = if sid == id then  v   else ""
 
-
+-- TODO: DRY, NTree.map
 toggleNode :: Int -> NTree LNode -> NTree LNode
 toggleNode sid (NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue, createNode, nodeValue, showRenameBox}) ary) =
   NTree (LNode {id,name, nodeType, open : nopen, popOver, renameNodeValue, createNode, nodeValue, showRenameBox}) $ map (toggleNode sid) ary
@@ -420,8 +429,8 @@ newtype RenameValue = RenameValue
   }
 
 instance encodeJsonRenameValue :: EncodeJson RenameValue where
-  encodeJson (RenameValue post)
-     = "r_name" := post.name
+  encodeJson (RenameValue {name})
+     = "r_name" := name
     ~> jsonEmptyObject
 
 renameNode :: Int -> RenameValue -> Aff (Array Int)

src/Gargantext/Pages/Corpus/Tabs/Ngrams/NgramsTable.purs

@@ -46,7 +46,6 @@ import Gargantext.Components.Table as T
 import Gargantext.Prelude
 import Gargantext.Config
 import Gargantext.Config.REST
-import Gargantext.Components.Tree (NTree(..))
 import Gargantext.Components.Loader as Loader
 import Gargantext.Pages.Corpus.Tabs.Types (CorpusInfo(..), PropsRow)
 

src/Gargantext/Pages/Layout/States.purs

@@ -6,7 +6,6 @@ import Data.Lens                                       (Lens', lens)
 import Data.Maybe                                      (Maybe(Just))
 import Effect (Effect)
 import Gargantext.Components.Login                  as LN
-import Gargantext.Components.Tree                   as Tree
 
 import Gargantext.Pages.Corpus.Document       as D
 import Gargantext.Pages.Corpus.Graph     as GE