Merge branch '278-dev-folder-view-home' of...

Merge branch '278-dev-folder-view-home' of ssh://gitlab.iscpif.fr:20022/gargantext/purescript-gargantext into dev-merge

src/Gargantext/Components/FolderView.purs

+module Gargantext.Components.FolderView where
+
+import Data.Array as A
+import Data.Maybe (Maybe(..), fromMaybe)
+import Effect.Aff (Aff)
+import Gargantext.Components.Forest.Tree.Node.Tools.FTree (FTree, LNode(..), NTree(..), fTreeID)
+import Gargantext.Hooks.Loader (useLoader)
+import Gargantext.Prelude (compare, pure, ($), (<$>), (<>), Ordering)
+import Gargantext.Routes (AppRoute(Home), SessionRoute(..), appPath, nodeTypeAppRoute)
+import Gargantext.Sessions (Session, get, sessionId)
+import Gargantext.Types (NodeType(..), SessionId, fldr)
+import Gargantext.Utils.Reactix as R2
+import Reactix as R
+import Reactix.DOM.HTML as H
+
+here :: R2.Here
+here = R2.here "Gargantext.Components.FolderView"
+
+type Props =
+  ( nodeId  :: Int
+  , session :: Session
+  )
+
+data FolderStyle = FolderUp | FolderChild
+
+folderViewLoad :: R2.Leaf Props
+folderViewLoad props = R.createElement folderViewLoadCpt props []
+
+folderViewLoadCpt :: R.Component Props
+folderViewLoadCpt = here.component "folderViewLoadCpt" cpt where
+  cpt {nodeId, session} _ = do
+    useLoader {nodeId, session} loadFolders $
+      \folders -> folderView {folders, nodeId, session}
+
+type FolderViewProps = 
+  ( 
+    nodeId :: Int
+  , folders:: FTree
+  , session :: Session
+  )
+
+folderView :: Record FolderViewProps -> R.Element
+folderView props = R.createElement folderViewCpt props []
+
+folderViewCpt :: R.Component FolderViewProps
+folderViewCpt = here.component "folderViewCpt" cpt where
+  cpt {nodeId, session, folders: (NTree (LNode {parent_id: parentId}) (folders))} _ = do
+    let sid = sessionId session 
+    let foldersS = A.sortBy sortFolders folders
+    let children = makeFolderElements foldersS sid
+    let parent = makeParentFolder parentId sid
+
+    pure $ H.div {className: "folders"} $ parent <> children
+
+  makeFolderElements :: Array (NTree LNode) -> 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 -> 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 _ = []
+
+  sortFolders :: FTree -> FTree -> Ordering
+  sortFolders a b = compare (fTreeID a) (fTreeID b)
+
+
+type FolderProps = 
+  (
+    style :: FolderStyle
+  , text :: String
+  , nodeType :: NodeType
+  , nodeId :: Int
+  , sid :: SessionId
+  )
+
+folder :: R2.Component FolderProps
+folder = R.createElement folderCpt
+
+folderCpt :: R.Component FolderProps
+folderCpt = here.component "folderCpt" cpt where
+  cpt {style, text, nodeId, sid, nodeType} _ = do
+    pure $ H.a {className: "btn btn-primary", href: "/#/" <> getFolderPath nodeType sid nodeId}  [ H.i { className: icon style nodeType } []
+                                                                   , H.br {}
+                                                                   , H.text text]
+  
+  icon :: FolderStyle -> NodeType -> String
+  icon FolderUp _ = "fa fa-folder-open"
+  icon _ nodeType = fldr nodeType false
+
+  getFolderPath :: NodeType -> SessionId -> Int -> String
+  getFolderPath nodeType sid nodeId = appPath $ fromMaybe Home $ nodeTypeAppRoute nodeType sid nodeId
+
+loadFolders :: Record Props -> Aff FTree
+loadFolders {nodeId, session} = get session $ TreeFirstLevel (Just nodeId) ""

src/Gargantext/Components/Nodes/Corpus.purs

 module Gargantext.Components.Nodes.Corpus where
 
-import Gargantext.Prelude
-  ( Unit, bind, discard, pure, show, unit, compare
-  , ($), (+), (-), (<), (<$>), (<<<), (<>), (==), (>), class Show, class Eq, Ordering)
+import Gargantext.Prelude (class Eq, class Show, Unit, bind, discard, pure, show, unit, ($), (+), (-), (<), (<$>), (<<<), (<>), (==), (>))
 import Data.Argonaut (class DecodeJson, decodeJson, encodeJson)
 import Data.Argonaut.Parser (jsonParser)
 import Data.Array as A
@@ -22,6 +20,7 @@ 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.InputWithEnter (inputWithEnter)
 import Gargantext.Components.Node (NodePoly(..), HyperdataList)
