[tree] Some graph refresh icon refactoring

Related to #131

src/Gargantext/Components/Forest/Tree.purs

@@ -168,14 +168,14 @@ type PerformActionProps =
 performAction :: Record PerformActionProps
               -> Action
               -> Aff Unit
-performAction { openNodes: (_ /\ setOpenNodes)
-              , reload: (_ /\ setReload)
-              , session
-              , tree: (NTree (LNode {id}) _) } DeleteNode = do
+performAction p@{ openNodes: (_ /\ setOpenNodes)
+                , reload: (_ /\ setReload)
+                , session
+                , tree: (NTree (LNode {id}) _) } DeleteNode = do
   void $ deleteNode session id
   liftEffect do
     setOpenNodes (Set.delete (mkNodeId session id))
-    setReload (_ + 1)
+  performAction p RefreshTree
 
 performAction { reload: (_ /\ setReload)
               , session
@@ -184,21 +184,20 @@ performAction { reload: (_ /\ setReload)
   liftEffect $ setAsyncTasks $ A.cons task
   liftEffect $ log2 "[performAction] SearchQuery task:" task
 
-performAction { reload: (_ /\ setReload)
-              , session
-              , tree: (NTree (LNode {id}) _) } (Submit name)  = do
+performAction p@{ reload: (_ /\ setReload)
+                , session
+                , tree: (NTree (LNode {id}) _) } (Submit name)  = do
   void $ renameNode session id $ RenameValue {name}
-  liftEffect do
-    setReload (_ + 1)
+  performAction p RefreshTree
 
-performAction { openNodes: (_ /\ setOpenNodes)
-              , reload: (_ /\ setReload)
-              , session
-              , tree: (NTree (LNode {id}) _) } (CreateSubmit name nodeType) = do
+performAction p@{ openNodes: (_ /\ setOpenNodes)
+                , reload: (_ /\ setReload)
+                , session
+                , tree: (NTree (LNode {id}) _) } (CreateSubmit name nodeType) = do
   void $ createNode session id $ CreateValue {name, nodeType}
   liftEffect do
     setOpenNodes (Set.insert (mkNodeId session id))
-    setReload (_ + 1)
+  performAction p RefreshTree
 
 performAction { session
               , tasks: (_ /\ setAsyncTasks)
@@ -206,3 +205,6 @@ performAction { session
   task <- uploadFile session nodeType id fileType {mName, contents}
   liftEffect $ setAsyncTasks $ A.cons task
   liftEffect $ log2 "uploaded, task:" task
+
+performAction { reload: (_ /\ setReload) } RefreshTree = do
+  liftEffect $ setReload (_ + 1)

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

@@ -19,6 +19,7 @@ data Action = CreateSubmit String GT.NodeType
             | SearchQuery GT.AsyncTaskWithType
             | Submit       String
             | UploadFile  GT.NodeType FileType (Maybe String) UploadFileContents
+            | RefreshTree
 
 -----------------------------------------------------
 -- UploadFile Action

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

@@ -24,7 +24,7 @@ import Gargantext.Components.Forest.Tree.Node.Action (Action(..), DroppedFile(..
 import Gargantext.Components.Forest.Tree.Node.Action.Add (NodePopup(..), createNodeView)
 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)
+import Gargantext.Components.Forest.Tree.Node.ProgressBar (asyncProgressBar, BarType(..))
 import Gargantext.Components.GraphExplorer.API as GEAPI
 import Gargantext.Components.Search.SearchBar (searchBar)
 import Gargantext.Components.Search.SearchField (Search, defaultSearch, isIsTex)
@@ -89,9 +89,13 @@ nodeMainSpan p@{ dispatch, folderOpen, frontends, session } = R.createElement el
               }
           [ nodeText { isSelected: (mCorpusId mCurrentRoute) == (Just id)
                      , name: name' props } ]
-        , nodeActions { id, nodeType, session }
+        , nodeActions { id
+                      , nodeType
+                      , refreshTree: const $ dispatch RefreshTree
+                      , session }
         , fileTypeView {dispatch, droppedFile, id, isDragOver, nodeType}
         , H.div {} (map (\t -> asyncProgressBar { asyncTask: t
+                                                , barType: Pie
                                                 , corpusId: id
                                                 , onFinish: const $ onAsyncTaskFinish t
                                                 , session }) asyncTasks)
@@ -192,6 +196,7 @@ type NodeActionsProps =
   (
     id :: ID
   , nodeType :: GT.NodeType
+  , refreshTree :: Unit -> Aff Unit
   , session :: Session
   )
 
@@ -201,24 +206,21 @@ nodeActions p = R.createElement nodeActionsCpt p []
 nodeActionsCpt :: R.Component NodeActionsProps
 nodeActionsCpt = R.hooksComponent "G.C.F.T.N.B.nodeActions" cpt
   where
-    cpt { id, nodeType: GT.Graph, session } _ = do
-      refresh <- R.useState' 0
-
-      useLoader (id /\ fst refresh) (graphVersions session) $ \gv ->
-        nodeActionsGraph { id, graphVersions: gv, session, triggerRefresh: triggerRefresh refresh }
+    cpt { id, nodeType: GT.Graph, refreshTree, session } _ = do
+      useLoader id (graphVersions session) $ \gv ->
+        nodeActionsGraph { id, graphVersions: gv, session, triggerRefresh: triggerRefresh refreshTree }
     cpt _ _ = do
       pure $ H.div {} []
 
-    graphVersions session (graphId /\ _) =
-      GEAPI.graphVersions { graphId, session }
-    triggerRefresh (_ /\ setRefresh) _ = setRefresh $ (+) 1
+    graphVersions session graphId = GEAPI.graphVersions { graphId, session }
+    triggerRefresh refreshTree = refreshTree
 
 type NodeActionsGraphProps =
   (
     id :: ID
   , graphVersions :: Record GEAPI.GraphVersions
   , session :: Session
-  , triggerRefresh :: Unit -> Effect Unit
+  , triggerRefresh :: Unit -> Aff Unit
   )
 
 nodeActionsGraph :: Record NodeActionsGraphProps -> R.Element
@@ -239,7 +241,7 @@ type GraphUpdateButtonProps =
   (
     id :: ID
   , session :: Session
-  , triggerRefresh :: Unit -> Effect Unit
+  , triggerRefresh :: Unit -> Aff Unit
   )
 
 graphUpdateButton :: Record GraphUpdateButtonProps -> R.Element
@@ -262,7 +264,7 @@ graphUpdateButtonCpt = R.hooksComponent "G.C.F.T.N.B.graphUpdateButton" cpt
             liftEffect $ setEnabled $ const false
             g <- GEAPI.updateGraphVersions { graphId: id, session }
             liftEffect $ setEnabled $ const true
-            liftEffect $ triggerRefresh unit
+            triggerRefresh unit
           pure unit
 
 -- END nodeActions

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

@@ -19,9 +19,13 @@ import Reactix as R
 import Reactix.DOM.HTML as H
 
 
+data BarType = Bar | Pie
+
+
 type Props =
   (
     asyncTask :: GT.AsyncTaskWithType
+  , barType   :: BarType
   , corpusId  :: ID
   , onFinish  :: Unit -> Effect Unit
   , session   :: Session