[FIX] merge

src/Gargantext/Components/Forest.purs

@@ -4,16 +4,14 @@ import Gargantext.Prelude
 
 import Data.Array as A
 import Data.Maybe (Maybe(..))
-import Data.Set (Set)
 import Data.Set as Set
 import Data.Tuple (fst)
 import Data.Tuple.Nested ((/\))
 import Gargantext.Components.Forest.Tree (treeView)
 import Gargantext.Components.Forest.Tree.Node.Action (Reload)
-import Gargantext.Components.Login.Types (TreeId)
 import Gargantext.Ends (Frontends)
 import Gargantext.Routes (AppRoute)
-import Gargantext.Sessions (Session(..), Sessions, unSessions)
+import Gargantext.Sessions (Session(..), Sessions, OpenNodes, unSessions)
 import Gargantext.Utils.Reactix as R2
 import Reactix as R
 import Reactix.DOM.HTML as H
@@ -33,7 +31,7 @@ forestCpt = R.hooksComponent "G.C.Forest.forest" cpt where
   cpt {frontends, route, sessions, showLogin } _ = do
     -- NOTE: this is a hack to reload the tree view on demand
     reload <- R.useState' (0 :: Reload)
-    openNodes <- R2.useLocalStorageState R2.openNodesKey (Set.empty :: Set TreeId)
+    openNodes <- R2.useLocalStorageState R2.openNodesKey (Set.empty :: OpenNodes)
     R2.useCache
       (frontends /\ route /\ sessions /\ fst openNodes /\ fst reload)
       (cpt' openNodes reload showLogin)

src/Gargantext/Components/Forest/Tree.purs

 module Gargantext.Components.Forest.Tree where
 
-import Gargantext.Components.Forest.Tree.Node.Action (Action(..), CreateValue(..), FTree, ID, LNode(..), NTree(..), Reload, RenameValue(..), Tree, createNode, deleteNode, loadNode, renameNode)
-import Gargantext.Prelude (Unit, bind, const, discard, map, pure, void, ($), (+), (/=), (<>))
-
 import DOM.Simple.Console (log2)
 import Data.Array as A
 import Data.Maybe (Maybe)
-import Data.Set (Set)
 import Data.Set as Set
 import Data.Tuple (Tuple(..), fst, snd)
 import Data.Tuple.Nested ((/\))
 import Effect.Aff (Aff)
 import Effect.Class (liftEffect)
-import Reactix as R
-import Reactix.DOM.HTML as H
-
+import Gargantext.Components.Forest.Tree.Node.Action (Action(..), CreateValue(..), FTree, ID, LNode(..), NTree(..), Reload, RenameValue(..), Tree, createNode, deleteNode, loadNode, renameNode)
 import Gargantext.Components.Forest.Tree.Node.Action.Upload (uploadFile)
 import Gargantext.Components.Forest.Tree.Node.Box (nodeMainSpan)
 import Gargantext.Components.Loader (loader)
-import Gargantext.Components.Login.Types (TreeId)
 import Gargantext.Ends (Frontends)
+import Gargantext.Prelude (Unit, bind, const, discard, map, pure, void, ($), (+), (/=), (<>))
 import Gargantext.Routes (AppRoute)
-import Gargantext.Sessions (Session)
+import Gargantext.Sessions (OpenNodes, Session, mkNodeId)
 import Gargantext.Types as GT
+import Reactix as R
+import Reactix.DOM.HTML as H
 
 ------------------------------------------------------------------------
 type Props = ( root          :: ID
              , mCurrentRoute :: Maybe AppRoute
              , session       :: Session
              , frontends     :: Frontends
-             , openNodes     :: R.State (Set TreeId)
+             , openNodes     :: R.State OpenNodes
              , reload        :: R.State Reload
              )
 
@@ -47,7 +43,7 @@ type Props' = ( root          :: ID
               , mCurrentRoute :: Maybe AppRoute
               , session       :: Session
               , frontends     :: Frontends
-              , openNodes     :: R.State (Set TreeId)
+              , openNodes     :: R.State OpenNodes
               , reload        :: R.State Reload
               )
 
@@ -65,7 +61,7 @@ type TreeViewProps = ( tree          :: FTree
                      , mCurrentRoute :: Maybe AppRoute
                      , frontends     :: Frontends
                      , session       :: Session
-                     , openNodes     :: R.State (Set TreeId)
+                     , openNodes     :: R.State OpenNodes
                      , reload :: R.State Reload
                      )
 
@@ -88,7 +84,7 @@ toHtml :: R.State Reload
        -> Session
        -> Frontends
        -> Maybe AppRoute
-       -> R.State (Set TreeId)
+       -> R.State OpenNodes
        -> R.Element
 toHtml reload treeState@(ts@{tree: (NTree (LNode {id, name, nodeType}) ary), asyncTasks} /\ setTreeState) session frontends mCurrentRoute openNodes = R.createElement el {} []
   where