@@ -32,10 +31,9 @@ import Gargantext.Components.Nodes.Types
 import Gargantext.Components.Nodes.Corpus.Types (CorpusData, Hyperdata(..))
 import Gargantext.Data.Array as GDA
 import Gargantext.Hooks.Loader (useLoader)
-import Gargantext.Routes (SessionRoute(NodeAPI, Children, TreeFirstLevel), AppRoute(Home), appPath, nodeTypeAppRoute)
+import Gargantext.Routes (SessionRoute(Children, NodeAPI))
 import Gargantext.Sessions (Session, get, put, sessionId)
-import Gargantext.Types (NodeType(..), AffTableResult, SessionId, fldr)
-import Gargantext.Components.Forest.Tree.Node.Tools.FTree (FTree, LNode(..), NTree(..), fTreeID)
+import Gargantext.Types (AffTableResult, NodeType(..))
 import Gargantext.Utils.Crypto as Crypto
 import Gargantext.Utils.Reactix as R2
 import Gargantext.Utils.Toestand as T2
@@ -92,7 +90,7 @@ corpusLayoutSelectionCpt = here.component "corpusLayoutSelection" cpt where
 
     pure $ renderContent viewType nodeId session key
 
-  renderContent Folders nodeId session key = folderViewLoad { nodeId, session }
+  renderContent Folders nodeId session key = FV.folderViewLoad { nodeId, session }
   renderContent Code nodeId session key = corpusLayoutWithKey { key, nodeId, session }
 
 
@@ -172,79 +170,6 @@ corpusLayoutViewCpt = here.component "corpusLayoutView" cpt
     onClickAdd fieldsS _ = do
       T.modify_ (\fields -> List.snoc fields $ Tuple (List.length fields) defaultField) fieldsS
 
-data FolderStyle = FolderUp | FolderChild
-
-folderViewLoad :: R2.Leaf LoadProps
-folderViewLoad props = R.createElement folderViewLoadCpt props []
-
-folderViewLoadCpt :: R.Component LoadProps
-folderViewLoadCpt = here.component "folderViewLoadCpt" cpt where
-  cpt {nodeId, session} _ = do
-    useLoader {nodeId, session} loadFolders $
-      \folders -> folderView {folders, nodeId, session}
-
-type FolderViewProps = 
-  ( 
-    nodeId :: Int
-  , folders:: FTree
-  , session :: Session
-  )
-
-folderView :: Record FolderViewProps -> R.Element
-folderView props = R.createElement folderViewCpt props []
-
-folderViewCpt :: R.Component FolderViewProps
-folderViewCpt = here.component "folderViewCpt" cpt where
-  cpt {nodeId, session, folders: (NTree (LNode {parent_id: parentId}) (folders))} _ = do
-    let sid = sessionId session 
-    let foldersS = A.sortBy sortFolders folders
-    let children = makeFolderElements foldersS sid
-    let parent = makeParentFolder parentId sid
-
-    pure $ H.div {className: "folders"} $ parent <> children
-
-  makeFolderElements :: Array (NTree LNode) -> 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 -> 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 _ = []
-
-  sortFolders :: FTree -> FTree -> Ordering
-  sortFolders a b = compare (fTreeID a) (fTreeID b)
-
-
-type FolderProps = 
-  (
-    style :: FolderStyle
-  , text :: String
-  , nodeType :: NodeType
-  , nodeId :: Int
-  , sid :: SessionId
-  )
-
-folder :: R2.Component FolderProps
-folder = R.createElement folderCpt
-
-folderCpt :: R.Component FolderProps
-folderCpt = here.component "folderCpt" cpt where
-  cpt {style, text, nodeId, sid, nodeType} _ = do
-    pure $ H.a {className: "btn btn-primary", href: "/#/" <> getFolderPath nodeType sid nodeId}  [ H.i { className: icon style nodeType } []
-                                                                   , H.br {}
-                                                                   , H.text text]
-  
-  icon :: FolderStyle -> NodeType -> String
-  icon FolderUp _ = "fa fa-folder-open"
-  icon _ nodeType = fldr nodeType false
-
-  getFolderPath :: NodeType -> SessionId -> Int -> String
-  getFolderPath nodeType sid nodeId = appPath $ fromMaybe Home $ nodeTypeAppRoute nodeType sid nodeId
-
 
 type FieldsCodeEditorProps =
   (
@@ -518,9 +443,6 @@ type LoadProps =
 loadCorpus' :: Record LoadProps -> Aff (NodePoly Hyperdata)
 loadCorpus' {nodeId, session} = get session $ NodeAPI Corpus (Just nodeId) ""
 
-loadFolders :: Record LoadProps -> Aff FTree
-loadFolders {nodeId, session} = get session $ TreeFirstLevel (Just nodeId) ""
-
 -- Just to make reloading effective
 loadCorpusWithReload :: { reload :: T2.Reload  | LoadProps } -> Aff (NodePoly Hyperdata)
 loadCorpusWithReload {nodeId, session} = loadCorpus' {nodeId, session}

src/Gargantext/Components/Nodes/Home.purs

 module Gargantext.Components.Nodes.Home where
 
+import Gargantext.Prelude
+
 import Data.Array as Array
+import Data.Maybe (fromJust)
 import Data.Newtype (class Newtype)
 import Effect (Effect)
-import Reactix as R
-import Reactix.DOM.HTML as H
-import Routing.Hash (setHash)
-import Toestand as T
-
 import Gargantext.Components.Data.Landing (BlockText(..), BlockTexts(..), Button(..), LandingData(..))
+import Gargantext.Components.FolderView as FV
 import Gargantext.Components.Lang (LandingLang(..))
 import Gargantext.Components.Lang.Landing.EnUS as En
 import Gargantext.Components.Lang.Landing.FrFR as Fr
 import Gargantext.Components.Nodes.Home.Public (renderPublic)
 import Gargantext.License (license)
-import Gargantext.Prelude -- (Unit, map, pure, unit, void, ($), (<>), (*>))
 import Gargantext.Sessions (Sessions)
 import Gargantext.Sessions as Sessions
+import Gargantext.Sessions.Types (Session(..))
 import Gargantext.Utils.Reactix as R2
+import Partial.Unsafe (unsafePartial)
+import Reactix as R
+import Reactix.DOM.HTML as H
+import Routing.Hash (setHash)
+import Toestand as T
 
 here :: R2.Here
 here = R2.here "Gargantext.Components.Nodes.Home"
@@ -87,7 +91,8 @@ joinButtonOrTutorial :: forall e. Sessions -> (e -> Effect Unit) -> R.Element
 joinButtonOrTutorial sessions click =
   if Sessions.null sessions
   then joinButton click
-  else tutorial
+  -- sessions is not empty
+  else tutorial {session: unsafePartial $ fromJust $ Array.head $ Sessions.unSessions sessions}
      
 joinButton :: forall e. (e -> Effect Unit) -> R.Element
 joinButton click =
@@ -131,23 +136,30 @@ summary =
         , H.ol {} (map toSummary tutos) ] ]          
     toSummary (Tuto x) = H.li {} [ H.a {href: "#" <> x.id} [ H.text x.title ]]
 
