forest works, tree links do not

src/Gargantext/Components/App.purs

@@ -3,7 +3,7 @@ module Gargantext.Components.App where
 import Prelude
 import Data.Array (fromFoldable)
 import Data.Foldable (intercalate)
-import Data.Maybe (Maybe(..))
+import Data.Maybe (Maybe(..), maybe')
 import Data.Tuple (fst, snd)
 import Reactix as R
 import Reactix.DOM.HTML as H
@@ -12,8 +12,8 @@ import Gargantext.Components.Data.Lang (Lang(..))
 import Gargantext.Components.Forest (forest)
 import Gargantext.Components.GraphExplorer (explorerLayout)
 import Gargantext.Components.Login (login)
-import Gargantext.Components.Search.SearchBar as SB
-import Gargantext.Components.Search.Types (allDatabases)
+-- import Gargantext.Components.Search.SearchBar as SB
+-- import Gargantext.Components.Search.Types (allDatabases)
 import Gargantext.Config (defaultFrontends, defaultBackends)
 import Gargantext.Components.Folder (folder)
 import Gargantext.Ends (Frontends)
@@ -29,6 +29,7 @@ import Gargantext.Router (router)
 import Gargantext.Routes (AppRoute(..))
 import Gargantext.Hooks.Router (useHashRouter)
 import Gargantext.Utils.Reactix as R2
+import Gargantext.Sessions as Sessions
 import Gargantext.Sessions (Sessions, useSessions, unSessions)
 
 -- TODO (what does this mean?)
@@ -47,37 +48,39 @@ appCpt = R.hooksComponent "G.C.App.app" cpt where
     showLogin  <- R.useState' false
     showCorpus <- R.useState' false
     
-    let tree          = forestLayout frontends (fst sessions) (fst route) (snd showLogin)
+    let forested          = forestLayout frontends (fst sessions) (fst route) (snd showLogin)
     let mCurrentRoute = fst route
     let backends      = fromFoldable defaultBackends
+    let withSession = \sid f -> maybe' (\_ -> forested $ homeLayout EN) f $ Sessions.lookup sid (fst sessions)
     pure $ case fst showLogin of
-      true -> tree $ login { sessions, backends, visible: showLogin }
+      true -> forested $ login { sessions, backends, visible: showLogin }
       false ->
-        case unSessions (fst sessions) of
-          Nothing -> tree $ homeLayout EN
-          Just session ->
-            case (fst route) of
-              Home     -> tree $ homeLayout EN
-              Login    -> login { sessions, backends, visible: showLogin }
-              Folder _ -> tree $ folder {}
-              Corpus nodeId -> tree $ corpusLayout { nodeId }
-              Texts  nodeId -> tree $ textsLayout { nodeId, session }
-              Lists  nodeId -> tree $ listsLayout { nodeId, session }
-              Dashboard _nodeId -> tree $ dashboardLayout {}
-              Annuaire    nodeId -> tree $ annuaireLayout { nodeId, session }
-              UserPage    nodeId -> tree $ userLayout { nodeId, session }
-              ContactPage nodeId -> tree $ userLayout { nodeId, session }
-              CorpusDocument corpusId listId nodeId ->
-                tree $ documentLayout { nodeId, listId, session, corpusId: Just corpusId }
-              Document listId nodeId ->
-                tree $ documentLayout { nodeId, listId, session, corpusId: Nothing }
-              PGraphExplorer graphId ->
-                simpleLayout (fst sessions) $
-                  explorerLayout { graphId, mCurrentRoute, session, sessions, treeId: Nothing, frontends}
+        case fst route of
+          Home  -> forested $ homeLayout EN
+          Login -> login { sessions, backends, visible: showLogin }
+          Folder sid _ -> withSession sid $ \_ -> forested (folder {})
+          Corpus sid nodeId -> withSession sid $ \_ -> forested $ corpusLayout { nodeId }
+          Texts sid nodeId -> withSession sid $ \session -> forested $ textsLayout { nodeId, session }
+          Lists sid nodeId -> withSession sid $ \session -> forested $ listsLayout { nodeId, session }
+          Dashboard sid _nodeId -> withSession sid $ \session -> forested $ dashboardLayout {}
+          Annuaire sid nodeId -> withSession sid $ \session -> forested $ annuaireLayout { nodeId, session }
+          UserPage sid nodeId -> withSession sid $ \session -> forested $ userLayout { nodeId, session }
+          ContactPage sid nodeId -> withSession sid $ \session -> forested $ userLayout { nodeId, session }
+          CorpusDocument sid corpusId listId nodeId ->
+            withSession sid $ \session -> forested $ documentLayout { nodeId, listId, session, corpusId: Just corpusId }
+          Document sid listId nodeId ->
+            withSession sid $
+              \session -> forested $ documentLayout { nodeId, listId, session, corpusId: Nothing }
+          PGraphExplorer sid graphId ->
+            withSession sid $
+              \session ->
+                simpleLayout $
+                  explorerLayout { graphId, mCurrentRoute, session
+                                 , sessions: (fst sessions), treeId: Nothing, frontends}
 
 forestLayout :: Frontends -> Sessions -> AppRoute -> R2.Setter Boolean -> R.Element -> R.Element
 forestLayout frontends sessions route showLogin child =
-  R.fragment [ topBar sessions, row main, footer {} ]
+  R.fragment [ topBar {}, row main, footer {} ]
   where
     row child' = H.div {className: "row"} [child']
     main =