@@ -96,10 +92,11 @@ toHtml reload treeState@(ts@{tree: (NTree (LNode {id, name, nodeType}) ary), asy
     pAction = performAction session reload openNodes treeState
 
     cpt props _ = do
-      let folderIsOpen         = Set.member id (fst openNodes)
-      let setFn                = if folderIsOpen then Set.delete else Set.insert
-      let toggleFolderIsOpen _ = (snd openNodes) (setFn id)
-      let folderOpen           = Tuple folderIsOpen toggleFolderIsOpen
+      let nodeId = mkNodeId session id
+      let folderIsOpen = Set.member nodeId (fst openNodes)
+      let setFn = if folderIsOpen then Set.delete else Set.insert
+      let toggleFolderIsOpen _ = (snd openNodes) (setFn nodeId)
+      let folderOpen = Tuple folderIsOpen toggleFolderIsOpen
 
       let withId (NTree (LNode {id: id'}) _) = id'
 
@@ -126,7 +123,7 @@ childNodes :: Session
            -> R.State Reload
            -> R.State Boolean
            -> Maybe AppRoute
-           -> R.State (Set TreeId)
+           -> R.State OpenNodes
            -> Array FTree
            -> Array R.Element
 childNodes _ _ _ _ _ _ [] = []
@@ -145,14 +142,14 @@ childNodes session frontends reload (true /\ _) mCurrentRoute openNodes ary =
 
 performAction :: Session
               -> R.State Int
-              -> R.State (Set TreeId)
+              -> R.State OpenNodes
               -> R.State Tree
               -> Action
               -> Aff Unit
 performAction session (_ /\ setReload) (_ /\ setOpenNodes) (s@{tree: NTree (LNode {id}) _} /\ setTree) DeleteNode = do
   void $ deleteNode session id
   liftEffect do
-    setOpenNodes (Set.delete id)
+    setOpenNodes (Set.delete (mkNodeId session id))
     setReload (_ + 1)
 
 performAction session (_ /\ setReload) _ ({tree: NTree (LNode {id}) _} /\ setTree) (SearchQuery task) = do
@@ -167,7 +164,7 @@ performAction session _ _ ({tree: NTree (LNode {id}) _} /\ setTree) (Submit name
 performAction session (_ /\ setReload) (_ /\ setOpenNodes) (s@{tree: NTree (LNode {id}) _} /\ setTree) (CreateSubmit name nodeType) = do
   void $ createNode session id $ CreateValue {name, nodeType}
   liftEffect do
-    setOpenNodes (Set.insert id)
+    setOpenNodes (Set.insert (mkNodeId session id))
     setReload (_ + 1)
 
 performAction session _ _ ({tree: NTree (LNode {id}) _} /\ setTree) (UploadFile fileType contents) = do

src/Gargantext/Components/Login/Types.purs

 module Gargantext.Components.Login.Types where
 
 import Prelude
-import Data.Argonaut ( class DecodeJson, class EncodeJson, decodeJson, jsonEmptyObject
-                      , (.:), (.:!), (:=), (~>)
-                      )
+
+import Data.Argonaut (class DecodeJson, class EncodeJson, decodeJson, jsonEmptyObject, (.:), (.:!), (:=), (~>))
 import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Eq (genericEq)
 import Data.Lens (Iso', iso)

src/Gargantext/Sessions.purs

@@ -12,12 +12,13 @@ import Data.Generic.Rep.Eq (genericEq)
 import Data.Maybe (Maybe(..))
 import Data.Sequence (Seq)
 import Data.Sequence as Seq
+import Data.Set (Set)
 import Data.Traversable (traverse)
 import Effect (Effect)
 import Effect.Aff (Aff)
-import Gargantext.Components.Login.Types (AuthRequest(..), AuthResponse(..), AuthInvalid(..), AuthData(..))
+import Gargantext.Components.Login.Types (AuthData(..), AuthInvalid(..), AuthRequest(..), AuthResponse(..), TreeId)
 import Gargantext.Config.REST as REST
-import Gargantext.Ends (class ToUrl, Backend, backendUrl, toUrl, sessionPath)
+import Gargantext.Ends (class ToUrl, Backend(..), backendUrl, sessionPath, toUrl)
 import Gargantext.Routes (SessionRoute)
 import Gargantext.Types (NodePath, SessionId(..), nodePath)
 import Gargantext.Utils.Reactix (getls)
@@ -33,7 +34,8 @@ newtype Session = Session
   { backend  :: Backend
   , username :: String
   , token    :: String
-  , treeId   :: Int }
+  , treeId   :: TreeId
+  }
 
 ------------------------------------------------------------------------
 -- | Main instances
@@ -58,9 +60,6 @@ sessionUrl (Session {backend}) = backendUrl backend
 sessionId :: Session -> SessionId
 sessionId = SessionId <<< show
 
-instance toUrlSessionString :: ToUrl Session String where
-  toUrl = sessionUrl
-
 --------------------
 -- | JSON instances
 instance encodeJsonSession :: EncodeJson Session where
@@ -140,6 +139,20 @@ tryRemove sid old@(Sessions ss) = ret where
     | new == old = Left unit
     | otherwise =  Right new
 
+-- open tree nodes data
+type OpenNodes = Set NodeId
+
+type NodeId =
+  { treeId :: TreeId  -- Id of the node
+  , baseUrl :: String -- the baseUrl of the backend
+  }
+
+mkNodeId :: Session -> TreeId -> NodeId
+mkNodeId (Session {backend: Backend {baseUrl}}) treeId = { treeId, baseUrl }
+
+instance toUrlSessionString :: ToUrl Session String where
+  toUrl = sessionUrl
+
 data Action
   = Login Session
   | Logout Session