Merge branch 'feature/toestand-global-state' of...

Merge branch 'feature/toestand-global-state' of ssh://gitlab.iscpif.fr:20022/gargantext/purescript-gargantext into dev-merge

Dockerfile.dev

@@ -9,6 +9,8 @@ RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources
 RUN apt-get update && apt-get install -y yarn
 RUN curl -L https://github.com/coot/zephyr/releases/download/v0.3.2/Linux.tar.gz | tar zx -C /usr/bin --strip-components=1 zephyr/zephyr
 
+RUN curl -L https://github.com/dhall-lang/dhall-haskell/releases/download/1.38.1/dhall-json-1.7.6-x86_64-linux.tar.bz2 | tar jx -C /usr/bin --strip-components=2 ./bin/dhall-to-json
+
 WORKDIR /opt/app
 EXPOSE 5000/tcp
 CMD ["bash"]
\ No newline at end of file

dist/styles/sass.css

@@ -642,10 +642,11 @@ li .leaf:hover a.settings {
   list-style: decimal !important;
 }
 
-#page-wrapper .cache-toggle {
+.cache-toggle {
   cursor: pointer;
 }
-#page-wrapper .side-panel {
+
+.side-panel {
   left: 70%;
   padding: 5px;
   position: fixed;
@@ -653,14 +654,14 @@ li .leaf:hover a.settings {
   background-color: #fff;
   width: 28%;
 }
-#page-wrapper .side-panel .header {
+.side-panel .header {
   float: right;
 }
-#page-wrapper .side-panel .corpus-doc-view .annotated-field-wrapper .annotated-field-runs {
+.side-panel .corpus-doc-view .annotated-field-wrapper .annotated-field-runs {
   max-height: 200px;
   overflow-y: scroll;
 }
-#page-wrapper .side-panel .corpus-doc-view .list-group .list-group-item-heading {
+.side-panel .corpus-doc-view .list-group .list-group-item-heading {
   display: inline-block;
   width: 60px;
 }

dist/styles/sass.css.map

-{"version":3,"sourceRoot":"","sources":["../../src/sass/_menu.sass","../../src/sass/_context_menu.sass","../../src/sass/_graph.sass","../../src/sass/_login.sass","../../src/sass/_tree.sass","../../src/sass/_code_editor.sass","../../src/sass/_styles.sass","../../src/sass/_range_slider.sass","../../src/sass/_annotation.sass","../../src/sass/_folder_view.sass"],"names":[],"mappings":"AAAA;AAEA;AACA;AACA;AACA;AACA;AAEA;EACI;EACA;;;AAEJ;EACI;EACA;EACA;EACA;;;AAEJ;EACE;;;AAEF;AACI;EACA;;;AAEJ;AACI;EACA;;;AAGJ;AACA;EACI;;;AAEJ;EACI;EACA;EACA;EACA;;;AAEJ;EACE;EACA;;;AAEF;EACE;;;AC7CF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;;;AClBF;EACE;EACA;EACA;;;AAEF;AAkCE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAxCA;EAZA;EACA;EAEA;EAWE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEF;EACE;EACA;;AAGA;EACE;EACA;;AACN;EACE;;AACF;EACE;;AAEF;EApCA;EACA;EAEA;EAmCE;EACA;;AACF;EACE;;AACF;EACE;;AAWF;EAEE;EACA;EACA;EACA;EAEA;EACA;EACA;;AAEA;EACE;;AAEJ;EACE;;AAEA;EACE;;AAEJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;;;ACrFJ;EACE;;;AAOF;EACE;;AACA;EACE;EACA;;;AAEJ;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAGF;EACE;;AAEE;EACE;EACA;;AACA;EACE;;;AAIJ;EACE;EACA;EACA;EACA;;;AAKJ;EACE;EACA;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACF;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;;AACF;EACE;EACA;EACA;EACA;;AACA;EACE;;AACN;EACE;EACA;EACA;EACA;;;AAGN;EACE;EACA;EACA;EACA;EACA;;AAGE;EACE;;;AAEN;EACE;EACA;EACA;EACA;EACA;;AAGE;EACE;;;AAEN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;;AAEJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;;AAGF;EACE;;;AAEJ;EACI;EACA;;;AAGF;EACE;;;AAEJ;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;ACvKF;EACE;;;AAGA;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGA;EACE;;AACF;EACE;;AAEJ;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;;AAGN;EACE;;;AAIA;EACE;;AACA;EACE;EACA;EACA;EACA;;AACF;EACE;EACA;EACA;EACA;EACA;;AACF;EACE;;AACF;EACE;EACA;EACA;EAEA;EACA;EACA;;AAEA;EACE;;AACF;EACE;;AAGN;EACE;;AACF;EACE;;AACA;EACE;EACA;;AAEE;EACE;EACA;;AACF;EACE;EACA;;AAIR;EACE;;AACF;EACE;;AACA;EACE;EACA;;AAEE;EACE;EACA;;AACF;EACE;EACA;;AACF;EACE;EACA;;AAEV;EACE;;AACF;EACE;;AAEE;EACE;;AACF;EACE;;AACN;EACE;;AAEE;EACE;;;AAGR;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AAEF;EACE;;;AAIF;EACE;;AAEA;EACE;;;AAGN;EACE;;AACF;EACE;;AACF;EACE;;;AAEJ;EACE;;;ACpJE;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EApCR;EACA;EACA;EACA;EACA;EACA;EACA;EAlBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AA0CM;EACE;EACA;EACA;EACA;EACA;EA5CR;EACA;EACA;EACA;EACA;EACA;EACA;EAlBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAkDE;EACE;EACA;EACA;EACA;EACA;EACA;;AACF;EACE;EACA;EACA;;AACA;EACE;EACA;;AACF;EACE;EACA;;AACF;EACE;EACA;;AAGE;EACE;;AAEF;EACE;;;ACrFV;EACE;;AACF;EAEE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAGE;EACE;EACA;;AAEF;EACE;EACA;;;AAEV;EACE;;AACA;EACE;;AACF;EACE;EACA;EACA;;;AAIA;EACE;;AACA;EACE;EACA;;AACF;EACE;;AACA;EACE;;AACJ;EACE;;;AAER;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;AAGI;EACE;;AACF;EACE;;;AAEN;EACE;EACA;EACA;;;AAIA;EACE;;AACF;EACE;;;AAEJ;EACE;;AACA;EACE;;;AAEJ;EACE;EACA;;;AClFF;EACE;AACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EAEA;EAEA;;AAEA;EACE;EAEA;EACA;EACA;;;AAGN;EACE;;;ACxBJ;EACE;;AAEA;EANE;EACA;;AAQF;EAbE;EACA;;AAeF;EAhBE;EACA;;AAkBF;EAnBE;EACA;;AAqBF;EA1BE;EACA,kBANyB;;AAkC3B;EA7BE;EACA,kBAPqB;;AAsCvB;EAhCE;EACA,kBAJoB;;;AAuCtB;EApCE;EACA,kBANyB;;AA4C3B;EAvCE;EACA,kBAPqB;;AAgDvB;EA1CE;EACA,kBAJoB;;;ACRxB;EACE;EACA;EACA;EACA","file":"sass.css"}
+{"version":3,"sourceRoot":"","sources":["../../src/sass/_menu.sass","../../src/sass/_context_menu.sass","../../src/sass/_graph.sass","../../src/sass/_login.sass","../../src/sass/_tree.sass","../../src/sass/_code_editor.sass","../../src/sass/_styles.sass","../../src/sass/_range_slider.sass","../../src/sass/_annotation.sass","../../src/sass/_folder_view.sass"],"names":[],"mappings":"AAAA;AAEA;AACA;AACA;AACA;AACA;AAEA;EACI;EACA;;;AAEJ;EACI;EACA;EACA;EACA;;;AAEJ;EACE;;;AAEF;AACI;EACA;;;AAEJ;AACI;EACA;;;AAGJ;AACA;EACI;;;AAEJ;EACI;EACA;EACA;EACA;;;AAEJ;EACE;EACA;;;AAEF;EACE;;;AC7CF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;;;AClBF;EACE;EACA;EACA;;;AAEF;AAkCE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAxCA;EAZA;EACA;EAEA;EAWE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEF;EACE;EACA;;AAGA;EACE;EACA;;AACN;EACE;;AACF;EACE;;AAEF;EApCA;EACA;EAEA;EAmCE;EACA;;AACF;EACE;;AACF;EACE;;AAWF;EAEE;EACA;EACA;EACA;EAEA;EACA;EACA;;AAEA;EACE;;AAEJ;EACE;;AAEA;EACE;;AAEJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;;;ACrFJ;EAEE;;;AAQF;EACE;;AACA;EACE;EACA;;;AAEJ;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAGF;EACE;;AAEE;EACE;EACA;;AACA;EACE;;;AAIJ;EACE;EACA;EACA;EACA;;;AAKJ;EACE;EACA;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACF;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;;AACF;EACE;EACA;EACA;EACA;;AACA;EACE;;AACN;EACE;EACA;EACA;EACA;;;AAGN;EACE;EACA;EACA;EACA;EACA;;AAGE;EACE;;;AAEN;EACE;EACA;EACA;EACA;EACA;;AAGE;EACE;;;AAEN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;;AAEJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;;AAGF;EACE;;;AAEJ;EACI;EACA;;;AAGF;EACE;;;AAEJ;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;ACzKF;EACE;;;AAGA;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGA;EACE;;AACF;EACE;;AAEJ;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;;AAGN;EACE;;;AAIA;EACE;;AACA;EACE;EACA;EACA;EACA;;AACF;EACE;EACA;EACA;EACA;EACA;;AACF;EACE;;AACF;EACE;EACA;EACA;EAEA;EACA;EACA;;AAEA;EACE;;AACF;EACE;;AAGN;EACE;;AACF;EACE;;AACA;EACE;EACA;;AAEE;EACE;EACA;;AACF;EACE;EACA;;AAIR;EACE;;AACF;EACE;;AACA;EACE;EACA;;AAEE;EACE;EACA;;AACF;EACE;EACA;;AACF;EACE;EACA;;AAEV;EACE;;AACF;EACE;;AAEE;EACE;;AACF;EACE;;AACN;EACE;;AAEE;EACE;;;AAGR;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AAEF;EACE;;;AAIF;EACE;;AAEA;EACE;;;AAGN;EACE;;AACF;EACE;;AACF;EACE;;;AAEJ;EACE;;;ACpJE;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EApCR;EACA;EACA;EACA;EACA;EACA;EACA;EAlBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AA0CM;EACE;EACA;EACA;EACA;EACA;EA5CR;EACA;EACA;EACA;EACA;EACA;EACA;EAlBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAkDE;EACE;EACA;EACA;EACA;EACA;EACA;;AACF;EACE;EACA;EACA;;AACA;EACE;EACA;;AACF;EACE;EACA;;AACF;EACE;EACA;;AAGE;EACE;;AAEF;EACE;;;ACtFZ;EACE;;;AACF;EAEE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAGE;EACE;EACA;;AAEF;EACE;EACA;;;AAER;EACE;;AACA;EACE;;AACF;EACE;EACA;EACA;;;AAIA;EACE;;AACA;EACE;EACA;;AACF;EACE;;AACA;EACE;;AACJ;EACE;;;AAER;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;AAGI;EACE;;AACF;EACE;;;AAEN;EACE;EACA;EACA;;;AAIA;EACE;;AACF;EACE;;;AAEJ;EACE;;AACA;EACE;;;AAEJ;EACE;EACA;;;ACjFF;EACE;AACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EAEA;EAEA;;AAEA;EACE;EAEA;EACA;EACA;;;AAGN;EACE;;;ACxBJ;EACE;;AAEA;EANE;EACA;;AAQF;EAbE;EACA;;AAeF;EAhBE;EACA;;AAkBF;EAnBE;EACA;;AAqBF;EA1BE;EACA,kBANyB;;AAkC3B;EA7BE;EACA,kBAPqB;;AAsCvB;EAhCE;EACA,kBAJoB;;;AAuCtB;EApCE;EACA,kBANyB;;AA4C3B;EAvCE;EACA,kBAPqB;;AAgDvB;EA1CE;EACA,kBAJoB;;;ACRxB;EACE;EACA;EACA;EACA","file":"sass.css"}
\ No newline at end of file

packages.dhall

@@ -80,6 +80,11 @@ let additions =
         , repo = "https://github.com/nwolverson/purescript-dom-filereader"
         , version = "v5.0.0"
         }
+      , formula = 
+        { dependencies = [ "effect", "prelude", "reactix", "record", "toestand", "tuples", "typelevel-prelude", "typisch" ]
+        , repo = "https://github.com/poorscript/purescript-formula"
+        , version = "v0.2.1"
+        }
       , markdown =
         { dependencies = [ "precise" ]
         , repo = "https://github.com/poorscript/purescript-markdown"
@@ -107,7 +112,17 @@ let additions =
           , "unsafe-coerce"
           ]
         , repo = "https://github.com/irresponsible/purescript-reactix"
-        , version = "v0.4.6"
+        , version = "v0.4.11"
+        }
+      , toestand = 
+        { dependencies = [ "effect", "reactix", "prelude", "record", "tuples", "typelevel-prelude", "typisch" ]
+        , repo = "https://github.com/poorscript/purescript-toestand"
+        , version = "v0.6.1"
+        }
+      , typisch = 
+        { dependencies = [ "prelude" ]
+        , repo = "https://github.com/poorscript/purescript-typisch"
+        , version = "v0.2.1"
         }
       , tuples-native =
         { dependencies =

src/Gargantext/AsyncTasks.purs

@@ -10,14 +10,13 @@ import Data.Either (Either(..))
 import Data.Map as Map
 import Data.Maybe (Maybe(..), maybe, fromMaybe)
 import Effect (Effect)
-import Reactix as R
-import Toestand as T
-import Web.Storage.Storage as WSS
-
 import Gargantext.Types as GT
 import Gargantext.Utils as GU
 import Gargantext.Utils.Reactix as R2
 import Gargantext.Utils.Toestand as T2
+import Reactix as R
+import Toestand as T
+import Web.Storage.Storage as WSS
 
 localStorageKey :: String
 localStorageKey = "garg-async-tasks"
@@ -56,8 +55,8 @@ removeTaskFromList ts (GT.AsyncTaskWithType { task: GT.AsyncTask { id: id' } })
   A.filter (\(GT.AsyncTaskWithType { task: GT.AsyncTask { id: id'' } }) -> id' /= id'') ts
 
 type ReductorProps = (
-    reloadForest :: T.Box T2.Reload
-  , reloadRoot   :: T.Box T2.Reload
+    reloadForest :: T2.ReloadS
+  , reloadRoot   :: T2.ReloadS
   , storage      :: Storage
   )
 
@@ -73,3 +72,26 @@ remove :: GT.NodeID -> GT.AsyncTaskWithType -> T.Box Storage -> Effect Unit
 remove id task storage = T.modify_ newStorage storage
   where
     newStorage s = Map.alter (maybe Nothing $ (\ts -> Just $ removeTaskFromList ts task)) id s
+
+
+-- When a task is finished: which tasks cause forest or app reload
+asyncTaskTriggersAppReload :: GT.AsyncTaskType -> Boolean
+asyncTaskTriggersAppReload _                     = false
+
+asyncTaskTTriggersAppReload :: GT.AsyncTaskWithType -> Boolean
+asyncTaskTTriggersAppReload (GT.AsyncTaskWithType { typ }) = asyncTaskTriggersAppReload typ
+
+asyncTaskTriggersMainPageReload :: GT.AsyncTaskType -> Boolean
+asyncTaskTriggersMainPageReload GT.UpdateNgramsCharts = true
+asyncTaskTriggersMainPageReload _                     = false
+
+asyncTaskTTriggersMainPageReload :: GT.AsyncTaskWithType -> Boolean
+asyncTaskTTriggersMainPageReload (GT.AsyncTaskWithType { typ }) = asyncTaskTriggersMainPageReload typ
+
+asyncTaskTriggersTreeReload :: GT.AsyncTaskType -> Boolean
+asyncTaskTriggersTreeReload GT.Form       = true
+asyncTaskTriggersTreeReload GT.UploadFile = true
+asyncTaskTriggersTreeReload _            = false
+
+asyncTaskTTriggersTreeReload :: GT.AsyncTaskWithType -> Boolean
+asyncTaskTTriggersTreeReload (GT.AsyncTaskWithType { typ }) = asyncTaskTriggersTreeReload typ

src/Gargantext/Components/App.purs

@@ -2,7 +2,6 @@ module Gargantext.Components.App (app) where
 
 import Gargantext.Prelude
 
-import Data.Maybe (Maybe(..))
 import Gargantext.AsyncTasks as GAT
 import Gargantext.Components.App.Data (emptyApp)
 import Gargantext.Components.Router (router)

src/Gargantext/Components/App/Data.purs

@@ -5,49 +5,76 @@ import Data.Maybe (Maybe(..))
 import Toestand as T
 
 import Gargantext.AsyncTasks as GAT
+import Gargantext.Components.GraphExplorer.Sidebar.Types as GEST
+import Gargantext.Components.Nodes.Lists.Types as ListsT
+import Gargantext.Components.Nodes.Texts.Types as TextsT
 import Gargantext.Ends (Backend)
 import Gargantext.Routes (AppRoute(Home))
 import Gargantext.Sessions as Sessions
-import Gargantext.Sessions (OpenNodes, Sessions)
-import Gargantext.Types (Handed(RightHanded))
+import Gargantext.Sessions (OpenNodes, Session, Sessions)
+import Gargantext.Types (Handed(RightHanded), SidePanelState(..))
 import Gargantext.Utils.Toestand as T2
 
 type App =
-  { backend      :: Maybe Backend
-  , forestOpen   :: OpenNodes
-  , handed       :: Handed
-  , reloadForest :: Int
-  , reloadRoot   :: Int
-  , route        :: AppRoute
-  , sessions     :: Sessions
-  , showCorpus   :: Boolean
-  , showLogin    :: Boolean
-  , tasks        :: GAT.Storage
+  { backend        :: Maybe Backend
+  , forestOpen     :: OpenNodes
+  , graphVersion   :: T2.Reload
+  , handed         :: Handed
+  , reloadForest   :: T2.Reload
+  , reloadMainPage :: T2.Reload
+  , reloadRoot     :: T2.Reload
+  , route          :: AppRoute
+  , session        :: Maybe Session
+  , sessions       :: Sessions
+  , showCorpus     :: Boolean
+  , showLogin      :: Boolean
+  , showTree       :: Boolean
+  , sidePanelGraph :: Maybe (Record GEST.SidePanel)
+  , sidePanelLists :: Maybe (Record ListsT.SidePanel)
+  , sidePanelTexts :: Maybe (Record TextsT.SidePanel)
+  , sidePanelState :: SidePanelState
+  , tasks          :: GAT.Storage
   }
 
 emptyApp :: App
 emptyApp =
-  { backend:      Nothing
-  , forestOpen:   Set.empty
-  , handed:       RightHanded
-  , reloadForest: T2.newReload
-  , reloadRoot:   T2.newReload
-  , route:        Home
-  , sessions:     Sessions.empty
-  , showCorpus:   false
-  , showLogin:    false
-  , tasks:        GAT.empty
+  { backend        : Nothing
+  , forestOpen     : Set.empty
+  , graphVersion   : T2.newReload
+  , handed         : RightHanded
+  , reloadForest   : T2.newReload
+  , reloadMainPage : T2.newReload
+  , reloadRoot     : T2.newReload
+  , route          : Home
+  , session        : Nothing
+  , sessions       : Sessions.empty
+  , showCorpus     : false
+  , showLogin      : false
+  , showTree       : true
+  , sidePanelGraph : GEST.initialSidePanel
+  , sidePanelLists : ListsT.initialSidePanel
+  , sidePanelTexts : TextsT.initialSidePanel
+  , sidePanelState : InitialClosed
+  , tasks          : GAT.empty
   }
 
 type Boxes =
-  { backend      :: T.Box (Maybe Backend)
-  , forestOpen   :: T.Box OpenNodes
-  , handed       :: T.Box Handed
-  , reloadForest :: T.Box T2.Reload
-  , reloadRoot   :: T.Box T2.Reload
-  , route        :: T.Box AppRoute
-  , sessions     :: T.Box Sessions
-  , showCorpus   :: T.Box Boolean
-  , showLogin    :: T.Box Boolean
-  , tasks        :: T.Box GAT.Storage
+  { backend        :: T.Box (Maybe Backend)
+  , forestOpen     :: T.Box OpenNodes
+  , graphVersion   :: T2.ReloadS
+  , handed         :: T.Box Handed
+  , reloadForest   :: T2.ReloadS
+  , reloadMainPage :: T2.ReloadS
+  , reloadRoot     :: T2.ReloadS
+  , route          :: T.Box AppRoute
+  , session        :: T.Box (Maybe Session)
+  , sessions       :: T.Box Sessions
+  , showCorpus     :: T.Box Boolean
+  , showLogin      :: T.Box Boolean
+  , showTree       :: T.Box Boolean
+  , sidePanelGraph :: T.Box (Maybe (Record GEST.SidePanel))
+  , sidePanelLists :: T.Box (Maybe (Record ListsT.SidePanel))
+  , sidePanelTexts :: T.Box (Maybe (Record TextsT.SidePanel))
+  , sidePanelState :: T.Box SidePanelState
+  , tasks          :: T.Box GAT.Storage
   }

src/Gargantext/Components/DocsTable.purs

@@ -15,11 +15,11 @@ import Data.Set (Set)
 import Data.Set as Set
 import Data.String as Str
 import Data.Symbol (SProxy(..))
-import Data.Tuple (Tuple(..), fst)
-import Data.Tuple.Nested ((/\))
+import Data.Tuple (Tuple(..))
+import DOM.Simple.Console (log2)
 import DOM.Simple.Event as DE
 import Effect (Effect)
-import Effect.Aff (Aff)
+import Effect.Aff (Aff, launchAff_)
 import Effect.Class (liftEffect)
 import Reactix as R
 import Reactix.DOM.HTML as H
@@ -31,14 +31,14 @@ import Gargantext.Components.DocsTable.Types
   ( DocumentsView(..), Hyperdata(..), LocalUserScore, Query, Response(..), sampleData )
 import Gargantext.Components.Table.Types as TT
 import Gargantext.Components.Nodes.Lists.Types as NT
-import Gargantext.Components.Nodes.Texts.Types (SidePanelTriggers)
+import Gargantext.Components.Nodes.Texts.Types as TextsT
 import Gargantext.Components.Table as TT
 import Gargantext.Ends (Frontends, url)
 import Gargantext.Hooks.Loader (useLoader, useLoaderWithCacheAPI, HashedResponse(..))
 import Gargantext.Routes as Routes
 import Gargantext.Routes (SessionRoute(NodeAPI))
 import Gargantext.Sessions (Session, sessionId, get, delete)
-import Gargantext.Types (ListId, NodeID, NodeType(..), OrderBy(..), TableResult, TabSubType, TabType, showTabType')
+import Gargantext.Types (ListId, NodeID, NodeType(..), OrderBy(..), SidePanelState(..), TableResult, TabSubType, TabType, showTabType')
 import Gargantext.Utils (sortWith)
 import Gargantext.Utils.CacheAPI as GUC
 import Gargantext.Utils.QueryString (joinQueryStrings, mQueryParamS, queryParam, queryParamS)
@@ -58,36 +58,35 @@ type Path a =
   , tabType   :: TabSubType a
   )
 
-type LayoutProps =
-  ( cacheState      :: T.Box NT.CacheState
-  , frontends       :: Frontends
-  , chart           :: R.Element
-  , listId          :: Int
-  , mCorpusId       :: Maybe Int
-  , nodeId          :: Int
-  -- , path         :: Record (Path a)
-  , session         :: Session
-  , showSearch      :: Boolean
-  , sidePanelTriggers :: Record SidePanelTriggers
-  , tabType         :: TabType
+type CommonProps =
+  ( cacheState     :: T.Box NT.CacheState
+  , frontends      :: Frontends
+  , listId         :: Int
+  , mCorpusId      :: Maybe Int
+  , nodeId         :: Int
+  , session        :: Session
+  , sidePanel      :: T.Box (Maybe (Record TextsT.SidePanel))
+  , sidePanelState :: T.Box SidePanelState
+  , tabType        :: TabType
   -- ^ tabType is not ideal here since it is too much entangled with tabs and
   -- ngramtable. Let's see how this evolves.  )
-  , totalRecords    :: Int
+  , totalRecords  :: Int
+  )
+
+type LayoutProps =
+  (
+    chart      :: R.Element
+  , showSearch :: Boolean
+  | CommonProps
+  -- , path      :: Record (Path a)
   )
 
 type PageLayoutProps =
-  ( cacheState        :: T.Box NT.CacheState
-  , frontends         :: Frontends
-  , key               :: String  -- NOTE Necessary to clear the component when cache state changes
-  , listId            :: Int
-  , mCorpusId         :: Maybe Int
-  , nodeId            :: Int
-  , params            :: TT.Params
-  , query             :: Query
-  , session           :: Session
-  , sidePanelTriggers :: Record SidePanelTriggers
-  , tabType           :: TabType
-  , totalRecords      :: Int
+  (
+    key    :: String  -- NOTE Necessary to clear the component when cache state changes
+  , params :: TT.Params
+  , query  :: Query
+  | CommonProps
   )
 
 _documentIdsDeleted  = prop (SProxy :: SProxy "documentIdsDeleted")
@@ -123,7 +122,8 @@ docViewCpt = here.component "docView" cpt where
                 , nodeId
                 , session
                 , showSearch
-                , sidePanelTriggers
+                , sidePanel
+                , sidePanelState
                 , tabType
                 , totalRecords
                 }
@@ -147,10 +147,11 @@ docViewCpt = here.component "docView" cpt where
                        , params
                        , query: query'
                        , session
-                       , sidePanelTriggers
+                       , sidePanel
+                       , sidePanelState
                        , tabType
                        , totalRecords
-                       } ] ] ]
+                       } [] ] ] ]
 
 type SearchBarProps =
   ( query :: T.Box Query )
@@ -246,8 +247,8 @@ filterDocs query docs = A.filter filterFunc docs
     filterFunc (Response { hyperdata: Hyperdata { title } }) =
       isJust $ Str.indexOf (Str.Pattern $ Str.toLower query) $ Str.toLower title
 
-pageLayout :: Record PageLayoutProps -> R.Element
-pageLayout props = R.createElement pageLayoutCpt props []
+pageLayout :: R2.Component PageLayoutProps
+pageLayout = R.createElement pageLayoutCpt
 
 pageLayoutCpt :: R.Component PageLayoutProps
 pageLayoutCpt = here.component "pageLayout" cpt where
@@ -259,7 +260,7 @@ pageLayoutCpt = here.component "pageLayout" cpt where
             , params
             , query
             , session
-            , sidePanelTriggers
+            , sidePanel
             , tabType } _ = do
     cacheState' <- T.useLive T.unequal cacheState
 
@@ -373,21 +374,25 @@ pagePaintRawCpt = here.component "pagePaintRawCpt" cpt where
                 , mCorpusId
                 , nodeId
                 , session
-                , sidePanelTriggers: sidePanelTriggers@{ currentDocIdRef }
+                , sidePanel
+                , sidePanelState
                 , totalRecords }
       , localCategories
       , params } _ = do
-
     reload <- T.useBox T2.newReload
+    mCurrentDocId <- T.useFocused
+          (maybe Nothing _.mCurrentDocId)
+          (\val -> maybe Nothing (\sp -> Just $ sp { mCurrentDocId = val })) sidePanel
+    mCurrentDocId' <- T.useLive T.unequal mCurrentDocId
 
     localCategories' <- T.useLive T.unequal localCategories
 
     pure $ TT.table
