Folder view: fix top-level back button

src/Gargantext/Components/FolderView.purs

@@ -9,7 +9,7 @@ import Gargantext.Hooks.Loader (useLoader)
 import Gargantext.Prelude (Ordering, Unit, compare, pure, ($), (<$>), (<>))
 import Gargantext.Routes (AppRoute(Home), SessionRoute(..), appPath, nodeTypeAppRoute)
 import Gargantext.Sessions (Session, get, sessionId)
-import Gargantext.Types (NodeType(..), SessionId, fldr)
+import Gargantext.Types as GT
 import Gargantext.Utils.Reactix as R2
 import Reactix as R
 import Reactix.DOM.HTML as H
@@ -49,40 +49,50 @@ folderViewMain props = R.createElement folderViewMainCpt props []
 
 folderViewMainCpt :: R.Component FolderViewProps
 folderViewMainCpt = here.component "folderViewMainCpt" cpt where
-  cpt {nodeId, session, backFolder, folders: (NTree (LNode {parent_id: parentId}) (folders))} _ = do
+  cpt {nodeId, session, backFolder, folders: (NTree (LNode {parent_id: parentId, nodeType}) (folders))} _ = do
     let sid = sessionId session 
     let foldersS = A.sortBy sortFolders folders
     let children = makeFolderElements foldersS sid
-    let parent = makeParentFolder parentId sid backFolder
+    let backHome = isBackHome nodeType
+    let parent = makeParentFolder parentId sid backFolder backHome
 
     pure $ H.div {className: "folders"} $ parent <> children
 
-  makeFolderElements :: Array (NTree LNode) -> SessionId -> Array R.Element
+  makeFolderElements :: Array (NTree LNode) -> GT.SessionId -> Array R.Element
   makeFolderElements foldersS sid = makeFolderElementsMap <$> foldersS where
     makeFolderElementsMap :: NTree LNode -> R.Element
     makeFolderElementsMap (NTree (LNode node) _) = folder {style: FolderChild, text: node.name, nodeId: node.id, nodeType: node.nodeType, sid: sid} []
 
-  makeParentFolder :: Maybe Int -> SessionId -> Boolean -> Array R.Element
-  makeParentFolder (Just parentId) sid _ =
+  makeParentFolder :: Maybe Int -> GT.SessionId -> Boolean -> Boolean -> Array R.Element
+  makeParentFolder (Just parentId) sid _ _ =
     -- FIXME: The NodeType here should not be hardcoded to FolderPrivate but we currently can't get the actual NodeType
     -- without performing another API call. Also parentId is never being returned by this API even when it clearly exists
-    [ folder {style: FolderUp, text: "..", nodeId: parentId, nodeType: FolderPrivate, sid: sid} [] ]
-  makeParentFolder Nothing _ true = [ H.button {className: "btn btn-primary", on: { click: back } }  [ H.i { className: "fa fa-folder-open" } []
+    [ folder {style: FolderUp, text: "..", nodeId: parentId, nodeType: GT.FolderPrivate, sid: sid} [] ]
+  makeParentFolder Nothing _ _ true = [ H.a {className: "btn btn-primary", href: appPath Home} [ H.i { className: "fa fa-folder-open" } []
                                                                    , H.br {}
                                                                    , H.text ".."] ]
-  makeParentFolder Nothing _ _ = []
+  makeParentFolder Nothing _ true _ = [ H.button {className: "btn btn-primary", on: { click: back } }  [ H.i { className: "fa fa-folder-open" } []
+                                                                   , H.br {}
+                                                                   , H.text ".."] ]
+  makeParentFolder Nothing _ _ _ = []
 
   sortFolders :: FTree -> FTree -> Ordering
   sortFolders a b = compare (fTreeID a) (fTreeID b)
 
+  isBackHome :: GT.NodeType -> Boolean
+  isBackHome GT.FolderPrivate = true
+  isBackHome GT.FolderPublic = true
+  isBackHome GT.FolderShared = true
+  isBackHome _ = false
+
 
 type FolderProps = 
   (
     style :: FolderStyle
   , text :: String
-  , nodeType :: NodeType
+  , nodeType :: GT.NodeType
   , nodeId :: Int
-  , sid :: SessionId
+  , sid :: GT.SessionId
   )
 
 folder :: R2.Component FolderProps
@@ -95,11 +105,11 @@ folderCpt = here.component "folderCpt" cpt where
                                                                    , H.br {}
                                                                    , H.text text]
   
-  icon :: FolderStyle -> NodeType -> String
+  icon :: FolderStyle -> GT.NodeType -> String
   icon FolderUp _ = "fa fa-folder-open"
-  icon _ nodeType = fldr nodeType false
+  icon _ nodeType = GT.fldr nodeType false
 
-  getFolderPath :: NodeType -> SessionId -> Int -> String
+  getFolderPath :: GT.NodeType -> GT.SessionId -> Int -> String
   getFolderPath nodeType sid nodeId = appPath $ fromMaybe Home $ nodeTypeAppRoute nodeType sid nodeId
 
 backButton :: R.Element