src/Gargantext/Components/DocsTable.purs

@@ -32,7 +32,7 @@ import Gargantext.Hooks.Loader (useLoader)
 import Gargantext.Utils.Reactix as R2
 import Gargantext.Routes as Routes
 import Gargantext.Routes (SessionRoute(NodeAPI))
-import Gargantext.Sessions (Session)
+import Gargantext.Sessions (Session, sessionId)
 import Gargantext.Types (NodeType(..), OrderBy(..), TabType, TabPostQuery(..))
 ------------------------------------------------------------------------
 
@@ -47,7 +47,7 @@ type Props =
   , listId       :: Int
   , corpusId     :: Maybe Int
   , showSearch   :: Boolean
-  , session         :: Session )
+  , session      :: Session )
   -- ^ tabType is not ideal here since it is too much entangled with tabs and
   -- ngramtable. Let's see how this evolves.  )
 
@@ -58,7 +58,7 @@ type PageLoaderProps =
   , listId       :: Int
   , corpusId     :: Maybe Int
   , query        :: Query
-  , session         :: Session )
+  , session      :: Session )
 
 type LocalCategories = Map Int Category
 type Query = String
@@ -248,16 +248,17 @@ loadPage session {nodeId, tabType, query, listId, corpusId, params: {limit, offs
     convOrderBy _ = DateAsc -- TODO
 
 renderPage :: R.State T.Params -> Record PageLoaderProps -> Array DocumentsView -> R.Element
-renderPage (_ /\ setTableParams) p res = R.createElement el p []
+renderPage (_ /\ setTableParams) p@{session} res = R.createElement el p []
   where
+    sid = sessionId session
     el = R.hooksComponent "RenderPage" cpt
 
     gi Favorite  = "glyphicon glyphicon-star"
     gi _ = "glyphicon glyphicon-star-empty"
     trashStyle Trash = {textDecoration: "line-through"}
     trashStyle _ = {textDecoration: "none"}
-    corpusDocument (Just corpusId) = Routes.CorpusDocument corpusId
-    corpusDocument _ = Routes.Document
+    corpusDocument (Just corpusId) = Routes.CorpusDocument sid corpusId
+    corpusDocument _ = Routes.Document sid
 
     cpt {session, nodeId, corpusId, listId, totalRecords} _children = do
       localCategories <- R.useState' (mempty :: LocalCategories)

src/Gargantext/Components/GraphExplorer.purs

@@ -48,7 +48,7 @@ explorerLayout props = R.createElement explorerLayoutCpt props []
 explorerLayoutCpt :: R.Component LayoutProps
 explorerLayoutCpt = R.hooksComponent "G.C.GraphExplorer.explorerLayout" cpt
   where
-    cpt {graphId, mCurrentRoute, treeId, session, frontends} _ =
+    cpt {graphId, mCurrentRoute, treeId, session, sessions, frontends} _ =
       useLoader graphId (getNodes session) handler
       where
         handler loaded = explorer {graphId, mCurrentRoute, treeId, session, sessions, graph, frontends}
@@ -90,7 +90,7 @@ explorerCpt = R.hooksComponent "G.C.GraphExplorer.explorer" cpt
         tree _ {showTree: false /\ _} _ = RH.div { id: "tree" } []
         tree {mCurrentRoute: route, treeId: root} _ showLogin= 
           RH.div {className: "col-md-2", style: {paddingTop: "60px"}}
-                 [forest {sessions, route, frontends, showLogin}]
+          [forest {sessions, route, frontends, showLogin}]
     outer = RH.div { className: "col-md-12" }
     inner = RH.div { className: "container-fluid", style: { paddingTop: "90px" } }
     row1  = RH.div { className: "row", style: { paddingBottom: "10px", marginTop: "-24px" } }

src/Gargantext/Components/Tree.purs

@@ -152,8 +152,8 @@ performAction session _ ({tree: NTree (LNode {id}) _} /\ _) (UploadFile fileType
 ------------------------------------------------------------------------
 
 mCorpusId :: Maybe AppRoute -> Maybe Int
-mCorpusId (Just (Routes.Corpus id)) = Just id
-mCorpusId (Just (Routes.CorpusDocument id _ _)) = Just id
+mCorpusId (Just (Routes.Corpus _ id)) = Just id
+mCorpusId (Just (Routes.CorpusDocument _ id _ _)) = Just id
 mCorpusId _ = Nothing
 
 treeView :: Record Props -> R.Element