-tutorial :: R.Element
-tutorial =
-  H.div { className: "mx-auto container" }
-  [ H.h1 {} [H.text "Welcome!"]
-  , H.h2 {} [H.text "For easy start, just watch the tutorials"]
-  , summary
-  , H.h3 {} [H.text "Tutorial resources"]
-  , section "How to start?" "alert-info" startTutos
-  -- , section "How to play?" "alert-warning" playTutos
-  -- , section "How to master?" "alert-danger" expertTutos
-  ]
-  where
-    section name class' tutos =
-      H.div {} $ Array.cons (H.h4 {} [ H.text name ]) (map (makeTuto class') tutos)
-    makeTuto class' (Tuto x) =
-      H.div { className : "alert " <> class', id: x.id}
-      [ video x.id, H.h4 {} [ H.text x.title ], H.p  {} [ H.text x.text ] ]
+tutorial :: R2.Leaf (session :: Session)
+tutorial props = R.createElement tutorialCpt props []
+
+tutorialCpt :: R.Component (session :: Session)
+tutorialCpt = here.component "tutorial" cpt where
+  cpt {session: session@(Session {treeId})} _ = do
+    let nodeId = treeId
+
+    pure $ H.div { className: "mx-auto container" }
+      [ FV.folderViewLoad {session, nodeId}
+      , H.h1 {} [H.text "Welcome!"]
+      , H.h2 {} [H.text "For easy start, just watch the tutorials"]
+      , summary
+      , H.h3 {} [H.text "Tutorial resources"]
+      , section "How to start?" "alert-info" startTutos
+      -- , section "How to play?" "alert-warning" playTutos
+      -- , section "How to master?" "alert-danger" expertTutos
+      ]
+    where
+      section name class' tutos =
+        H.div {} $ Array.cons (H.h4 {} [ H.text name ]) (map (makeTuto class') tutos)
+      makeTuto class' (Tuto x) =
+        H.div { className : "alert " <> class', id: x.id}
+        [ video x.id, H.h4 {} [ H.text x.title ], H.p  {} [ H.text x.text ] ]
 
 startTutos :: Array Tuto
 startTutos =