-      { syncResetButton : [ H.div {} [] ]
-      , colNames
+      { colNames
       , container: TT.defaultContainer { title: "Documents" }
       , params
-      , rows: rows reload localCategories'
+      , rows: rows reload localCategories' mCurrentDocId'
+      , syncResetButton : [ H.div {} [] ]
       , totalRecords
       , wrapColElts
       }
@@ -403,14 +408,19 @@ pagePaintRawCpt = here.component "pagePaintRawCpt" cpt where
           | otherwise = Routes.Document sid listId
         colNames = TT.ColumnName <$> [ "Show", "Tag", "Date", "Title", "Source", "Score" ]
         wrapColElts = const identity
-        rows reload localCategories' = row <$> A.toUnfoldable documents
+        rows reload localCategories' mCurrentDocId' = row <$> A.toUnfoldable documents
           where
             row dv@(DocumentsView r@{ _id, category }) =
               { row:
                 TT.makeRow [ -- H.div {} [ H.a { className, style, on: {click: click Favorite} } [] ]
                             H.div { className: "" }
-                                  [ docChooser { listId, mCorpusId, nodeId: r._id, selected, sidePanelTriggers, tableReload: reload } []
-                                                                   ]
+                                  [ docChooser { listId
+                                               , mCorpusId
+                                               , nodeId: r._id
+                                               , sidePanel
+                                               , sidePanelState
+                                               , tableReload: reload } []
+                                  ]
                           --, H.div { className: "column-tag flex" } [ caroussel { category: cat, nodeId, row: dv, session, setLocalCategories } [] ]
                           , H.div { className: "column-tag flex" }
                                   [ rating { nodeId
@@ -432,17 +442,17 @@ pagePaintRawCpt = here.component "pagePaintRawCpt" cpt where
               where
                 cat         = fromMaybe category (localCategories' ^. at _id)
                 -- checked    = Star_1 == cat
+                selected   = mCurrentDocId' == Just r._id
                 tClassName = trashClassName cat selected
                 className  = gi cat
-                selected   = R.readRef currentDocIdRef == Just r._id
 
 type DocChooser = (
-    listId            :: ListId
-  , mCorpusId         :: Maybe NodeID
-  , nodeId            :: NodeID
-  , selected          :: Boolean
-  , sidePanelTriggers :: Record SidePanelTriggers
-  , tableReload       :: T2.ReloadS
+    listId         :: ListId
+  , mCorpusId      :: Maybe NodeID
+  , nodeId         :: NodeID
+  , sidePanel      :: T.Box (Maybe (Record TextsT.SidePanel))
+  , sidePanelState :: T.Box SidePanelState
+  , tableReload    :: T2.ReloadS
   )
 
 docChooser :: R2.Component DocChooser
@@ -457,23 +467,38 @@ docChooserCpt = here.component "docChooser" cpt
     cpt { listId
         , mCorpusId: Just corpusId
         , nodeId
-        , selected
-        , sidePanelTriggers: { triggerAnnotatedDocIdChange }
+        , sidePanel
+        , sidePanelState
         , tableReload } _ = do
+      mCurrentDocId <- T.useFocused
+            (maybe Nothing _.mCurrentDocId)
+            (\val -> maybe Nothing (\sp -> Just $ sp { mCurrentDocId = val })) sidePanel
+      mCurrentDocId' <- T.useLive T.unequal mCurrentDocId
 
-      let eyeClass = if selected then "fa-eye" else "fa-eye-slash"
+      let selected = mCurrentDocId' == Just nodeId
+          eyeClass = if selected then "fa-eye" else "fa-eye-slash"
 
       pure $ H.div { className: "btn" } [
         H.span { className: "fa " <> eyeClass
-               , on: { click: onClick } } []
+               , on: { click: onClick selected } } []
       ]
       where
-        onClick _ = do
+        onClick selected _ = do
           -- log2 "[docChooser] onClick, listId" listId
           -- log2 "[docChooser] onClick, corpusId" corpusId
           -- log2 "[docChooser] onClick, nodeId" nodeId
-          R2.callTrigger triggerAnnotatedDocIdChange { corpusId, listId, nodeId }
-          T2.reload tableReload
+          -- R2.callTrigger triggerAnnotatedDocIdChange { corpusId, listId, nodeId }
+          -- T2.reload tableReload
+          if selected then do
+            T.write_ Nothing sidePanel
+            T.write_ Closed sidePanelState
+          else do
+            T.write_ (Just { corpusId: corpusId
+                          , listId: listId
+                          , mCurrentDocId: Just nodeId
+                          , nodeId: nodeId }) sidePanel
+            T.write_ Opened sidePanelState
+          log2 "[docChooser] sidePanel opened" sidePanelState
 
 
 newtype SearchQuery = SearchQuery {

src/Gargantext/Components/Forest.purs

@@ -9,8 +9,7 @@ module Gargantext.Components.Forest
   ) where
 
 import Data.Array as A
-import Data.Maybe (Maybe(..), fromMaybe)
-import Data.Tuple (fst)
+import Data.Maybe (Maybe, fromMaybe)
 import Data.Tuple.Nested ((/\))
 import Reactix as R
 import Reactix.DOM.HTML as H
@@ -33,25 +32,26 @@ here = R2.here "Gargantext.Components.Forest"
 
 -- Shared by components here with Tree
 type Common = 
-  ( frontends     :: Frontends
-  , handed        :: T.Box Handed
-  , reloadRoot    :: T.Box T2.Reload
-  , route         :: T.Box AppRoute
+  ( frontends      :: Frontends
+  , handed         :: T.Box Handed
+  , reloadMainPage :: T2.ReloadS
+  , reloadRoot     :: T2.ReloadS
+  , route          :: T.Box AppRoute
   )
 
 type Props =
   ( backend      :: T.Box (Maybe Backend)
   , forestOpen   :: T.Box OpenNodes
-  , reloadForest :: T.Box T2.Reload
+  , reloadForest :: T2.ReloadS
   , sessions     :: T.Box Sessions
   , showLogin    :: T.Box Boolean
+  , showTree     :: T.Box Boolean
   , tasks        :: T.Box GAT.Storage
   | Common 
   )
 
 type TreeExtra = (
     forestOpen :: T.Box OpenNodes
-  , session :: Session
   )
 
 forest :: R2.Component Props
@@ -64,45 +64,43 @@ forestCpt = here.component "forest" cpt where
             , frontends
             , handed
             , reloadForest
+            , reloadMainPage
             , reloadRoot
             , route
             , sessions
             , showLogin
+            , showTree
             , tasks } _ = do
     -- TODO Fix this. I think tasks shouldn't be a Box but only a Reductor
     -- tasks'        <- GAT.useTasks reloadRoot reloadForest
     -- R.useEffect' $ do
     --   T.write_ (Just tasks') tasks
     handed'       <- T.useLive T.unequal handed
-    reloadForest' <- T.useLive T.unequal reloadForest
+    sessions'     <- T.useLive T.unequal sessions
+    -- forestOpen'   <- T.useLive T.unequal forestOpen
     -- reloadRoot'   <- T.useLive T.unequal reloadRoot
     -- route'        <- T.useLive T.unequal route
-    forestOpen'   <- T.useLive T.unequal forestOpen
-    sessions'     <- T.useLive T.unequal sessions
+
+    showTree' <- T.useLive T.unequal showTree
 
     -- TODO If `reloadForest` is set, `reload` state should be updated
     -- TODO fix tasks ref
-    -- R.useEffect' $ do
-      -- R.setRef tasks $ Just tasks'
-    R2.useCache
-      ( frontends /\ sessions' /\ handed' /\ forestOpen' /\ reloadForest' )
-      (cp handed' sessions')
-        where
-          common = RX.pick props :: Record Common
-          cp handed' sessions' _ =
-            pure $ H.div { className: "forest" }
-              (A.cons (plus handed' showLogin) (trees handed' sessions'))
-          trees handed' sessions' = (tree handed') <$> unSessions sessions'
-          tree handed' s@(Session {treeId}) =
-            treeLoader { forestOpen
-                       , frontends
-                       , handed: handed'
-                       , reload: reloadForest
-                       , reloadRoot
-                       , root: treeId
-                       , route
-                       , session: s
-                       , tasks } []
+    pure $ H.div { className: "forest " <> if showTree' then "" else "d-none" }
+      (A.cons (plus handed' showLogin) (trees handed' sessions'))
+    where
+      common = RX.pick props :: Record Common
+      trees handed' sessions' = (tree handed') <$> unSessions sessions'
+      tree handed' s@(Session {treeId}) =
+        treeLoader { forestOpen
+                   , frontends
+                   , handed: handed'
+                   , reload: reloadForest
+                   , reloadMainPage
+                   , reloadRoot
+                   , root: treeId
+                   , route
+                   , session: s
+                   , tasks } []
 
 plus :: Handed -> T.Box Boolean -> R.Element
 plus handed showLogin = H.div { className: "row" }
@@ -155,7 +153,8 @@ forestLayoutMain = R.createElement forestLayoutMainCpt
 
 forestLayoutMainCpt :: R.Component Props
 forestLayoutMainCpt = here.component "forestLayoutMain" cpt where
-  cpt props children = pure $ forestLayoutRaw props [ mainPage {} children ]
+  cpt props@{ reloadMainPage } children =
+    pure $ forestLayoutRaw props [ mainPage {} children ]
 
 forestLayoutRaw :: R2.Component Props
 forestLayoutRaw = R.createElement forestLayoutRawCpt
@@ -166,9 +165,11 @@ forestLayoutRawCpt = here.component "forestLayoutRaw" cpt where
         , forestOpen
         , frontends
         , reloadForest
+        , reloadMainPage
         , reloadRoot
         , route
         , sessions
+        , showTree
         , showLogin
         , tasks } children = do
     handed' <- T.useLive T.unequal p.handed
@@ -184,9 +185,11 @@ forestLayoutRawCpt = here.component "forestLayoutRaw" cpt where
                  , forestOpen
                  , handed
                  , reloadForest
+                 , reloadMainPage
                  , reloadRoot
                  , route
                  , sessions
+                 , showTree
                  , showLogin
                  , tasks } []
 

src/Gargantext/Components/Forest/Tree.purs

@@ -6,7 +6,6 @@ import Data.Array as A
 import Data.Maybe (Maybe(..))
 import Data.Set as Set
 import Data.Traversable (traverse_, traverse)
-import Data.Tuple (snd)
 import DOM.Simple.Console (log, log2)
 import Effect (Effect)
 import Effect.Aff (Aff)
@@ -47,7 +46,8 @@ here = R2.here "Gargantext.Components.Forest.Tree"
 
 -- Shared by every component here + performAction + nodeSpan
 type Universal =
-  ( reloadRoot :: T.Box T2.Reload )
+  ( reloadMainPage :: T2.ReloadS
+  , reloadRoot     :: T2.ReloadS )
 
 -- Shared by every component here + nodeSpan
 type Global =
@@ -60,7 +60,7 @@ type Global =
 -- Shared by every component here
 type Common = (
    forestOpen :: T.Box OpenNodes
- , reload     :: T.Box T2.Reload
+ , reload     :: T2.ReloadS
  | Global
  )
 
@@ -90,7 +90,7 @@ getNodeTree session nodeId = get session $ GR.NodeAPI GT.Tree (Just nodeId) ""
 getNodeTreeFirstLevel :: Session -> ID -> Aff FTree
 getNodeTreeFirstLevel session nodeId = get session $ GR.TreeFirstLevel (Just nodeId) ""
 
-type NodeProps = ( reloadTree :: T.Box T2.Reload, session :: Session | Common )
+type NodeProps = ( reloadTree :: T2.ReloadS, session :: Session | Common )
 
 type TreeProps = ( tree :: FTree | NodeProps )
 
@@ -99,42 +99,72 @@ tree props = R.createElement treeCpt props []
 
 treeCpt :: R.Component TreeProps
 treeCpt = here.component "tree" cpt where
-  cpt p@{ session, tree: NTree (LNode { id, name, nodeType }) children } _ = do
+  cpt p@{ reload, session, tree: NTree (LNode { id, name, nodeType }) children } _ = do
     setPopoverRef <- R.useRef Nothing
     folderOpen <- T2.useMemberBox nodeId p.forestOpen
-    folderOpen' <- T.useLive T.unequal folderOpen
-    pure $ H.ul { className: ulClass <> " " <> handedClass }
-      [ H.li { className: childrenClass children }
+    pure $ H.ul { className: ulClass }
+      [ H.li { className: childrenClass children' }
         [ nodeSpan (nsprops { folderOpen, name, id, nodeType, setPopoverRef, isLeaf })
-          (renderChildren folderOpen')
+          [ renderChildren (Record.merge p { childProps: { children', folderOpen, render: tree } } ) [] ]
         ]
       ]
     where
       isLeaf = A.null children
       nodeId = mkNodeId session id
-      ulClass  = switchHanded "ml" "mr" p.handed <> "-auto tree"
-      handedClass = switchHanded "left" "right" p.handed <> "handed"
+      ulClass  = switchHanded "ml left" "mr right" p.handed <> "-auto tree handed"
       children' = A.sortWith fTreeID pubChildren
       pubChildren = if isPublic nodeType then map (map pub) children else children
-      renderChildren false = []
-      renderChildren true = map renderChild children' where
-        renderChild (NTree (LNode {id: cId}) _) = childLoader props [] where
-          props = Record.merge nodeProps { id: cId, render: tree }
-          nodeProps = RecordE.pick p :: Record NodeProps
       nsprops extra = Record.merge common extra' where
         common = RecordE.pick p :: Record NSCommon
-        extra' = Record.merge extra { dispatch } where
+        extra' = Record.merge extra { dispatch, reload } where
           dispatch a = performAction a (Record.merge common' spr) where
             common' = RecordE.pick p :: Record PACommon
             spr = { setPopoverRef: extra.setPopoverRef }
   pub (LNode n@{ nodeType: t }) = LNode (n { nodeType = publicize t })
   childrenClass [] = "no-children"
-  childrenClass _ = "with-children"
+  childrenClass _  = "with-children"
+
+
+type ChildrenTreeProps =
+  ( childProps :: { children'  :: Array FTree
+                  , folderOpen :: T.Box Boolean
+                  , render     :: R2.Leaf TreeProps }
+  | TreeProps )
+
+
+renderChildren :: R2.Component ChildrenTreeProps
+renderChildren = R.createElement renderChildrenCpt
+
+renderChildrenCpt :: R.Component ChildrenTreeProps
+renderChildrenCpt = here.component "renderChildren" cpt where
+  cpt p@{ childProps: { folderOpen } } _ = do
+    folderOpen' <- T.useLive T.unequal folderOpen
+
+    if folderOpen' then
+      pure $ renderTreeChildren p []
+    else
+      pure $ H.div {} []
+
+renderTreeChildren :: R2.Component ChildrenTreeProps
+renderTreeChildren = R.createElement renderTreeChildrenCpt
+
+renderTreeChildrenCpt :: R.Component ChildrenTreeProps
+renderTreeChildrenCpt = here.component "renderTreeChildren" cpt where
+  cpt p@{ childProps: { children'
+                      , folderOpen
+                      , render } } _ = do
+    pure $ R.fragment (map renderChild children')
+
+    where
+      nodeProps = RecordE.pick p :: Record NodeProps
+      renderChild (NTree (LNode {id: cId}) _) = childLoader props [] where
+        props = Record.merge nodeProps { id: cId, render }
+
 
 --- The properties tree shares in common with performAction
 type PACommon =
   ( forestOpen   :: T.Box OpenNodes
-  , reloadTree   :: T.Box T2.Reload
+  , reloadTree   :: T2.ReloadS
   , session      :: Session
   , tasks        :: T.Box GAT.Storage
   , tree         :: FTree
@@ -155,7 +185,7 @@ childLoaderCpt :: R.Component ChildLoaderProps
 childLoaderCpt = here.component "childLoader" cpt where
   cpt p@{ render } _ = do
     reload <- T.useBox T2.newReload
-    let reloads = [ reload, p.reloadTree, p.reloadRoot ]
+    let reloads = [ reload, p.reloadRoot, p.reloadTree ]
     cache <- (A.cons p.id) <$> traverse (T.useLive T.unequal) reloads
     useLoader cache fetch (paint reload)
     where
@@ -168,75 +198,95 @@ childLoaderCpt = here.component "childLoader" cpt where
 type PerformActionProps =
   ( setPopoverRef :: R.Ref (Maybe (Boolean -> Effect Unit)) | PACommon )
 
--- | This thing is basically a hangover from when garg was a thermite
--- | application. we should slowly get rid of it.
-performAction :: Action -> Record PerformActionProps -> Aff Unit
-performAction (DeleteNode nt) p@{ forestOpen
-                                , session
-                                , tree: (NTree (LNode {id, parent_id}) _) } = do
+closePopover { setPopoverRef } =
+   liftEffect $ traverse_ (\set -> set false) (R.readRef setPopoverRef)
+
+refreshTree p = liftEffect $ T2.reload p.reloadTree *> closePopover p
+
+deleteNode' nt p@{ tree: (NTree (LNode {id, parent_id}) _) } = do
   case nt of
-    GT.NodePublic GT.FolderPublic -> void $ deleteNode session nt id
-    GT.NodePublic _               -> void $ unpublishNode session parent_id id
-    _                             -> void $ deleteNode session nt id
-  liftEffect $ T.modify_ (Set.delete (mkNodeId session id)) forestOpen
-  performAction RefreshTree p
-performAction (DoSearch task) p@{ tasks
-                                , tree: (NTree (LNode {id}) _) } = liftEffect $ do
+    GT.NodePublic GT.FolderPublic -> void $ deleteNode p.session nt id
+    GT.NodePublic _               -> void $ unpublishNode p.session parent_id id
+    _                             -> void $ deleteNode p.session nt id
+  liftEffect $ T.modify_ (Set.delete (mkNodeId p.session id)) p.forestOpen
+  refreshTree p
+
+doSearch task p@{ tasks, tree: NTree (LNode {id}) _ } = liftEffect $ do
   GAT.insert id task tasks
   log2 "[performAction] DoSearch task:" task
-performAction (UpdateNode params) p@{ tasks
-                                    , tree: (NTree (LNode {id}) _) } = do
+  
+updateNode params p@{ tasks, tree: (NTree (LNode {id}) _) } = do
   task <- updateRequest params p.session id
   liftEffect $ do
     GAT.insert id task tasks
     log2 "[performAction] UpdateNode task:" task
-performAction (RenameNode name) p@{ tree: (NTree (LNode {id}) _) } = do
+
+renameNode name p@{ tree: (NTree (LNode {id}) _) } = do
   void $ rename p.session id $ RenameValue { text: name }
-  performAction RefreshTree p
-performAction (ShareTeam username) p@{ tree: (NTree (LNode {id}) _)} =
+  refreshTree p
+
+shareTeam username p@{ tree: (NTree (LNode {id}) _)} =
   void $ Share.shareReq p.session id $ Share.ShareTeamParams {username}
-performAction (SharePublic { params }) p@{ forestOpen } = traverse_ f params where
+
+sharePublic params p@{ forestOpen } = traverse_ f params where
   f (SubTreeOut { in: inId, out }) = do
     void $ Share.shareReq p.session inId $ Share.SharePublicParams { node_id: out }
     liftEffect $ T.modify_ (Set.insert (mkNodeId p.session out)) forestOpen
-    performAction RefreshTree p
-performAction (AddContact params) p@{ tree: (NTree (LNode {id}) _) } =
-    void $ Contact.contactReq p.session id params
-performAction (AddNode name nodeType) p@{ forestOpen
-                                        , tree: (NTree (LNode { id }) _) } = do
+    refreshTree p
+
+addContact params p@{ tree: (NTree (LNode {id}) _) } =
+  void $ Contact.contactReq p.session id params
+
+addNode' name nodeType p@{ forestOpen, tree: (NTree (LNode { id }) _) } = do
   task <- addNode p.session id $ AddNodeValue {name, nodeType}
   liftEffect $ T.modify_ (Set.insert (mkNodeId p.session id)) forestOpen
-  performAction RefreshTree p
-performAction (UploadFile nodeType fileType mName blob) p@{ tasks
-                                                          , tree: (NTree (LNode { id }) _) } = do
+  refreshTree p
+
+uploadFile' nodeType fileType mName blob p@{ tasks, tree: (NTree (LNode { id }) _) } = do
   task <- uploadFile p.session nodeType id fileType {mName, blob}
   liftEffect $ do
     GAT.insert id task tasks
     log2 "[performAction] UploadFile, uploaded, task:" task
-performAction (UploadArbitraryFile mName blob) p@{ tasks
-                                                 , tree: (NTree (LNode { id }) _) } = do
+
+uploadArbitraryFile' mName blob p@{ tasks, tree: (NTree (LNode { id }) _) } = do
   task <- uploadArbitraryFile p.session id { blob, mName }
   liftEffect $ do
     GAT.insert id task tasks
     log2 "[performAction] UploadArbitraryFile, uploaded, task:" task
-performAction DownloadNode _ = liftEffect $ log "[performAction] DownloadNode"
-performAction (MoveNode {params}) p@{ forestOpen
-                                    , session } = traverse_ f params where
+
+moveNode params p@{ forestOpen, session } = traverse_ f params where
   f (SubTreeOut { in: in', out }) = do
     void $ moveNodeReq p.session in' out
     liftEffect $ T.modify_ (Set.insert (mkNodeId session out)) forestOpen
-    performAction RefreshTree p
-performAction (MergeNode { params }) p = traverse_ f params where
+    refreshTree p
+
+mergeNode params p = traverse_ f params where
   f (SubTreeOut { in: in', out }) = do
     void $ mergeNodeReq p.session in' out
-    performAction RefreshTree p
-performAction (LinkNode { nodeType, params }) p = traverse_ f params where
+    refreshTree p
+
+linkNode nodeType params p = traverse_ f params where
   f (SubTreeOut { in: in', out }) = do
     void $ linkNodeReq p.session nodeType in' out
-    performAction RefreshTree p
-performAction RefreshTree p = do
-  liftEffect $ T2.reload p.reloadTree
-  performAction ClosePopover p
+    refreshTree p
+
+-- | This thing is basically a hangover from when garg was a thermite
+-- | application. we should slowly get rid of it.
+performAction :: Action -> Record PerformActionProps -> Aff Unit
+performAction (DeleteNode nt) p = deleteNode' nt p
+performAction (DoSearch task) p = doSearch task p
+performAction (UpdateNode params) p = updateNode params p
+performAction (RenameNode name) p = renameNode name p
+performAction (ShareTeam username) p = shareTeam username p
+performAction (SharePublic { params }) p = sharePublic params p
+performAction (AddContact params) p = addContact params p
+performAction (AddNode name nodeType) p = addNode' name nodeType p
+performAction (UploadFile nodeType fileType mName blob) p = uploadFile' nodeType fileType mName blob p
+performAction (UploadArbitraryFile mName blob) p = uploadArbitraryFile' mName blob p
+performAction DownloadNode _ = liftEffect $ log "[performAction] DownloadNode"
+performAction (MoveNode {params}) p = moveNode params p
+performAction (MergeNode {params}) p = mergeNode params p
+performAction (LinkNode { nodeType, params }) p = linkNode nodeType params p
+performAction RefreshTree p = refreshTree p
 performAction NoAction _ = liftEffect $ log "[performAction] NoAction"
-performAction ClosePopover { setPopoverRef } =
-  liftEffect $ traverse_ (\set -> set false) (R.readRef setPopoverRef)
+performAction ClosePopover p = closePopover p

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

@@ -45,16 +45,18 @@ here = R2.here "Gargantext.Components.Forest.Tree.Node"
 
 -- Main Node
 type NodeMainSpanProps =
-  ( folderOpen    :: T.Box Boolean
-  , frontends     :: Frontends
-  , id            :: ID
-  , isLeaf        :: IsLeaf
-  , name          :: Name
-  , nodeType      :: GT.NodeType
-  , reloadRoot    :: T.Box T2.Reload
-  , route         :: T.Box Routes.AppRoute
-  , setPopoverRef :: R.Ref (Maybe (Boolean -> Effect Unit))
-  , tasks         :: T.Box GAT.Storage
+  ( folderOpen     :: T.Box Boolean
+  , frontends      :: Frontends
+  , id             :: ID
+  , isLeaf         :: IsLeaf
+  , name           :: Name
+  , nodeType       :: GT.NodeType
+  , reload         :: T2.ReloadS
+  , reloadMainPage :: T2.ReloadS
+  , reloadRoot     :: T2.ReloadS
+  , route          :: T.Box Routes.AppRoute
+  , setPopoverRef  :: R.Ref (Maybe (Boolean -> Effect Unit))
+  , tasks          :: T.Box GAT.Storage
   | CommonProps
   )
 
@@ -66,8 +68,12 @@ nodeSpan = R.createElement nodeSpanCpt
 nodeSpanCpt :: R.Component NodeMainSpanProps
 nodeSpanCpt = here.component "nodeSpan" cpt
   where
-    cpt props children = do
-      pure $ H.div {} ([ nodeMainSpan props [] ] <> children)
+    cpt props@{ handed } children = do
+      let className = case handed of
+            GT.LeftHanded  -> "lefthanded"
+            GT.RightHanded -> "righthanded"
+
+      pure $ H.div { className } ([ nodeMainSpan props [] ] <> children)
 
 nodeMainSpan :: R2.Component NodeMainSpanProps
 nodeMainSpan = R.createElement nodeMainSpanCpt
@@ -83,6 +89,8 @@ nodeMainSpanCpt = here.component "nodeMainSpan" cpt
               , isLeaf
               , name
               , nodeType
+              , reload
+              , reloadMainPage
               , reloadRoot
               , route
               , session
@@ -110,16 +118,21 @@ nodeMainSpanCpt = here.component "nodeMainSpan" cpt
         $ reverseHanded handed
         [ folderIcon  { folderOpen, nodeType } []
         , chevronIcon { folderOpen, handed, isLeaf, nodeType } []
-        , nodeLink { frontends, handed, folderOpen, id, isSelected
-                   , name: name' props, nodeType, session } []
+        , nodeLink { frontends
+                   , handed
+                   , folderOpen
+                   , id
+                   , isSelected
+                   , name: name' props
+                   , nodeType
+                   , session } []
 
                 , fileTypeView { dispatch, droppedFile, id, isDragOver, nodeType }
                 , H.div {} (map (\t -> asyncProgressBar { asyncTask: t
                                                        , barType: Pie
                                                        , nodeId: id
                                                        , onFinish: onTaskFinish id t
-                                                       , session
-                                                       }
+                                                       , session } []
                                 ) currentTasks'
                            )
                 , if nodeType == GT.NodeUser
@@ -146,6 +159,22 @@ nodeMainSpanCpt = here.component "nodeMainSpan" cpt
         where
           onTaskFinish id' t _ = do
             GAT.finish id' t tasks
+            if GAT.asyncTaskTTriggersAppReload t then do
+              here.log2 "reloading root for task" t
+              T2.reload reloadRoot
+            else do
+              if GAT.asyncTaskTTriggersTreeReload t then do
+                here.log2 "reloading tree for task" t
+                T2.reload reload
+              else do
+                here.log2 "task doesn't trigger a tree reload" t
+                pure unit
+              if GAT.asyncTaskTTriggersMainPageReload t then do
+                here.log2 "reloading main page for task" t
+                T2.reload reloadMainPage
+              else do
+                here.log2 "task doesn't trigger a main page reload" t
+                pure unit
             -- snd tasks $ GAT.Finish id' t
             -- mT <- T.read tasks
             -- case mT of
@@ -168,9 +197,9 @@ nodeMainSpanCpt = here.component "nodeMainSpan" cpt
             <> "Click here to execute one of them." } []
     dropProps droppedFile droppedFile' isDragOver isDragOver' =
       { className: "leaf " <> (dropClass droppedFile' isDragOver')
-      , on: { drop: dropHandler droppedFile
+      , on: { dragLeave: onDragLeave isDragOver
             , dragOver: onDragOverHandler isDragOver
-            , dragLeave: onDragLeave isDragOver }
+            , drop: dropHandler droppedFile }
       }
       where
         dropClass (Just _) _    = "file-dropped"
@@ -184,12 +213,12 @@ nodeMainSpanCpt = here.component "nodeMainSpan" cpt
           blob <- R2.dataTransferFileBlob e
           void $ launchAff do
             --contents <- readAsText blob
-            liftEffect $ T.write_
-                        (Just
-                        $ DroppedFile { blob: (UploadFileBlob blob)
-                                      , fileType: Just CSV
-                                      , lang    : EN
-                                      }) droppedFile
+            liftEffect $ do
+              T.write_ (Just
+                       $ DroppedFile { blob: (UploadFileBlob blob)
+                                     , fileType: Just CSV
+                                     , lang    : EN
+                                     }) droppedFile
     onDragOverHandler isDragOver e = do
       -- prevent redirection when file is dropped
       -- https://stackoverflow.com/a/6756680/941471
@@ -283,7 +312,7 @@ graphNodeActionsCpt :: R.Component NodeActionsCommon
 graphNodeActionsCpt = here.component "graphNodeActions" cpt where
   cpt { id, session, refresh } _ =
     useLoader id (graphVersions session) $ \gv ->
-      nodeActionsGraph { graphVersions: gv, session, id, refresh }
+      nodeActionsGraph { graphVersions: gv, session, id, refresh } []
   graphVersions session graphId = GraphAPI.graphVersions { graphId, session }
 
 listNodeActions :: R2.Leaf NodeActionsCommon

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

@@ -7,6 +7,7 @@ import Data.Tuple.Nested ((/\))
 import Effect.Aff (Aff, launchAff_)
 import Reactix as R
 import Reactix.DOM.HTML as H
+import Toestand as T
 
 import Gargantext.Prelude
 
@@ -59,45 +60,49 @@ type CreateNodeProps =
   , nodeTypes :: Array NodeType
   )
 
-addNodeView :: Record CreateNodeProps
-            -> R.Element
-addNodeView p@{ dispatch, nodeType, nodeTypes } = R.createElement el p []
-  where
-    el = here.component "addNodeView" cpt
-    cpt {id, name} _ = do
-      nodeName@(name' /\ setNodeName) <- R.useState' "Name"
-      nodeType'@(nt /\ setNodeType)   <- R.useState' $ fromMaybe Folder $ head nodeTypes
-
-      let
-          SettingsBox {edit} = settingsBox nt
-          setNodeType' nt = do
-            setNodeName $ const $ GT.prettyNodeType nt
-            setNodeType $ const nt
-          (maybeChoose /\ nt') = if length nodeTypes > 1
-                           then ([ formChoiceSafe nodeTypes Error setNodeType' ] /\ nt)
-                           else ([H.div {} [H.text $ "Creating a node of type "
-                                                  <> show defaultNt
-                                                  <> " with name:"
-                                           ]
-                                  ] /\ defaultNt
-                                 )
-                              where
-                                defaultNt = (fromMaybe Error $ head nodeTypes)
-          maybeEdit   = [ if edit
-                          then inputWithEnter {
-                              onBlur: \val -> setNodeName $ const val
-                            , onEnter: \_ -> launchAff_ $ dispatch (AddNode name' nt')
-                            , onValueChanged: \val -> setNodeName $ const val
-                            , autoFocus: true
-                            , className: "form-control"
-                            , defaultValue: name' -- (prettyNodeType nt')
-                            , placeholder: name'  -- (prettyNodeType nt')
-                            , type: "text"
-                            }
-                          else H.div {} []
-                        ]
-
-      pure $ panel (maybeChoose <> maybeEdit) (submitButton (AddNode name' nt') dispatch)
+addNodeView :: R2.Component CreateNodeProps
+addNodeView = R.createElement addNodeViewCpt
+addNodeViewCpt :: R.Component CreateNodeProps
+addNodeViewCpt = here.component "addNodeView" cpt where
+  cpt { dispatch
+      , id
+      , name
+      , nodeTypes } _ = do
+    nodeName <- T.useBox "Name"
+    nodeName' <- T.useLive T.unequal nodeName
+    nodeType <- T.useBox $ fromMaybe Folder $ head nodeTypes
+    nodeType' <- T.useLive T.unequal nodeType
+
+    let
+        SettingsBox {edit} = settingsBox nodeType'
+        setNodeType' nt = do
+          T.write_ (GT.prettyNodeType nt) nodeName
+          T.write_ nt nodeType
+        (maybeChoose /\ nt') = if length nodeTypes > 1
+                         then ([ formChoiceSafe nodeTypes Error setNodeType' ] /\ nodeType')
+                         else ([H.div {} [H.text $ "Creating a node of type "
+                                                <> show defaultNt
+                                                <> " with name:"
+                                         ]
+                                ] /\ defaultNt
+                               )
+                            where
+                              defaultNt = (fromMaybe Error $ head nodeTypes)
+        maybeEdit   = [ if edit
+                        then inputWithEnter {
+                            onBlur: \val -> T.write_ val nodeName
+                          , onEnter: \_ -> launchAff_ $ dispatch (AddNode nodeName' nt')
+                          , onValueChanged: \val -> T.write_ val nodeName
+                          , autoFocus: true
+                          , className: "form-control"
+                          , defaultValue: nodeName' -- (prettyNodeType nt')
+                          , placeholder: nodeName'  -- (prettyNodeType nt')
+                          , type: "text"
+                          }
+                        else H.div {} []
+                      ]
+
+    pure $ panel (maybeChoose <> maybeEdit) (submitButton (AddNode nodeName' nt') dispatch)
 
 -- END Create Node
 

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

 module Gargantext.Components.Forest.Tree.Node.Action.Contact where
 
 import Prelude
+
 import Data.Maybe (Maybe(..))
 import Effect.Aff (Aff, launchAff)
 import Formula as F
-import Reactix as R
-import Reactix.DOM.HTML as H
-import Toestand as T
-
-import Gargantext.Components.Forest.Tree.Node.Action (Action)
+import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
 import Gargantext.Components.Forest.Tree.Node.Action.Contact.Types (AddContactParams(..))
--- import Gargantext.Components.Forest.Tree.Node.Tools.SubTree (subTreeView, SubTreeParamsIn)
 import Gargantext.Routes as GR
 import Gargantext.Sessions (Session, post)
 import Gargantext.Types (ID)
 import Gargantext.Types as GT
 import Gargantext.Utils.Reactix as R2
+import Reactix as R
+import Reactix.DOM.HTML as H
+import Toestand as T
 
 here :: R2.Here
 here = R2.here "Gargantext.Components.Forest.Tree.Node.Action.Contact"
@@ -24,20 +23,36 @@ contactReq :: Session -> ID -> AddContactParams -> Aff ID
 contactReq session nodeId =
   post session $ GR.NodeAPI GT.Annuaire (Just nodeId) "contact"
 
+type ActionAddContact =
+  ( dispatch :: Action -> Aff Unit
+  , id :: ID )
+
+actionAddContact :: R2.Component ActionAddContact
+actionAddContact = R.createElement actionAddContactCpt
+actionAddContactCpt :: R.Component ActionAddContact
+actionAddContactCpt = here.component "actionAddContact" cpt where
+  cpt { dispatch, id } _ = do
+    isOpen <- T.useBox true
+    pure $ textInputBox
+      { boxAction: \p -> AddContact p
+      , boxName:"addContact"
+      , dispatch
+      , id
+      , isOpen
+      , params: {firstname:"First Name", lastname: "Last Name"} }
+
 type TextInputBoxProps =
-  ( id        :: ID
+  ( boxAction :: AddContactParams -> Action
+  , boxName   :: String
   , dispatch  :: Action -> Aff Unit
-  , params    :: Record AddContactProps
+  , id        :: ID
   , isOpen    :: T.Box Boolean
-  , boxName   :: String
-  , boxAction :: AddContactParams -> Action
-  )
+  , params    :: Record AddContactProps )
 
-type AddContactProps = ( firstname :: String, lastname :: String)
+type AddContactProps = ( firstname :: String, lastname :: String )
 
 textInputBox :: R2.Leaf TextInputBoxProps
 textInputBox props = R.createElement textInputBoxCpt props []
-
 textInputBoxCpt :: R.Component TextInputBoxProps
 textInputBoxCpt = here.component "textInputBox" cpt where
   cpt p@{ boxName, boxAction, dispatch, isOpen

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

@@ -2,18 +2,25 @@ module Gargantext.Components.Forest.Tree.Node.Action.Delete
   where
 
 import Data.Maybe (Maybe(..))
-import Gargantext.Prelude
 import Effect.Aff (Aff)
-import Gargantext.Types  as GT
-import Gargantext.Sessions (Session, delete, put_)
-import Gargantext.Routes (SessionRoute(..))
-import Gargantext.Types (NodeType(..))
-import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
 import Reactix as R
-import Gargantext.Components.Forest.Tree.Node.Tools (submitButton, panel)
 import Reactix.DOM.HTML as H
 
+import Gargantext.Prelude
+
+import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
+import Gargantext.Components.Forest.Tree.Node.Tools (submitButton, panel)
+import Gargantext.Routes (SessionRoute(..))
+import Gargantext.Sessions (Session, delete, put_)
+import Gargantext.Types  as GT
+import Gargantext.Types (NodeType(..))
+import Gargantext.Utils.Reactix as R2
+
+here :: R2.Here
+here = R2.here "Gargantext.Components.Forest.Tree.Node.Action.Delete"
+
 -- TODO Delete with asyncTaskWithType
+
 deleteNode :: Session -> NodeType -> GT.ID -> Aff GT.ID
 deleteNode session nt nodeId = delete session $ NodeAPI GT.Node (Just nodeId) ""
 
@@ -30,21 +37,37 @@ unpublishNode s p n = put_ s $ NodeAPI GT.Node p ("unpublish/" <> show n)
 
 
 -- | Action : Delete
-actionDelete :: NodeType -> (Action -> Aff Unit) -> R.Hooks R.Element
-actionDelete NodeUser _ = do
-  pure $ panel [ H.div { style: {margin: "10px"}}
-                       [ H.text $ "Yes, we are RGPD compliant!"
-                      <> " But you can not delete User Node yet."
-                      <> " We are still on development."
-                      <> " Thanks for your comprehensin."
+type Delete =
+  ( dispatch :: Action -> Aff Unit
+  , nodeType :: NodeType )
+
+actionDelete :: R2.Component Delete
+actionDelete = R.createElement actionDeleteCpt
+actionDeleteCpt :: R.Component Delete
+actionDeleteCpt = here.component "actionDelete" cpt where
+  cpt props@{ nodeType: NodeUser } _ = pure $ actionDeleteUser props []
+  cpt props                        _ = pure $ actionDeleteOther props []
+
+actionDeleteUser :: R2.Component Delete
+actionDeleteUser = R.createElement actionDeleteUserCpt
+actionDeleteUserCpt :: R.Component Delete
+actionDeleteUserCpt = here.component "actionDeleteUser" cpt where
+  cpt _  _ = do
+    pure $ panel [ H.div { style: {margin: "10px"}}
+                    [ H.text $ "Yes, we are RGPD compliant!"
+                    <> " But you can not delete User Node yet."
+                    <> " We are still on development."
+                    <> " Thanks for your comprehensin."
+                    ]
+            ] (H.div {} [])
+
+actionDeleteOther :: R2.Component Delete
+actionDeleteOther = R.createElement actionDeleteOtherCpt
+actionDeleteOtherCpt :: R.Component Delete
+actionDeleteOtherCpt = here.component "actionDeleteOther" cpt where
+  cpt { dispatch, nodeType } _ = do
+    pure $ panel (map (\t -> H.p {} [H.text t])
+                       [ "Are your sure you want to delete it ?"
+                       , "If yes, click again below."
                        ]
-               ]
-               (H.div {} [])
-
-actionDelete nt dispatch = do
-  pure $ panel (map (\t -> H.p {} [H.text t])
-                     [ "Are your sure you want to delete it ?"
-                     , "If yes, click again below."
-                     ]
-                )
-                (submitButton (DeleteNode nt) dispatch)
+                  ) (submitButton (DeleteNode nodeType) dispatch)

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

 module Gargantext.Components.Forest.Tree.Node.Action.Documentation where
 
-import Gargantext.Prelude (map, pure, show, ($), (<>))
-import Gargantext.Types (NodeType)
-import Gargantext.Types as GT
 import Reactix as R
 import Reactix.DOM.HTML as H
+
+import Gargantext.Prelude (map, pure, show, ($), (<>))
+
 import Gargantext.Components.Forest.Tree.Node.Tools (panel)
+import Gargantext.Types (NodeType)
+import Gargantext.Types as GT
+import Gargantext.Utils.Reactix as R2
+
+here :: R2.Here
+here = R2.here "Gargantext.Components.Forest.Tree.Node.Action.Documentation"
 
 -- | Action: Show Documentation
-actionDoc :: NodeType -> R.Hooks R.Element
-actionDoc nodeType =
-  pure $ panel ( [ infoTitle nodeType ]
-                 <> (map (\info -> H.p {} [H.text info]) $ docOf nodeType)
-               )
-               ( H.div {} [])
-  where
-    infoTitle :: NodeType -> R.Element
-    infoTitle nt = H.div { style: {margin: "10px"}}
-                         [ H.h3 {} [H.text "Documentation about " ]
-                         , H.h3 {className: GT.fldr nt true} [ H.text $ show nt ]
-                         ]
+type ActionDoc =
+  ( nodeType :: NodeType )
+
+actionDoc :: R2.Component ActionDoc
+actionDoc = R.createElement actionDocCpt
+actionDocCpt :: R.Component ActionDoc
+actionDocCpt = here.component "actionDoc" cpt where
+  cpt { nodeType } _ = do
+    pure $ panel ([ infoTitle nodeType ]
+                   <> (map (\info -> H.p {} [H.text info]) $ docOf nodeType)
+                 )
+                 (H.div {} [])
+    where
+      infoTitle :: NodeType -> R.Element
+      infoTitle nt = H.div { style: {margin: "10px"}}
+                        [ H.h3 {} [H.text "Documentation about " ]
+                        , H.h3 {className: GT.fldr nt true} [ H.text $ show nt ]
+                        ]
 
 -- | TODO add documentation of all NodeType
 docOf :: NodeType -> Array String

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

 module Gargantext.Components.Forest.Tree.Node.Action.Download where
 
 import Data.Maybe (Maybe(..))
+import Reactix as R
+import Reactix.DOM.HTML as H
+
 import Gargantext.Components.Forest.Tree.Node.Action (Action(DownloadNode))
 import Gargantext.Components.Forest.Tree.Node.Tools (fragmentPT, panel, submitButtonHref)
 import Gargantext.Ends (url)
 import Gargantext.Prelude (pure, ($))
 import Gargantext.Routes as Routes
 import Gargantext.Sessions (Session)
-import Gargantext.Types (NodeType(..), ID)
+import Gargantext.Types (ID)
 import Gargantext.Types as GT
-import Reactix as R
-import Reactix.DOM.HTML as H
+import Gargantext.Utils.Reactix as R2
+
+here :: R2.Here
+here = R2.here "Gargantext.Components.Forest.Tree.Node.Action.Documentation"
 
 -- | Action : Download
-actionDownload :: NodeType -> ID -> Session -> R.Hooks R.Element
-actionDownload NodeList id session = pure $ panel [H.div {} [H.text info]]
-                                           (submitButtonHref DownloadNode href)
+type ActionDownload =
+  ( id       :: ID
+  , nodeType :: GT.NodeType
+  , session  :: Session )
+
+actionDownload :: R2.Component ActionDownload
+actionDownload = R.createElement actionDownloadCpt
+actionDownloadCpt :: R.Component ActionDownload
+actionDownloadCpt = here.component "actionDownload" cpt where
+  cpt props@{ nodeType: GT.Corpus } _   = pure $ actionDownloadCorpus props []
+  cpt props@{ nodeType: GT.Graph } _    = pure $ actionDownloadGraph props []
+  cpt props@{ nodeType: GT.NodeList } _ = pure $ actionDownloadNodeList props []
+  cpt props@{ nodeType: _ } _           = pure $ actionDownloadOther props []
+
+actionDownloadCorpus :: R2.Component ActionDownload
+actionDownloadCorpus = R.createElement actionDownloadCorpusCpt
+actionDownloadCorpusCpt :: R.Component ActionDownload
+actionDownloadCorpusCpt = here.component "actionDownloadCorpus" cpt where
+  cpt { id, session } _ = do
+    pure $ panel [H.div {} [H.text info]]
+      (submitButtonHref DownloadNode href)
     where
-      href  = url session $ Routes.NodeAPI GT.NodeList (Just id) ""
-      info  = "Info about the List as JSON format"
+      href  = url session $ Routes.NodeAPI GT.Corpus (Just id) "export"
+      info  = "Download as JSON"
 
-actionDownload GT.Graph id session = pure $ panel [H.div {} [H.text info]]
-                                           (submitButtonHref DownloadNode href)
+actionDownloadGraph :: R2.Component ActionDownload
+actionDownloadGraph = R.createElement actionDownloadGraphCpt
+actionDownloadGraphCpt :: R.Component ActionDownload
+actionDownloadGraphCpt = here.component "actionDownloadGraph" cpt where
+  cpt { id, session } _ = do
+    pure $ panel [H.div {} [H.text info]]
+      (submitButtonHref DownloadNode href)
     where
       href  = url session $ Routes.NodeAPI GT.Graph (Just id) "gexf"
       info  = "Info about the Graph as GEXF format"
 
-actionDownload GT.Corpus id session = pure $ panel [H.div {} [H.text info]]
-                                           (submitButtonHref DownloadNode href)
+actionDownloadNodeList :: R2.Component ActionDownload
+actionDownloadNodeList = R.createElement actionDownloadNodeListCpt
+actionDownloadNodeListCpt :: R.Component ActionDownload
+actionDownloadNodeListCpt = here.component "actionDownloadNodeList" cpt where
+  cpt { id, session } _ = do
+    pure $ panel [ H.div {} [H.text info] ]
+      (submitButtonHref DownloadNode href)
     where
-      href  = url session $ Routes.NodeAPI GT.Corpus (Just id) "export"
-      info  = "Download as JSON"
+      href  = url session $ Routes.NodeAPI GT.NodeList (Just id) ""
+      info  = "Info about the List as JSON format"
 
 {-
 -- TODO fix the route
@@ -40,5 +73,9 @@ actionDownload GT.Texts id session = pure $ panel [H.div {} [H.text info]]
       href  = url session $ Routes.NodeAPI GT.Texts (Just id) ""
       info  = "TODO: fix the backend route. What is the expected result ?"
       -}
-actionDownload _ _ _ = pure $ fragmentPT $ "Soon, you will be able to download your file here "
-
+actionDownloadOther :: R2.Component ActionDownload
+actionDownloadOther = R.createElement actionDownloadOtherCpt
+actionDownloadOtherCpt :: R.Component ActionDownload
+actionDownloadOtherCpt = here.component "actionDownloadOther" cpt where
+  cpt { id, session } _ = do
+    pure $ fragmentPT $ "Soon, you will be able to download your file here "

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

@@ -49,7 +49,6 @@ linkNodeType  _   = GT.Error
 
 linkNode :: R2.Component SubTreeParamsIn
 linkNode = R.createElement linkNodeCpt
-
 linkNodeCpt :: R.Component SubTreeParamsIn
 linkNodeCpt = here.component "linkNode" cpt
   where

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

@@ -2,7 +2,6 @@ module Gargantext.Components.Forest.Tree.Node.Action.Merge where
 
 import Data.Maybe (Maybe(..))
 import Data.Set as Set
-import Data.Tuple.Nested ((/\))
 import Effect.Aff (Aff)
 import Reactix as R
 import Reactix.DOM.HTML as H
@@ -26,7 +25,6 @@ mergeNodeReq session fromId toId =
 
 mergeNode :: R2.Component SubTreeParamsIn
 mergeNode = R.createElement mergeNodeCpt
-
 mergeNodeCpt :: R.Component SubTreeParamsIn
 mergeNodeCpt = here.component "mergeNode" cpt
   where

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

 module Gargantext.Components.Forest.Tree.Node.Action.Move where
 
 import Data.Maybe (Maybe(..))
-import Data.Tuple.Nested ((/\))
 import Effect.Aff (Aff)
 import Reactix as R
 import Reactix.DOM.HTML as H
@@ -26,7 +25,6 @@ moveNodeReq session fromId toId =
 
 moveNode :: R2.Component SubTreeParamsIn
 moveNode = R.createElement moveNodeCpt
-
 moveNodeCpt :: R.Component SubTreeParamsIn
 moveNodeCpt = here.component "moveNode" cpt
   where

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

@@ -32,7 +32,6 @@ type Props =
 -- | Action : Search
 actionSearch :: R2.Component Props
 actionSearch = R.createElement actionSearchCpt
-
 actionSearchCpt :: R.Component Props
 actionSearchCpt = here.component "actionSearch" cpt
   where

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

@@ -4,7 +4,6 @@ import Data.Argonaut as Argonaut
 import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Show (genericShow)
 import Data.Maybe (Maybe(..))
-import Data.Tuple.Nested ((/\))
 import Effect.Aff (Aff)
 import Prelude (($))
 import Reactix as R
@@ -15,7 +14,7 @@ import Gargantext.Components.Forest.Tree.Node.Action (Action)
 import Gargantext.Components.Forest.Tree.Node.Action as Action
 import Gargantext.Components.Forest.Tree.Node.Tools as Tools
 import Gargantext.Components.Forest.Tree.Node.Tools.SubTree (subTreeView, SubTreeParamsIn)
-import Gargantext.Prelude (class Eq, class Show, bind, pure)
+import Gargantext.Prelude (class Eq, class Show, bind, pure, Unit)
 import Gargantext.Routes as GR
 import Gargantext.Sessions (Session, post)
 import Gargantext.Types (ID)
@@ -34,9 +33,6 @@ shareReq session nodeId =
 shareAction :: String -> Action
 shareAction username = Action.ShareTeam username
 
-------------------------------------------------------------------------
-textInputBox :: Record Tools.TextInputBoxProps -> R.Element
-textInputBox p = Tools.textInputBox p []
 
 ------------------------------------------------------------------------
 data ShareNodeParams = ShareTeamParams   { username :: String }
@@ -57,11 +53,30 @@ instance encodeJsonShareNodeParams :: Argonaut.EncodeJson ShareNodeParams where
 
 
 ------------------------------------------------------------------------
-shareNode :: Record SubTreeParamsIn -> R.Element
-shareNode p = R.createElement shareNodeCpt p []
+type ShareNode =
+  ( id :: ID
+  , dispatch :: Action -> Aff Unit )
 
-shareNodeCpt :: R.Component SubTreeParamsIn
+shareNode :: R2.Component ShareNode
+shareNode = R.createElement shareNodeCpt
+shareNodeCpt :: R.Component ShareNode
 shareNodeCpt = here.component "shareNode" cpt
+  where
+    cpt { dispatch, id } _ = do
+      isOpen <- T.useBox true
+      pure $ Tools.panel
+                [ Tools.textInputBox { boxAction: shareAction
+                                     , boxName: "Share"
+                                     , dispatch
+                                     , id
+                                     , isOpen
+                                     , text: "username" } []
+                ] (H.div {} [])
+------------------------------------------------------------------------
+publishNode :: R2.Component SubTreeParamsIn
+publishNode = R.createElement publishNodeCpt
+publishNodeCpt :: R.Component SubTreeParamsIn
+publishNodeCpt = here.component "publishNode" cpt
   where
     cpt p@{dispatch, subTreeParams, id, nodeType, session, handed} _ = do
       action <- T.useBox (Action.SharePublic { params: Nothing })
@@ -73,13 +88,13 @@ shareNodeCpt = here.component "shareNode" cpt
                 Nothing -> H.div {} []
               _   -> H.div {} []
 
-      pure $ Tools.panel [ subTreeView { action
-                                       , dispatch
-                                       , handed
-                                       , id
-                                       , nodeType
-                                       , session
-                                       , subTreeParams
-                                       } []
-              ] button
-
+      pure $ Tools.panel
+        [ subTreeView { action
+                      , dispatch
+                      , handed
+                      , id
+                      , nodeType
+                      , session
+                      , subTreeParams
+                      } []
+        ] button

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

 module Gargantext.Components.Forest.Tree.Node.Action.Update where
 
-import Data.Tuple.Nested ((/\))
+import Gargantext.Components.Forest.Tree.Node.Action.Update.Types
+
 import Data.Maybe (Maybe(..))
 import Effect.Aff (Aff)
 import Reactix as R
 import Reactix.DOM.HTML as H
+import Toestand as T
 
 import Gargantext.Prelude
 
 import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
-import Gargantext.Components.Forest.Tree.Node.Action.Update.Types
 import Gargantext.Components.Forest.Tree.Node.Tools (formChoiceSafe, submitButton, panel)
-import Gargantext.Types (NodeType(..), ID)
-import Gargantext.Types  as GT
-import Gargantext.Sessions (Session, post)
 import Gargantext.Routes as GR
+import Gargantext.Sessions (Session, post)
+import Gargantext.Types (NodeType(..), ID)
+import Gargantext.Types as GT
+import Gargantext.Utils.Reactix as R2
 
+here :: R2.Here
+here = R2.here "Gargantext.Components.Forest.Tree.Node.Action.Update"
 
 updateRequest :: UpdateNodeParams -> Session -> ID -> Aff GT.AsyncTaskWithType
 updateRequest updateNodeParams session nodeId = do
@@ -25,49 +29,77 @@ updateRequest updateNodeParams session nodeId = do
       p = GR.NodeAPI GT.Node (Just nodeId) "update"
 
 ----------------------------------------------------------------------
-update ::  NodeType
-       -> (Action -> Aff Unit)
-       ->  R.Hooks R.Element
-update NodeList dispatch = do
-  meth @( methodList /\ setMethod  ) <- R.useState' Basic
-
-  let setMethod' = setMethod <<< const
-
-  pure $ panel [ -- H.text "Update with"
-                formChoiceSafe [Basic, Advanced, WithModel] Basic setMethod'
-               ]
-               (submitButton (UpdateNode $ UpdateNodeParamsList {methodList}) dispatch)
-
-update Graph dispatch = do
-  meth @( methodGraph /\ setMethod  ) <- R.useState' Order1
-
-  let setMethod' = setMethod <<< const
-
-  pure $ panel [ -- H.text "Update with"
-                formChoiceSafe [Order1, Order2] Order1 setMethod'
-               ]
-               (submitButton (UpdateNode $ UpdateNodeParamsGraph {methodGraph}) dispatch)
-
-update Texts dispatch  = do
-  meth @( methodTexts /\ setMethod  ) <- R.useState' NewNgrams
-
-  let setMethod' = setMethod <<< const
-
-  pure $ panel [ -- H.text "Update with"
-                formChoiceSafe [NewNgrams, NewTexts, Both] NewNgrams setMethod'
-               ]
-               (submitButton (UpdateNode $ UpdateNodeParamsTexts {methodTexts}) dispatch)
-
-update Dashboard dispatch  = do
-  meth @( methodBoard /\ setMethod  ) <- R.useState' All
-
-  let setMethod' = setMethod <<< const
-
-  pure $ panel [ -- H.text "Update with"
-                formChoiceSafe [All, Sources, Authors, Institutes, Ngrams] All setMethod'
-               ]
-               (submitButton (UpdateNode $ UpdateNodeParamsBoard {methodBoard}) dispatch)
-
-update _     _  = pure $ H.div {} []
+type UpdateProps =
+  ( dispatch :: Action -> Aff Unit
+  , nodeType :: NodeType )
+
+update ::  R2.Component UpdateProps
+update = R.createElement updateCpt
+updateCpt :: R.Component UpdateProps
+updateCpt = here.component "update" cpt where
+  cpt props@{ dispatch, nodeType: Dashboard } _ = pure $ updateDashboard props []
+  cpt props@{ dispatch, nodeType: Graph } _     = pure $ updateGraph props []
+  cpt props@{ dispatch, nodeType: NodeList } _  = pure $ updateNodeList props []
+  cpt props@{ dispatch, nodeType: Texts } _     = pure $ updateTexts props []
+  cpt props@{ dispatch, nodeType: _ } _         = pure $ updateOther props []
+
+updateDashboard :: R2.Component UpdateProps
+updateDashboard = R.createElement updateDashboardCpt
+updateDashboardCpt :: R.Component UpdateProps
+updateDashboardCpt = here.component "updateDashboard" cpt where
+  cpt { dispatch } _ = do
+    methodBoard <- T.useBox All
+    methodBoard' <- T.useLive T.unequal methodBoard
+
+    pure $ panel [ -- H.text "Update with"
+                  formChoiceSafe [All, Sources, Authors, Institutes, Ngrams] All (\val -> T.write_ val methodBoard)
+                 ]
+                 (submitButton (UpdateNode $ UpdateNodeParamsBoard { methodBoard: methodBoard' }) dispatch)
+
+updateGraph :: R2.Component UpdateProps
+updateGraph = R.createElement updateGraphCpt
+updateGraphCpt :: R.Component UpdateProps
+updateGraphCpt = here.component "updateGraph" cpt where
+  cpt { dispatch } _ = do
+    methodGraph <- T.useBox Order1
+    methodGraph' <- T.useLive T.unequal methodGraph
+
+    pure $ panel [ -- H.text "Update with"
+                  formChoiceSafe [Order1, Order2] Order1 (\val -> T.write_ val methodGraph)
+                 ]
+                 (submitButton (UpdateNode $ UpdateNodeParamsGraph { methodGraph: methodGraph' }) dispatch)
+
+updateNodeList :: R2.Component UpdateProps
+updateNodeList = R.createElement updateNodeListCpt
+updateNodeListCpt :: R.Component UpdateProps
+updateNodeListCpt = here.component "updateNodeList" cpt where
+  cpt { dispatch } _ = do
+    methodList <- T.useBox Basic
+    methodList' <- T.useLive T.unequal methodList
+
+    pure $ panel [ -- H.text "Update with"
+                  formChoiceSafe [Basic, Advanced, WithModel] Basic (\val -> T.write_ val methodList)
+                 ]
+                 (submitButton (UpdateNode $ UpdateNodeParamsList { methodList: methodList' }) dispatch)
+
+updateTexts :: R2.Component UpdateProps
+updateTexts = R.createElement updateTextsCpt
+updateTextsCpt :: R.Component UpdateProps
+updateTextsCpt = here.component "updateTexts" cpt where
+  cpt { dispatch } _ = do
+    methodTexts <- T.useBox NewNgrams
+    methodTexts' <- T.useLive T.unequal methodTexts
+
+    pure $ panel [ -- H.text "Update with"
+                  formChoiceSafe [NewNgrams, NewTexts, Both] NewNgrams (\val -> T.write_ val methodTexts)
+                 ]
+                 (submitButton (UpdateNode $ UpdateNodeParamsTexts { methodTexts: methodTexts' }) dispatch)
+
+updateOther :: R2.Component UpdateProps
+updateOther = R.createElement updateOtherCpt
+updateOtherCpt :: R.Component UpdateProps
+updateOtherCpt = here.component "updateOther" cpt where
+  cpt { dispatch } _ = do
+    pure $ H.div {} []
 
 -- fragmentPT $ "Update " <> show nodeType

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

@@ -40,20 +40,31 @@ here = R2.here "Gargantext.Components.Forest.Tree.Node.Action.Upload"
 -- UploadFile Action
 
 -- | Action : Upload
-actionUpload :: NodeType -> ID -> Session -> (Action -> Aff Unit) -> R.Hooks R.Element
-actionUpload NodeList id session dispatch =
-  pure $ uploadTermListView {dispatch, id, nodeType: GT.NodeList, session}
-
-actionUpload Corpus id session dispatch =
-  pure $ uploadFileView {dispatch, id, nodeType: Corpus, session}
+type ActionUpload =
+  ( dispatch :: Action -> Aff Unit
+  , id       :: ID
+  , nodeType :: NodeType
+  , session  :: Session )
+
+actionUpload :: R2.Component ActionUpload
+actionUpload = R.createElement actionUploadCpt
+actionUploadCpt :: R.Component ActionUpload
+actionUploadCpt = here.component "actionUpload" cpt where
+  cpt { nodeType: Corpus, dispatch, id, session } _ = pure $ uploadFileView {dispatch, id, nodeType: GT.Corpus, session}
+  cpt { nodeType: NodeList, dispatch, id, session } _ = pure $ uploadTermListView {dispatch, id, nodeType: GT.NodeList, session}
+  cpt props@{ nodeType: _, dispatch, id, session } _ = pure $ actionUploadOther props []
 
 {-
 actionUpload Annuaire id session dispatch =
   pure $ uploadFileView {dispatch, id, nodeType: Annuaire, session}
   -}
 
-actionUpload _ _ _ _ =
-  pure $ fragmentPT $ "Soon, upload for this NodeType."
+actionUploadOther :: R2.Component ActionUpload
+actionUploadOther = R.createElement actionUploadOtherCpt
+actionUploadOtherCpt :: R.Component ActionUpload
+actionUploadOtherCpt = here.component "actionUploadOther" cpt where
+  cpt _ _ = do
+    pure $ fragmentPT $ "Soon, upload for this NodeType."
 
 
 -- file upload types
@@ -82,12 +93,13 @@ uploadFileViewCpt :: R.Component Props
 uploadFileViewCpt = here.component "uploadFileView" cpt
   where
     cpt {dispatch, id, nodeType} _ = do
-      mFile    :: R.State (Maybe UploadFile) <- R.useState' Nothing
-      fileType@(_ /\ setFileType)   <- R.useState'  CSV
-      lang@( _chosenLang /\ setLang) <- R.useState' EN
+      -- mFile    :: R.State (Maybe UploadFile) <- R.useState' Nothing
+      mFile <- T.useBox (Nothing :: Maybe UploadFile)
+      fileType <- T.useBox CSV
+      lang <- T.useBox EN
 
-      let setFileType' = setFileType <<< const
-      let setLang' = setLang <<< const
+      let setFileType' val = T.write_ val fileType
+      let setLang' val = T.write_ val lang
 
       let bodies =
             [ R2.row
@@ -133,8 +145,8 @@ uploadFileViewCpt = here.component "uploadFileView" cpt
     renderOptionLang :: Lang -> R.Element
     renderOptionLang opt = H.option {} [ H.text $ show opt ]
 
-    onChangeContents :: forall e. R.State (Maybe UploadFile) -> E.SyntheticEvent_ e -> Effect Unit
-    onChangeContents (mFile /\ setMFile) e = do
+    onChangeContents :: forall e. T.Box (Maybe UploadFile) -> E.SyntheticEvent_ e -> Effect Unit
+    onChangeContents mFile e = do
       let mF = R2.inputFileNameWithBlob 0 e
       E.preventDefault e
       E.stopPropagation e
@@ -144,15 +156,15 @@ uploadFileViewCpt = here.component "uploadFileView" cpt
           --contents <- readAsText blob
           --contents <- readAsDataURL blob
           liftEffect $ do
-            setMFile $ const $ Just $ {blob: UploadFileBlob blob, name}
+            T.write_ (Just $ {blob: UploadFileBlob blob, name}) mFile
 
 
 type UploadButtonProps =
   ( dispatch :: Action -> Aff Unit
-  , fileType :: R.State FileType
+  , fileType :: T.Box FileType
   , id       :: GT.ID
-  , lang     :: R.State Lang
-  , mFile    :: R.State (Maybe UploadFile)
+  , lang     :: T.Box Lang
+  , mFile    :: T.Box (Maybe UploadFile)
   , nodeType :: GT.NodeType
   )
 
@@ -163,36 +175,39 @@ uploadButtonCpt :: R.Component UploadButtonProps
 uploadButtonCpt = here.component "uploadButton" cpt
   where
     cpt { dispatch
-        , fileType: (fileType /\ setFileType)
+        , fileType
         , id
-        , lang: (lang /\ setLang)
-        , mFile: (mFile /\ setMFile)
+        , lang
+        , mFile
         , nodeType
-        } _ = pure
-            $ H.button { className: "btn btn-primary"
-                       , "type" : "button"
-                       , disabled
-                       , style    : { width: "100%" }
-                       , on: {click: onClick}
-                       } [ H.text "Upload" ]
+        } _ = do
+      fileType' <- T.useLive T.unequal fileType
+      mFile' <- T.useLive T.unequal mFile
+
+      let disabled = case mFile' of
+            Nothing -> "1"
+            Just _  -> ""
+
+      pure $ H.button { className: "btn btn-primary"
+                      , "type" : "button"
+                      , disabled
+                      , style    : { width: "100%" }
+                      , on: {click: onClick fileType' mFile'}
+                      } [ H.text "Upload" ]
       where
-        disabled = case mFile of
-          Nothing -> "1"
-          Just _  -> ""
-
-        onClick e = do
-          let { blob, name } = unsafePartial $ fromJust mFile
-          log2 "[uploadButton] fileType" fileType
+        onClick fileType' mFile' e = do
+          let { blob, name } = unsafePartial $ fromJust mFile'
+          log2 "[uploadButton] fileType" fileType'
           void $ launchAff do
-            case fileType of
+            case fileType' of
               Arbitrary ->
                 dispatch $ UploadArbitraryFile (Just name) blob
               _ ->
-                dispatch $ UploadFile nodeType fileType (Just name) blob
+                dispatch $ UploadFile nodeType fileType' (Just name) blob
             liftEffect $ do
-              setMFile     $ const $ Nothing
-              setFileType  $ const $ CSV
-              setLang      $ const $ EN
+              T.write_ Nothing mFile
+              T.write_ CSV fileType
+              T.write_ EN lang
             dispatch ClosePopover
 
 -- START File Type View
@@ -352,7 +367,8 @@ uploadTermListViewCpt :: R.Component Props
 uploadTermListViewCpt = here.component "uploadTermListView" cpt
   where
     cpt {dispatch, id, nodeType} _ = do
-      mFile :: R.State (Maybe UploadFile) <- R.useState' Nothing
+      mFile <- T.useBox (Nothing :: Maybe UploadFile)
+
       let body = H.input { type: "file"
                             , placeholder: "Choose file"
                             , on: {change: onChangeContents mFile}
@@ -362,15 +378,15 @@ uploadTermListViewCpt = here.component "uploadTermListView" cpt
                                                , id
                                                , mFile
                                                , nodeType
-                                               } 
+                                               }
                             ]
 
       pure $ panel [body] footer
 
-    onChangeContents :: forall e. R.State (Maybe UploadFile)
+    onChangeContents :: forall e. T.Box (Maybe UploadFile)
                      -> E.SyntheticEvent_ e
                      -> Effect Unit
-    onChangeContents (mFile /\ setMFile) e = do
+    onChangeContents mFile e = do
       let mF = R2.inputFileNameWithBlob 0 e
       E.preventDefault  e
       E.stopPropagation e
@@ -379,37 +395,41 @@ uploadTermListViewCpt = here.component "uploadTermListView" cpt
         Just {blob, name} -> void $ launchAff do
           --contents <- readAsText blob
           liftEffect $ do
-            setMFile $ const $ Just $ { blob: UploadFileBlob blob
-                                      , name
-                                      }
+            T.write_ (Just $ { blob: UploadFileBlob blob
+                             , name }) mFile
 
 
 type UploadTermButtonProps =
   ( dispatch :: Action -> Aff Unit
   , id       :: Int
-  , mFile    :: R.State (Maybe UploadFile)
+  , mFile    :: T.Box (Maybe UploadFile)
   , nodeType :: GT.NodeType
   )
 
-uploadTermButton :: Record UploadTermButtonProps -> R.Element
+uploadTermButton :: R2.Leaf UploadTermButtonProps
 uploadTermButton props = R.createElement uploadTermButtonCpt props []
 
 uploadTermButtonCpt :: R.Component UploadTermButtonProps
 uploadTermButtonCpt = here.component "uploadTermButton" cpt
   where
-    cpt {dispatch, id, mFile: (mFile /\ setMFile), nodeType} _ = do
-        pure $ H.button {className: "btn btn-primary", disabled, on: {click: onClick}} [ H.text "Upload" ]
+    cpt { dispatch
+        , id
+        , mFile
+        , nodeType } _ = do
+      mFile' <- T.useLive T.unequal mFile
+
+      let  disabled = case mFile' of
+             Nothing -> "1"
+             Just _  -> ""
+
+      pure $ H.button { className: "btn btn-primary"
+                      , disabled
+                      , on: {click: onClick mFile'}
+                      } [ H.text "Upload" ]
       where
-        disabled = case mFile of
-          Nothing -> "1"
-          Just _  -> ""
-
-        onClick e = do
-          let {name, blob} = unsafePartial $ fromJust mFile
+        onClick mFile' e = do
+          let {name, blob} = unsafePartial $ fromJust mFile'
           void $ launchAff do
             _ <- dispatch $ UploadFile nodeType CSV (Just name) blob
             liftEffect $ do
-              setMFile $ const $ Nothing
-
-
-
+              T.write_ Nothing mFile

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

@@ -169,13 +169,13 @@ panelAction p = R.createElement panelActionCpt p []
 panelActionCpt :: R.Component PanelActionProps
 panelActionCpt = here.component "panelAction" cpt
   where
-    cpt {action: Documentation nodeType}                  _ = actionDoc      nodeType
-    cpt {action: Download, id, nodeType, session}         _ = actionDownload nodeType id session
-    cpt {action: Upload, dispatch, id, nodeType, session} _ = actionUpload   nodeType id session dispatch
-    cpt {action: Delete, nodeType, dispatch}              _ = actionDelete   nodeType dispatch
+    cpt {action: Documentation nodeType}                  _ = pure $ actionDoc { nodeType } []
+    cpt {action: Download, id, nodeType, session}         _ = pure $ actionDownload { id, nodeType, session } []
+    cpt {action: Upload, dispatch, id, nodeType, session} _ = pure $ actionUpload { dispatch, id, nodeType, session } []
+    cpt {action: Delete, nodeType, dispatch}              _ = pure $ actionDelete { dispatch, nodeType } []
     cpt {action: Add xs, dispatch, id, name, nodeType} _ =
-      pure $ addNodeView {dispatch, id, name, nodeType, nodeTypes: xs}
-    cpt {action: Refresh , dispatch, id, nodeType, session} _ = update nodeType dispatch
+      pure $ addNodeView {dispatch, id, name, nodeType, nodeTypes: xs} []
+    cpt {action: Refresh , dispatch, id, nodeType, session} _ = pure $ update { dispatch, nodeType } []
     cpt {action: Config , dispatch, id, nodeType, session} _ =
       pure $ fragmentPT $ "Config " <> show nodeType
     -- Functions using SubTree
@@ -185,21 +185,10 @@ panelActionCpt = here.component "panelAction" cpt
       pure $ moveNode { dispatch, id, nodeType, session, subTreeParams, handed } []
     cpt {action: Link {subTreeParams}, dispatch, id, nodeType, session, handed} _ =
       pure $ linkNode {dispatch, id, nodeType, session, subTreeParams, handed} []
-    cpt {action : Share, dispatch, id, name } _ = do
-      isOpen <- T.useBox true
-      pure $ panel
-        [ textInputBox
-          { boxAction: Share.shareAction, boxName: "Share"
-          , dispatch, id, text: "username", isOpen } []
-        ] (H.div {} [])
-    cpt {action : AddingContact, dispatch, id, name } _ = do
-      isOpen <- T.useBox true
-      pure $ Contact.textInputBox
-        { id, dispatch, isOpen, boxName:"addContact"
-        , params : {firstname:"First Name", lastname: "Last Name"}
-        , boxAction: \p -> AddContact p }
+    cpt {action : Share, dispatch, id, name } _ = pure $ Share.shareNode { dispatch, id } []
+    cpt {action : AddingContact, dispatch, id, name } _ = pure $ Contact.actionAddContact { dispatch, id } []
     cpt {action : Publish {subTreeParams}, dispatch, id, nodeType, session, handed} _ =
-      pure $ Share.shareNode {dispatch, id, nodeType, session, subTreeParams, handed}
+      pure $ Share.publishNode { dispatch, handed, id, nodeType, session, subTreeParams } []
     cpt props@{action: SearchBox, id, session, dispatch, nodePopup} _ =
       pure $ actionSearch { dispatch, id: (Just id), nodePopup, session } []
     cpt _ _ = pure $ H.div {} []

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

@@ -9,6 +9,7 @@ import Effect.Class (liftEffect)
 import Effect.Timer (clearInterval, setInterval)
 import Reactix as R
 import Reactix.DOM.HTML as H
+import Toestand as T
 
 import Gargantext.Prelude
 import Gargantext.Routes (SessionRoute(..))
@@ -31,8 +32,8 @@ type Props = (
   )
 
 
-asyncProgressBar :: Record Props -> R.Element
-asyncProgressBar p = R.createElement asyncProgressBarCpt p []
+asyncProgressBar :: R2.Component Props
+asyncProgressBar = R.createElement asyncProgressBarCpt
 
 asyncProgressBarCpt :: R.Component Props
 asyncProgressBarCpt = here.component "asyncProgressBar" cpt
@@ -42,7 +43,7 @@ asyncProgressBarCpt = here.component "asyncProgressBar" cpt
               , nodeId
               , onFinish
               } _ = do
-      (progress /\ setProgress) <- R.useState' 0.0
+      progress <- T.useBox 0.0
       intervalIdRef <- R.useRef Nothing
 
       R.useEffectOnce' $ do
@@ -50,7 +51,7 @@ asyncProgressBarCpt = here.component "asyncProgressBar" cpt
           launchAff_ $ do
             asyncProgress@(GT.AsyncProgress {status}) <- queryProgress props
             liftEffect do
-              setProgress \p -> min 100.0 $ GT.progressPercent asyncProgress
+              T.write_ (min 100.0 $ GT.progressPercent asyncProgress) progress
               if (status == GT.Finished) || (status == GT.Killed) || (status == GT.Failed) then do
                 _ <- case R.readRef intervalIdRef of
                   Nothing -> pure unit
@@ -64,17 +65,12 @@ asyncProgressBarCpt = here.component "asyncProgressBar" cpt
         pure unit
 
 
-      pure $ progressIndicator { barType, label: id, progress: toInt progress }
-
-    toInt :: Number -> Int
-    toInt n = case fromNumber n of
-        Nothing -> 0
-        Just x  -> x
+      pure $ progressIndicator { barType, label: id, progress }
 
 type ProgressIndicatorProps =
   ( barType  :: BarType
   , label    :: String
-  , progress :: Int
+  , progress :: T.Box Number
   )
 
 progressIndicator :: Record ProgressIndicatorProps -> R.Element
@@ -83,23 +79,30 @@ progressIndicator p = R.createElement progressIndicatorCpt p []
 progressIndicatorCpt :: R.Component ProgressIndicatorProps
 progressIndicatorCpt = here.component "progressIndicator" cpt
   where
-    cpt { barType: Bar, label, progress } _ = do
-      pure $
-        H.div { className: "progress" } [
-          H.div { className: "progress-bar"
-                , role: "progressbar"
-                , style: { width: (show $ progress) <> "%" }
-                } [ H.text label ]
-        ]
-
-    cpt { barType: Pie, label, progress } _ = do
-      pure $
-        H.div { className: "progress-pie" } [
-          H.div { className: "progress-pie-segment"
-                , style: { "--over50": if progress < 50 then "0" else "1"
-                         , "--value": show $ progress } } [
-          ]
-        ]
+    cpt { barType, label, progress } _ = do
+      progress' <- T.useLive T.unequal progress
+      let progressInt = toInt progress'
+
+      case barType of
+        Bar -> pure $
+                H.div { className: "progress" }
+                  [ H.div { className: "progress-bar"
+                        , role: "progressbar"
+                        , style: { width: (show $ progressInt) <> "%" }
+                        } [ H.text label ]
+                  ]
+        Pie -> pure $
+                H.div { className: "progress-pie" }
+                  [ H.div { className: "progress-pie-segment"
+                          , style: { "--over50": if progressInt < 50 then "0" else "1"
+                                   , "--value": show $ progressInt } } [
+                    ]
+                  ]
+
+    toInt :: Number -> Int
+    toInt n = case fromNumber n of
+        Nothing -> 0
+        Just x  -> x
 
 queryProgress :: Record Props -> Aff GT.AsyncProgress
 queryProgress { asyncTask: GT.AsyncTaskWithType { task: GT.AsyncTask {id}
@@ -110,8 +113,8 @@ queryProgress { asyncTask: GT.AsyncTaskWithType { task: GT.AsyncTask {id}
               } = get session (p typ)
   where
     -- TODO refactor path
-    p GT.UpdateNode         = NodeAPI GT.Node   (Just nodeId) $ path <> id <> "/poll?limit=1"
     p GT.UpdateNgramsCharts = NodeAPI GT.Node   (Just nodeId) $ path <> id <> "/poll?limit=1"
+    p GT.UpdateNode         = NodeAPI GT.Node   (Just nodeId) $ path <> id <> "/poll?limit=1"
     p _                     = NodeAPI GT.Corpus (Just nodeId) $ path <> id <> "/poll?limit=1"
     path = GT.asyncTaskTypePath typ
 

src/Gargantext/Components/Forest/Tree/Node/Tools/Sync.purs

@@ -5,10 +5,11 @@ import Gargantext.Prelude
 import Effect.Aff (Aff, launchAff_)
 import Data.Tuple.Nested ((/\))
 import Data.Maybe (Maybe(..))
-import Effect.Class (liftEffect)
 import Data.Tuple (fst)
+import Effect.Class (liftEffect)
 import Reactix.DOM.HTML as H
 import Reactix as R
+import Toestand as T
 
 import Gargantext.Components.GraphExplorer.API as GraphAPI
 import Gargantext.Types as GT
@@ -27,9 +28,8 @@ type NodeActionsGraphProps =
   , refresh :: Unit -> Aff Unit
   )
 
-nodeActionsGraph :: Record NodeActionsGraphProps -> R.Element
-nodeActionsGraph p = R.createElement nodeActionsGraphCpt p []
-
+nodeActionsGraph :: R2.Component NodeActionsGraphProps
+nodeActionsGraph = R.createElement nodeActionsGraphCpt
 nodeActionsGraphCpt :: R.Component NodeActionsGraphProps
 nodeActionsGraphCpt = here.component "nodeActionsGraph" cpt
   where
@@ -54,22 +54,23 @@ graphUpdateButtonCpt :: R.Component GraphUpdateButtonProps
 graphUpdateButtonCpt = here.component "graphUpdateButton" cpt
   where
     cpt { id, session, refresh } _ = do
-      enabled <- R.useState' true
+      enabled <- T.useBox true
+      enabled' <- T.useLive T.unequal enabled
 
       pure $ H.div { className: "update-button "
-                   <> if (fst enabled)
+                   <> if enabled'
                          then "enabled"
                          else "disabled text-muted"
                    } [ H.span { className: "fa fa-refresh"
-                     , on: { click: onClick enabled } } []
+                     , on: { click: onClick enabled' enabled } } []
                      ]
       where
-        onClick (false /\ _) _ = pure unit
-        onClick (true /\ setEnabled) _ = do
+        onClick false _ = pure unit
+        onClick true enabled = do
           launchAff_ $ do
-            liftEffect $ setEnabled $ const false
+            liftEffect $ T.write_ false enabled
             g <- GraphAPI.updateGraphVersions { graphId: id, session }
-            liftEffect $ setEnabled $ const true
+            liftEffect $ T.write_ true enabled
             refresh unit
           pure unit
 
@@ -109,7 +110,7 @@ nodeListUpdateButtonCpt :: R.Component NodeListUpdateButtonProps
 nodeListUpdateButtonCpt = here.component "nodeListUpdateButton" cpt
   where
     cpt { listId, nodeId, nodeType, session, refresh } _ = do
-      enabled <- R.useState' true
+      -- enabled <- T.useBox true
 
       pure $ H.div {} [] {- { className: "update-button " 
                      <> if (fst enabled) then "enabled" else "disabled text-muted"

src/Gargantext/Components/GraphExplorer.purs

@@ -12,22 +12,13 @@ import Data.Nullable (null, Nullable)
 import Data.Sequence as Seq
 import Data.Set as Set
 import Data.Tuple (Tuple(..))
-import Data.Tuple.Nested ((/\))
 import Effect.Aff (Aff)
-import Math (log)
-import Partial.Unsafe (unsafePartial)
-import Reactix as R
-import Reactix.DOM.HTML as RH
-import Record as Record
-import Record.Extra as RX
-import Toestand as T
-
 import Gargantext.AsyncTasks as GAT
-import Gargantext.Components.Forest (forest)
+import Gargantext.Components.App.Data (Boxes)
 import Gargantext.Components.Graph as Graph
 import Gargantext.Components.GraphExplorer.Controls as Controls
 import Gargantext.Components.GraphExplorer.Search (nodeSearchControl)
-import Gargantext.Components.GraphExplorer.Sidebar as Sidebar
+import Gargantext.Components.GraphExplorer.Sidebar.Types as GEST
 import Gargantext.Components.GraphExplorer.ToggleButton as Toggle
 import Gargantext.Components.GraphExplorer.Types as GET
 import Gargantext.Data.Louvain as Louvain
@@ -41,63 +32,89 @@ import Gargantext.Types as Types
 import Gargantext.Utils.Range as Range
 import Gargantext.Utils.Reactix as R2
 import Gargantext.Utils.Toestand as T2
+import Math as Math
+import Partial.Unsafe (unsafePartial)
+import Reactix as R
+import Reactix.DOM.HTML as RH
+import Record as Record
+import Record.Extra as RX
+import Toestand as T
 
 here :: R2.Here
 here = R2.here "Gargantext.Components.GraphExplorer"
 
 type BaseProps =
-  ( backend       :: T.Box (Maybe Backend)
-  , frontends     :: Frontends
-  , graphId       :: GET.GraphId
-  , handed        :: T.Box Types.Handed
-  , route         :: T.Box AppRoute
-  , sessions      :: T.Box Sessions
-  , showLogin     :: T.Box Boolean
-  , tasks         :: T.Box GAT.Storage
+  ( backend        :: T.Box (Maybe Backend)
+  , boxes          :: Boxes
+  , frontends      :: Frontends
+  , graphId        :: GET.GraphId
+  , handed         :: T.Box Types.Handed
+  , route          :: T.Box AppRoute
+  , sessions       :: T.Box Sessions
+  , showLogin      :: T.Box Boolean
+  , tasks          :: T.Box GAT.Storage
   )
 
-type LayoutLoaderProps = ( session :: R.Context Session | BaseProps )
-
 type LayoutProps =
-  ( graphVersion :: T2.ReloadS
-  , session :: Session
+  ( session      :: Session
   | BaseProps )
 
+type GraphWriteProps =
+  ( graph          :: SigmaxT.SGraph
+  , hyperdataGraph :: GET.HyperdataGraph
+  , mMetaData'     :: Maybe GET.MetaData
+  | LayoutProps
+  )
+
 type Props =
   ( graph          :: SigmaxT.SGraph
   , hyperdataGraph :: GET.HyperdataGraph
-  , mMetaData      :: Maybe GET.MetaData
   | LayoutProps
   )
 
 --------------------------------------------------------------
-explorerLayoutLoader :: R2.Component LayoutLoaderProps
-explorerLayoutLoader = R.createElement explorerLayoutLoaderCpt
-
-explorerLayoutLoaderCpt :: R.Component LayoutLoaderProps
-explorerLayoutLoaderCpt = here.component "explorerLayoutLoader" cpt where
-  cpt props _ = do
-    graphVersion <- T.useBox T2.newReload
-    session <- R.useContext props.session -- todo: ugh, props fiddling
-    let base = RX.pick props :: Record BaseProps
-    let props' = Record.merge base { graphVersion, session }
-    pure $ explorerLayout props' []
-    
 explorerLayout :: R2.Component LayoutProps
 explorerLayout = R.createElement explorerLayoutCpt
 
 explorerLayoutCpt :: R.Component LayoutProps
 explorerLayoutCpt = here.component "explorerLayout" cpt where
-  cpt props@{ backend, graphId, graphVersion, session } _ = do
+  cpt props@{ backend, boxes: { graphVersion }, graphId, session } _ = do
     graphVersion' <- T.useLive T.unequal graphVersion
 
     useLoader graphId (getNodes session graphVersion') handler
     where
-      handler loaded = explorer (Record.merge props { graph, hyperdataGraph: loaded, mMetaData }) []
+      handler loaded = explorerWriteGraph (Record.merge props { graph, hyperdataGraph: loaded, mMetaData' }) []
         -- explorer (Record.merge props { graph, graphVersion, hyperdataGraph: loaded, mMetaData })
         where
           GET.HyperdataGraph { graph: hyperdataGraph } = loaded
-          Tuple mMetaData graph = convert hyperdataGraph
+          Tuple mMetaData' graph = convert hyperdataGraph
+
+explorerWriteGraph :: R2.Component GraphWriteProps
+explorerWriteGraph = R.createElement explorerWriteGraphCpt
+
+explorerWriteGraphCpt :: R.Component GraphWriteProps
+explorerWriteGraphCpt = here.component "explorerWriteGraph" cpt where
+  cpt props@{ boxes: { sidePanelGraph, sidePanelState }
+            , graph
+            , hyperdataGraph
+            , mMetaData' } _ = do
+      R.useEffectOnce' $ do
+        T.write_ (Just { mGraph: Just graph
+                       , mMetaData: mMetaData'
+                       , multiSelectEnabled: false
+                       , removedNodeIds: Set.empty
+                       , selectedNodeIds: Set.empty
+                       , showControls: false
+                       , sideTab: GET.SideTabLegend }) sidePanelGraph
+
+      -- { mGraph, mMetaData, sideTab } <- GEST.focusedSidePanel sidePanelGraph
+
+      -- R.useEffect' $ do
+      --   here.log2 "writing graph" graph
+      --   T.write_ (Just graph) mGraph
+      --   T.write_ mMetaData' mMetaData
+
+      pure $ explorer (RX.pick props :: Record Props) []
 
 --------------------------------------------------------------
 explorer :: R2.Component Props
@@ -107,24 +124,26 @@ explorerCpt :: R.Component Props
 explorerCpt = here.component "explorer" cpt
   where
     cpt props@{ backend
+              , boxes: boxes@{ graphVersion, reloadForest, showTree, sidePanelGraph, sidePanelState }
               , frontends
               , graph
               , graphId
-              , graphVersion
               , handed
               , hyperdataGraph
-              , mMetaData
               , route
               , session
               , sessions
               , showLogin
               , tasks
               } _ = do
+      { mMetaData, sideTab } <- GEST.focusedSidePanel sidePanelGraph
       handed' <- T.useLive T.unequal handed
       graphVersion' <- T.useLive T.unequal graphVersion
       graphVersionRef <- R.useRef graphVersion'
+      mMetaData' <- T.useLive T.unequal mMetaData
+      -- sideTab <- T.useBox GET.SideTabLegend
 
-      let startForceAtlas = maybe true (\(GET.MetaData { startForceAtlas: sfa }) -> sfa) mMetaData
+      let startForceAtlas = maybe true (\(GET.MetaData { startForceAtlas: sfa }) -> sfa) mMetaData'
 
       let forceAtlasS = if startForceAtlas
                           then SigmaxT.InitialRunning
@@ -132,19 +151,21 @@ explorerCpt = here.component "explorer" cpt
 
       dataRef <- R.useRef graph
       graphRef <- R.useRef null
-      reloadForest <- T.useBox T2.newReload
       controls <- Controls.useGraphControls { forceAtlasS
                                             , graph
                                             , graphId
                                             , hyperdataGraph
-                                            , reloadForest: \_ -> T2.reload reloadForest
+                                            , reloadForest
                                             , session
+                                            , showTree
+                                            , sidePanel: sidePanelGraph
+                                            , sidePanelState
                                             }
       multiSelectEnabled' <- T.useLive T.unequal controls.multiSelectEnabled
       showTree' <- T.useLive T.unequal controls.showTree
       multiSelectEnabledRef <- R.useRef multiSelectEnabled'
 
-      forestOpen <- T.useBox $ Set.empty
+      forestOpen <- T.useBox $ (Set.empty :: OpenNodes)
       R.useEffectOnce' $ do
         R2.loadLocalStorageState R2.openNodesKey forestOpen
         T.listen (R2.listenLocalStorageState R2.openNodesKey) forestOpen
@@ -166,131 +187,74 @@ explorerCpt = here.component "explorer" cpt
           T.write_ SigmaxT.EShow controls.showEdges
           T.write_ forceAtlasS controls.forceAtlasState
           T.write_ Graph.Init controls.graphStage
-          T.write_ GET.InitialClosed controls.showSidePanel
+          T.write_ Types.InitialClosed controls.sidePanelState
 
       pure $
-        RH.div { className: "graph-meta-container" } [
-          RH.div { className: "fixed-top navbar navbar-expand-lg"
-                 , id: "graph-explorer" }
-            [ rowToggle
-                    [ col [ spaces [ Toggle.treeToggleButton { state: controls.showTree } [] ]]
-                    , col [ spaces [ Toggle.controlsToggleButton { state: controls.showControls } [] ]]
-                    , col [ spaces [ Toggle.sidebarToggleButton { state: controls.showSidePanel } [] ]]
-                    , col [ spaces [ nodeSearchControl { graph
-                                                       , multiSelectEnabled: controls.multiSelectEnabled
-                                                       , selectedNodeIds: controls.selectedNodeIds } [] ] ]
-                    ]
-            ]
-        , RH.div { className: "graph-container" } [
-            inner handed' [
-              rowControls [ Controls.controls controls ]
-            , RH.div { className: "row graph-row" } $ mainLayout handed' $
-                tree { backend
-                     , forestOpen
-                     , frontends
-                     , handed
-                     , reload: reloadForest
-                     , route
-                     , reloadForest
-                     , sessions
-                     , show: showTree'
-                     , showLogin: showLogin
-                     , tasks
-                     }
-                /\
-                RH.div { ref: graphRef, id: "graph-view", className: "col-md-12" } []
-                /\
-                graphView { controls
+        RH.div { className: "graph-meta-container" }
+        [ RH.div { className: "graph-container" }
+          [ inner handed'
+            [ RH.div { id: "controls-container" } [ Controls.controls controls [] ]
+            , RH.div { className: "row graph-row" }
+              [ RH.div { ref: graphRef, id: "graph-view", className: "col-md-12" } []
+              , graphView { controls
                           , elRef: graphRef
                           , graphId
                           , graph
                           , hyperdataGraph
                           , mMetaData
                           , multiSelectEnabledRef
-                          }
-                /\
-                mSidebar mMetaData { frontends
-                                   , graph
-                                   , graphId
-                                   , graphVersion
-                                   , removedNodeIds : controls.removedNodeIds
-                                   , session
-                                   , selectedNodeIds: controls.selectedNodeIds
-                                   , showSidePanel  :   controls.showSidePanel
-                                   , reloadForest
-                                   }
+                          } []
+              ]
             ]
           ]
         ]
 
-    mainLayout Types.RightHanded (tree' /\ gc /\ gv /\ sdb) = [tree', gc, gv, sdb]
-    mainLayout Types.LeftHanded  (tree' /\ gc /\ gv /\ sdb) = [sdb, gc, gv, tree']
-
-    outer = RH.div { className: "col-md-12" }
     inner h = RH.div { className: "container-fluid " <> hClass }
       where
         hClass = case h of
           Types.LeftHanded  -> "lefthanded"
           Types.RightHanded -> "righthanded"
-    -- rowToggle  = RH.div { id: "toggle-container" }
-    rowToggle  = RH.ul { className: "navbar-nav ml-auto mr-auto" }
-    rowControls = RH.div { id: "controls-container" }
-    -- col       = RH.div { className: "col-md-4" }
-    col = RH.li { className: "nav-item" }
-    pullLeft  = RH.div { className: "pull-left"  }
-    pullRight = RH.div { className: "pull-right" }
-    -- spaces    = RH.div { className: "flex-space-between" }
-    spaces = RH.a { className: "nav-link" }
-
-
-    tree :: Record TreeProps -> R.Element
-    tree { show: false } = RH.div { id: "tree" } []
-    tree { backend, forestOpen, frontends, handed, reload, route, sessions, showLogin, reloadForest, tasks } =
-      RH.div {className: "col-md-2 graph-tree"} [
-        forest { backend
-               , forestOpen
-               , frontends
-               , handed
-               , reloadForest
-               , reloadRoot: reload
-               , route
-               , sessions
-               , showLogin
-               , tasks } []
-      ]
 
-    mSidebar :: Maybe GET.MetaData
-             -> Record MSidebarProps
-             -> R.Element
-    mSidebar  Nothing            _ = RH.div {} []
-    mSidebar (Just metaData) props =
-      Sidebar.sidebar (Record.merge props { metaData })
-
-type TreeProps = (
-    backend      :: T.Box (Maybe Backend)
-  , forestOpen   :: T.Box OpenNodes
-  , frontends    :: Frontends
-  , handed       :: T.Box Types.Handed
-  , reload       :: T.Box T2.Reload
-  , reloadForest :: T.Box T2.Reload
-  , route        :: T.Box AppRoute
-  , sessions     :: T.Box Sessions
-  , show         :: Boolean
-  , showLogin    :: T.Box Boolean
-  , tasks        :: T.Box GAT.Storage
+type TopBar =
+  (
+    boxes    :: Boxes
   )
 
-type MSidebarProps =
-  ( frontends       :: Frontends
-  , graph           :: SigmaxT.SGraph
-  , graphId         :: GET.GraphId
-  , graphVersion    :: T2.ReloadS
-  , reloadForest    :: T.Box T2.Reload
-  , removedNodeIds  :: T.Box SigmaxT.NodeIds
-  , selectedNodeIds :: T.Box SigmaxT.NodeIds
-  , session         :: Session
-  , showSidePanel   :: T.Box GET.SidePanelState
-  )
+topBar :: R2.Component TopBar
+topBar = R.createElement topBarCpt
+
+topBarCpt :: R.Component TopBar
+topBarCpt = here.component "topBar" cpt where
+  cpt { boxes: { showTree
+               , sidePanelGraph
+               , sidePanelState } } _ = do
+    { mGraph, multiSelectEnabled, selectedNodeIds, showControls } <- GEST.focusedSidePanel sidePanelGraph
+
+    mGraph' <- T.useLive T.unequal mGraph
+
+    let search = case mGraph' of
+          Just graph -> nodeSearchControl { graph
+                                         , multiSelectEnabled
+                                         , selectedNodeIds } []
+          Nothing -> RH.div {} []
+
+    pure $ RH.form { className: "d-flex" }
+      [ Toggle.treeToggleButton { state: showTree } []
+      , Toggle.controlsToggleButton { state: showControls } []
+      , Toggle.sidebarToggleButton { state: sidePanelState } []
+      , search
+      -- [ col [ spaces [ Toggle.treeToggleButton { state: showTree } [] ]]
+      -- , col [ spaces [ Toggle.controlsToggleButton { state: showControls } [] ]]
+      -- , col [ spaces [ Toggle.sidebarToggleButton { state: sidePanelState } [] ]]
+      -- , col [ spaces [ search ] ]
+      ]
+    where
+      -- rowToggle  = RH.div { id: "toggle-container" }
+      rowToggle  = RH.ul { className: "navbar-nav ml-auto mr-auto" }
+      -- col       = RH.div { className: "col-md-4" }
+      col = RH.li { className: "nav-item" }
+      -- spaces    = RH.div { className: "flex-space-between" }
+      spaces = RH.a { className: "nav-link" }
 
 type GraphProps = (
     controls              :: Record Controls.Controls
@@ -298,13 +262,13 @@ type GraphProps = (
   , graphId               :: GET.GraphId
   , graph                 :: SigmaxT.SGraph
   , hyperdataGraph        :: GET.HyperdataGraph
-  , mMetaData             :: Maybe GET.MetaData
+  , mMetaData             :: T.Box (Maybe GET.MetaData)
   , multiSelectEnabledRef :: R.Ref Boolean
 )
 
-graphView :: Record GraphProps -> R.Element
+graphView :: R2.Component GraphProps
 --graphView sigmaRef props = R.createElement (R.memo el memoCmp) props []
-graphView props = R.createElement graphViewCpt props []
+graphView = R.createElement graphViewCpt
 
 graphViewCpt :: R.Component GraphProps
 graphViewCpt = here.component "graphView" cpt
@@ -318,6 +282,7 @@ graphViewCpt = here.component "graphView" cpt
         , multiSelectEnabledRef } _children = do
       edgeConfluence' <- T.useLive T.unequal controls.edgeConfluence
       edgeWeight' <- T.useLive T.unequal controls.edgeWeight
+      mMetaData' <- T.useLive T.unequal mMetaData
       multiSelectEnabled' <- T.useLive T.unequal controls.multiSelectEnabled
       nodeSize' <- T.useLive T.unequal controls.nodeSize
       removedNodeIds' <- T.useLive T.unequal controls.removedNodeIds
@@ -334,12 +299,12 @@ graphViewCpt = here.component "graphView" cpt
             else
               graph
       let transformedGraph = transformGraph louvainGraph { edgeConfluence'
-                                                                  , edgeWeight'
-                                                                  , nodeSize'
-                                                                  , removedNodeIds'
-                                                                  , selectedNodeIds'
-                                                                  , showEdges' }
-      let startForceAtlas = maybe true (\(GET.MetaData { startForceAtlas: sfa }) -> sfa) mMetaData
+                                                         , edgeWeight'
+                                                         , nodeSize'
+                                                         , removedNodeIds'
+                                                         , selectedNodeIds'
+                                                         , showEdges' }
+      let startForceAtlas = maybe true (\(GET.MetaData { startForceAtlas: sfa }) -> sfa) mMetaData'
 
       R.useEffect1' multiSelectEnabled' $ do
         R.setRef multiSelectEnabledRef multiSelectEnabled'
@@ -371,7 +336,7 @@ convert (GET.GraphData r) = Tuple r.metaData $ SigmaxT.Graph {nodes, edges}
         , hidden : false
         , id    : n.id_
         , label : n.label
-        , size  : log (toNumber n.size + 1.0)
+        , size  : Math.log (toNumber n.size + 1.0)
         , type  : modeGraphType gargType
         , x     : n.x -- cos (toNumber i)
         , y     : n.y -- sin (toNumber i)

src/Gargantext/Components/GraphExplorer/Button.purs

@@ -23,6 +23,7 @@ import Gargantext.Hooks.Sigmax as Sigmax
 import Gargantext.Hooks.Sigmax.Sigma as Sigma
 import Gargantext.Sessions (Session)
 import Gargantext.Utils.Reactix as R2
+import Gargantext.Utils.Toestand as T2
 
 here :: R2.Here
 here = R2.here "Gargantext.Components.GraphExplorer.Button"
@@ -53,12 +54,12 @@ centerButton sigmaRef = simpleButton {
   }
 
 
-type CameraButtonProps = (
-    id :: Int
+type CameraButtonProps =
+  ( id             :: Int
   , hyperdataGraph :: GET.HyperdataGraph
-  , session :: Session
-  , sigmaRef :: R.Ref Sigmax.Sigma
-  , reloadForest :: Unit -> Effect Unit
+  , session        :: Session
+  , sigmaRef       :: R.Ref Sigmax.Sigma
+  , reloadForest   :: T2.ReloadS
   )
 
 
@@ -94,7 +95,7 @@ cameraButton { id
         launchAff_ $ do
           clonedGraphId <- cloneGraph { id, hyperdataGraph: hyperdataGraph', session }
           ret <- uploadArbitraryDataURL session clonedGraphId (Just $ nowStr <> "-" <> "screenshot.png") screen
-          liftEffect $ reloadForest unit
+          liftEffect $ T2.reload reloadForest
           pure ret
   , text: "Screenshot"
   }

src/Gargantext/Components/GraphExplorer/Controls.purs

@@ -3,8 +3,6 @@ module Gargantext.Components.GraphExplorer.Controls
  , useGraphControls
  , controls
  , controlsCpt
- , setShowTree
- , setShowControls
  ) where
 
 import Data.Array as A
@@ -12,7 +10,6 @@ import Data.Int as I
 import Data.Maybe (Maybe(..), maybe)
 import Data.Sequence as Seq
 import Data.Set as Set
-import Effect (Effect)
 import Effect.Timer (setTimeout)
 import Prelude
 import Reactix as R
@@ -24,12 +21,15 @@ import Gargantext.Components.GraphExplorer.Button (centerButton, cameraButton)
 import Gargantext.Components.GraphExplorer.RangeControl (edgeConfluenceControl, edgeWeightControl, nodeSizeControl)
 import Gargantext.Components.GraphExplorer.SlideButton (labelSizeButton, mouseSelectorSizeButton)
 import Gargantext.Components.GraphExplorer.ToggleButton (multiSelectEnabledButton, edgesToggleButton, louvainToggleButton, pauseForceAtlasButton)
+import Gargantext.Components.GraphExplorer.Sidebar.Types as GEST
 import Gargantext.Components.GraphExplorer.Types as GET
 import Gargantext.Hooks.Sigmax as Sigmax
 import Gargantext.Hooks.Sigmax.Types as SigmaxT
 import Gargantext.Sessions (Session)
+import Gargantext.Types as GT
 import Gargantext.Utils.Range as Range
 import Gargantext.Utils.Reactix as R2
+import Gargantext.Utils.Toestand as T2
 
 here :: R2.Here
 here = R2.here "Gargantext.Components.GraphExplorer.Controls"
@@ -44,15 +44,16 @@ type Controls =
   , hyperdataGraph     :: GET.HyperdataGraph
   , multiSelectEnabled :: T.Box Boolean
   , nodeSize           :: T.Box Range.NumberRange
-  , reloadForest       :: Unit -> Effect Unit
+  , reloadForest       :: T2.ReloadS
   , removedNodeIds     :: T.Box SigmaxT.NodeIds
   , selectedNodeIds    :: T.Box SigmaxT.NodeIds
   , session            :: Session
   , showControls       :: T.Box Boolean
   , showEdges          :: T.Box SigmaxT.ShowEdgesState
   , showLouvain        :: T.Box Boolean
-  , showSidePanel      :: T.Box GET.SidePanelState
   , showTree           :: T.Box Boolean
+  , sidePanelState     :: T.Box GT.SidePanelState
+  , sideTab            :: T.Box GET.SideTab
   , sigmaRef           :: R.Ref Sigmax.Sigma
   )
 
@@ -64,8 +65,8 @@ initialLocalControls = do
   mouseSelectorSize <- T.useBox 15.0
   pure $ { labelSize, mouseSelectorSize }
 
-controls :: Record Controls -> R.Element
-controls props = R.createElement controlsCpt props []
+controls :: R2.Component Controls
+controls = R.createElement controlsCpt
 
 controlsCpt :: R.Component Controls
 controlsCpt = here.component "controls" cpt
@@ -85,14 +86,15 @@ controlsCpt = here.component "controls" cpt
         , showControls
         , showEdges
         , showLouvain
-        , showSidePanel
         , showTree
+        , sidePanelState
+        , sideTab
         , sigmaRef } _ = do
       forceAtlasState' <- T.useLive T.unequal forceAtlasState
       graphStage' <- T.useLive T.unequal graphStage
       selectedNodeIds' <- T.useLive T.unequal selectedNodeIds
       showControls' <- T.useLive T.unequal showControls
-      showSidePanel' <- T.useLive T.unequal showSidePanel
+      sidePanelState' <- T.useLive T.unequal sidePanelState
 
       localControls <- initialLocalControls
       -- ref to track automatic FA pausing
@@ -115,8 +117,9 @@ controlsCpt = here.component "controls" cpt
 
       -- Automatic opening of sidebar when a node is selected (but only first time).
       R.useEffect' $ do
-        if showSidePanel' == GET.InitialClosed && (not Set.isEmpty selectedNodeIds') then
-          T.write_ (GET.Opened GET.SideTabData) showSidePanel
+        if sidePanelState' == GT.InitialClosed && (not Set.isEmpty selectedNodeIds') then do
+          T.write_ GT.Opened sidePanelState
+          T.write_ GET.SideTabData sideTab
         else
           pure unit
 
@@ -154,40 +157,40 @@ controlsCpt = here.component "controls" cpt
       let nodeSizeMax = maybe 100.0 _.size $ A.last nodesSorted
       let nodeSizeRange = Range.Closed { min: nodeSizeMin, max: nodeSizeMax }
 
-      pure $ case showControls' of
-        false -> RH.div {} []
-        -- true -> R2.menu { id: "toolbar" } [
-        true -> RH.nav { className: "navbar navbar-expand-lg" }
-                 [ RH.ul { className: "navbar-nav mx-auto" } [ -- change type button (?)
-                     RH.li { className: "nav-item" } [ centerButton sigmaRef ]
-                   , RH.li { className: "nav-item" } [ pauseForceAtlasButton { state: forceAtlasState } [] ]
-                   , RH.li { className: "nav-item" } [ edgesToggleButton { state: showEdges } [] ]
-                   , RH.li { className: "nav-item" } [ louvainToggleButton { state: showLouvain } [] ]
-                   , RH.li { className: "nav-item" } [ edgeConfluenceControl { range: edgeConfluenceRange
-                                                                             , state: edgeConfluence } [] ]
-                   , RH.li { className: "nav-item" } [ edgeWeightControl { range: edgeWeightRange
-                                                                         , state: edgeWeight } [] ]
-              -- change level
-              -- file upload
-              -- run demo
-              -- search button
-              -- search topics
-                   , RH.li { className: "nav-item" } [ labelSizeButton sigmaRef localControls.labelSize ] -- labels size: 1-4
-                   , RH.li { className: "nav-item" } [ nodeSizeControl { range: nodeSizeRange
-                                                                       , state: nodeSize } [] ]
-              -- zoom: 0 -100 - calculate ratio
-                   , RH.li { className: "nav-item" } [ multiSelectEnabledButton { state: multiSelectEnabled } [] ]  -- toggle multi node selection
-              -- save button
-                   , RH.li { className: "nav-item" }
-                     [ mouseSelectorSizeButton sigmaRef localControls.mouseSelectorSize ]
-                   , RH.li { className: "nav-item" }
-                     [ cameraButton { id: graphId
-                                    , hyperdataGraph: hyperdataGraph
-                                    , session: session
-                                    , sigmaRef: sigmaRef
-                                    , reloadForest: reloadForest } ]
-            ]
-          ]
+      let className = "navbar navbar-expand-lg " <> if showControls' then "" else "d-none"
+
+      pure $ RH.nav { className }
+                 [ RH.ul { className: "navbar-nav mx-auto" }
+                   [ -- change type button (?)
+                     navItem [ centerButton sigmaRef ]
+                   , navItem [ pauseForceAtlasButton { state: forceAtlasState } [] ]
+                   , navItem [ edgesToggleButton { state: showEdges } [] ]
+                   , navItem [ louvainToggleButton { state: showLouvain } [] ]
+                   , navItem [ edgeConfluenceControl { range: edgeConfluenceRange
+                                                     , state: edgeConfluence } [] ]
+                   , navItem [ edgeWeightControl { range: edgeWeightRange
+                                                 , state: edgeWeight } [] ]
+                   -- change level
+                   -- file upload
+                   -- run demo
+                   -- search button
+                   -- search topics
+                   , navItem [ labelSizeButton sigmaRef localControls.labelSize ] -- labels size: 1-4
+                   , navItem [ nodeSizeControl { range: nodeSizeRange
+                                               , state: nodeSize } [] ]
+                   -- zoom: 0 -100 - calculate ratio
+                   , navItem [ multiSelectEnabledButton { state: multiSelectEnabled } [] ]  -- toggle multi node selection
+                   -- save button
+                   , navItem [ mouseSelectorSizeButton sigmaRef localControls.mouseSelectorSize ]
+                   , navItem [ cameraButton { id: graphId
+                                            , hyperdataGraph: hyperdataGraph
+                                            , session: session
+                                            , sigmaRef: sigmaRef
+                                            , reloadForest } ]
+                   ]
+                 ]
+      where
+        navItem = RH.li { className: "nav-item" }
           --   RH.ul {} [ -- change type button (?)
           --     RH.li {} [ centerButton sigmaRef ]
           --   , RH.li {} [ pauseForceAtlasButton {state: forceAtlasState} ]
@@ -218,18 +221,24 @@ controlsCpt = here.component "controls" cpt
           -- ]
 
 useGraphControls :: { forceAtlasS :: SigmaxT.ForceAtlasState
-                   , graph :: SigmaxT.SGraph
-                   , graphId :: GET.GraphId
-                   , hyperdataGraph :: GET.HyperdataGraph
-                   , session :: Session
-                   , reloadForest :: Unit -> Effect Unit }
+                    , graph          :: SigmaxT.SGraph
+                    , graphId        :: GET.GraphId
+                    , hyperdataGraph :: GET.HyperdataGraph
+                    , reloadForest   :: T2.ReloadS
+                    , session        :: Session
+                    , showTree       :: T.Box Boolean
+                    , sidePanel      :: T.Box (Maybe (Record GEST.SidePanel))
+                    , sidePanelState :: T.Box GT.SidePanelState }
                  -> R.Hooks (Record Controls)
 useGraphControls { forceAtlasS
                  , graph
                  , graphId
                  , hyperdataGraph
+                 , reloadForest
                  , session
-                 , reloadForest } = do
+                 , showTree
+                 , sidePanel
+                 , sidePanelState } = do
   edgeConfluence <- T.useBox $ Range.Closed { min: 0.0, max: 1.0 }
   edgeWeight <- T.useBox $ Range.Closed {
       min: 0.0
@@ -237,18 +246,19 @@ useGraphControls { forceAtlasS
     }
   forceAtlasState <- T.useBox forceAtlasS
   graphStage      <- T.useBox Graph.Init
-  multiSelectEnabled <- T.useBox false
+  -- multiSelectEnabled <- T.useBox false
   nodeSize <- T.useBox $ Range.Closed { min: 0.0, max: 100.0 }
-  removedNodeIds <- T.useBox SigmaxT.emptyNodeIds
-  selectedNodeIds <- T.useBox SigmaxT.emptyNodeIds
-  showControls    <- T.useBox false
+  -- removedNodeIds <- T.useBox SigmaxT.emptyNodeIds
+  -- selectedNodeIds <- T.useBox SigmaxT.emptyNodeIds
+  -- showControls    <- T.useBox false
   showEdges <- T.useBox SigmaxT.EShow
   showLouvain <- T.useBox false
-  showSidePanel   <- T.useBox GET.InitialClosed
-  showTree <- T.useBox false
+  -- sidePanelState   <- T.useBox GT.InitialClosed
   sigma <- Sigmax.initSigma
   sigmaRef <- R.useRef sigma
 
+  { multiSelectEnabled, removedNodeIds, selectedNodeIds, showControls, sideTab } <- GEST.focusedSidePanel sidePanel
+
   pure { edgeConfluence
        , edgeWeight
        , forceAtlasState
@@ -264,14 +274,9 @@ useGraphControls { forceAtlasS
        , showControls
        , showEdges
        , showLouvain
-       , showSidePanel
+       , sidePanelState
        , showTree
+       , sideTab
        , sigmaRef
        , reloadForest
        }
-
-setShowControls :: Record Controls -> Boolean -> Effect Unit
-setShowControls { showControls } v = T.write_ v showControls
-
-setShowTree :: Record Controls -> Boolean -> Effect Unit
-setShowTree { showTree } v = T.write_ (not v) showTree

src/Gargantext/Components/GraphExplorer/Search.purs

@@ -44,19 +44,17 @@ sizeButtonCpt = here.component "nodeSearchControl" cpt
       search' <- T.useLive T.unequal search
       multiSelectEnabled' <- T.useLive T.unequal multiSelectEnabled
 
-      pure $
-        H.div { className: "form-group" }
-          [ H.div { className: "input-group" }
-            [ inputWithAutocomplete { autocompleteSearch: autocompleteSearch graph
-                                    , onAutocompleteClick: \s -> triggerSearch graph s multiSelectEnabled' selectedNodeIds
-                                    , onEnterPress: \s -> triggerSearch graph s multiSelectEnabled' selectedNodeIds
-                                    , state: search } []
-            , H.div { className: "btn input-group-addon"
-                    , on: { click: \_ -> triggerSearch graph search' multiSelectEnabled' selectedNodeIds }
-                    }
-              [ H.span { className: "fa fa-search" } [] ]
-            ]
-          ]
+      pure $ R.fragment
+        [ inputWithAutocomplete { autocompleteSearch: autocompleteSearch graph
+                                , classes: "mx-2"
+                                , onAutocompleteClick: \s -> triggerSearch graph s multiSelectEnabled' selectedNodeIds
+                                , onEnterPress: \s -> triggerSearch graph s multiSelectEnabled' selectedNodeIds
+                                , state: search } []
+        , H.div { className: "btn input-group-addon"
+                , on: { click: \_ -> triggerSearch graph search' multiSelectEnabled' selectedNodeIds }
+                }
+          [ H.span { className: "fa fa-search" } [] ]
+        ]
 
 autocompleteSearch :: SigmaxT.SGraph -> String -> Array String
 autocompleteSearch graph s = Seq.toUnfoldable $ (_.label) <$> searchNodes s nodes

src/Gargantext/Components/GraphExplorer/Sidebar.purs

@@ -23,13 +23,12 @@ import Toestand as T
 import Gargantext.Prelude
 
 import Gargantext.Components.Lang (Lang(..))
-import Gargantext.Components.Search (SearchType(..), SearchQuery(..))
-import Gargantext.Components.GraphExplorer.Types  as GET
-import Gargantext.Components.GraphExplorer.Types  (SidePanelState(..), SideTab(..))
+import Gargantext.Components.GraphExplorer.Types as GET
 import Gargantext.Components.GraphExplorer.Legend as Legend
 import Gargantext.Components.NgramsTable.Core as NTC
 import Gargantext.Components.Nodes.Corpus.Graph.Tabs (tabs) as CGT
 import Gargantext.Components.RandomText (words)
+import Gargantext.Components.Search (SearchType(..), SearchQuery(..))
 import Gargantext.Data.Array (mapMaybe)
 import Gargantext.Ends (Frontends)
 import Gargantext.Hooks.Sigmax.Types as SigmaxT
@@ -44,7 +43,7 @@ here = R2.here "Gargantext.Components.GraphExplorer.Sidebar"
 type Common = (
     graphId         :: NodeID
   , metaData        :: GET.MetaData
-  , reloadForest    :: T.Box T2.Reload
+  , reloadForest    :: T2.ReloadS
   , removedNodeIds  :: T.Box SigmaxT.NodeIds
   , selectedNodeIds :: T.Box SigmaxT.NodeIds
   , session         :: Session
@@ -54,38 +53,33 @@ type Props = (
     frontends       :: Frontends
   , graph           :: SigmaxT.SGraph
   , graphVersion    :: T2.ReloadS
-  , showSidePanel   :: T.Box GET.SidePanelState
+  , sideTab         :: T.Box GET.SideTab
   | Common
   )
 
-sidebar :: Record Props -> R.Element
-sidebar props = R.createElement sidebarCpt props []
+sidebar :: R2.Component Props
+sidebar = R.createElement sidebarCpt
 
 sidebarCpt :: R.Component Props
 sidebarCpt = here.component "sidebar" cpt
   where
-    cpt props@{ metaData, showSidePanel } _ = do
-      showSidePanel' <- T.useLive T.unequal showSidePanel
-
-      case showSidePanel' of
-        GET.Closed -> pure $ RH.div {} []
-        GET.InitialClosed -> pure $ RH.div {} []
-        GET.Opened sideTabT -> do
-          let sideTab' = case sideTabT of
-                SideTabLegend -> sideTabLegend sideTabProps []
-                SideTabData -> sideTabData sideTabProps []
-                SideTabCommunity -> sideTabCommunity sideTabProps []
-          pure $ RH.div { id: "sp-container" }
-            [ sideTabNav { sidePanel: showSidePanel
-                         , sideTabs: [SideTabLegend, SideTabData, SideTabCommunity] } []
-            , sideTab'
-            ]
+    cpt props@{ sideTab } _ = do
+      sideTab' <- T.useLive T.unequal sideTab
+
+      pure $ RH.div { id: "sp-container" }
+        [ sideTabNav { sideTab
+                     , sideTabs: [GET.SideTabLegend, GET.SideTabData, GET.SideTabCommunity] } []
+        , case sideTab' of
+            GET.SideTabLegend -> sideTabLegend sideTabProps []
+            GET.SideTabData -> sideTabData sideTabProps []
+            GET.SideTabCommunity -> sideTabCommunity sideTabProps []
+        ]
       where
         sideTabProps = RX.pick props :: Record SideTabProps
 
 type SideTabNavProps = (
-    sidePanel :: T.Box GET.SidePanelState
-  , sideTabs  :: Array SideTab
+    sideTab  :: T.Box GET.SideTab
+  , sideTabs :: Array GET.SideTab
   )
 
 sideTabNav :: R2.Component SideTabNavProps
@@ -94,24 +88,22 @@ sideTabNav = R.createElement sideTabNavCpt
 sideTabNavCpt :: R.Component SideTabNavProps
 sideTabNavCpt = here.component "sideTabNav" cpt
   where
-    cpt { sidePanel
-        , sideTabs } _ = do
-      sidePanel' <- T.useLive T.unequal sidePanel
+    cpt { sideTab, sideTabs } _ = do
+      sideTab' <- T.useLive T.unequal sideTab
 
       pure $ R.fragment [ H.div { className: "text-primary center"} [H.text ""]
-                        , H.div { className: "nav nav-tabs"} (liItem sidePanel' <$> sideTabs)
+                        , H.div { className: "nav nav-tabs"} (liItem sideTab' <$> sideTabs)
                             -- , H.div {className: "center"} [ H.text "Doc sideTabs"]
                         ]
       where
-        liItem :: GET.SidePanelState -> SideTab -> R.Element
-        liItem sidePanel' tab =
+        liItem :: GET.SideTab -> GET.SideTab -> R.Element
+        liItem sideTab' tab =
           H.div { className : "nav-item nav-link"
-                            <> if (Opened tab) == sidePanel'
+                            <> if tab == sideTab'
                                  then " active"
                                  else ""
-              , on: { click: \_ -> T.write (Opened tab) sidePanel
-                    }
-              } [ H.text $ show tab ]
+                , on: { click: \_ -> T.write_ tab sideTab }
+                } [ H.text $ show tab ]
 
 type SideTabProps = Props
 
@@ -140,12 +132,13 @@ sideTabDataCpt = here.component "sideTabData" cpt
         [ selectedNodes (Record.merge { nodesMap: SigmaxT.nodesGraphMap props.graph } props) []
         , neighborhood props []
         , RH.div { className: "col-md-12", id: "query" }
-          [ query SearchDoc
-            props.frontends
-            props.metaData
-            props.session
-            (SigmaxT.nodesGraphMap props.graph)
-            selectedNodeIds'
+          [ query { frontends: props.frontends
+                  , metaData: props.metaData
+                  , nodesMap: SigmaxT.nodesGraphMap props.graph
+                  , searchType: SearchDoc
+                  , selectedNodeIds: selectedNodeIds'
+                  , session: props.session
+                  } []
           ]
         ]
         where
@@ -169,12 +162,13 @@ sideTabCommunityCpt = here.component "sideTabCommunity" cpt
       pure $ RH.div { className: "col-md-12", id: "query" }
         [ selectedNodes (Record.merge { nodesMap: SigmaxT.nodesGraphMap props.graph } props) []
         , neighborhood props []
-        , query SearchContact
-          props.frontends
-          props.metaData
-          props.session
-          (SigmaxT.nodesGraphMap props.graph)
-          selectedNodeIds'
+        , query { frontends: props.frontends
+                , metaData: props.metaData
+                , nodesMap: SigmaxT.nodesGraphMap props.graph
+                , searchType: SearchContact
+                , selectedNodeIds: selectedNodeIds'
+                , session: props.session
+                } []
         ]
 
 
@@ -319,7 +313,7 @@ type DeleteNodes =
   ( graphId      :: NodeID
   , metaData     :: GET.MetaData
   , nodes        :: Array (Record SigmaxT.Node)
-  , reloadForest :: T.Box T2.Reload
+  , reloadForest :: T2.ReloadS
   , session      :: Session
   , termList     :: TermList
   )
@@ -372,35 +366,56 @@ deleteNode termList session (GET.MetaData metaData) node = do
     patch_list :: NTC.Replace TermList
     patch_list = NTC.Replace { new: termList, old: MapTerm }
 
-query :: SearchType
-      -> Frontends
-      -> GET.MetaData
-      -> Session
-      -> SigmaxT.NodesMap
-      -> SigmaxT.NodeIds
-      -> R.Element
-query _ _ _ _ _ selectedNodeIds | Set.isEmpty selectedNodeIds = RH.div {} []
-query searchType frontends (GET.MetaData metaData) session nodesMap selectedNodeIds =
-  query' (head metaData.corpusId)
-  where
-    query' Nothing         = RH.div {} []
-    query' (Just corpusId) =
-      CGT.tabs { frontends
-               , session
-               , query: SearchQuery { query : concat $ toQuery <$> Set.toUnfoldable selectedNodeIds
-                                    , expected: searchType
-                                    }
-               , sides: [side corpusId]
-               }
-
-    toQuery id = case Map.lookup id nodesMap of
-      Nothing -> []
-      Just n -> words n.label
-
-    side corpusId = GET.GraphSideCorpus { corpusId
-                                        , listId     : metaData.list.listId
-                                        , corpusLabel: metaData.title
-                                        }
+type Query =
+  ( frontends       :: Frontends
+  , metaData        :: GET.MetaData
+  , nodesMap        :: SigmaxT.NodesMap
+  , searchType      :: SearchType
+  , selectedNodeIds :: SigmaxT.NodeIds
+  , session         :: Session )
+
+query :: R2.Component Query
+query = R.createElement queryCpt
+
+queryCpt :: R.Component Query
+queryCpt = here.component "query" cpt where
+  cpt props@{ selectedNodeIds } _ = do
+
+    pure $ if Set.isEmpty selectedNodeIds
+           then RH.div {} []
+           else query' props []
+
+query' :: R2.Component Query
+query' = R.createElement queryCpt'
+
+queryCpt' :: R.Component Query
+queryCpt' = here.component "query'" cpt where
+  cpt { frontends
+      , metaData: GET.MetaData metaData
+      , nodesMap
+      , searchType
+      , selectedNodeIds
+      , session } _ = do
+    pure $ case (head metaData.corpusId) of
+      Nothing -> RH.div {} []
+      Just corpusId ->
+        CGT.tabs { frontends
+                 , query: SearchQuery { expected: searchType
+                                      , query : concat $ toQuery <$> Set.toUnfoldable selectedNodeIds
+                                      }
+                 , session
+                 , sides: [side corpusId]
+                 }
+
+    where
+      toQuery id = case Map.lookup id nodesMap of
+        Nothing -> []
+        Just n -> words n.label
+
+      side corpusId = GET.GraphSideCorpus { corpusId
+                                          , corpusLabel: metaData.title
+                                          , listId     : metaData.list.listId
+                                          }
 
 ------------------------------------------------------------------------
 

src/Gargantext/Components/GraphExplorer/Sidebar/Types.purs

+module Gargantext.Components.GraphExplorer.Sidebar.Types where
+
+import Data.Maybe (Maybe(..), maybe)
+import Data.Set as Set
+import Reactix as R
+import Toestand as T
+
+import Gargantext.Prelude
+
+import Gargantext.Components.GraphExplorer.Types as GET
+import Gargantext.Hooks.Sigmax.Types as SigmaxT
+
+type SidePanel =
+  (
+    mGraph             :: Maybe SigmaxT.SGraph
+  , mMetaData          :: Maybe GET.MetaData
+  , multiSelectEnabled :: Boolean
+  , removedNodeIds     :: SigmaxT.NodeIds
+  , selectedNodeIds    :: SigmaxT.NodeIds
+  , showControls       :: Boolean
+  , sideTab            :: GET.SideTab
+  )
+
+initialSidePanel :: Maybe (Record SidePanel)
+initialSidePanel = Nothing
+
+
+focusedSidePanel :: T.Box (Maybe (Record SidePanel))
+                 -> R.Hooks { mGraph              :: T.Box (Maybe SigmaxT.SGraph)
+                            , mMetaData          :: T.Box (Maybe GET.MetaData)
+                            , multiSelectEnabled :: T.Box Boolean
+                            , removedNodeIds     :: T.Box SigmaxT.NodeIds
+                            , selectedNodeIds    :: T.Box SigmaxT.NodeIds
+                            , showControls       :: T.Box Boolean
+                            , sideTab            :: T.Box GET.SideTab }
+focusedSidePanel sidePanel = do
+  mGraph <- T.useFocused
+            (maybe Nothing _.mGraph)
+            (\val -> maybe Nothing (\sp -> Just $ sp { mGraph = val })) sidePanel
+  mMetaData <- T.useFocused
+            (maybe Nothing _.mMetaData)
+            (\val -> maybe Nothing (\sp -> Just $ sp { mMetaData = val })) sidePanel
+  multiSelectEnabled <- T.useFocused
+                        (maybe false _.multiSelectEnabled)
+                        (\val -> maybe Nothing (\sp -> Just $ sp { multiSelectEnabled = val })) sidePanel
+  removedNodeIds <- T.useFocused
+                     (maybe Set.empty _.removedNodeIds)
+                     (\val -> maybe Nothing (\sp -> Just $ sp { removedNodeIds = val })) sidePanel
+  selectedNodeIds <- T.useFocused
+                     (maybe Set.empty _.selectedNodeIds)
+                     (\val -> maybe Nothing (\sp -> Just $ sp { selectedNodeIds = val })) sidePanel
+  showControls <- T.useFocused
+                  (maybe false _.showControls)
+                  (\val -> maybe Nothing (\sp -> Just $ sp { showControls = val })) sidePanel
+  sideTab <- T.useFocused
+                  (maybe GET.SideTabLegend _.sideTab)
+                  (\val -> maybe Nothing (\sp -> Just $ sp { sideTab = val })) sidePanel
+
+  pure $ {
+    mGraph
+  , mMetaData
+  , multiSelectEnabled
+  , removedNodeIds
+  , selectedNodeIds
+  , showControls
+  , sideTab
+  }

src/Gargantext/Components/GraphExplorer/ToggleButton.purs

@@ -18,8 +18,8 @@ import Reactix as R
 import Reactix.DOM.HTML as H
 import Toestand as T
 
-import Gargantext.Components.GraphExplorer.Types as GET
 import Gargantext.Hooks.Sigmax.Types as SigmaxTypes
+import Gargantext.Types as GT
 import Gargantext.Utils.Reactix as R2
 
 here :: R2.Here
@@ -46,8 +46,8 @@ toggleButtonCpt = here.component "toggleButton" cpt
         , style } _ = do
       state' <- T.useLive T.unequal state
 
-      pure $ H.button { className: "btn btn-outline-" <> style <> " " <> cls state'
-                      , on: {click: onClick}
+      pure $ H.button { className: "btn btn-outline-" <> style <> " " <> cls state' <> " mx-2"
+                      , on: { click: onClick }
                       } [ R2.small {} [ H.text (text onMessage offMessage state') ] ]
 
     cls true = "active"
@@ -185,7 +185,7 @@ treeToggleButtonCpt = here.component "treeToggleButton" cpt
         } []
 
 type SidebarToggleButtonProps = (
-  state :: T.Box GET.SidePanelState
+  state :: T.Box GT.SidePanelState
 )
 
 sidebarToggleButton :: R2.Component SidebarToggleButtonProps
@@ -201,17 +201,18 @@ sidebarToggleButtonCpt = here.component "sidebarToggleButton" cpt
                       , on: { click: onClick state }
                       } [ R2.small {} [ H.text (text onMessage offMessage state') ] ]
 
-    cls (GET.Opened _) = "active"
-    cls _ = ""
+    cls GT.Opened = "active"
+    cls _         = ""
 
     onMessage = "Hide Sidebar"
     offMessage = "Show Sidebar"
-    text on _off (GET.Opened _)    = on
-    text _on off GET.InitialClosed = off
-    text _on off GET.Closed        = off
+    text on _off GT.Opened        = on
+    text _on off GT.InitialClosed = off
+    text _on off GT.Closed        = off
 
     onClick state = \_ ->
-      T.modify_ (\s -> case s of
-        GET.InitialClosed -> GET.Opened GET.SideTabLegend
-        GET.Closed        -> GET.Opened GET.SideTabLegend
-        (GET.Opened _)    -> GET.Closed) state
+      T.modify_ GT.toggleSidePanelState state
+                  -- case s of
+        -- GET.InitialClosed -> GET.Opened GET.SideTabLegend
+        -- GET.Closed        -> GET.Opened GET.SideTabLegend
+        -- (GET.Opened _)    -> GET.Closed) state

src/Gargantext/Components/GraphExplorer/Types.purs

@@ -114,9 +114,9 @@ type State = (
   --, legendData :: R.State (Array Legend)
   --, multiNodeSelection :: R.State Boolean
   --, selectedNodes :: R.State (Set SelectedNode)
-  --, showSidePanel :: R.State Boolean
   --, showControls :: T.Box Boolean
   --, showTree :: R.State Boolean
+  --, sidePanelState :: R.State Boolean
   --, sigmaGraphData :: R.State (Maybe SigmaxTypes.SGraph)
   --, sigmaSettings :: R.State ({|Graph.SigmaSettings})
     --treeId :: R.State (Maybe TreeId)
@@ -281,10 +281,6 @@ defaultPalette = ["#5fa571","#ab9ba2","#da876d","#bdd3ff","#b399df","#ffdfed","#
 intColor :: Int -> String
 intColor i = unsafePartial $ fromJust $ defaultPalette !! (i `mod` length defaultPalette)
 
-
-data SidePanelState = InitialClosed | Opened SideTab | Closed
-derive instance eqSidePanelState :: Eq SidePanelState
-
 data SideTab = SideTabLegend | SideTabData | SideTabCommunity
 
 derive instance eqSideTab :: Eq SideTab

src/Gargantext/Components/InputWithAutocomplete.purs

@@ -22,10 +22,11 @@ type Completions = Array String
 
 type Props =
   (
-    autocompleteSearch :: String -> Completions
+    autocompleteSearch  :: String -> Completions
+  , classes             :: String
   , onAutocompleteClick :: String -> Effect Unit
-  , onEnterPress :: String -> Effect Unit
-  , state :: T.Box String
+  , onEnterPress        :: String -> Effect Unit
+  , state               :: T.Box String
   )
 
 inputWithAutocomplete :: R2.Component Props
@@ -35,6 +36,7 @@ inputWithAutocompleteCpt :: R.Component Props
 inputWithAutocompleteCpt = here.component "inputWithAutocomplete" cpt
   where
     cpt props@{ autocompleteSearch
+              , classes
               , onAutocompleteClick
               , onEnterPress
               , state } _ = do
@@ -45,7 +47,7 @@ inputWithAutocompleteCpt = here.component "inputWithAutocomplete" cpt
       let onFocus completions e = T.write_ (autocompleteSearch state') completions
 
       pure $
-        H.span { className: "input-with-autocomplete" }
+        H.span { className: "input-with-autocomplete " <> classes }
         [
           completionsCpt { completions, onAutocompleteClick, state } []
         , H.input { type: "text"

src/Gargantext/Components/NgramsTable.purs

@@ -259,9 +259,8 @@ tableContainerCpt { dispatch
 
 type CommonProps = (
     afterSync         :: Unit -> Aff Unit
-  , reloadForest      :: T.Box T2.Reload
-  , reloadRoot        :: T.Box T2.Reload
-  , sidePanelTriggers :: Record NT.SidePanelTriggers
+  , reloadForest      :: T2.ReloadS
+  , reloadRoot        :: T2.ReloadS
   , tabNgramType      :: CTabNgramType
   , tasks             :: T.Box GAT.Storage
   , withAutoUpdate    :: Boolean
@@ -287,7 +286,6 @@ loadedNgramsTableCpt = here.component "loadedNgramsTable" cpt where
             , path
             , reloadForest
             , reloadRoot
-            , sidePanelTriggers
             , state
             , tabNgramType
             , tasks
@@ -300,9 +298,6 @@ loadedNgramsTableCpt = here.component "loadedNgramsTable" cpt where
     searchQuery <- T.useFocused (_.searchQuery) (\a b -> b { searchQuery = a }) path
     searchQuery' <- T.useLive T.unequal searchQuery
 
-    -- R.useEffectOnce' $ do
-    --   T.listen (\_ -> TT.changePage 1 params) searchQuery
-
     let ngramsTable = applyNgramsPatches state' initTable
         roots = rootsOf ngramsTable
 
@@ -351,8 +346,7 @@ loadedNgramsTableCpt = here.component "loadedNgramsTable" cpt where
                                       , ngramsLocalPatch
                                       , ngramsParent
                                       , ngramsSelection
-                                      , ngramsTable
-                                      , sidePanelTriggers } []
+                                      , ngramsTable } []
           , delete: false
           }
 
@@ -550,7 +544,6 @@ mainNgramsTableCpt = here.component "mainNgramsTable" cpt
               , path
               , reloadForest
               , reloadRoot
-              , sidePanelTriggers
               , tabNgramType
               , tasks
               , withAutoUpdate } _ = do
@@ -566,7 +559,6 @@ mainNgramsTableCpt = here.component "mainNgramsTable" cpt
                                                       , path
                                                       , reloadForest
                                                       , reloadRoot
-                                                      , sidePanelTriggers
                                                       , tabNgramType
                                                       , tasks
                                                       , versioned
@@ -585,7 +577,6 @@ mainNgramsTableCpt = here.component "mainNgramsTable" cpt
                                                                       , path
                                                                       , reloadForest
                                                                       , reloadRoot
-                                                                      , sidePanelTriggers
                                                                       , tabNgramType
                                                                       , tasks
                                                                       , versionedWithCount
@@ -655,7 +646,6 @@ mainNgramsTablePaintCpt = here.component "mainNgramsTablePaint" cpt
               , path
               , reloadForest
               , reloadRoot
-              , sidePanelTriggers
               , tabNgramType
               , tasks
               , versioned
@@ -668,7 +658,6 @@ mainNgramsTablePaintCpt = here.component "mainNgramsTablePaint" cpt
                                , path
                                , reloadForest
                                , reloadRoot
-                               , sidePanelTriggers
                                , state
                                , tabNgramType
                                , tasks
@@ -694,7 +683,6 @@ mainNgramsTablePaintNoCacheCpt = here.component "mainNgramsTablePaintNoCache" cp
               , path
               , reloadForest
               , reloadRoot
-              , sidePanelTriggers
               , tabNgramType
               , tasks
               , versionedWithCount
@@ -710,7 +698,6 @@ mainNgramsTablePaintNoCacheCpt = here.component "mainNgramsTablePaintNoCache" cp
       , path: path
       , reloadForest
       , reloadRoot
-      , sidePanelTriggers
       , state
       , tabNgramType
       , tasks

src/Gargantext/Components/NgramsTable/Components.purs

@@ -211,7 +211,6 @@ type RenderNgramsItem = (
   , ngramsParent      :: Maybe NgramsTerm
   , ngramsSelection   :: Set NgramsTerm
   , ngramsTable       :: NgramsTable
-  , sidePanelTriggers :: Record NT.SidePanelTriggers
   )
 
 renderNgramsItem :: R2.Component RenderNgramsItem
@@ -227,7 +226,6 @@ renderNgramsItemCpt = here.component "renderNgramsItem" cpt
         , ngramsParent
         , ngramsSelection
         , ngramsTable
-        , sidePanelTriggers: { toggleSidePanel }
         } _ = do
       pure $ Tbl.makeRow [
           H.div { className: "ngrams-selector" } [
@@ -254,8 +252,9 @@ renderNgramsItemCpt = here.component "renderNgramsItem" cpt
               a (ngramsStyle <> [DOM.onClick $ const effect])
             Nothing ->
               span ngramsStyle
-        onClick _ = do
-          R2.callTrigger toggleSidePanel unit
+        onClick _ = pure unit :: Effect Unit
+        -- onClick _ = do
+        --   R2.callTrigger toggleSidePanel unit
         termList    = ngramsElement ^. _NgramsElement <<< _list
         ngramsStyle = [termStyle termList ngramsOpacity]
         ngramsEdit  = Just <<< dispatch <<< SetParentResetChildren <<< Just <<< view _ngrams

src/Gargantext/Components/NgramsTable/Core.purs

@@ -1110,7 +1110,7 @@ coreDispatch path state (Synchronize { afterSync }) =
 coreDispatch _ state (CommitPatch pt) =
   commitPatch pt state
 coreDispatch _ state ResetPatches =
-  T.modify_ (\s -> s { ngramsLocalPatch = { ngramsPatches: mempty } }) state
+  T.modify_ (_ { ngramsLocalPatch = { ngramsPatches: mempty } }) state
 
 isSingleNgramsTerm :: NgramsTerm -> Boolean
 isSingleNgramsTerm nt = isSingleTerm $ ngramsTermText nt
@@ -1141,32 +1141,34 @@ syncResetButtonsCpt :: R.Component SyncResetButtonsProps
 syncResetButtonsCpt = here.component "syncResetButtons" cpt
   where
     cpt { afterSync, ngramsLocalPatch, performAction } _ = do
-      -- synchronizing <- T.useBox false
-      -- synchronizing' <- T.useLive T.unequal synchronizing
+      synchronizing <- T.useBox false
+      synchronizing' <- T.useLive T.unequal synchronizing
 
       let
         hasChanges = ngramsLocalPatch /= mempty
         hasChangesClass = if hasChanges then "" else " disabled"
 
+        synchronizingClass = if synchronizing' then " disabled" else ""
+
         resetClick _ = do
           performAction ResetPatches
 
         synchronizeClick _ = delay unit $ \_ -> do
-          -- T.write_ true synchronizing
+          T.write_ true synchronizing
           performAction $ Synchronize { afterSync: newAfterSync }
 
         newAfterSync x = do
           afterSync x
-          -- liftEffect $ T.write_ false synchronizing
+          liftEffect $ T.write_ false synchronizing
 
       pure $ H.div { className: "btn-toolbar" }
         [ H.div { className: "btn-group mr-2" }
-          [ H.button { className: "btn btn-danger " <> hasChangesClass
+          [ H.button { className: "btn btn-danger " <> hasChangesClass <> synchronizingClass
                      , on: { click: resetClick }
                      } [ H.text "Reset" ]
           ]
         , H.div { className: "btn-group mr-2" }
-          [ H.button { className: "btn btn-primary " <> hasChangesClass
+          [ H.button { className: "btn btn-primary " <> hasChangesClass <> synchronizingClass
                      , on: { click: synchronizeClick }
                      } [ H.text "Sync" ]
           ]

src/Gargantext/Components/NgramsTable/Loader.purs

@@ -88,10 +88,10 @@ useCachedAPILoaderEffect { cacheEndpoint
           --   log2 "[useCachedAPILoaderEffect] cached version" version
           --   log2 "[useCachedAPILoaderEffect] real version" cacheReal
           _ <- GUC.deleteReq cache req
-          vr'@(Versioned { version: _, data: _ }) <- GUC.cachedJson cache req
-          if version == cacheReal then
+          vr'@(Versioned { version: version', data: _ }) <- GUC.cachedJson cache req
+          if version' == cacheReal then
             pure vr'
           else
-            throwError $ error $ "Fetched clean cache but hashes don't match: " <> show version <> " != " <> show cacheReal
+            throwError $ error $ "[NgramsTable.Loader] Fetched clean cache but hashes don't match: " <> show version <> " != " <> show cacheReal
         liftEffect $ do
           T.write_ (Just $ handleResponse val) state

src/Gargantext/Components/Nodes/Annuaire.purs

@@ -49,7 +49,7 @@ newtype IndividuView =
 type LayoutProps =
   ( frontends :: Frontends
   , nodeId    :: Int
-  , session   :: R.Context Session
+  , session   :: Session
   )
 
 annuaireLayout :: R2.Leaf LayoutProps
@@ -57,15 +57,14 @@ annuaireLayout props = R.createElement annuaireLayoutCpt props []
 
 annuaireLayoutCpt :: R.Component LayoutProps
 annuaireLayoutCpt = here.component "annuaireLayout" cpt where
-  cpt { frontends, nodeId, session } _ = cp <$> R.useContext session where
-    cp s = annuaireLayoutWithKey { frontends, key, nodeId, session: s } where
-      key = show (sessionId s) <> "-" <> show nodeId
+  cpt { frontends, nodeId, session } _ = do
+    pure $ annuaireLayoutWithKey { frontends, key, nodeId, session }
+      where
+        key = show (sessionId session) <> "-" <> show nodeId
 
 type KeyLayoutProps =
-  ( frontends :: Frontends
-  , nodeId    :: Int
-  , session   :: Session
-  , key       :: String
+  ( key       :: String
+  | LayoutProps
   )
 
 annuaireLayoutWithKey :: R2.Leaf KeyLayoutProps

src/Gargantext/Components/Nodes/Annuaire/Tabs.purs

@@ -17,13 +17,14 @@ import Gargantext.AsyncTasks as GAT
 import Gargantext.Components.DocsTable as DT
 import Gargantext.Components.NgramsTable as NT
 import Gargantext.Components.NgramsTable.Core as NTC
+import Gargantext.Components.Nodes.Texts.Types as TextsT
 import Gargantext.Components.Tab as Tab
 import Gargantext.Components.Nodes.Annuaire.User.Contacts.Types (ContactData)
 import Gargantext.Components.Nodes.Lists.Types as LTypes
 import Gargantext.Components.Nodes.Texts.Types as TTypes
 import Gargantext.Ends (Frontends)
 import Gargantext.Sessions (Session)
-import Gargantext.Types (CTabNgramType(..), PTabNgramType(..), TabType(..), TabSubType(..))
+import Gargantext.Types (CTabNgramType(..), PTabNgramType(..), SidePanelState, TabType(..), TabSubType(..))
 import Gargantext.Utils.Reactix as R2
 import Gargantext.Utils.Toestand as T2
 
@@ -51,15 +52,16 @@ modeTabType' Books = CTabAuthors
 modeTabType' Communication = CTabAuthors
 
 type TabsProps =
-  ( cacheState        :: T.Box LTypes.CacheState
-  , contactData       :: ContactData
-  , frontends         :: Frontends
-  , nodeId            :: Int
-  , reloadForest      :: T.Box T2.Reload
-  , reloadRoot        :: T.Box T2.Reload
-  , session           :: Session
-  , sidePanelTriggers :: Record LTypes.SidePanelTriggers
-  , tasks             :: T.Box GAT.Storage
+  ( cacheState     :: T.Box LTypes.CacheState
+  , contactData    :: ContactData
+  , frontends      :: Frontends
+  , nodeId         :: Int
+  , reloadForest   :: T2.ReloadS
+  , reloadRoot     :: T2.ReloadS
+  , session        :: Session
+  , sidePanel      :: T.Box (Maybe (Record TextsT.SidePanel))
+  , sidePanelState :: T.Box SidePanelState
+  , tasks          :: T.Box GAT.Storage
   )
 
 tabs :: R2.Leaf TabsProps
@@ -68,20 +70,20 @@ tabs props = R.createElement tabsCpt props []
 tabsCpt :: R.Component TabsProps
 tabsCpt = here.component "tabs" cpt where
   cpt props _ = do
-    active <- R.useState' 0
-    triggers <- TTypes.emptySidePanelTriggers
-    pure $ Tab.tabs { selected: fst active, tabs: tabs' props triggers }
-  tabs' props trg =
-    [ "Documents"     /\ docs trg
+    activeTab <- T.useBox 0
+
+    pure $ Tab.tabs { activeTab, tabs: tabs' props }
+  tabs' props@{ sidePanel, sidePanelState } =
+    [ "Documents"     /\ docs
     , "Patents"       /\ ngramsView (viewProps Patents)
     , "Books"         /\ ngramsView (viewProps Books)
     , "Communication" /\ ngramsView (viewProps Communication)
-    , "Trash"         /\ docs trg -- TODO pass-in trash mode
+    , "Trash"         /\ docs -- TODO pass-in trash mode
     ] where
       viewProps mode = Record.merge props { defaultListId: props.contactData.defaultListId
                                           , mode }
       totalRecords = 4736 -- TODO lol
-      docs sidePanelTriggers = DT.docViewLayout (Record.merge { sidePanelTriggers } $ Record.merge dtCommon dtExtra)
+      docs = DT.docViewLayout (Record.merge { sidePanel, sidePanelState } $ Record.merge dtCommon dtExtra)
       dtCommon = RX.pick props :: Record DTCommon
       dtExtra =
         { chart: mempty
@@ -98,7 +100,7 @@ type DTCommon =
   , frontends         :: Frontends
   , nodeId            :: Int
   , session           :: Session
-  -- , sidePanelTriggers :: Record LTypes.SidePanelTriggers
+  -- , sidePanel    :: T.Box (Record SidePanel)
   )
 
 type NgramsViewTabsProps =
@@ -119,22 +121,21 @@ ngramsViewCpt = here.component "ngramsView" cpt where
     pure $ NT.mainNgramsTable (props' path) [] where
       most = RX.pick props :: Record NTCommon
       props' path =
-        Record.merge most
+        (Record.merge most
           { afterSync
           , path
           , tabType:        TabPairing (TabNgramType $ modeTabType mode)
           , tabNgramType:   modeTabType' mode
-          , withAutoUpdate: false }
+          , withAutoUpdate: false }) :: Record NT.MainNgramsTableProps
         where
           afterSync :: Unit -> Aff Unit
           afterSync _ = pure unit
 
 type NTCommon =
-  ( cacheState        :: T.Box LTypes.CacheState
-  , defaultListId     :: Int
-  , reloadForest      :: T.Box T2.Reload
-  , reloadRoot        :: T.Box T2.Reload
-  , session           :: Session
-  , sidePanelTriggers :: Record LTypes.SidePanelTriggers
-  , tasks             :: T.Box GAT.Storage
+  ( cacheState     :: T.Box LTypes.CacheState
+  , defaultListId  :: Int
+  , reloadForest   :: T2.ReloadS
+  , reloadRoot     :: T2.ReloadS
+  , session        :: Session
+  , tasks          :: T.Box GAT.Storage
   )

src/Gargantext/Components/Nodes/Annuaire/User.purs

 module Gargantext.Components.Nodes.Annuaire.User
   ( module Gargantext.Components.Nodes.Annuaire.User.Contacts.Types
   , userLayout
-  , userLayoutSessionContext
   )
   where
 
@@ -14,8 +13,6 @@ import Effect.Aff (Aff, launchAff_)
 import Effect.Class (liftEffect)
 import Reactix as R
 import Reactix.DOM.HTML as H
-import Record as Record
-import Record.Extra as REX
 import Toestand as T
 
 import Gargantext.AsyncTasks as GAT
@@ -23,11 +20,12 @@ import Gargantext.Components.InputWithEnter (inputWithEnter)
 import Gargantext.Components.Nodes.Annuaire.User.Contacts.Types (Contact(..), ContactData, ContactTouch(..), ContactWhere(..), ContactWho(..), HyperdataContact(..), HyperdataUser(..), _city, _country, _firstName, _labTeamDeptsJoinComma, _lastName, _mail, _office, _organizationJoinComma, _ouFirst, _phone, _role, _shared, _touch, _who, defaultContactTouch, defaultContactWhere, defaultContactWho, defaultHyperdataContact, defaultHyperdataUser)
 import Gargantext.Components.Nodes.Annuaire.Tabs as Tabs
 import Gargantext.Components.Nodes.Lists.Types as LT
+import Gargantext.Components.Nodes.Texts.Types as TT
 import Gargantext.Ends (Frontends)
 import Gargantext.Hooks.Loader (useLoader)
 import Gargantext.Routes as Routes
 import Gargantext.Sessions (WithSession, WithSessionContext, Session, get, put, sessionId)
-import Gargantext.Types (NodeType(..))
+import Gargantext.Types (NodeType(..), SidePanelState)
 import Gargantext.Utils.Reactix as R2
 import Gargantext.Utils.Toestand as T2
 
@@ -99,18 +97,20 @@ contactInfoItemCpt :: R.Component ContactInfoItemProps
 contactInfoItemCpt = here.component "contactInfoItem" cpt
   where
     cpt {hyperdata, label, lens, onUpdateHyperdata, placeholder} _ = do
-      isEditing <- R.useState' false
+      isEditing <- T.useBox false
+      isEditing' <- T.useLive T.unequal isEditing
+
       let value = (L.view cLens hyperdata) :: String
       valueRef <- R.useRef value
 
       pure $ H.div { className: "form-group row" } [
         H.span { className: "col-sm-2 col-form-label" } [ H.text label ]
-      , item isEditing valueRef
+      , item isEditing' isEditing valueRef
       ]
 
       where
         cLens = L.cloneLens lens
-        item (false /\ setIsEditing) valueRef =
+        item false isEditing valueRef =
           H.div { className: "input-group col-sm-6" } [
             H.input { className: "form-control"
                     , defaultValue: placeholder'
@@ -123,8 +123,8 @@ contactInfoItemCpt = here.component "contactInfoItem" cpt
           ]
           where
             placeholder' = R.readRef valueRef
-            onClick _ = setIsEditing $ const true
-        item (true /\ setIsEditing) valueRef =
+            onClick _ = T.write_ true isEditing
+        item true isEditing valueRef =
           H.div { className: "input-group col-sm-6" } [
             inputWithEnter {
                 autoFocus: true
@@ -143,7 +143,7 @@ contactInfoItemCpt = here.component "contactInfoItem" cpt
           ]
           where
             onClick _ = do
-              setIsEditing $ const false
+              T.write_ true isEditing
               let newHyperdata = (L.over cLens (\_ -> R.readRef valueRef) hyperdata) :: HyperdataUser
               onUpdateHyperdata newHyperdata
 
@@ -151,11 +151,13 @@ listElement :: Array R.Element -> R.Element
 listElement = H.li { className: "list-group-item justify-content-between" }
 
 type LayoutNoSessionProps =
-  ( frontends    :: Frontends
-  , nodeId       :: Int
-  , reloadForest :: T.Box T2.Reload
-  , reloadRoot   :: T.Box T2.Reload
-  , tasks        :: T.Box GAT.Storage
+  ( frontends      :: Frontends
+  , nodeId         :: Int
+  , reloadForest   :: T2.ReloadS
+  , reloadRoot     :: T2.ReloadS
+  , sidePanel      :: T.Box (Maybe (Record TT.SidePanel))
+  , sidePanelState :: T.Box SidePanelState
+  , tasks          :: T.Box GAT.Storage
   )
 
 type LayoutProps = WithSession LayoutNoSessionProps
@@ -167,24 +169,20 @@ type KeyLayoutProps = (
   | LayoutProps
   )
 
-userLayoutSessionContext :: R2.Component LayoutSessionContextProps
-userLayoutSessionContext = R.createElement userLayoutSessionContextCpt
-
-userLayoutSessionContextCpt :: R.Component LayoutSessionContextProps
-userLayoutSessionContextCpt = here.component "userLayoutSessionContext" cpt
-  where
-    cpt props@{ session } _ = do
-      session' <- R.useContext session
-
-      pure $ userLayout (Record.merge { session: session' } $ (REX.pick props :: Record LayoutNoSessionProps)) []
-
 userLayout :: R2.Component LayoutProps
 userLayout = R.createElement userLayoutCpt
 
 userLayoutCpt :: R.Component LayoutProps
 userLayoutCpt = here.component "userLayout" cpt
   where
-    cpt { frontends, nodeId, reloadForest, reloadRoot, session, tasks } _ = do
+    cpt { frontends
+        , nodeId
+        , reloadForest
+        , reloadRoot
+        , session
+        , sidePanel
+        , sidePanelState
+        , tasks } _ = do
       let sid = sessionId session
 
       pure $ userLayoutWithKey {
@@ -194,6 +192,8 @@ userLayoutCpt = here.component "userLayout" cpt
         , reloadForest
         , reloadRoot
         , session
+        , sidePanel
+        , sidePanelState
         , tasks
         }
 
@@ -203,14 +203,19 @@ userLayoutWithKey props = R.createElement userLayoutWithKeyCpt props []
 userLayoutWithKeyCpt :: R.Component KeyLayoutProps
 userLayoutWithKeyCpt = here.component "userLayoutWithKey" cpt
   where
-    cpt { frontends, nodeId, reloadForest, reloadRoot, session, tasks } _ = do
+    cpt { frontends
+        , nodeId
+        , reloadForest
+        , reloadRoot
+        , session
+        , sidePanel
+        , sidePanelState
+        , tasks } _ = do
       reload <- T.useBox T2.newReload
       reload' <- T.useLive T.unequal reload
 
       cacheState <- T.useBox LT.CacheOn
 
-      sidePanelTriggers <- LT.emptySidePanelTriggers
-
       useLoader {nodeId, reload: reload', session} getUserWithReload $
         \contactData@{contactNode: Contact {name, hyperdata}} ->
           H.ul { className: "col-md-12 list-group" } [
@@ -224,7 +229,8 @@ userLayoutWithKeyCpt = here.component "userLayoutWithKey" cpt
                , reloadForest
                , reloadRoot
                , session
-               , sidePanelTriggers
+               , sidePanel
+        , sidePanelState
                , tasks
                }
           ]

src/Gargantext/Components/Nodes/Annuaire/User/Contact.purs

@@ -26,11 +26,12 @@ import Gargantext.Components.Nodes.Annuaire.User.Contacts.Types
   , _shared, _touch, _who, defaultContactTouch, defaultContactWhere
   , defaultContactWho, defaultHyperdataContact, defaultHyperdataUser )
 import Gargantext.Components.Nodes.Lists.Types as LT
+import Gargantext.Components.Nodes.Texts.Types as TT
 import Gargantext.Ends (Frontends)
 import Gargantext.Hooks.Loader (useLoader)
 import Gargantext.Routes as Routes
 import Gargantext.Sessions (Session, get, put, sessionId)
-import Gargantext.Types (NodeType(..))
+import Gargantext.Types (NodeType(..), SidePanelState)
 import Gargantext.Utils.Reactix as R2
 import Gargantext.Utils.Toestand as T2
 
@@ -90,23 +91,25 @@ type ContactInfoItemProps =
   , placeholder       :: String
   )
 
-contactInfoItem :: Record ContactInfoItemProps -> R.Element
+contactInfoItem :: R2.Leaf ContactInfoItemProps
 contactInfoItem props = R.createElement contactInfoItemCpt props []
-
 contactInfoItemCpt :: R.Component ContactInfoItemProps
 contactInfoItemCpt = here.component "contactInfoItem" cpt
   where
-    cpt {hyperdata, label, lens, onUpdateHyperdata, placeholder} _ = do
-      isEditing <- R.useState' false
+    cpt { hyperdata, label, lens, onUpdateHyperdata, placeholder } _ = do
+      isEditing <- T.useBox false
+      isEditing' <- T.useLive T.unequal isEditing
+
       let value = (L.view cLens hyperdata) :: String
+
       valueRef <- R.useRef value
       pure $
         H.div { className: "form-group row" }
         [ H.span { className: "col-sm-2 col-form-label" } [ H.text label ]
-        , item isEditing valueRef ]
+        , item isEditing' isEditing valueRef ]
       where
         cLens = L.cloneLens lens
-        item (false /\ setIsEditing) valueRef =
+        item false isEditing valueRef =
           H.div { className: "input-group col-sm-6" }
           [ H.input
             { className: "form-control", type: "text"
@@ -115,8 +118,8 @@ contactInfoItemCpt = here.component "contactInfoItem" cpt
             [ H.div { className: "input-group-text fa fa-pencil" } [] ]]
           where
             placeholder' = R.readRef valueRef
-            click _ = setIsEditing $ const true
-        item (true /\ setIsEditing) valueRef =
+            click _ = T.write_ true isEditing
+        item true isEditing valueRef =
           H.div { className: "input-group col-sm-6" }
           [ inputWithEnter
             { autoFocus: true
@@ -131,7 +134,7 @@ contactInfoItemCpt = here.component "contactInfoItem" cpt
             [ H.div { className: "input-group-text fa fa-floppy-o" } [] ]]
           where
             click _ = do
-              setIsEditing $ const false
+              T.write_ false isEditing
               let newHyperdata = (L.over cLens (\_ -> R.readRef valueRef) hyperdata) :: HyperdataContact
               onUpdateHyperdata newHyperdata
 
@@ -139,14 +142,16 @@ listElement :: Array R.Element -> R.Element
 listElement = H.li { className: "list-group-item justify-content-between" }
 
 type BasicProps =
-  ( frontends :: Frontends
-  , nodeId    :: Int
-  , tasks     :: T.Box GAT.Storage
+  ( frontends      :: Frontends
+  , nodeId         :: Int
+  , sidePanelState :: T.Box SidePanelState
+  , sidePanel      :: T.Box (Maybe (Record TT.SidePanel))
+  , tasks          :: T.Box GAT.Storage
   )
 
 type ReloadProps =
-  ( reloadForest :: T.Box T2.Reload
-  , reloadRoot   :: T.Box T2.Reload
+  ( reloadForest :: T2.ReloadS
+  , reloadRoot   :: T2.ReloadS
   | BasicProps
   )
 
@@ -157,7 +162,7 @@ type KeyLayoutProps = ( key :: String, session :: Session | ReloadProps )
 saveContactHyperdata :: Session -> Int -> HyperdataContact -> Aff Int
 saveContactHyperdata session id = put session (Routes.NodeAPI Node (Just id) "")
 
-type AnnuaireLayoutProps = ( annuaireId :: Int, session :: R.Context Session | ReloadProps )
+type AnnuaireLayoutProps = ( annuaireId :: Int, session :: Session | ReloadProps )
 
 type AnnuaireKeyLayoutProps = ( annuaireId :: Int | KeyLayoutProps )
 
@@ -166,13 +171,29 @@ contactLayout = R.createElement contactLayoutCpt
 
 contactLayoutCpt :: R.Component AnnuaireLayoutProps
 contactLayoutCpt = here.component "contactLayout" cpt where
-  cpt { annuaireId, frontends, nodeId, reloadForest, reloadRoot, session, tasks } _ = do
-    s <- R.useContext session
-    let key = show (sessionId s) <> "-" <> show nodeId
+  cpt { annuaireId
+      , frontends
+      , nodeId
+      , reloadForest
+      , reloadRoot
+      , session
+      , sidePanel
+      , sidePanelState
+      , tasks } _ = do
+    let key = show (sessionId session) <> "-" <> show nodeId
     pure $
       contactLayoutWithKey
-      { annuaireId, tasks, frontends, key, nodeId
-      , session: s, reloadForest, reloadRoot }
+      { annuaireId
+      , frontends
+      , key
+      , nodeId
+      , reloadForest
+      , reloadRoot
+      , session
+      , sidePanel
+      , sidePanelState
+      , tasks
+      }
 
 contactLayoutWithKey :: R2.Leaf AnnuaireKeyLayoutProps
 contactLayoutWithKey props = R.createElement contactLayoutWithKeyCpt props []
@@ -185,11 +206,12 @@ contactLayoutWithKeyCpt = here.component "contactLayoutWithKey" cpt where
         , reloadRoot
         , nodeId
         , session
+        , sidePanel
+        , sidePanelState
         , tasks } _ = do
       reload <- T.useBox T2.newReload
       _ <- T.useLive T.unequal reload
       cacheState <- T.useBox LT.CacheOn
-      sidePanelTriggers <- LT.emptySidePanelTriggers
       useLoader nodeId (getAnnuaireContact session annuaireId) $
         \contactData@{contactNode: Contact' {name, hyperdata}} ->
           H.ul { className: "col-md-12 list-group" }
@@ -201,12 +223,13 @@ contactLayoutWithKeyCpt = here.component "contactLayoutWithKey" cpt where
                    , frontends
                    , nodeId
                    , session
-                   , sidePanelTriggers
+                   , sidePanel
+                   , sidePanelState
                    , reloadForest
                    , reloadRoot
                    , tasks } ]
       where
-        onUpdateHyperdata :: T.Box T2.Reload -> HyperdataContact -> Effect Unit
+        onUpdateHyperdata :: T2.ReloadS -> HyperdataContact -> Effect Unit
         onUpdateHyperdata reload hd =
           launchAff_ $
             saveContactHyperdata session nodeId hd *> liftEffect (T2.reload reload)

src/Gargantext/Components/Nodes/Annuaire/User/Contacts/Tabs.purs

@@ -20,7 +20,7 @@ import Gargantext.Components.Nodes.Lists.Types as LTypes
 import Gargantext.Components.Nodes.Texts.Types as TTypes
 import Gargantext.Ends (Frontends)
 import Gargantext.Sessions (Session)
-import Gargantext.Types (CTabNgramType(..), PTabNgramType(..), TabType(..), TabSubType(..))
+import Gargantext.Types (CTabNgramType(..), PTabNgramType(..), SidePanelState, TabType(..), TabSubType(..))
 import Gargantext.Utils.Reactix as R2
 import Gargantext.Utils.Toestand as T2
 
@@ -49,15 +49,16 @@ modeTabType' Books = CTabAuthors
 modeTabType' Communication = CTabAuthors
 
 type TabsProps = (
-    cacheState        :: T.Box LTypes.CacheState
-  , contactData       :: ContactData'
-  , frontends         :: Frontends
-  , nodeId            :: Int
-  , reloadForest      :: T.Box T2.Reload
-  , reloadRoot        :: T.Box T2.Reload
-  , session           :: Session
-  , sidePanelTriggers :: Record LTypes.SidePanelTriggers
-  , tasks             :: T.Box GAT.Storage
+    cacheState     :: T.Box LTypes.CacheState
+  , contactData    :: ContactData'
+  , frontends      :: Frontends
+  , nodeId         :: Int
+  , reloadForest   :: T2.ReloadS
+  , reloadRoot     :: T2.ReloadS
+  , session        :: Session
+  , sidePanel      :: T.Box (Maybe (Record TTypes.SidePanel))
+  , sidePanelState :: T.Box SidePanelState
+  , tasks          :: T.Box GAT.Storage
   )
 
 tabs :: Record TabsProps -> R.Element
@@ -73,13 +74,14 @@ tabsCpt = here.component "tabs" cpt
         , frontends
         , nodeId
         , session
-        , sidePanelTriggers
+        , sidePanel
+        , sidePanelState
         , reloadForest } _ = do
-      active <- R.useState' 0
-      textsSidePanelTriggers <- TTypes.emptySidePanelTriggers
-      pure $ Tab.tabs { selected: fst active, tabs: tabs' textsSidePanelTriggers }
+      activeTab <- T.useBox 0
+
+      pure $ Tab.tabs { activeTab, tabs: tabs' }
       where
-        tabs' trg =
+        tabs' =
           [ "Documents"     /\ docs
           , "Patents"       /\ ngramsView patentsView []
           , "Books"         /\ ngramsView booksView []
@@ -93,26 +95,23 @@ tabsCpt = here.component "tabs" cpt
                           , defaultListId
                           , mode: Patents
                           , nodeId
-                          , session
-                          , sidePanelTriggers
-                          , reloadForest }
+                          , reloadForest
+                          , session }
             booksView   = { reloadRoot
                           , tasks
                           , cacheState
                           , defaultListId
                           , mode: Books
                           , nodeId
-                          , session
-                          , sidePanelTriggers
-                          , reloadForest }
+                          , reloadForest
+                          , session }
             commView    = { reloadRoot, tasks
                           , cacheState
                           , defaultListId
                           , mode: Communication
                           , nodeId
-                          , session
-                          , sidePanelTriggers
-                          , reloadForest }
+                          , reloadForest
+                          , session }
             chart       = mempty
             totalRecords = 4736 -- TODO
             docs = DT.docViewLayout
@@ -124,22 +123,22 @@ tabsCpt = here.component "tabs" cpt
               , nodeId
               , session
               , showSearch: true
-              , sidePanelTriggers: trg
+              , sidePanel
+              , sidePanelState
               , tabType: TabPairing TabDocs
               , totalRecords
               }
 
 
 type NgramsViewTabsProps = (
-    cacheState        :: T.Box LTypes.CacheState
-  , defaultListId     :: Int
-  , mode              :: Mode
-  , nodeId            :: Int
-  , reloadForest      :: T.Box T2.Reload
-  , reloadRoot        :: T.Box T2.Reload
-  , session           :: Session
-  , sidePanelTriggers :: Record LTypes.SidePanelTriggers
-  , tasks             :: T.Box GAT.Storage
+    cacheState     :: T.Box LTypes.CacheState
+  , defaultListId  :: Int
+  , mode           :: Mode
+  , nodeId         :: Int
+  , reloadForest   :: T2.ReloadS
+  , reloadRoot     :: T2.ReloadS
+  , session        :: Session
+  , tasks          :: T.Box GAT.Storage
   )
 
 ngramsView :: R2.Component NgramsViewTabsProps
@@ -155,7 +154,6 @@ ngramsViewCpt = here.component "ngramsView" cpt
         , mode
         , nodeId
         , session
-        , sidePanelTriggers
         , tasks } _ = do
       path <- T.useBox $ NTC.initialPageParams session nodeId [defaultListId] (TabDocument TabDocs)
 
@@ -167,7 +165,6 @@ ngramsViewCpt = here.component "ngramsView" cpt
         , reloadForest
         , reloadRoot
         , session
-        , sidePanelTriggers
         , tabNgramType
         , tabType
         , tasks

src/Gargantext/Components/Nodes/Corpus.purs

 module Gargantext.Components.Nodes.Corpus where
 
-import Gargantext.Prelude (class Eq, class Show, Unit, bind, discard, pure, show, unit, ($), (+), (-), (<), (<$>), (<<<), (<>), (==), (>))
+import DOM.Simple.Console (log2)
 import Data.Argonaut (class DecodeJson, decodeJson, encodeJson)
 import Data.Argonaut.Parser (jsonParser)
 import Data.Array as A
@@ -11,46 +11,44 @@ import Data.Generic.Rep.Show (genericShow)
 import Data.List as List
 import Data.Maybe (Maybe(..), fromMaybe)
 import Data.Tuple (Tuple(..))
-import DOM.Simple.Console (log2)
 import Effect (Effect)
 import Effect.Aff (Aff, launchAff_, throwError)
 import Effect.Class (liftEffect)
 import Effect.Exception (error)
-import Reactix as R
-import Reactix.DOM.HTML as H
-import Toestand as T
-
-import Gargantext.Components.FolderView as FV
 import Gargantext.Components.CodeEditor as CE
+import Gargantext.Components.FolderView as FV
+import Gargantext.Components.Forest.Tree.Node.Action.Search.Types (doc)
 import Gargantext.Components.InputWithEnter (inputWithEnter)
 import Gargantext.Components.Node (NodePoly(..), HyperdataList)
-import Gargantext.Components.Nodes.Types
-  ( FTField, FTFieldWithIndex, FTFieldsWithIndex, Field(..), FieldType(..), Hash, Index
-  , defaultField, defaultHaskell', defaultJSON', defaultMarkdown', defaultPython' )
-
 import Gargantext.Components.Nodes.Corpus.Types (CorpusData, Hyperdata(..))
+import Gargantext.Components.Nodes.Types (FTField, FTFieldWithIndex, FTFieldsWithIndex, Field(..), FieldType(..), Hash, Index, defaultField, defaultHaskell', defaultJSON', defaultMarkdown', defaultPython')
 import Gargantext.Data.Array as GDA
 import Gargantext.Hooks.Loader (useLoader)
+import Gargantext.Prelude (class Eq, class Show, Unit, bind, discard, pure, show, unit, ($), (+), (-), (<), (<$>), (<<<), (<>), (==), (>))
 import Gargantext.Routes (SessionRoute(Children, NodeAPI))
 import Gargantext.Sessions (Session, get, put, sessionId)
 import Gargantext.Types (AffTableResult, NodeType(..))
 import Gargantext.Utils.Crypto as Crypto
 import Gargantext.Utils.Reactix as R2
 import Gargantext.Utils.Toestand as T2
+import Reactix as R
+import Reactix.DOM.HTML as H
+import Toestand as T
 
 here :: R2.Here
 here = R2.here "Gargantext.Components.Nodes.Corpus"
 
-type Props = ( nodeId  :: Int, session :: R.Context Session )
+type Props = ( nodeId  :: Int, session :: Session )
 
 corpusLayout :: R2.Leaf Props
 corpusLayout props = R.createElement corpusLayoutCpt props []
 
 corpusLayoutCpt :: R.Component Props
 corpusLayoutCpt = here.component "corpusLayout" cpt where
-  cpt { nodeId, session } _ = cp <$> R.useContext session where
-    cp s = corpusLayoutMain { key, nodeId, session: s } where
-      key = show (sessionId s) <> "-" <> show nodeId
+  cpt { nodeId, session } _ = do
+    pure $ corpusLayoutMain { key, nodeId, session }
+      where
+        key = show (sessionId session) <> "-" <> show nodeId
 
 type KeyProps =
   ( nodeId  :: Int

src/Gargantext/Components/Nodes/Corpus/Dashboard.purs

@@ -28,21 +28,21 @@ import Gargantext.Utils.Toestand as T2
 here :: R2.Here
 here = R2.here "Gargantext.Components.Nodes.Corpus.Dashboard"
 
-type Props = ( nodeId :: NodeID, session :: R.Context Session )
+type Props = ( nodeId :: NodeID, session :: Session )
 
 dashboardLayout :: R2.Component Props
 dashboardLayout = R.createElement dashboardLayoutCpt
 
 dashboardLayoutCpt :: R.Component Props
 dashboardLayoutCpt = here.component "dashboardLayout" cpt where
-  cpt { nodeId, session } content = cp <$> R.useContext session where
-    cp s = dashboardLayoutWithKey { key, nodeId, session: s } content where
-      key = show (sessionId s) <> "-" <> show nodeId
+  cpt { nodeId, session } content = do
+    pure $ dashboardLayoutWithKey { key, nodeId, session } content
+      where
+        key = show (sessionId session) <> "-" <> show nodeId
 
 type KeyProps =
   ( key     :: String
-  , nodeId  :: NodeID
-  , session :: Session
+  | Props
   )
 
 dashboardLayoutWithKey :: R2.Component KeyProps

src/Gargantext/Components/Nodes/Corpus/Document.purs

@@ -118,7 +118,7 @@ type LayoutProps =
  (  listId    :: ListId
   , mCorpusId :: Maybe NodeID
   , nodeId    :: NodeID
-  , session   :: R.Context Session
+  , session   :: Session
   )
 
 documentMainLayout :: R2.Component LayoutProps
@@ -133,9 +133,10 @@ documentLayout = R.createElement documentLayoutCpt
 
 documentLayoutCpt :: R.Component LayoutProps
 documentLayoutCpt = here.component "documentLayout" cpt where
-  cpt { listId, mCorpusId, nodeId, session } children = cp <$> R.useContext session where
-    cp s = documentLayoutWithKey { key, listId, mCorpusId, nodeId, session: s } children where
-      key = show (sessionId s) <> "-" <> show nodeId
+  cpt { listId, mCorpusId, nodeId, session } children = do
+    pure $ documentLayoutWithKey { key, listId, mCorpusId, nodeId, session } children
+      where
+        key = show (sessionId session) <> "-" <> show nodeId
 
 type KeyLayoutProps =
   ( key      :: String

src/Gargantext/Components/Nodes/Corpus/Graph/Tabs.purs

@@ -2,12 +2,14 @@ module Gargantext.Components.Nodes.Corpus.Graph.Tabs where
 
 import Prelude hiding (div)
 import Data.Array (fromFoldable)
-import Data.Tuple (Tuple(..), fst)
+import Data.Tuple (Tuple(..))
 import Reactix as R
+import Toestand as T
+
 import Gargantext.Components.GraphExplorer.Types (GraphSideCorpus(..))
 import Gargantext.Components.FacetsTable (docView)
 import Gargantext.Components.Search (SearchQuery)
-import Gargantext.Components.Table as T
+import Gargantext.Components.Table as Table
 import Gargantext.Components.Tab as Tab
 import Gargantext.Ends (Frontends)
 import Gargantext.Sessions (Session)
@@ -31,8 +33,9 @@ tabsCpt :: R.Component Props
 tabsCpt = here.component "tabs" cpt
   where
     cpt {frontends, query, session, sides} _ = do
-      active <- R.useState' 0
-      pure $ Tab.tabs {tabs: tabs', selected: fst active}
+      activeTab <- T.useBox 0
+
+      pure $ Tab.tabs { activeTab, tabs: tabs' }
       where
         tabs' = fromFoldable $ tab frontends session query <$> sides
 
@@ -42,5 +45,4 @@ tab frontends session query (GraphSideCorpus {corpusId: nodeId, corpusLabel, lis
   where
     dvProps   = {frontends, session, nodeId, listId, query, chart, totalRecords: 0, container}
     chart     = mempty
-    container = T.graphContainer {title: corpusLabel}
-
+    container = Table.graphContainer {title: corpusLabel}

src/Gargantext/Components/Nodes/File.purs

@@ -55,25 +55,25 @@ instance decodeFile :: DecodeJson File where
     hyperdata <- (obj .: "hyperdata") >>= decodeJson
     pure $ File { id, date, hyperdata, name }
 
-type FileLayoutProps = ( nodeId :: NodeID, session :: R.Context Session )
+type FileLayoutProps = ( nodeId :: NodeID, session :: Session )
 
 fileLayout :: R2.Leaf FileLayoutProps
 fileLayout props = R.createElement fileLayoutCpt props []
 
 fileLayoutCpt :: R.Component FileLayoutProps
 fileLayoutCpt = here.component "fileLayout" cpt where
-  cpt { nodeId, session } _ = R.useContext session >>= cp where
-    cp s = useLoader nodeId (loadFile s) onLoad where
-      onLoad loaded = fileLayoutLoaded { loaded, nodeId, session: s } where
-        key = show (sessionId s) <> "-" <> show nodeId
+  cpt { nodeId, session } _ = do
+    useLoader nodeId (loadFile session) onLoad
+      where
+        onLoad loaded = fileLayoutLoaded { loaded, nodeId, session }
+        key = show (sessionId session) <> "-" <> show nodeId
 
 loadFile :: Session -> NodeID -> Aff File
 loadFile session nodeId = get session $ NodeAPI Node (Just nodeId) ""
 
 type FileLayoutLoadedProps =
   ( loaded  :: File
-  , nodeId  :: Int
-  , session :: Session
+  | FileLayoutProps
   )
 
 fileLayoutLoaded :: Record FileLayoutLoadedProps -> R.Element

src/Gargantext/Components/Nodes/Frame.purs

@@ -46,15 +46,13 @@ instance encodeJsonHyperdata :: Argonaut.EncodeJson Hyperdata where
 
 type Props =
   ( nodeId   :: Int
-  , session  :: R.Context Session
   , nodeType :: NodeType
+  , session  :: Session
   )
 
 type KeyProps =
   ( key      :: String
-  , nodeId   :: Int
-  , session  :: Session
-  , nodeType :: NodeType
+  | Props
   )
 
 frameLayout :: R2.Leaf Props
@@ -62,9 +60,10 @@ frameLayout props = R.createElement frameLayoutCpt props []
 
 frameLayoutCpt :: R.Component Props
 frameLayoutCpt = here.component "frameLayout" cpt where
-  cpt { nodeId, nodeType, session } _ = cp <$> R.useContext session where
-    cp s = frameLayoutWithKey { key, nodeId, nodeType, session: s } where
-      key = show (sessionId s) <> "-" <> show nodeId
+  cpt { nodeId, nodeType, session } _ = do
+    pure $ frameLayoutWithKey { key, nodeId, nodeType, session }
+      where
+        key = show (sessionId session) <> "-" <> show nodeId
 
 frameLayoutWithKey :: R2.Leaf KeyProps
 frameLayoutWithKey props = R.createElement frameLayoutWithKeyCpt props []

src/Gargantext/Components/Nodes/Home/Public.purs

@@ -75,12 +75,10 @@ loadPublicData _l = do
 
 renderPublic :: R2.Leaf ()
 renderPublic props = R.createElement renderPublicCpt props []
-
 renderPublicCpt :: R.Component ()
 renderPublicCpt = here.component "renderPublic" cpt where
   cpt _ _ = do
-    reload <- R.useState' 0
-    useLoader { reload: fst reload } loadPublicData loaded where
+    useLoader { reload: 0 } loadPublicData loaded where
       loaded publicData = publicLayout { publicData }
 
 publicLayout :: Record PublicDataProps -> R.Element

src/Gargantext/Components/Nodes/Lists.purs

 module Gargantext.Components.Nodes.Lists where
 
-import DOM.Simple.Console (log, log2)
 import Data.Maybe (Maybe(..))
-import Data.Tuple (fst, snd)
-import Data.Tuple.Nested ((/\))
 import Effect (Effect)
 import Effect.Aff (launchAff_)
 import Gargantext.AsyncTasks as GAT
-import Gargantext.Components.Forest as Forest
 import Gargantext.Components.NgramsTable.Loader (clearCache)
 import Gargantext.Components.Node (NodePoly(..))
 import Gargantext.Components.Nodes.Corpus (loadCorpusWithChild)
 import Gargantext.Components.Nodes.Corpus.Types (getCorpusInfo, CorpusInfo(..), Hyperdata(..))
 import Gargantext.Components.Nodes.Lists.Tabs as Tabs
-import Gargantext.Components.Nodes.Lists.Types (CacheState(..), ListsLayoutControls, SidePanelState(..), initialControls, toggleSidePanelState)
+import Gargantext.Components.Nodes.Lists.Types (CacheState(..), SidePanel)
 import Gargantext.Components.Table as Table
 import Gargantext.Hooks.Loader (useLoader)
 import Gargantext.Prelude (Unit, bind, const, discard, pure, show, unit, ($), (<>))
@@ -24,42 +20,27 @@ import Gargantext.Utils.Toestand as T2
 import Reactix as R
 import Reactix.DOM.HTML as H
 import Record as Record
-import Record.Extra as REX
 import Toestand as T
 
 here :: R2.Here
 here = R2.here "Gargantext.Components.Nodes.Lists"
-
-listsWithSessionContext :: R2.Component CommonPropsSessionContext
-listsWithSessionContext = R.createElement listsWithSessionContextCpt
-
-listsWithSessionContextCpt :: R.Component CommonPropsSessionContext
-listsWithSessionContextCpt = here.component "listsWithSessionContext" cpt where
-  cpt props@{ session } _ = do
-      session' <- R.useContext session
-      controls <- initialControls
-
-      pure $ R.fragment [
-        -- topBar { controls } []
-        listsLayout (Record.merge { controls, session: session' } props) []
-      , H.div { className: "side-panel" } [ sidePanel { controls, session: session' } [] ]
-      ]
 --------------------------------------------------------
 
 type CommonPropsNoSession =
-  ( nodeId        :: Int
-  , reloadForest  :: T.Box T2.Reload
-  , reloadRoot    :: T.Box T2.Reload
-  , sessionUpdate :: Session -> Effect Unit
-  , tasks         :: T.Box GAT.Storage
+  ( nodeId         :: Int
+  , reloadForest   :: T2.ReloadS
+  , reloadMainPage :: T2.ReloadS
+  , reloadRoot     :: T2.ReloadS
+  , sessionUpdate  :: Session -> Effect Unit
+  , sidePanel      :: T.Box (Maybe (Record SidePanel))
+  , sidePanelState :: T.Box GT.SidePanelState
+  , tasks          :: T.Box GAT.Storage
   )
 
-type CommonProps = WithSession CommonPropsNoSession
+type Props = WithSession CommonPropsNoSession
 
 type CommonPropsSessionContext = WithSessionContext CommonPropsNoSession
 
-type Props = ( controls :: Record ListsLayoutControls | CommonProps )
-
 type WithTreeProps = ( handed :: GT.Handed | Props )
 
 listsLayout :: R2.Component Props
@@ -69,58 +50,70 @@ listsLayoutCpt :: R.Component Props
 listsLayoutCpt = here.component "listsLayout" cpt where
   cpt props@{ nodeId, session } _ = do
     let sid = sessionId session
-    pure $ listsLayoutWithKey $ Record.merge props { key: show sid <> "-" <> show nodeId }
+    pure $ listsLayoutWithKey (Record.merge props { key: show sid <> "-" <> show nodeId }) []
 
 type KeyProps = ( key :: String | Props )
 
-listsLayoutWithKey :: Record KeyProps -> R.Element
-listsLayoutWithKey props = R.createElement listsLayoutWithKeyCpt props []
+listsLayoutWithKey :: R2.Component KeyProps
+listsLayoutWithKey = R.createElement listsLayoutWithKeyCpt
 
 listsLayoutWithKeyCpt :: R.Component KeyProps
 listsLayoutWithKeyCpt = here.component "listsLayoutWithKey" cpt where
-    cpt { controls, nodeId, reloadForest, reloadRoot, session, sessionUpdate, tasks } _ = do
-      let path = { nodeId, session }
-
-      cacheState <- T.useBox $ getCacheState CacheOn session nodeId
-      cacheState' <- T.useLive T.unequal cacheState
-
-      R.useEffectOnce' $ do
-        T.listen (\{ new } -> afterCacheStateChange new) cacheState
-
-      useLoader path loadCorpusWithChild $
-        \corpusData@{ corpusId, corpusNode: NodePoly poly, defaultListId } ->
-          let { date, hyperdata : Hyperdata h, name } = poly
-              CorpusInfo { authors, desc, query } = getCorpusInfo h.fields
-          in
-          R.fragment [
-            Table.tableHeaderLayout {
-                cacheState
-              , date
-              , desc
-              , key: "listsLayoutWithKey-header-" <> (show cacheState')
-              , query
-              , title: "Corpus " <> name
-              , user: authors } []
-          , Tabs.tabs {
-               cacheState
-             , corpusData
-             , corpusId
-             , key: "listsLayoutWithKey-tabs-" <> (show cacheState')
-             , reloadForest
-             , reloadRoot
-             , session
-             , sidePanelTriggers: controls.triggers
-             , tasks
-             }
-          ]
-      where
-        afterCacheStateChange cacheState = do
-          launchAff_ $ clearCache unit
-          sessionUpdate $ setCacheState session nodeId cacheState
+  cpt { nodeId
+      , reloadForest
+      , reloadMainPage
+      , reloadRoot
+      , session
+      , sessionUpdate
+      , sidePanel
+      , sidePanelState
+      , tasks } _ = do
+    activeTab <- T.useBox 0
+    reloadMainPage' <- T.useLive T.unequal reloadMainPage
+
+    let path = { nodeId, session }
+
+    cacheState <- T.useBox $ getCacheState CacheOn session nodeId
+    cacheState' <- T.useLive T.unequal cacheState
+
+    R.useEffectOnce' $ do
+      T.listen (\{ new } -> afterCacheStateChange new) cacheState
+
+    useLoader path loadCorpusWithChild $
+      \corpusData@{ corpusId, corpusNode: NodePoly poly, defaultListId } ->
+        let { date, hyperdata : Hyperdata h, name } = poly
+            CorpusInfo { authors, desc, query } = getCorpusInfo h.fields
+        in
+        R.fragment [
+          Table.tableHeaderLayout {
+              cacheState
+            , date
+            , desc
+            , key: "listsLayoutWithKey-header-" <> (show cacheState')
+            , query
+            , title: "Corpus " <> name
+            , user: authors } []
+        , Tabs.tabs {
+              activeTab
+            , cacheState
+            , corpusData
+            , corpusId
+            , key: "listsLayoutWithKey-tabs-" <> (show cacheState')
+            , reloadForest
+            , reloadRoot
+            , session
+            , tasks
+            }
+        ]
+    where
+      afterCacheStateChange cacheState = do
+        launchAff_ $ clearCache unit
+        sessionUpdate $ setCacheState session nodeId cacheState
 
 type SidePanelProps =
-  ( controls :: Record ListsLayoutControls
-  , session  :: Session
+  ( session        :: Session
+  , sidePanel      :: T.Box (Maybe (Record SidePanel))
+  , sidePanelState :: T.Box GT.SidePanelState
   )
 
 sidePanel :: R2.Component SidePanelProps
@@ -129,29 +122,17 @@ sidePanel = R.createElement sidePanelCpt
 sidePanelCpt :: R.Component SidePanelProps
 sidePanelCpt = here.component "sidePanel" cpt
   where
-    cpt { controls: { triggers: { toggleSidePanel
-                                , triggerSidePanel
-                                } }
-        , session } _ = do
-
-      showSidePanel <- R.useState' InitialClosed
-
-      R.useEffect' $ do
-        let toggleSidePanel' _  = snd showSidePanel toggleSidePanelState
-            triggerSidePanel' _ = snd showSidePanel $ const Opened
-        R2.setTrigger toggleSidePanel  toggleSidePanel'
-        R2.setTrigger triggerSidePanel triggerSidePanel'
+    cpt { session
+        , sidePanel
+        , sidePanelState } _ = do
 
-      (mCorpusId /\ setMCorpusId) <- R.useState' Nothing
-      (mListId   /\ setMListId  ) <- R.useState' Nothing
-      (mNodeId   /\ setMNodeId  ) <- R.useState' Nothing
+      sidePanelState' <- T.useLive T.unequal sidePanelState
 
-      let mainStyle = case fst showSidePanel of
-            Opened -> { display: "block" }
-            _      -> { display: "none" }
+      let mainStyle = case sidePanelState' of
+            GT.Opened -> { display: "block" }
+            _         -> { display: "none" }
 
-      let closeSidePanel _ = do
-            snd showSidePanel $ const Closed
+      let closeSidePanel _ = T.write_ GT.Closed sidePanelState
 
       pure $ H.div { style: mainStyle } [
         H.div { className: "header" } [

src/Gargantext/Components/Nodes/Lists/Tabs.purs

@@ -34,14 +34,14 @@ here :: R2.Here
 here = R2.here "Gargantext.Components.Nodes.Lists.Tabs"
 
 type Props = (
-    cacheState        :: T.Box CacheState
-  , corpusData        :: CorpusData
-  , corpusId          :: Int
-  , reloadForest      :: T.Box T2.Reload
-  , reloadRoot        :: T.Box T2.Reload
-  , session           :: Session
-  , sidePanelTriggers :: Record SidePanelTriggers
-  , tasks             :: T.Box GAT.Storage
+    activeTab    :: T.Box Int
+  , cacheState   :: T.Box CacheState
+  , corpusData   :: CorpusData
+  , corpusId     :: Int
+  , reloadForest :: T2.ReloadS
+  , reloadRoot   :: T2.ReloadS
+  , session      :: Session
+  , tasks        :: T.Box GAT.Storage
   )
 
 type PropsWithKey = ( key :: String | Props )
@@ -51,9 +51,9 @@ tabs props = R.createElement tabsCpt props []
 
 tabsCpt :: R.Component PropsWithKey
 tabsCpt = here.component "tabs" cpt where
-  cpt props _ = do
-    (selected /\ setSelected) <- R.useState' 0
-    pure $ Tab.tabs { selected, tabs: tabs' } where
+  cpt props@{ activeTab } _ = do
+    pure $ Tab.tabs { activeTab
+                    , tabs: tabs' } where
       tabs' = [ "Terms"      /\ view Terms []
               , "Authors"    /\ view Authors []
               , "Institutes" /\ view Institutes []
@@ -76,7 +76,6 @@ ngramsViewCpt = here.component "ngramsView" cpt where
             , reloadRoot
             , mode
             , session
-            , sidePanelTriggers
             , tasks } _ = do
       chartsReload <- T.useBox T2.newReload
 
@@ -104,7 +103,6 @@ ngramsViewCpt = here.component "ngramsView" cpt where
                                 , reloadForest
                                 , reloadRoot
                                 , session
-                                , sidePanelTriggers
                                 , tabNgramType
                                 , tabType
                                 , tasks

src/Gargantext/Components/Nodes/Lists/Types.purs

 module Gargantext.Components.Nodes.Lists.Types where
 
-import Data.Argonaut (class DecodeJson, decodeJson, class EncodeJson, encodeJson, (~>), (:=))
+import Data.Argonaut (class DecodeJson, class EncodeJson, decodeJson, encodeJson)
 import Data.Argonaut.Decode.Error (JsonDecodeError(..))
+import Data.Maybe (Maybe(..))
 import Data.Either (Either(..))
 import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Eq (genericEq)
 import Data.Generic.Rep.Show (genericShow)
-import Data.Maybe (Maybe(..))
-import Reactix as R
 
 import Gargantext.Prelude
 import Gargantext.Types (ListId, NodeID)
@@ -34,45 +33,7 @@ instance encodeJsonCacheState :: EncodeJson CacheState where
 instance showCacheState :: Show CacheState where
   show = genericShow
 
+type SidePanel = ()
 
-data SidePanelState = InitialClosed | Opened | Closed
-derive instance eqSidePanelState :: Eq SidePanelState
-
-toggleSidePanelState :: SidePanelState -> SidePanelState
-toggleSidePanelState InitialClosed = Opened
-toggleSidePanelState Closed        = Opened
-toggleSidePanelState Opened        = Closed
-
-type TriggerAnnotatedDocIdChangeParams = (
-    corpusId :: NodeID
-  , listId   :: ListId
-  , nodeId   :: NodeID
-  )
-
-type SidePanelTriggers = (
-    toggleSidePanel             :: R2.Trigger Unit  -- toggles side panel
-  , triggerSidePanel            :: R2.Trigger Unit  -- opens side panel
-)
-
-emptySidePanelTriggers :: R.Hooks (Record SidePanelTriggers)
-emptySidePanelTriggers = do
-  toggleSidePanel             <- R.useRef Nothing
-  triggerSidePanel            <- R.useRef Nothing
-
-  pure $ {
-      toggleSidePanel
-    , triggerSidePanel
-    }
-
-
-type ListsLayoutControls = (
-    triggers      :: Record SidePanelTriggers
-  )
-
-initialControls :: R.Hooks (Record ListsLayoutControls)
-initialControls = do
-  triggers <- emptySidePanelTriggers
-
-  pure $ {
-      triggers
-  }
+initialSidePanel :: Maybe (Record SidePanel)
+initialSidePanel = Nothing

src/Gargantext/Components/Nodes/Texts.purs

 module Gargantext.Components.Nodes.Texts where
 
-import Prelude
-  ( class Eq, class Show, Unit, bind, const, discard
-  , pure, show, unit, ($), (&&), (<>), (==) )
 import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Show (genericShow)
 import Data.Maybe (Maybe(..))
-import Data.Tuple (fst, snd)
 import Data.Tuple.Nested ((/\))
-import Effect (Effect)
 import Effect.Aff (launchAff_)
 import Reactix as R
 import Reactix.DOM.HTML as H
 import Record as Record
-import Record.Extra as REX
 import Toestand as T
 
+import Gargantext.Prelude
+
 import Gargantext.Components.DocsTable as DT
-import Gargantext.Components.Forest as Forest
-import Gargantext.Hooks.Loader (useLoader)
 import Gargantext.Components.NgramsTable.Loader (clearCache)
 import Gargantext.Components.Node (NodePoly(..))
 import Gargantext.Components.Nodes.Corpus (loadCorpusWithChild)
 import Gargantext.Components.Nodes.Corpus.Chart.Histo (histo)
 import Gargantext.Components.Nodes.Corpus.Document as D
-import Gargantext.Components.Nodes.Corpus.Types
-  ( CorpusData, Hyperdata(..), getCorpusInfo, CorpusInfo(..) )
-import Gargantext.Components.Nodes.Lists.Types as NT
-import Gargantext.Components.Nodes.Texts.Types
-  ( SidePanelState(..), SidePanelTriggers, TextsLayoutControls
-  , TriggerAnnotatedDocIdChangeParams, initialControls, toggleSidePanelState )
-
+import Gargantext.Components.Nodes.Corpus.Types (CorpusData, Hyperdata(..), getCorpusInfo, CorpusInfo(..))
+import Gargantext.Components.Nodes.Lists.Types as LT
+import Gargantext.Components.Nodes.Texts.Types as TT
 import Gargantext.Components.Tab as Tab
 import Gargantext.Components.Table as Table
 import Gargantext.Ends (Frontends)
+import Gargantext.Hooks.Loader (useLoader)
 import Gargantext.Sessions (WithSession, WithSessionContext, Session, sessionId, getCacheState)
-import Gargantext.Types (CTabNgramType(..), ListId, NodeID, TabSubType(..), TabType(..))
+import Gargantext.Types (CTabNgramType(..), ListId, NodeID, SidePanelState(..), TabSubType(..), TabType(..))
 import Gargantext.Utils.Reactix as R2
 
 here :: R2.Here
 here = R2.here "Gargantext.Components.Nodes.Texts"
 
 --------------------------------------------------------
-textsWithSessionContext :: R2.Component CommonPropsSessionContext
-textsWithSessionContext = R.createElement textsWithSessionContextCpt
-
-textsWithSessionContextCpt :: R.Component CommonPropsSessionContext
-textsWithSessionContextCpt = here.component "textsWithSessionContext" cpt
-  where
-    cpt props@{ session } _ = do
-      session' <- R.useContext session
-      controls <- initialControls
-
-      pure $ R.fragment
-        [ -- topBar { controls } []
-          textsLayout (Record.merge { controls, session: session' } props) []
-        , H.div { className: "side-panel" } [ sidePanel { controls, session: session' } [] ]
-        ]
-
-
-type TopBarProps = ( controls :: Record TextsLayoutControls )
-
-topBar :: R2.Component TopBarProps
-topBar = R.createElement topBarCpt
-
-topBarCpt :: R.Component TopBarProps
-topBarCpt = here.component "topBar" cpt
-  where
-    cpt { controls } _ = do
-      -- empty for now because the button is moved to the side panel
-      pure $ H.div {} []
-        -- H.ul { className: "nav navbar-nav" } [
-        --   H.li {} [
-        --      sidePanelToggleButton { state: controls.showSidePanel } []
-        --      ]
-        --   ]  -- head (goes to top bar)
-
 
 
 type CommonPropsNoSession = (
-    frontends :: Frontends
-  , nodeId    :: NodeID
+    frontends      :: Frontends
+  , nodeId         :: NodeID
+  , sidePanel      :: T.Box (Maybe (Record TT.SidePanel))
+  , sidePanelState :: T.Box SidePanelState
   )
 
-type CommonProps = WithSession CommonPropsNoSession
-type CommonPropsSessionContext = WithSessionContext CommonPropsNoSession
+type Props = WithSession CommonPropsNoSession
 
-type Props = ( controls :: Record TextsLayoutControls | CommonProps )
 
 textsLayout :: R2.Component Props
 textsLayout = R.createElement textsLayoutCpt
 
 textsLayoutCpt :: R.Component Props
 textsLayoutCpt = here.component "textsLayout" cpt where
-  cpt { controls, frontends, nodeId, session } children = do
-    pure $ textsLayoutWithKey { controls
-                              , frontends
+  cpt { frontends, nodeId, session, sidePanel, sidePanelState } children = do
+    pure $ textsLayoutWithKey { frontends
                               , key
                               , nodeId
-                              , session } children
+                              , session
+                              , sidePanel
+                              , sidePanelState } children
       where
-        key = show sid <> "-" <> show nodeId
-          where
-            sid = sessionId session
+        key = show nodeId
+        -- key = show sid <> "-" <> show nodeId
+        --   where
+        --     sid = sessionId session
 
 type KeyProps = (
-    key       :: String
-  , controls  :: Record TextsLayoutControls
-  , frontends :: Frontends
-  , nodeId    :: NodeID
-  , session   :: Session
+    key            :: String
+  , frontends      :: Frontends
+  , nodeId         :: NodeID
+  , session        :: Session
+  , sidePanel      :: T.Box (Maybe (Record TT.SidePanel))
+  , sidePanelState :: T.Box SidePanelState
   )
 
 textsLayoutWithKey :: R2.Component KeyProps
@@ -118,8 +78,8 @@ textsLayoutWithKey = R.createElement textsLayoutWithKeyCpt
 textsLayoutWithKeyCpt :: R.Component KeyProps
 textsLayoutWithKeyCpt = here.component "textsLayoutWithKey" cpt
   where
-    cpt { controls, frontends, nodeId, session } _children = do
-      cacheState <- T.useBox $ getCacheState NT.CacheOff session nodeId
+    cpt { frontends, nodeId, session, sidePanel, sidePanelState } _children = do
+      cacheState <- T.useBox $ getCacheState LT.CacheOff session nodeId
       cacheState' <- T.useLive T.unequal cacheState
 
       R.useEffectOnce' $ do
@@ -143,7 +103,8 @@ textsLayoutWithKeyCpt = here.component "textsLayoutWithKey" cpt
                    , corpusId
                    , frontends
                    , session
-                   , sidePanelTriggers: controls.triggers }
+                   , sidePanel
+                   , sidePanelState }
             ]
       where
         afterCacheStateChange cacheState = do
@@ -166,12 +127,13 @@ modeTabType MoreLikeFav    = CTabAuthors  -- TODO
 modeTabType MoreLikeTrash  = CTabSources  -- TODO
 
 type TabsProps =
-  ( cacheState      :: T.Box NT.CacheState
-  , corpusData      :: CorpusData
-  , corpusId        :: NodeID
-  , frontends       :: Frontends
-  , session         :: Session
-  , sidePanelTriggers :: Record SidePanelTriggers
+  ( cacheState     :: T.Box LT.CacheState
+  , corpusData     :: CorpusData
+  , corpusId       :: NodeID
+  , frontends      :: Frontends
+  , session        :: Session
+  , sidePanel      :: T.Box (Maybe (Record TT.SidePanel))
+  , sidePanelState :: T.Box SidePanelState
   )
 
 tabs :: Record TabsProps -> R.Element
@@ -180,13 +142,13 @@ tabs props = R.createElement tabsCpt props []
 tabsCpt :: R.Component TabsProps
 tabsCpt = here.component "tabs" cpt
   where
-    cpt { cacheState, corpusId, corpusData, frontends, session, sidePanelTriggers } _ = do
-      (selected /\ setSelected) <- R.useState' 0
-
+    cpt { cacheState, corpusId, corpusData, frontends, session, sidePanel, sidePanelState } _ = do
       let path = initialPath
 
+      activeTab <- T.useBox 0
+
       pure $ Tab.tabs {
-          selected
+          activeTab
         , tabs: [
             "Documents"       /\ R.fragment [
                 histo { path, session }
@@ -211,18 +173,20 @@ tabsCpt = here.component "tabs" cpt
                                         -- , path
                                         , session
                                         , tabType
-                                        , sidePanelTriggers } []
+                                        , sidePanel
+                                        , sidePanelState } []
 
 type DocViewProps a = (
-    cacheState        :: T.Box NT.CacheState
-  , corpusData        :: CorpusData
-  , corpusId          :: NodeID
-  , frontends         :: Frontends
-  , listId            :: ListId
-  -- , path           :: Record DT.Path
-  , session           :: Session
-  , tabType           :: TabSubType a
-  , sidePanelTriggers :: Record SidePanelTriggers
+    cacheState     :: T.Box LT.CacheState
+  , corpusData     :: CorpusData
+  , corpusId       :: NodeID
+  , frontends      :: Frontends
+  , listId         :: ListId
+  -- , path        :: Record DT.Path
+  , session        :: Session
+  , tabType        :: TabSubType a
+  , sidePanel      :: T.Box (Maybe (Record TT.SidePanel))
+  , sidePanelState :: T.Box SidePanelState
   )
 
 docView :: forall a. R2.Component (DocViewProps a)
@@ -241,7 +205,8 @@ docViewLayoutRec { cacheState
                  , listId
                  , session
                  , tabType: TabDocs
-                 , sidePanelTriggers } =
+                 , sidePanel
+                 , sidePanelState } =
   { cacheState
   , chart  : H.div {} []
   , frontends
@@ -251,7 +216,8 @@ docViewLayoutRec { cacheState
     -- ^ TODO merge nodeId and corpusId in DT
   , session
   , showSearch: true
-  , sidePanelTriggers
+  , sidePanel
+  , sidePanelState
   , tabType: TabCorpus TabDocs
   , totalRecords: 4737
   }
@@ -261,7 +227,8 @@ docViewLayoutRec { cacheState
                  , listId
                  , session
                  , tabType: TabMoreLikeFav
-                 , sidePanelTriggers } =
+                 , sidePanel
+                 , sidePanelState } =
   { cacheState
   , chart  : H.div {} []
   , frontends
@@ -271,7 +238,8 @@ docViewLayoutRec { cacheState
     -- ^ TODO merge nodeId and corpusId in DT
   , session
   , showSearch: false
-  , sidePanelTriggers
+  , sidePanel
+  , sidePanelState
   , tabType: TabCorpus TabMoreLikeFav
   , totalRecords: 4737
   }
@@ -281,7 +249,8 @@ docViewLayoutRec { cacheState
                  , listId
                  , session
                  , tabType: TabMoreLikeTrash
-                 , sidePanelTriggers } =
+                 , sidePanel
+                 , sidePanelState } =
   { cacheState
   , chart  : H.div {} []
   , frontends
@@ -291,7 +260,8 @@ docViewLayoutRec { cacheState
   -- ^ TODO merge nodeId and corpusId in DT
   , session
   , showSearch: false
-  , sidePanelTriggers
+  , sidePanel
+  , sidePanelState
   , tabType: TabCorpus TabMoreLikeTrash
   , totalRecords: 4737
   }
@@ -301,7 +271,8 @@ docViewLayoutRec { cacheState
                  , listId
                  , session
                  , tabType: TabTrash
-                 , sidePanelTriggers } =
+                 , sidePanel
+                 , sidePanelState } =
   { cacheState
   , chart  : H.div {} []
   , frontends
@@ -311,7 +282,8 @@ docViewLayoutRec { cacheState
   -- ^ TODO merge nodeId and corpusId in DT
   , session
   , showSearch: true
-  , sidePanelTriggers
+  , sidePanel
+  , sidePanelState
   , tabType: TabCorpus TabTrash
   , totalRecords: 4737
   }
@@ -322,7 +294,8 @@ docViewLayoutRec { cacheState
                  , listId
                  , session
                  , tabType
-                 , sidePanelTriggers } =
+                 , sidePanel
+                 , sidePanelState } =
   { cacheState
   , chart  : H.div {} []
   , frontends
@@ -332,7 +305,8 @@ docViewLayoutRec { cacheState
   -- ^ TODO merge nodeId and corpusId in DT
   , session
   , showSearch: true
-  , sidePanelTriggers
+  , sidePanel
+  , sidePanelState
   , tabType: TabCorpus TabTrash
   , totalRecords: 4737
   }
@@ -340,8 +314,9 @@ docViewLayoutRec { cacheState
 
 --------------------------------------------------------
 type SidePanelProps = (
-    controls :: Record TextsLayoutControls
-  , session  :: Session
+    session        :: Session
+  , sidePanel      :: T.Box (Maybe (Record TT.SidePanel))
+  , sidePanelState :: T.Box SidePanelState
   )
 
 sidePanel :: R2.Component SidePanelProps
@@ -350,54 +325,67 @@ sidePanel = R.createElement sidePanelCpt
 sidePanelCpt :: R.Component SidePanelProps
 sidePanelCpt = here.component "sidePanel" cpt
   where
-    cpt { controls: { triggers: { currentDocIdRef
-                                , toggleSidePanel
-                                , triggerAnnotatedDocIdChange
-                                , triggerSidePanel
-                                } }
-        , session } _ = do
-
-      showSidePanel <- R.useState' InitialClosed
-
-      R.useEffect' $ do
-        let toggleSidePanel' _  = snd showSidePanel toggleSidePanelState
-            triggerSidePanel' _ = snd showSidePanel $ const Opened
-        R2.setTrigger toggleSidePanel  toggleSidePanel'
-        R2.setTrigger triggerSidePanel triggerSidePanel'
-
-      (mCorpusId /\ setMCorpusId) <- R.useState' Nothing
-      (mListId /\ setMListId) <- R.useState' Nothing
-      (mNodeId /\ setMNodeId) <- R.useState' Nothing
-
-      R.useEffect3 mCorpusId mListId mNodeId $ do
-        let trigger :: Record TriggerAnnotatedDocIdChangeParams -> Effect Unit
-            trigger { corpusId, listId, nodeId } = do
+    cpt { session
+        , sidePanel
+        , sidePanelState } _ = do
+
+      sidePanelState' <- T.useLive T.unequal sidePanelState
+      sidePanel' <- T.useLive T.unequal sidePanel
+
+      -- R.useEffect' $ do
+      --   let toggleSidePanel' _  = snd sidePanelState toggleSidePanelState
+      --       triggerSidePanel' _ = snd sidePanelState $ const Opened
+      --   R2.setTrigger toggleSidePanel  toggleSidePanel'
+      --   R2.setTrigger triggerSidePanel triggerSidePanel'
+
+      -- (mCorpusId /\ setMCorpusId) <- R.useState' Nothing
+      -- (mListId /\ setMListId) <- R.useState' Nothing
+      -- (mNodeId /\ setMNodeId) <- R.useState' Nothing
+
+      -- R.useEffect3 mCorpusId mListId mNodeId $ do
+      --   if mCorpusId == Just corpusId && mListId == Just listId && mNodeId == Just nodeId && mCurrentDocId == Just nodeId then do
+      --     T.modify_ (\sp -> sp { mCurrentDocId = Nothing }) sidePanel
+      --   else do
+      --     T.modify_ (\sp -> sp { mCorpusId = Just corpusId
+      --                         , mCurrentDocId = Just nodeId
+      --                         , mListId = Just listId
+      --                         , mNodeId = Just nodeId }) sidePanel
+        -- let trigger :: Record TriggerAnnotatedDocIdChangeParams -> Effect Unit
+        --     trigger { corpusId, listId, nodeId } = do
               -- log2 "[sidePanel trigger] trigger corpusId change" corpusId
               -- log2 "[sidePanel trigger] trigger listId change" listId
               -- log2 "[sidePanel trigger] trigger nodeId change" nodeId
-              if mCorpusId == Just corpusId && mListId == Just listId && mNodeId == Just nodeId && R.readRef currentDocIdRef == Just nodeId then do
-                R.setRef currentDocIdRef Nothing
-                R2.callTrigger toggleSidePanel unit
-              else do
-                setMCorpusId $ const $ Just corpusId
-                setMListId $ const $ Just listId
-                setMNodeId $ const $ Just nodeId
-                R.setRef currentDocIdRef $ Just nodeId
-                R2.callTrigger triggerSidePanel unit
+              -- if mCorpusId == Just corpusId && mListId == Just listId && mNodeId == Just nodeId && mCurrentDocId == Just nodeId then do
+                -- R.setRef currentDocIdRef Nothing
+                -- T.modify_ (\sp -> sp { mCurrentDocId = Nothing }) sidePanel
+                -- R2.callTrigger toggleSidePanel unit
+              -- else do
+                -- setMCorpusId $ const $ Just corpusId
+                -- setMListId $ const $ Just listId
+                -- setMNodeId $ const $ Just nodeId
+                -- R.setRef currentDocIdRef $ Just nodeId
+                -- R2.callTrigger triggerSidePanel unit
+                -- T.modify_ (\sp -> sp { mCorpusId = Just corpusId
+                --                     , mCurrentDocId = Just nodeId
+                --                     , mListId = Just listId
+                --                     , mNodeId = Just nodeId }) sidePanel
         -- log2 "[sidePanel] trigger" trigger
-        R2.setTrigger triggerAnnotatedDocIdChange trigger
+        -- R2.setTrigger triggerAnnotatedDocIdChange trigger
+        -- pure unit
 
-        pure $ do
-          -- log "[sidePanel] clearing triggerAnnotatedDocIdChange"
-          R2.clearTrigger triggerAnnotatedDocIdChange
+        -- pure $ do
+        --   -- log "[sidePanel] clearing triggerAnnotatedDocIdChange"
+        --   R2.clearTrigger triggerAnnotatedDocIdChange
 
-      let mainStyle = case fst showSidePanel of
+      let mainStyle = case sidePanelState' of
             Opened -> { display: "block" }
             _      -> { display: "none" }
 
       let closeSidePanel _ = do
-            R.setRef currentDocIdRef Nothing
-            snd showSidePanel $ const Closed
+            -- T.modify_ (\sp -> sp { mCurrentDocId = Nothing
+            --                     , state = Closed }) sidePanel
+            T.write_ Closed sidePanelState
+            T.write_ Nothing sidePanel
 
       pure $ H.div { style: mainStyle } [
         H.div { className: "header" } [
@@ -406,14 +394,12 @@ sidePanelCpt = here.component "sidePanel" cpt
             H.span { className: "fa fa-times" } []
           ]
         ]
-      , sidePanelDocView { mCorpusId, mListId, mNodeId, session } []
+      , sidePanelDocView { mSidePanel: sidePanel', session } []
       ]
 
 type SidePanelDocView = (
-    mCorpusId :: Maybe NodeID
-  , mListId   :: Maybe ListId
-  , mNodeId   :: Maybe NodeID
-  , session  :: Session
+    mSidePanel :: Maybe (Record TT.SidePanel)
+  , session    :: Session
   )
 
 sidePanelDocView :: R2.Component SidePanelDocView
@@ -422,16 +408,11 @@ sidePanelDocView = R.createElement sidePanelDocViewCpt
 sidePanelDocViewCpt :: R.Component SidePanelDocView
 sidePanelDocViewCpt = here.component "sidePanelDocView" cpt
   where
-    cpt { mListId: Nothing } _ = do
-      pure $ H.div {} []
-    cpt { mNodeId: Nothing } _ = do
+    cpt { mSidePanel: Nothing } _ = do
       pure $ H.div {} []
-    cpt { mCorpusId
-        , mListId: Just listId
-        , mNodeId: Just nodeId
+    cpt { mSidePanel: Just { corpusId, listId, nodeId }
         , session } _ = do
-      let session' = R.createContext session
       pure $ D.documentLayout { listId
-                              , mCorpusId
+                              , mCorpusId: Just corpusId
                               , nodeId
-                              , session: session' } []
+                              , session } []

src/Gargantext/Components/Nodes/Texts/Types.purs

 module Gargantext.Components.Nodes.Texts.Types where
 
 import Data.Maybe (Maybe(..))
-import Effect (Effect)
 import Reactix as R
 
 import Gargantext.Prelude
@@ -56,3 +55,15 @@ initialControls = do
   pure $ {
       triggers
   }
+
+
+type SidePanel =
+  (
+    corpusId      :: NodeID
+  , listId        :: ListId
+  , mCurrentDocId :: Maybe Int
+  , nodeId        :: NodeID
+  )
+
+initialSidePanel :: Maybe (Record SidePanel)
+initialSidePanel = Nothing

src/Gargantext/Components/Router.purs

 module Gargantext.Components.Router (router) where
 
+import Gargantext.Prelude
+
 import Data.Array (fromFoldable)
 import Data.Maybe (Maybe(..))
+import Data.Tuple.Nested ((/\))
 import Reactix as R
 import Reactix.DOM.HTML as H
 import Record as Record
 import Record.Extra as RE
 import Toestand as T
-import Unsafe.Coerce (unsafeCoerce)
 
-import Gargantext.Prelude
-
-import Gargantext.AsyncTasks as GAT
 import Gargantext.Components.App.Data (Boxes)
 import Gargantext.Components.Footer (footer)
 import Gargantext.Components.Forest as Forest
-import Gargantext.Components.GraphExplorer (explorerLayoutLoader)
+import Gargantext.Components.GraphExplorer as GraphExplorer
+import Gargantext.Components.GraphExplorer.Sidebar as GES
+import Gargantext.Components.GraphExplorer.Sidebar.Types as GEST
 import Gargantext.Components.Lang (LandingLang(LL_EN))
 import Gargantext.Components.Login (login)
 import Gargantext.Components.Nodes.Annuaire (annuaireLayout)
-import Gargantext.Components.Nodes.Annuaire.User (userLayoutSessionContext)
+import Gargantext.Components.Nodes.Annuaire.User (userLayout)
 import Gargantext.Components.Nodes.Annuaire.User.Contact (contactLayout)
 import Gargantext.Components.Nodes.Corpus (corpusLayout)
 import Gargantext.Components.Nodes.Corpus.Dashboard (dashboardLayout)
@@ -29,15 +30,14 @@ import Gargantext.Components.Nodes.Frame (frameLayout)
 import Gargantext.Components.Nodes.Home (homeLayout)
 import Gargantext.Components.Nodes.Lists as Lists
 import Gargantext.Components.Nodes.Texts as Texts
-import Gargantext.Components.SessionLoader (sessionWrapper)
-import Gargantext.Components.SimpleLayout (simpleLayout)
 import Gargantext.Components.TopBar as TopBar
 import Gargantext.Config (defaultFrontends, defaultBackends)
 import Gargantext.Ends (Backend)
 import Gargantext.Routes (AppRoute)
 import Gargantext.Routes as GR
-import Gargantext.Sessions (Session)
-import Gargantext.Types (CorpusId, ListId, NodeID, NodeType(..), SessionId)
+import Gargantext.Sessions as Sessions
+import Gargantext.Sessions (Session, WithSession)
+import Gargantext.Types (CorpusId, ListId, NodeID, NodeType(..), SessionId, SidePanelState(..))
 import Gargantext.Utils.Reactix as R2
 
 here :: R2.Here
@@ -45,10 +45,10 @@ here = R2.here "Gargantext.Components.Router"
 
 type Props = ( boxes :: Boxes )
 
-type SessionProps = ( session :: R.Context Session, sessionId :: SessionId | Props )
+type SessionProps = ( sessionId :: SessionId | Props )
 
 type SessionNodeProps = ( nodeId :: NodeID | SessionProps )
-type Props' = ( route' :: AppRoute, backend :: Backend | Props )
+type Props' = ( backend :: Backend, route' :: AppRoute | Props )
 
 router :: R2.Leaf Props
 router props = R.createElement routerCpt props []
@@ -58,17 +58,9 @@ routerCpt = here.component "router" cpt where
   cpt props@{ boxes } _ = do
     pure $ R.fragment
       [ loginModal { boxes } []
-      , TopBar.topBar { handed: boxes.handed } []
-      , Forest.forestLayoutMain { backend: boxes.backend
-                                , forestOpen: boxes.forestOpen
-                                , frontends: defaultFrontends
-                                , handed: boxes.handed
-                                , reloadForest: boxes.reloadForest
-                                , reloadRoot: boxes.reloadRoot
-                                , route: boxes.route
-                                , sessions: boxes.sessions
-                                , showLogin: boxes.showLogin
-                                , tasks: boxes.tasks } [ renderRoute props [] ]
+      , topBar { boxes } []
+      , forest { boxes } []
+      , sidePanel { boxes } []
       ]
 
 renderRoute :: R2.Component Props
@@ -77,9 +69,7 @@ renderRoute = R.createElement renderRouteCpt
 renderRouteCpt :: R.Component Props
 renderRouteCpt = here.component "renderRoute" cpt where
   cpt props@{ boxes } _ = do
-    let session = R.createContext (unsafeCoerce {})
-    let sessionProps sId = Record.merge { session, sessionId: sId } props
-    let sessionNodeProps sId nId = Record.merge { nodeId: nId } $ sessionProps sId
+    let sessionNodeProps sId nId = Record.merge { nodeId: nId, sessionId: sId } props
 
     route' <- T.useLive T.unequal boxes.route
 
@@ -95,7 +85,7 @@ renderRouteCpt = here.component "renderRoute" cpt where
         GR.FolderPrivate s n      -> corpus (sessionNodeProps s n) []
         GR.FolderPublic  s n      -> corpus (sessionNodeProps s n) []
         GR.FolderShared  s n      -> corpus (sessionNodeProps s n) []
-        GR.Home                   -> home props []
+        GR.Home                   -> home { boxes } []
         GR.Lists s n              -> lists (sessionNodeProps s n) []
         GR.Login                  -> login' boxes
         GR.PGraphExplorer s g     -> graphExplorer (sessionNodeProps s g) []
@@ -109,14 +99,10 @@ renderRouteCpt = here.component "renderRoute" cpt where
       ]
 
 
-type LoginModalProps = (
-  boxes :: Boxes
-  )
-
-loginModal :: R2.Component LoginModalProps
+loginModal :: R2.Component Props
 loginModal = R.createElement loginModalCpt
 
-loginModalCpt :: R.Component LoginModalProps
+loginModalCpt :: R.Component Props
 loginModalCpt = here.component "loginModal" cpt
   where
     cpt { boxes: boxes@{ showLogin } } _ = do
@@ -124,59 +110,169 @@ loginModalCpt = here.component "loginModal" cpt
 
         pure $ if showLogin' then login' boxes else H.div {} []
 
-forested :: R2.Component Props
-forested = R.createElement forestedCpt
+type AuthedProps =
+  ( content :: Session -> R.Element
+  | SessionProps )
 
-forestedCpt :: R.Component Props
-forestedCpt = here.component "forested" cpt
-  where
-    cpt { boxes: { backend
-                 , forestOpen
-                 , handed
-                 , reloadForest
-                 , reloadRoot
-                 , route
-                 , sessions
-                 , showLogin
-                 , tasks } } children = do
-      pure $ Forest.forestLayoutMain { backend
-                                     , forestOpen
-                                     , frontends: defaultFrontends
-                                     , handed
-                                     , reloadForest
-                                     , reloadRoot
-                                     , route
-                                     , sessions
-                                     , showLogin
-                                     , tasks } children
-
-authed :: Record SessionProps -> R.Element -> R.Element
-authed props@{ boxes: { sessions }, session, sessionId } content =
-  sessionWrapper { fallback: home homeProps []
-                 , context: session
-                 , sessionId
-                 , sessions } [ content, footer {} [] ]
+authed :: R2.Component AuthedProps
+authed = R.createElement authedCpt
+
+authedCpt :: R.Component AuthedProps
+authedCpt = here.component "authed" cpt where
+  cpt props@{ boxes: { session, sessions }
+            , content
+            , sessionId } _ = do
+    sessions' <- T.useLive T.unequal sessions
+    let session' = Sessions.lookup sessionId sessions'
+
+    R.useEffect' $ do
+      T.write_ session' session
+
+    case session' of
+      Nothing -> pure $ home homeProps []
+      Just s  -> pure $ R.fragment [ content s, footer {} [] ]
     where
       homeProps = RE.pick props :: Record Props
 
+topBar :: R2.Component Props
+topBar = R.createElement topBarCpt
+
+topBarCpt :: R.Component Props
+topBarCpt = here.component "topBar" cpt where
+  cpt props@{ boxes: boxes@{ handed
+                           , route } } _ = do
+    route' <- T.useLive T.unequal boxes.route
+
+    let children = case route' of
+          GR.PGraphExplorer s g -> [ GraphExplorer.topBar { boxes } [] ]
+          _                     -> []
+
+    pure $ TopBar.topBar { handed } children
+
+
+forest :: R2.Component Props
+forest = R.createElement forestCpt
+
+forestCpt :: R.Component Props
+forestCpt = here.component "forest" cpt where
+  cpt props@{ boxes: boxes@{ backend
+                           , forestOpen
+                           , handed
+                           , reloadForest
+                           , reloadMainPage
+                           , reloadRoot
+                           , route
+                           , sessions
+                           , showLogin
+                           , showTree
+                           , tasks }
+            } _ = do
+    pure $ Forest.forestLayoutMain { backend
+                                   , forestOpen
+                                   , frontends: defaultFrontends
+                                   , handed
+                                   , reloadForest
+                                   , reloadMainPage
+                                   , reloadRoot
+                                   , route
+                                   , sessions
+                                   , showLogin
+                                   , showTree
+                                   , tasks } [ renderRoute { boxes } [] ]
+
+sidePanel :: R2.Component Props
+sidePanel = R.createElement sidePanelCpt
+
+sidePanelCpt :: R.Component Props
+sidePanelCpt = here.component "sidePanel" cpt where
+  cpt props@{ boxes: boxes@{ graphVersion
+                           , reloadForest
+                           , session
+                           , sidePanelGraph
+                           , sidePanelState
+                           , sidePanelLists
+                           , sidePanelTexts } } _ = do
+    session' <- T.useLive T.unequal session
+    sidePanelState' <- T.useLive T.unequal sidePanelState
+
+    case session' of
+      Nothing -> pure $ H.div {} []
+      Just s  ->
+        case sidePanelState' of
+          Opened -> pure $ openedSidePanel (Record.merge { session: s } props) []
+          _      -> pure $ H.div {} []
+
+openedSidePanel :: R2.Component (WithSession Props)
+openedSidePanel = R.createElement openedSidePanelCpt
+
+openedSidePanelCpt :: R.Component (WithSession Props)
+openedSidePanelCpt = here.component "openedSidePanel" cpt where
+  cpt props@{ boxes: boxes@{ graphVersion
+                           , reloadForest
+                           , route
+                           , sidePanelGraph
+                           , sidePanelState
+                           , sidePanelLists
+                           , sidePanelTexts }
+            , session} _ = do
+    { mGraph, mMetaData, removedNodeIds, selectedNodeIds, sideTab } <- GEST.focusedSidePanel sidePanelGraph
+    mGraph' <- T.useLive T.unequal mGraph
+    mGraphMetaData' <- T.useLive T.unequal mMetaData
+    route' <- T.useLive T.unequal route
+
+    let wrapper = H.div { className: "side-panel" }
+
+    case route' of
+      GR.Lists s n -> do
+        pure $ wrapper
+          [ Lists.sidePanel { session
+                            , sidePanel: sidePanelLists
+                            , sidePanelState } [] ]
+      GR.PGraphExplorer s g -> do
+        case (mGraph' /\ mGraphMetaData') of
+          (Nothing /\ _) -> pure $ wrapper []
+          (_ /\ Nothing) -> pure $ wrapper []
+          (Just graph /\ Just metaData) -> do
+            pure $ wrapper
+              [ GES.sidebar { frontends: defaultFrontends
+                            , graph
+                            , graphId: g
+                            , graphVersion
+                            , metaData
+                            , reloadForest
+                            , removedNodeIds
+                            , selectedNodeIds
+                            , session
+                            , sideTab
+                            } [] ]
+      GR.Texts s n -> do
+        pure $ wrapper
+          [ Texts.sidePanel { session
+                            , sidePanel: sidePanelTexts
+                            , sidePanelState } [] ]
+      _ -> pure $ wrapper []
+
 annuaire :: R2.Component SessionNodeProps
 annuaire = R.createElement annuaireCpt
 
 annuaireCpt :: R.Component SessionNodeProps
 annuaireCpt = here.component "annuaire" cpt where
-  cpt props@{ boxes, nodeId, session, sessionId } _ = do
+  cpt props@{ boxes, nodeId } _ = do
     let sessionProps = RE.pick props :: Record SessionProps
-    pure $ authed sessionProps $ annuaireLayout { frontends, nodeId, session }
-      where frontends = defaultFrontends
+    pure $ authed (Record.merge { content: \session ->
+                                   annuaireLayout { frontends: defaultFrontends
+                                                  , nodeId
+                                                  , session } } sessionProps) []
 
 corpus :: R2.Component SessionNodeProps
 corpus = R.createElement corpusCpt
 
 corpusCpt :: R.Component SessionNodeProps
 corpusCpt = here.component "corpus" cpt where
-  cpt props@{ boxes, nodeId, session } _ = do
+  cpt props@{ boxes, nodeId } _ = do
     let sessionProps = RE.pick props :: Record SessionProps
-    pure $ authed sessionProps $ corpusLayout { nodeId, session }
+    pure $ authed (Record.merge { content: \session ->
+                                   corpusLayout { nodeId, session } } sessionProps) []
 
 type CorpusDocumentProps =
   ( corpusId :: CorpusId
@@ -190,11 +286,13 @@ corpusDocument = R.createElement corpusDocumentCpt
 corpusDocumentCpt :: R.Component CorpusDocumentProps
 corpusDocumentCpt = here.component "corpusDocument" cpt
   where
-    cpt props@{ boxes, corpusId: corpusId', listId, nodeId, session, sessionId } _ = do
+    cpt props@{ boxes, corpusId: corpusId', listId, nodeId } _ = do
       let sessionProps = RE.pick props :: Record SessionProps
-      pure $ authed sessionProps $
-        documentMainLayout { mCorpusId: corpusId, listId: listId, nodeId, session } []
-        where corpusId = Just corpusId'
+      pure $ authed (Record.merge { content: \session ->
+                                     documentMainLayout { mCorpusId: Just corpusId'
+                                                        , listId: listId
+                                                        , nodeId
+                                                        , session } [] } sessionProps )[]
 
 dashboard :: R2.Component SessionNodeProps
 dashboard = R.createElement dashboardCpt
@@ -202,9 +300,10 @@ dashboard = R.createElement dashboardCpt
 dashboardCpt :: R.Component SessionNodeProps
 dashboardCpt = here.component "dashboard" cpt
   where
-    cpt props@{ boxes, nodeId, session } _ = do
+    cpt props@{ boxes, nodeId } _ = do
       let sessionProps = RE.pick props :: Record SessionProps
-      pure $ authed sessionProps $ dashboardLayout { nodeId, session } []
+      pure $ authed (Record.merge { content: \session ->
+                                     dashboardLayout { nodeId, session } [] } sessionProps) []
 
 type DocumentProps = ( listId :: ListId | SessionNodeProps )
 
@@ -213,11 +312,41 @@ document = R.createElement documentCpt
 
 documentCpt :: R.Component DocumentProps
 documentCpt = here.component "document" cpt where
-  cpt props@{ listId, nodeId, session, sessionId, boxes } _ = do
+  cpt props@{ boxes, listId, nodeId } _ = do
     let sessionProps = RE.pick props :: Record SessionProps
-    pure $ authed sessionProps $
-      documentMainLayout { listId, nodeId, mCorpusId, session } []
-      where mCorpusId = Nothing
+    pure $ authed (Record.merge { content: \session ->
+                                   documentMainLayout { listId
+                                                      , nodeId
+                                                      , mCorpusId: Nothing
+                                                      , session } [] } sessionProps) []
+
+graphExplorer :: R2.Component SessionNodeProps
+graphExplorer = R.createElement graphExplorerCpt
+
+graphExplorerCpt :: R.Component SessionNodeProps
+graphExplorerCpt = here.component "graphExplorer" cpt where
+  cpt props@{ boxes: boxes@{ backend
+                           , handed
+                           , route
+                           , sessions
+                           , showLogin
+                           , sidePanelGraph
+                           , sidePanelState
+                           , tasks }
+            , nodeId } _ = do
+    let sessionProps = RE.pick props :: Record SessionProps
+    pure $ authed (Record.merge { content: \session ->
+                                   -- simpleLayout { handed }
+                                   GraphExplorer.explorerLayout { backend
+                                                                , boxes
+                                                                , frontends: defaultFrontends
+                                                                , graphId: nodeId
+                                                                , handed
+                                                                , route
+                                                                , session
+                                                                , sessions
+                                                                , showLogin
+                                                                , tasks } [] } sessionProps) []
 
 home :: R2.Component Props
 home = R.createElement homeCpt
@@ -225,7 +354,7 @@ home = R.createElement homeCpt
 homeCpt :: R.Component Props
 homeCpt = here.component "home" cpt where
   cpt props@{ boxes: boxes@{ sessions, showLogin } } _ = do
-    pure $ homeLayout  { lang: LL_EN, sessions, showLogin }
+    pure $ homeLayout { lang: LL_EN, sessions, showLogin }
 
 lists :: R2.Component SessionNodeProps
 lists = R.createElement listsCpt
@@ -236,23 +365,26 @@ listsCpt = here.component "lists" cpt where
                      , forestOpen
                      , handed
                      , reloadForest
+                     , reloadMainPage
                      , reloadRoot
                      , route
                      , sessions
                      , showLogin
+                     , sidePanelState
+                     , sidePanelLists
                      , tasks }
-            , nodeId
-            , session
-            , sessionId } _ = do
+            , nodeId } _ = do
     let sessionProps = RE.pick props :: Record SessionProps
-    pure $ authed sessionProps $
-      Lists.listsWithSessionContext { nodeId
-                                    , reloadForest
-                                    , reloadRoot
-                                    , session
-                                    , sessionUpdate: \_ -> pure unit
-                                    , tasks } []
-      where frontends = defaultFrontends
+    pure $ authed (Record.merge { content: \session ->
+                                   Lists.listsLayout { nodeId
+                                                     , reloadForest
+                                                     , reloadMainPage
+                                                     , reloadRoot
+                                                     , session
+                                                     , sessionUpdate: \_ -> pure unit
+                                                     , sidePanel: sidePanelLists
+                                                     , sidePanelState
+                                                     , tasks } [] } sessionProps) []
 
 login' :: Boxes -> R.Element
 login' { backend, sessions, showLogin: visible } =
@@ -261,37 +393,15 @@ login' { backend, sessions, showLogin: visible } =
         , sessions
         , visible }
 
-graphExplorer :: R2.Component SessionNodeProps
-graphExplorer = R.createElement graphExplorerCpt
-
-graphExplorerCpt :: R.Component SessionNodeProps
-graphExplorerCpt = here.component "graphExplorer" cpt where
-  cpt props@{ boxes: { backend, handed, route, sessions, showLogin, tasks }
-            , nodeId
-            , session } _ = do
-    let sessionProps = RE.pick props :: Record SessionProps
-    pure $ authed sessionProps $
-      simpleLayout { handed }
-      [ explorerLayoutLoader { backend
-                             , frontends
-                             , graphId: nodeId
-                             , handed
-                             , route
-                             , session
-                             , sessions
-                             , showLogin
-                             , tasks } [] ]
-      where frontends = defaultFrontends
-
 routeFile :: R2.Component SessionNodeProps
 routeFile = R.createElement routeFileCpt
 
 routeFileCpt :: R.Component SessionNodeProps
 routeFileCpt = here.component "routeFile" cpt where
-  cpt props@{ nodeId, session, sessionId, boxes } _ = do
+  cpt props@{ boxes, nodeId } _ = do
     let sessionProps = RE.pick props :: Record SessionProps
-    pure $ authed sessionProps $
-      fileLayout { nodeId, session }
+    pure $ authed (Record.merge { content: \session ->
+                                   fileLayout { nodeId, session } } sessionProps) []
 
 type RouteFrameProps = (
   nodeType :: NodeType
@@ -303,20 +413,20 @@ routeFrame = R.createElement routeFrameCpt
 
 routeFrameCpt :: R.Component RouteFrameProps
 routeFrameCpt = here.component "routeFrame" cpt where
-  cpt props@{ nodeId, nodeType, session, sessionId, boxes } _ = do
+  cpt props@{ boxes, nodeId, nodeType } _ = do
     let sessionProps = RE.pick props :: Record SessionProps
-    pure $ authed sessionProps $
-      frameLayout { nodeId, nodeType, session }
+    pure $ authed (Record.merge { content: \session ->
+                                   frameLayout { nodeId, nodeType, session } } sessionProps) []
 
 team :: R2.Component SessionNodeProps
 team = R.createElement teamCpt
 
 teamCpt :: R.Component SessionNodeProps
 teamCpt = here.component "team" cpt where
-  cpt props@{ nodeId, session, sessionId, boxes } _ = do
+  cpt props@{ boxes, nodeId } _ = do
     let sessionProps = RE.pick props :: Record SessionProps
-    pure $ authed sessionProps $
-      corpusLayout { nodeId, session }
+    pure $ authed (Record.merge { content: \session ->
+                                   corpusLayout { nodeId, session } } sessionProps) []
 
 texts :: R2.Component SessionNodeProps
 texts = R.createElement textsCpt
@@ -332,36 +442,39 @@ textsCpt = here.component "texts" cpt
                        , route
                        , sessions
                        , showLogin
+                       , sidePanelState
+                       , sidePanelTexts
                        , tasks }
-              , nodeId
-              , session
-              , sessionId } _ = do
+              , nodeId } _ = do
       let sessionProps = RE.pick props :: Record SessionProps
-      pure $ authed sessionProps $
-        Texts.textsWithSessionContext { frontends
-                                      , nodeId
-                                      , session } []
-        where
-          frontends = defaultFrontends
+      pure $ authed (Record.merge { content: \session ->
+                                     Texts.textsLayout { frontends: defaultFrontends
+                                                       , nodeId
+                                                       , session
+                                                       , sidePanel: sidePanelTexts
+                                                       , sidePanelState } [] } sessionProps) []
 
 user :: R2.Component SessionNodeProps
 user = R.createElement userCpt
 
 userCpt :: R.Component SessionNodeProps
 userCpt = here.component "user" cpt where
-  cpt props@{ boxes: boxes@{ reloadForest, reloadRoot, tasks }
-            , nodeId
-            , session
-            , sessionId } _ = do
+  cpt props@{ boxes: boxes@{ reloadForest
+                           , reloadRoot
+                           , sidePanelState
+                           , sidePanelTexts
+                           , tasks }
+            , nodeId } _ = do
     let sessionProps = RE.pick props :: Record SessionProps
-    pure $ authed sessionProps $
-      userLayoutSessionContext { frontends
-                               , nodeId
-                               , reloadForest
-                               , reloadRoot
-                               , session
-                               , tasks } []
-      where frontends = defaultFrontends
+    pure $ authed (Record.merge { content: \session ->
+                                   userLayout { frontends: defaultFrontends
+                                              , nodeId
+                                              , reloadForest
+                                              , reloadRoot
+                                              , session
+                                              , sidePanel: sidePanelTexts
+                                              , sidePanelState
+                                              , tasks } [] } sessionProps) []
 
 type ContactProps = ( annuaireId :: NodeID | SessionNodeProps )
 
@@ -370,10 +483,22 @@ contact = R.createElement contactCpt
 
 contactCpt :: R.Component ContactProps
 contactCpt = here.component "contact" cpt where
-  cpt props@{ annuaireId, nodeId, session, sessionId
-            , boxes: { reloadForest, reloadRoot, tasks } } _ = do
+  cpt props@{ annuaireId
+            , boxes: { reloadForest
+                     , reloadRoot
+                     , sidePanelTexts
+                     , sidePanelState
+                     , tasks }
+            , nodeId } _ = do
     let sessionProps = RE.pick props :: Record SessionProps
     let forestedProps = RE.pick props :: Record Props
-    pure $ authed sessionProps $
-      contactLayout { annuaireId, frontends, nodeId, reloadForest, reloadRoot, session, tasks } []
-      where frontends = defaultFrontends
+    pure $ authed (Record.merge { content: \session ->
+                                   contactLayout { annuaireId
+                                                 , frontends: defaultFrontends
+                                                 , nodeId
+                                                 , reloadForest
+                                                 , reloadRoot
+                                                 , session
+                                                 , sidePanel: sidePanelTexts
+                                                 , sidePanelState
+                                                 , tasks } [] } sessionProps) []

src/Gargantext/Components/SessionLoader.purs

@@ -20,8 +20,8 @@ here = R2.here "Gargantext.Components.SessionWrapper"
 
 type Props =
   (
-    fallback  :: R.Element
-  , context   :: R.Context Session
+    context   :: R.Context Session
+  , fallback  :: R.Element
   , sessionId :: SessionId
   , sessions  :: T.Box Sessions
   )

src/Gargantext/Components/Tab.purs

 module Gargantext.Components.Tab where
 
-import Prelude hiding (div)
 import Data.FunctorWithIndex (mapWithIndex)
 import Data.Tuple (Tuple)
 import Data.Tuple.Nested ((/\))
@@ -8,14 +7,16 @@ import Reactix as R
 import Reactix.DOM.HTML as H
 import Toestand as T
 
+import Gargantext.Prelude
+
 import Gargantext.Utils.Reactix as R2
 
 here :: R2.Here
 here = R2.here "Gargantext.Components.Tab"
 
 type TabsProps = (
-    selected :: Int
-  , tabs     :: Array (Tuple String R.Element)
+    activeTab  :: T.Box Int
+  , tabs       :: Array (Tuple String R.Element)
   )
 
 tabs :: R2.Leaf TabsProps
@@ -24,18 +25,17 @@ tabs props = R.createElement tabsCpt props []
 -- this is actually just the list of tabs, not the tab contents itself
 tabsCpt :: R.Component TabsProps
 tabsCpt = here.component "tabs" cpt where
-  cpt props _ = do
-    activeTab <- T.useBox props.selected
+  cpt props@{ activeTab, tabs } _ = do
     activeTab' <- T.useLive T.unequal activeTab
 
     pure $ H.div {}
       [ H.nav {}
         [ H.br {}
         , H.div { className: "nav nav-tabs", title: "Search result" }
-          (mapWithIndex (button activeTab activeTab') props.tabs)
+          (mapWithIndex (button activeTab activeTab') tabs)
         ]
       , H.div { className: "tab-content" }
-        (mapWithIndex (item activeTab') props.tabs)
+        (mapWithIndex (item activeTab') tabs)
       ]
   button activeTab selected index (name /\ _) =
     H.a { className, on: { click } } [ H.text name ] where
@@ -52,9 +52,9 @@ tab = R.createElement tabCpt
 
 -- | A tab only shows its contents if it is currently selected
 tabCpt :: R.Component TabProps
-tabCpt = R.staticComponent "G.C.Tab.tab" cpt
+tabCpt = here.component "tab" cpt
   where
-    cpt { selected, index } children = H.div { className } children'
+    cpt { selected, index } children = pure $ H.div { className } children'
       where
         same = selected == index
         className = "tab-pane" <> (if same then "show active" else "fade")

src/Gargantext/Components/Table.purs

@@ -142,10 +142,10 @@ tableCpt = here.component "table" cpt
                 Just (DESC d) | c == d -> [lnk (Just (ASC  c)) "DESC ", lnk Nothing (columnName c)]
                 _ -> [lnk (Just (ASC c)) (columnName c)]
       pure $ container
-        { syncResetButton
-        , pageSizeControl: sizeDD { params }
+        { pageSizeControl: sizeDD { params }
         , pageSizeDescription: textDescription state.page state.pageSize totalRecords
         , paginationLinks: pagination { params, totalPages }
+        , syncResetButton
         , tableBody: map _.row $ A.fromFoldable rows
         , tableHead: H.tr {} (colHeader <$> colNames)
         }

src/Gargantext/Components/TopBar.purs

@@ -23,25 +23,29 @@ topBar = R.createElement topBarCpt
 topBarCpt :: R.Component TopBarProps
 topBarCpt = here.component "topBar" cpt
   where
-    cpt { handed } _children = do
+    cpt { handed } children = do
       handed' <- T.useLive T.unequal handed
 
       pure $ H.div { className: "navbar navbar-expand-lg navbar-dark bg-dark fixed-top"
                    , id: "dafixedtop"
                    , role: "navigation"
-                   } $ reverseHanded handed' [
-                      -- NOTE: first (and only) entry in the sorted array should have the "ml-auto class"
-                      -- https://stackoverflow.com/questions/19733447/bootstrap-navbar-with-left-center-or-right-aligned-items
-                      -- In practice: only apply "ml-auto" to the last element of this list, if handed == LeftHanded
-                      logo
-                   , H.ul { className: "navbar-nav " <> if handed' == LeftHanded then "ml-auto" else "" } $ reverseHanded handed' [
-                        divDropdownLeft {} []
-                      , handButton handed'
-                      , smiley
-                      , H.li { className: "nav-item" } [ themeSwitcher { theme: defaultTheme
-                                                                       , themes: allThemes } [] ]
-                      ]
-                   ]
+                   }
+        [ H.div { className: "container-fluid" } $ reverseHanded handed' [
+             -- NOTE: first (and only) entry in the sorted array should have the "ml-auto class"
+             -- https://stackoverflow.com/questions/19733447/bootstrap-navbar-with-left-center-or-right-aligned-items
+             -- In practice: only apply "ml-auto" to the last element of this list, if handed == LeftHanded
+             logo
+             , H.div { className: "collapse navbar-collapse" }
+               [ H.ul { className: "navbar-nav " <> if handed' == LeftHanded then "ml-auto" else "" } $ reverseHanded handed'
+               ([ divDropdownLeft {} []
+                , handButton handed'
+                , smiley
+                , H.li { className: "nav-item" } [ themeSwitcher { theme: defaultTheme
+                                                                 , themes: allThemes } [] ]
+                ] <> children)
+               ]
+             ]
+        ]
           where
             handButton handed' = H.li { title: "If you are Left Handed you can change\n"
                                             <> "the interface by clicking on me. Click\n"

src/Gargantext/Hooks/Loader.purs

@@ -157,6 +157,6 @@ useCachedAPILoaderEffect { cacheEndpoint
           if h == cacheReal then
             pure hr'
           else
-            throwError $ error $ "Fetched clean cache but hashes don't match: " <> h <> " != " <> cacheReal
+            throwError $ error $ "[Hooks.Loader] Fetched clean cache but hashes don't match: " <> h <> " != " <> cacheReal
         liftEffect $ do
           T.write_ (Just $ handleResponse val) state

src/Gargantext/Hooks/Sigmax/Types.purs

@@ -19,7 +19,10 @@ import Gargantext.Types as GT
 
 newtype Graph n e = Graph { edges :: Seq.Seq {|e}, nodes :: Seq.Seq {|n} }
 
---derive instance eqGraph :: Eq Graph
+derive instance genericGraph :: Generic (Graph n e) _
+
+instance eqGraphInst :: (Eq (Record n), Eq (Record e)) => Eq (Graph n e) where
+  eq = genericEq
 
 --instance eqGraph :: Eq Graph where
 --  eq (Graph {nodes: n1, edges: e1}) (Graph {nodes: n2, edges: e2}) = n1 == n2 && e1 == e2

src/Gargantext/Types.purs

@@ -644,14 +644,6 @@ asyncTaskTypePath UpdateNgramsCharts = "ngrams/async/charts/update/"
 asyncTaskTypePath UpdateNode         = "update/"
 asyncTaskTypePath UploadFile         = "async/file/add/"
 
-asyncTaskTriggersAppReload :: AsyncTaskType -> Boolean
-asyncTaskTriggersAppReload _ = true
-
-asyncTaskTriggersTreeReload :: AsyncTaskType -> Boolean
-asyncTaskTriggersTreeReload Form       = true
-asyncTaskTriggersTreeReload UploadFile = true
-asyncTaskTriggersTreeReload _          = false
-
 
 type AsyncTaskID = String
 
@@ -773,6 +765,14 @@ prettyNodeType nt = S.replace (S.Pattern "Node")   (S.Replacement " ")
                   $ S.replace (S.Pattern "Folder") (S.Replacement " ")
                   $ show nt
 
+---------------------------------------------------------------------------
 
+data SidePanelState = InitialClosed | Opened | Closed
+derive instance genericSidePanelState :: Generic SidePanelState _
+instance eqSidePanelState :: Eq SidePanelState where
+  eq = genericEq
 
-
+toggleSidePanelState :: SidePanelState -> SidePanelState
+toggleSidePanelState InitialClosed = Opened
+toggleSidePanelState Closed        = Opened
+toggleSidePanelState Opened        = Closed

src/sass/_login.sass

 #dafixedtop
-  z-index: 999  // correction for the popover
+  // correction for the popover
+  z-index: 999
+  // height: 60px
 
 //.logoSmall
 //  line-height: 15px

src/sass/_styles.sass

-#page-wrapper
-  .cache-toggle
-    cursor: pointer
-  .side-panel
-    //background-color: $dark
-    left: 70%
-    padding: 5px
-    position: fixed
-    top: 60px
-    background-color: #fff
-    width: 28%
-    .header
-      float: right
-    .corpus-doc-view
-      .annotated-field-wrapper
-        .annotated-field-runs
-          max-height: 200px
-          overflow-y: scroll
-      .list-group
-        .list-group-item-heading
-          display: inline-block
-          width: 60px
+.cache-toggle
+  cursor: pointer
+.side-panel
+  //background-color: $dark
+  left: 70%
+  padding: 5px
+  position: fixed
+  top: 60px
+  background-color: #fff
+  width: 28%
+  .header
+    float: right
+  .corpus-doc-view
+    .annotated-field-wrapper
+      .annotated-field-runs
+        max-height: 200px
+        overflow-y: scroll
+    .list-group
+      .list-group-item-heading
+        display: inline-block
+        width: 60px
 
 .simple-layout
   height: 100%