Merge branch 'dev-spago-next' into dev-add-edge-weight-control

package.json

 {
   "name": "Gargantext",
-  "version": "0.0.6.9.9.9.9.1",
+  "version": "0.0.7.1",
   "scripts": {
     "build": "spago build",
     "bundle": "spago bundle --module Main --outfile dist/bundle.js",

src/Gargantext/Components/App/Store.purs

@@ -10,22 +10,24 @@ module Gargantext.Components.App.Store
   ) where
 
 
+import Gargantext.Prelude
+
 import Data.Map (Map)
 import Data.Map as Map
 import Data.Maybe (Maybe(..))
 import Data.Set as Set
+import Data.Tuple (Tuple)
 import Gargantext.AsyncTasks as GAT
 import Gargantext.Components.Lang as Lang
 import Gargantext.Components.Nodes.Lists.SidePanel as ListsSP
 import Gargantext.Components.Nodes.Texts.Types as TextsT
 import Gargantext.Components.Themes as Themes
 import Gargantext.Ends (Backend)
-import Gargantext.Prelude
 import Gargantext.Routes (AppRoute(Home), Tile)
 import Gargantext.Sessions (Session, Sessions)
 import Gargantext.Sessions as Sessions
 import Gargantext.Sessions.Types (OpenNodes(..))
-import Gargantext.Types (FrontendError, Handed(RightHanded), SidePanelState(..))
+import Gargantext.Types (FrontendError, Handed(RightHanded), ID, SidePanelState(..))
 import Gargantext.Utils.Reactix as R2
 import Gargantext.Utils.Stores as Stores
 import Gargantext.Utils.Toestand as T2
@@ -45,6 +47,7 @@ type Store =
   , graphVersion        :: T2.ReloadS
   , handed              :: T.Box Handed
   , lang                :: T.Box Lang.LandingLang
+  , loginRedirect       :: T.Box (Maybe (Tuple String ID))
   , pinnedTreeId        :: T.Box (Map String Int)
   , reloadForest        :: T2.ReloadS
   , reloadMainPage      :: T2.ReloadS
@@ -73,6 +76,7 @@ type State =
   , graphVersion        :: T2.Reload
   , handed              :: Handed
   , lang                :: Lang.LandingLang
+  , loginRedirect       :: Maybe (Tuple String ID)
   , pinnedTreeId        :: Map String Int
   , reloadForest        :: T2.Reload
   , reloadMainPage      :: T2.Reload
@@ -102,6 +106,7 @@ options =
   , graphVersion        : T2.newReload
   , handed              : RightHanded
   , lang                : Lang.LL_EN
+  , loginRedirect       : Nothing
   , pinnedTreeId        : Map.empty
   , reloadForest        : T2.newReload
   , reloadMainPage      : T2.newReload

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

@@ -17,9 +17,11 @@ instance JSON.ReadForeign AddContactParams where readImpl = GUSJ.taggedSumRep
 instance JSON.WriteForeign AddContactParams where
   writeImpl (AddContactParams { firstname, lastname }) =
     JSON.writeImpl { type: "AddContactParams"
-                   , values: { firstname, lastname } }
+                   , firstname
+                   , lastname  }
   writeImpl (AddContactParamsAdvanced { firstname, lastname }) =
     JSON.writeImpl { type: "AddContactParamsAdvanced"
-                   , values: { firstname, lastname } }
+                   , firstname
+                   , lastname }
 
 

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

@@ -20,7 +20,7 @@ import Gargantext.Hooks.Loader (useLoader)
 import Gargantext.Prelude
 import Gargantext.Routes as GR
 import Gargantext.Sessions (Session, get, post)
-import Gargantext.Types (ID)
+import Gargantext.Types (ID, NodeID, NodeType)
 import Gargantext.Types as GT
 import Gargantext.Utils.Reactix as R2
 import Gargantext.Utils.SimpleJSON as GUSJ
@@ -44,8 +44,9 @@ getCompletionsReq { session }  =
 
 
 ------------------------------------------------------------------------
-data ShareNodeParams = ShareTeamParams   { username :: String }
-               | SharePublicParams { node_id  :: Int    }
+data ShareNodeParams =
+    ShareTeamParams   { username :: String }
+  | SharePublicParams { node_id  :: Int    }
 derive instance Eq ShareNodeParams
 derive instance Generic ShareNodeParams _
 instance JSON.ReadForeign ShareNodeParams where readImpl = GUSJ.taggedSumRep
@@ -144,6 +145,36 @@ publishNodeCpt = here.component "publishNode" cpt
                       , session
                       , subTreeParams
                       } []
-
         -- footer
         , button ]
+------------------------------------------------------------------------
+type ShareURL =
+  ( nodeType :: NodeType
+  , id :: ID 
+  , session :: Session)
+
+shareURL :: R2.Component ShareURL
+shareURL = R.createElement shareURLcpt
+
+shareURLcpt :: R.Component ShareURL
+shareURLcpt = R2.hereComponent here "shareURL" hCpt
+  where
+    hCpt hp {nodeType, id, session} _ = do
+      useLoader { errorHandler: Just errorHandler
+                , herePrefix: hp
+                , loader: loadUrl
+                , path: {nodeType, id, session}
+                , render: \url -> shareURLInner {url} [] }
+    errorHandler err = here.warn2 "[ShareURL] RESTError" err
+
+shareURLInner :: R2.Component ( url :: String )
+shareURLInner = R.createElement shareURLInnercpt
+
+shareURLInnercpt :: R.Component ( url :: String )
+shareURLInnercpt = here.component "shareURLInner" cpt
+  where
+    cpt { url } _ = do
+      pure $ Tools.panel { mError: Nothing } [ H.div {} [ H.text url ] ]
+
+loadUrl :: { session :: Session, id :: NodeID, nodeType :: NodeType } -> AffRESTError String
+loadUrl { session, id, nodeType } = get session $ GR.ShareURL id nodeType

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

@@ -363,6 +363,7 @@ panelActionCpt = here.component "panelAction" cpt
     cpt { action: SearchBox, dispatch, id, session } _ =
       pure $ actionSearch { dispatch, id: Just id, session } []
     cpt { action : Share, id, session } _ = pure $ Share.shareNode { id, session } []
+    cpt { action: ShareURL, id, nodeType, session } _ = pure $ Share.shareURL { nodeType, id, session } []
     cpt { action: Upload, dispatch, id, nodeType, session} _ =
       pure $ actionUpload { dispatch, id, nodeType, session } []
     cpt { action: WriteNodesDocuments, dispatch, id, session } _ =

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

@@ -29,6 +29,7 @@ data NodeAction = Add    (Array NodeType)
                 | ReloadWithSettings
                 | Reconstruct
                 | SearchBox
+                | ShareURL
                 | Share
                 | Upload 
                 | WriteNodesDocuments  -- https://gitlab.iscpif.fr/gargantext/purescript-gargantext/issues/331
@@ -51,6 +52,7 @@ instance Eq NodeAction where
   eq Refresh Refresh                         = true
   eq ReloadWithSettings ReloadWithSettings   = true
   eq SearchBox SearchBox                     = true
+  eq ShareURL ShareURL                       = true
   eq Share Share                             = true
   eq Upload Upload                           = true
   eq WriteNodesDocuments WriteNodesDocuments = true
@@ -73,6 +75,7 @@ instance Show NodeAction where
   show Refresh             = "Refresh"
   show ReloadWithSettings  = "Reload (with settings)"
   show SearchBox           = "SearchBox"
+  show ShareURL            = "Share URL"
   show Share               = "Share"
   show Upload              = "Upload"
   show WriteNodesDocuments = "WriteNodesDocuments"
@@ -94,6 +97,7 @@ glyphiconNodeAction Reconstruct         = "cogs"
 glyphiconNodeAction Refresh             = "refresh"
 glyphiconNodeAction ReloadWithSettings  = "reload-with-settings"
 glyphiconNodeAction SearchBox           = "search"
+glyphiconNodeAction ShareURL            = "share-alt"
 glyphiconNodeAction Share               = "user-plus"
 glyphiconNodeAction Upload              = "upload"
 glyphiconNodeAction WriteNodesDocuments = "bars"
@@ -160,6 +164,7 @@ settingsBoxLens Corpus =
               , Move moveParameters
               , Upload
               , SearchBox
+              , ShareURL
               , WriteNodesDocuments
                 -- , Download
               , Link (linkParams Annuaire)
@@ -180,6 +185,7 @@ settingsBoxLens Folder =
                       -- , NodeFrameNotebook
                     ]
               , Move moveParameters
+              , ShareURL
               , Delete
               ]
 settingsBoxLens FolderPrivate =
@@ -203,6 +209,7 @@ settingsBoxLens Graph =
               , Config
               , Download -- TODO as GEXF or JSON
                 -- , Publish publishParams
+              , ShareURL
               , Delete
               ]
 settingsBoxLens NodeFile =
@@ -214,6 +221,7 @@ settingsBoxLens NodeFrameNotebook =
                       -- , NodeFrameNotebook
                     ]
               , Move moveFrameParameters
+              , ShareURL
               , Delete
               ]
 settingsBoxLens NodeFrameVisio =
@@ -221,6 +229,7 @@ settingsBoxLens NodeFrameVisio =
                     , Notes
                     , Calc
                     ]
+              , ShareURL
               , Delete
               ]
 settingsBoxLens NodeList =
@@ -228,6 +237,7 @@ settingsBoxLens NodeList =
               , Config
               , Upload
               , Download
+              , ShareURL
               , Merge {subTreeParams : SubTreeParams { showtypes: [ FolderPrivate
                                                                   , FolderShared
                                                                   , Team
@@ -259,6 +269,7 @@ settingsBoxLens NodeTexts =
   _buttons .~ [ ReloadWithSettings
               -- , Upload
               , Download
+              , ShareURL
               -- , Delete
               ]
 settingsBoxLens NodeUser =
@@ -272,10 +283,12 @@ settingsBoxLens Notes =
                     , Corpus
                     ]
               , Move moveFrameParameters
+              , ShareURL
               , Delete
               ]
 settingsBoxLens Phylo =
   _buttons .~ [ Reconstruct
+              , ShareURL
               , Delete
               ]
 settingsBoxLens Team =
@@ -290,6 +303,7 @@ settingsBoxLens Team =
                     , NodeFrameVisio
                     ]
               , Share
+              , ShareURL
               , ManageTeam
               , Delete
               ]

src/Gargantext/Components/GraphQL.purs

@@ -21,7 +21,9 @@ import Gargantext.Components.GraphQL.User (User, UserInfo, UserInfoM, UserPubmed
 import Gargantext.Config.REST as REST
 import Gargantext.Ends (Backend(..))
 import Gargantext.Prelude
+import Gargantext.Routes (AppRoute)
 import Gargantext.Sessions (Session(..))
+import Gargantext.Types (NodeType)
 import Gargantext.Utils.Reactix as R2
 import GraphQL.Client.BaseClients.Urql (UrqlClient, createClient)
 import GraphQL.Client.Query (decodeGqlRes) --, mutationJson)
@@ -149,7 +151,8 @@ type Schema
     , contexts_for_ngrams :: { corpus_id :: Int, ngrams_terms :: Array String } -> Array GQLCTX.Context
     , imt_schools :: {} -> Array GQLIMT.School
     , languages :: {} -> Array GQLNLP.Language
-    , node_parent :: { node_id :: Int, parent_type :: String } -> Array GQLNode.Node  -- TODO: parent_type :: NodeType
+    , node_children :: { node_id :: Int, child_type :: NodeType } -> Array GQLNode.Node
+    , node_parent :: { node_id :: Int, parent_type :: NodeType } -> Array GQLNode.Node
     , nodes :: { node_id :: Int } -> Array GQLNode.Node
     , nodes_corpus :: { corpus_id :: Int } -> Array GQLNode.Corpus
     , user_infos :: { user_id :: Int } -> Array UserInfo

src/Gargantext/Components/GraphQL/Endpoints.purs

@@ -12,7 +12,7 @@ import Gargantext.Components.GraphQL.Contact (AnnuaireContact, annuaireContactQu
 import Gargantext.Components.GraphQL.Context as GQLCTX
 import Gargantext.Components.GraphQL.IMT as GQLIMT
 import Gargantext.Components.GraphQL.NLP as GQLNLP
-import Gargantext.Components.GraphQL.Node (Corpus, Node, nodeParentQuery, nodesQuery, nodesCorpusQuery)
+import Gargantext.Components.GraphQL.Node (Corpus, Node, nodeChildrenQuery, nodeParentQuery, nodesQuery, nodesCorpusQuery)
 import Gargantext.Components.GraphQL.Team (Team, teamQuery)
 import Gargantext.Components.GraphQL.Tree (TreeFirstLevel, treeFirstLevelQuery, BreadcrumbInfo, breadcrumbQuery)
 import Gargantext.Components.GraphQL.User (UserInfo, userInfoQuery, User, userQuery)
@@ -20,6 +20,7 @@ import Gargantext.Components.Lang (Lang)
 import Gargantext.Config.REST (RESTError(..), AffRESTError)
 import Gargantext.Core.NgramsTable.Types (NgramsTerm(..))
 import Gargantext.Prelude
+import Gargantext.Routes (AppRoute(..))
 import Gargantext.Sessions (Session(..))
 import Gargantext.Types (CorpusId, NodeType)
 import Gargantext.Utils.Reactix as R2
@@ -64,11 +65,20 @@ getNodeParent :: Session -> Int -> NodeType -> AffRESTError (Array Node)
 getNodeParent session nodeId parentType = do
   eRes <- queryGql session "get node parent" $
                      nodeParentQuery `withVars` { id: nodeId
-                                                , parent_type: show parentType }  -- TODO: remove "show"
+                                                , parent_type: parentType }
   -- liftEffect $ here.log2 "[getNodeParent] node_parent" node_parent
   --pure node_parent
   pure $ rmap _.node_parent eRes
 
+getNodeChildren :: Session -> Int -> NodeType -> AffRESTError (Array Node)
+getNodeChildren session nodeId childType = do
+  eRes <- queryGql session "get node child" $
+                     nodeChildrenQuery `withVars` { id: nodeId
+                                                  , child_type: childType }
+  -- liftEffect $ here.log2 "[getNodeParent] node_parent" node_parent
+  --pure node_parent
+  pure $ rmap _.node_children eRes
+
 getUser :: Session -> Int -> AffRESTError User
 getUser session id = do
   eRes <- queryGql session "get user" $ userQuery `withVars` { id }
@@ -218,7 +228,7 @@ getContextNgrams session context_id list_id = do
   pure $ rmap (\{ context_ngrams } -> NormNgramsTerm <$> context_ngrams) eRes
 
 getBreadcrumb :: Session -> Int -> AffRESTError BreadcrumbInfo
-getBreadcrumb session id = do
-  eRes <- queryGql session "get breadcrumb branch" $ breadcrumbQuery `withVars` { id }
+getBreadcrumb session node_id = do
+  eRes <- queryGql session "get breadcrumb branch" $ breadcrumbQuery `withVars` { node_id }
   -- liftEffect $ here.log2 "[getBreadcrumb] breadcrumb" tree_branch
   pure $ rmap _.tree_branch eRes

src/Gargantext/Components/GraphQL/Node.purs

@@ -2,6 +2,7 @@ module Gargantext.Components.GraphQL.Node where
 
 import Gargantext.Prelude
 import Gargantext.Utils.GraphQL as GGQL
+import Gargantext.Types (NodeType)
 import GraphQL.Client.Args (Args, (=>>))
 import GraphQL.Client.Variable (Var(..))
 import Type.Proxy (Proxy(..))
@@ -46,6 +47,11 @@ nodesCorpusQuery = { nodes_corpus: { corpus_id: Var :: _ "id" Int } =>>
              }
 
 nodeParentQuery = { node_parent: { node_id: Var :: _ "id" Int
-                                 , parent_type: Var :: _ "parent_type" String } =>>  -- TODO parent_type :: NodeType
+                                 , parent_type: Var :: _ "parent_type" NodeType } =>>
                     GGQL.getFieldsStandard (Proxy :: _ Node)
                   }
+
+nodeChildrenQuery = { node_children: { node_id: Var :: _ "id" Int
+                                     , child_type: Var :: _ "child_type" NodeType } =>>
+                      GGQL.getFieldsStandard (Proxy :: _ Node)
+                    }

src/Gargantext/Components/GraphQL/Tree.purs

@@ -3,6 +3,7 @@ module Gargantext.Components.GraphQL.Tree where
 import Gargantext.Prelude
 
 import Data.Maybe (Maybe)
+import Gargantext.Routes (AppRoute)
 import Gargantext.Types (NodeType)
 import GraphQL.Client.Args ((=>>))
 import GraphQL.Client.Variable (Var(..))
@@ -42,7 +43,7 @@ treeFirstLevelQuery = { tree: { root_id: Var :: _ "id" Int} =>>
   }
  }
 
-breadcrumbQuery = { tree_branch: { node_id: Var :: _ "id" Int} =>>
+breadcrumbQuery = { tree_branch: { node_id: Var :: _ "node_id" Int } =>>
   { parents: 
     { name: unit
     , node_type: unit
@@ -50,4 +51,4 @@ breadcrumbQuery = { tree_branch: { node_id: Var :: _ "id" Int} =>>
     , parent_id: unit
     }
   }
-}
+}
\ No newline at end of file

src/Gargantext/Components/Login.purs

@@ -21,20 +21,22 @@ import Data.Array (head)
 import Data.Foldable (intercalate)
 import Data.Maybe (Maybe(..), fromMaybe)
 import Data.String as DST
+import Data.Tuple (Tuple)
 import Data.Tuple.Nested ((/\))
 import Effect (Effect)
 import Effect.Aff (Milliseconds(..), delay, launchAff_)
 import Effect.Class (liftEffect)
 import Gargantext.Components.Bootstrap as B
 import Gargantext.Components.Bootstrap.Types (ComponentStatus(..), Elevation(..), ModalSizing(..), Position(..), TooltipPosition(..), Variant(..))
-import Gargantext.Components.Login.PasswordForm as PasswordForm
 import Gargantext.Components.Login.LoginForm as LoginForm
+import Gargantext.Components.Login.PasswordForm as PasswordForm
 import Gargantext.Components.Login.Types (FormType(..))
 import Gargantext.Components.NgramsTable.Loader as NTL
 import Gargantext.Ends (Backend(..))
 import Gargantext.Hooks.Loader as GHL
 import Gargantext.Sessions (Session(..), Sessions, Action(Logout), unSessions)
 import Gargantext.Sessions as Sessions
+import Gargantext.Types (ID)
 import Gargantext.Utils ((?))
 import Gargantext.Utils.Reactix as R2
 import Reactix as R
@@ -51,10 +53,11 @@ here = R2.here "Gargantext.Components.Login"
 -- if not logged user can not save his work
 
 type Props =
-  ( backend  :: T.Box (Maybe Backend)
-  , backends :: Array Backend
-  , sessions :: T.Box Sessions
-  , visible  :: T.Box Boolean
+  ( backend       :: T.Box (Maybe Backend)
+  , backends      :: Array Backend
+  , sessions      :: T.Box Sessions
+  , visible       :: T.Box Boolean
+  , loginRedirect :: T.Box (Maybe (Tuple String ID))
   )
 
 login :: R2.Leaf Props
@@ -82,7 +85,7 @@ loginContainer :: R2.Leaf Props
 loginContainer = R2.leaf loginContainerCpt
 loginContainerCpt :: R.Component Props
 loginContainerCpt = here.component "container" cpt where
-  cpt props@{ sessions, visible } _ = do
+  cpt props@{ sessions, visible, loginRedirect } _ = do
     -- | States
     -- |
     mBackend <- R2.useLive' props.backend
@@ -109,6 +112,7 @@ loginContainerCpt = here.component "container" cpt where
               , formType
               , sessions
               , visible
+              , loginRedirect
               }
             ForgotPassword ->
               PasswordForm.component

src/Gargantext/Components/Login/LoginForm.purs

@@ -6,8 +6,9 @@ import Gargantext.Prelude
 
 import Data.Either (Either(..))
 import Data.Foldable (foldl, intercalate)
-import Data.Maybe (Maybe(..))
+import Data.Maybe (Maybe(..), fromMaybe)
 import Data.String as String
+import Data.Tuple (Tuple)
 import Data.Tuple.Nested ((/\))
 import Effect (Effect)
 import Effect.Aff (Aff, launchAff_)
@@ -18,9 +19,12 @@ import Gargantext.Components.Login.Types (AuthRequest(..), FormType(..))
 import Gargantext.Ends (Backend)
 import Gargantext.Hooks.FormValidation (VForm, useFormValidation)
 import Gargantext.Hooks.FormValidation.Unboxed as FV
+import Gargantext.Hooks.LinkHandler (useLinkHandler)
 import Gargantext.Hooks.StateRecord (useStateRecord)
-import Gargantext.Sessions (Session, Sessions, postAuthRequest)
+import Gargantext.Routes as GR
+import Gargantext.Sessions (Session, Sessions, postAuthRequest, sessionId)
 import Gargantext.Sessions as Sessions
+import Gargantext.Types (ID, NodeType(..))
 import Gargantext.Utils ((?))
 import Gargantext.Utils.Reactix as R2
 import Reactix as R
@@ -33,10 +37,11 @@ here :: R2.Here
 here = R2.here "Gargantext.Components.Login.Form"
 
 type Props =
-  ( backend  :: Backend
-  , formType :: T.Box FormType
-  , sessions :: T.Box Sessions
-  , visible  :: T.Box Boolean
+  ( backend       :: Backend
+  , formType      :: T.Box FormType
+  , sessions      :: T.Box Sessions
+  , visible       :: T.Box Boolean
+  , loginRedirect :: T.Box (Maybe (Tuple String ID))
   )
 
 component :: R2.Leaf Props
@@ -47,6 +52,7 @@ componentCpt = here.component "main" cpt where
       , formType
       , sessions
       , visible
+      , loginRedirect
       } _ = do
     -- | States
     -- |
@@ -56,6 +62,8 @@ componentCpt = here.component "main" cpt where
     onPending' /\ onPending
       <- R2.useBox' false
 
+    loginRedirect' <- R2.useLive' loginRedirect
+
     -- | Hooks
     -- |
     { state
@@ -65,6 +73,8 @@ componentCpt = here.component "main" cpt where
 
     fv <- useFormValidation
 
+    { goToRoute } <- useLinkHandler
+
     -- | Behaviors
     -- |
     let
@@ -96,6 +106,11 @@ componentCpt = here.component "main" cpt where
                 Right session_ -> liftEffect
                   $   Sessions.change (Sessions.Login session_) sessions
                   *>  T.write_ false visible
+                  *>  case loginRedirect' of
+                        Just (nodeType /\ nodeId) -> do
+                          T.write_ Nothing loginRedirect
+                          goToRoute $ fromMaybe GR.Login $ GR.nodeTypeAppRoute (fromMaybe Node $ read nodeType) (sessionId session_) nodeId
+                        Nothing -> pure unit
 
             T.write_ false onPending
 

src/Gargantext/Components/Router.purs

-module Gargantext.Components.Router (router) where
+module Gargantext.Components.Router
+  ( router
+  , shareCpt
+  )
+  where
 
 import Gargantext.Prelude
 
 import DOM.Simple as DOM
-import Data.Array (filter, length)
+import Data.Array (filter, head, length)
 import Data.Array as A
 import Data.Foldable (intercalate)
 import Data.Map as M
 import Data.Maybe (Maybe(..), fromMaybe, maybe)
+import Data.Tuple (Tuple(..))
 import Data.UUID (UUID)
 import Data.UUID as UUID
 import Effect (Effect)
@@ -16,7 +21,6 @@ import Gargantext.Components.ErrorsView as ErrorsView
 import Gargantext.Components.Forest (forestLayout)
 import Gargantext.Components.Forest.Breadcrumb as Breadcrumb
 import Gargantext.Components.ForgotPassword (forgotPasswordLayout)
--- import Gargantext.Components.GraphQL.Node (Node)
 import Gargantext.Components.Login (login)
 import Gargantext.Components.Nodes.Annuaire (annuaireLayout)
 import Gargantext.Components.Nodes.Annuaire.User (userLayout)
@@ -38,13 +42,14 @@ import Gargantext.Components.TreeSearch (treeSearch)
 import Gargantext.Config (defaultFrontends, defaultBackends)
 import Gargantext.Context.Session as SessionContext
 import Gargantext.Ends (Backend)
+import Gargantext.Hooks.LinkHandler (useLinkHandler)
 import Gargantext.Hooks.Resize (ResizeType(..), useResizeHandler)
 import Gargantext.Hooks.Session (useSession)
-import Gargantext.Routes (AppRoute, Tile)
+import Gargantext.Routes (AppRoute(..), Tile)
 import Gargantext.Routes as GR
-import Gargantext.Sessions (Session, sessionId)
+import Gargantext.Sessions (Session, sessionId, unSessions)
 import Gargantext.Sessions as Sessions
-import Gargantext.Types (CorpusId, Handed(..), ListId, NodeID, NodeType(..), SessionId, SidePanelState(..))
+import Gargantext.Types (CorpusId, Handed(..), ListId, NodeID, NodeType(..), SessionId, SidePanelState(..), ID)
 import Gargantext.Utils ((?))
 import Gargantext.Utils.Reactix (getElementById)
 import Gargantext.Utils.Reactix as R2
@@ -177,8 +182,7 @@ mainPageCpt = here.component "mainPage" cpt where
 
       H.div { className: "router__body main-page" }
       [
-        Breadcrumb.component
-        { boxes }
+        Breadcrumb.component { }
       ,
         H.div
         { className: intercalate " "
@@ -358,6 +362,7 @@ renderRouteCpt = R.memo' $ here.component "renderRoute" cpt where
         GR.NodeTexts s n          -> texts (sessionNodeProps s n) []
         GR.UserPage s n           -> user (sessionNodeProps s n) []
         GR.ForgotPassword p       -> forgotPassword {boxes, params: p} []
+        GR.Share t n              -> share {boxes, nodeType: t, nodeId: n} []
       ]
 
 --------------------------------------------------------------
@@ -481,7 +486,6 @@ type CorpusDocumentProps =
 
 corpusDocument :: R2.Component CorpusDocumentProps
 corpusDocument = R.createElement corpusDocumentCpt
-
 corpusDocumentCpt :: R.Component CorpusDocumentProps
 corpusDocumentCpt = here.component "corpusDocument" cpt where
   cpt props@{ corpusId, listId, nodeId } _ = do
@@ -490,16 +494,16 @@ corpusDocumentCpt = here.component "corpusDocument" cpt where
 
       authedProps =
         Record.merge
-        { content:
-            \session ->
-              Document.node
-              { mCorpusId: Just corpusId
-              , listId
-              , nodeId
-              , key: show (sessionId session) <> "-" <> show nodeId
-              }
-        }
-        sessionProps
+          { content:
+              \session ->
+                Document.node
+                { mCorpusId: Just corpusId
+                , listId
+                , nodeId
+                , key: show (sessionId session) <> "-" <> show nodeId
+                }
+          }
+          sessionProps
 
     pure $ authed authedProps []
 
@@ -524,7 +528,6 @@ type DocumentProps =
 
 document :: R2.Component DocumentProps
 document = R.createElement documentCpt
-
 documentCpt :: R.Component DocumentProps
 documentCpt = here.component "document" cpt where
   cpt props@{ listId, nodeId } _ = do
@@ -616,12 +619,13 @@ listsCpt = here.component "lists" cpt where
 --------------------------------------------------------------
 
 login' :: Boxes -> R.Element
-login' { backend, sessions, showLogin: visible } =
+login' { backend, sessions, showLogin: visible, loginRedirect } =
   login
   { backend
   , backends: A.fromFoldable defaultBackends
   , sessions
   , visible
+  , loginRedirect
   }
 
 --------------------------------------------------------------
@@ -767,3 +771,32 @@ forgotPasswordCpt = here.component "forgotPassword" cpt where
     let uuid = fromMaybe "" $ M.lookup "uuid" params
 
     pure $ forgotPasswordLayout { server, uuid } []
+
+--------------------------------------------------------------
+
+type ShareProps = (nodeType :: String, nodeId :: ID | Props)
+
+share :: R2.Component ShareProps
+share = R.createElement shareCpt
+
+shareCpt :: R.Component ShareProps
+shareCpt = here.component "share" cpt where
+  cpt { nodeType, nodeId, boxes} _ = do
+    { goToRoute } <- useLinkHandler
+    sessions' <- T.useLive T.unequal boxes.sessions
+
+    case unSessions sessions' of
+      [] -> do 
+        R.useEffect' $ T.write_ true boxes.showLogin
+        R.useEffect' $ T.write_ (Just (Tuple nodeType nodeId)) boxes.loginRedirect
+        R.useEffect' $ goToRoute Login
+        pure $ H.text "no session"
+      s -> case head s of
+        Just s' -> do
+          R.useEffect' $ goToRoute $ fromMaybe Login $ GR.nodeTypeAppRoute (fromMaybe Node $ read nodeType) (sessionId s') nodeId
+          pure $ H.text $ "session route: " <> (show $ fromMaybe Login $ GR.nodeTypeAppRoute (fromMaybe Node $ read nodeType) (sessionId s') nodeId)
+        Nothing -> do
+          R.useEffect' $ T.write_ true boxes.showLogin
+          R.useEffect' $ T.write_ (Just (Tuple nodeType nodeId)) boxes.loginRedirect
+          R.useEffect' $ goToRoute Login
+          pure $ H.text "no session"

src/Gargantext/Components/TreeSearch.purs

@@ -169,14 +169,15 @@ treeSearchRenderContainerCpt = here.component "treeSearchRenderContainer" cpt wh
 
 treeSearchRender :: R2.Leaf RenderProps
 treeSearchRender = R2.leaf treeSearchRenderCpt
-
 treeSearchRenderCpt :: R.Component RenderProps
 treeSearchRenderCpt = here.component "treeSearchRenderCpt" cpt where
   cpt { visible, session, searchData, goToRoute } _ = do
+    { route } <- AppStore.use
+    route' <- T.useLive T.unequal route
 
-    pure $ H.div {className: "search-modal__results"} (results searchData)
+    pure $ H.div {className: "search-modal__results"} (results route' searchData)
       where
-        results s = map searchResult s
+        results route' s = map searchResult s
           where
             searchResult sd = H.div 
                               { className: "result py-1"} 
@@ -195,9 +196,9 @@ treeSearchRenderCpt = here.component "treeSearchRenderCpt" cpt where
                                                , H.div {}
                                                  [
                                                    H.text " Path: "
-                                                 , breadcrumbView { nodeId: sd.id
-                                                                  , session: Just session
-                                                                  , format: "text"
+                                                 , breadcrumbView { format: "text"
+                                                                  , route: route'
+                                                                  , session
                                                                   }
                                                  ]
                                                ]
@@ -218,10 +219,10 @@ treeSearchRenderCpt = here.component "treeSearchRenderCpt" cpt where
                                 H.span { className: "node-path small" }
                                 [
                                   H.text " — "
-                                , breadcrumbView { nodeId: sd.id
-                                                  , session: Just session
-                                                  , format: "text"
-                                                  }
+                                , breadcrumbView { format: "text"
+                                                 , route: route'
+                                                 , session: session
+                                                 }
                                 ]
                               ]
 

src/Gargantext/Ends.purs

@@ -217,6 +217,7 @@ sessionPath (R.ChartHash { chartType, listId, tabType } i) =
 -- sessionPath (R.NodeAPI (NodeContact s a i) i) = sessionPath $ "annuaire/" <> show a <> "/contact/" <> show i
 sessionPath (R.PhyloAPI nId) = "node/" <> show nId <> "/phylo"
 sessionPath R.Members = "members"
+sessionPath (R.ShareURL i t) = "shareurl?type=" <> show t <> "&id=" <> show i
 
 ------- misc routing stuff
 

src/Gargantext/Router.purs

@@ -39,6 +39,7 @@ router = oneOf
   , RouteFrameCode     <$> (route "code"     *> sid) <*> int
   , RouteFrameVisio    <$> (route "visio"    *> sid) <*> int
   , RouteFile          <$> (route "file"     *> sid) <*> int
+  , Share              <$> (route "share"    *> str) <*> int
   , Home              <$   lit ""
   ]
  where

src/Gargantext/Routes.purs

@@ -2,11 +2,16 @@ module Gargantext.Routes where
 
 import Prelude
 
+import Data.Argonaut as Argonaut
 import Data.Maybe (Maybe(..))
 import Data.UUID (UUID)
 import Data.Map as M
 import Gargantext.Types (ChartOpts, ChartType, CorpusMetricOpts, CTabNgramType, Id, Limit, ListId, DocId, NgramsGetOpts, NgramsGetTableAllOpts, NodeType, Offset, OrderBy, SearchOpts, SessionId, TabSubType, TabType, TermList)
 import Gargantext.Types as GT
+import Gargantext.Utils.SimpleJSON (encodeJsonArgonaut)
+import GraphQL.Client.Args (class ArgGql)
+import GraphQL.Client.Variables.TypeName (class VarTypeName)
+import Simple.JSON as JSON
 
 data AppRoute
   = Annuaire       SessionId Int
@@ -25,7 +30,6 @@ data AppRoute
   | Lists          SessionId Int
   | Login
   | NodeTexts       SessionId Int
-  | TreeFlat        SessionId Int String
   | PGraphExplorer  SessionId Int
   | PhyloExplorer   SessionId Int
   | RouteFile       SessionId Int
@@ -34,7 +38,9 @@ data AppRoute
   | RouteFrameVisio SessionId Int
   | RouteFrameWrite SessionId Int
   | Team            SessionId Int
+  | TreeFlat        SessionId Int String
   | UserPage        SessionId Int
+  | Share           String Int
 
 derive instance Eq AppRoute
 
@@ -65,6 +71,7 @@ instance Show AppRoute where
   show (RouteFrameCode  s i)    = "code"           <> show i <> " (" <> show s <> ")"
   show (RouteFrameVisio s i)    = "visio"          <> show i <> " (" <> show s <> ")"
   show (RouteFile       s i)    = "file"           <> show i <> " (" <> show s <> ")"
+  show (Share           n i)    = "share"          <> show n <> show i
 
 
 appPath :: AppRoute -> String
@@ -94,6 +101,7 @@ appPath (RouteFrameCalc  s i)     = "calc/"      <> show s <> "/" <> show i
 appPath (RouteFrameCode  s i)     = "code/"      <> show s <> "/" <> show i
 appPath (RouteFrameVisio s i)     = "visio/"      <> show s <> "/" <> show i
 appPath (RouteFile s i)          = "file/"      <> show s <> "/" <> show i
+appPath (Share n i)              = "share/"     <> show n <> "/" <> show i
 
 nodeTypeAppRoute :: NodeType -> SessionId -> Int -> Maybe AppRoute
 nodeTypeAppRoute GT.Annuaire s i       = Just $ Annuaire s i
@@ -117,6 +125,7 @@ nodeTypeAppRoute GT.NodeFrameVisio s i = Just $ RouteFrameVisio s i
 nodeTypeAppRoute _ _ _                 = Nothing
 
 
+
 data SessionRoute
   = Tab TabType (Maybe Id)
   | Children NodeType Offset Limit (Maybe OrderBy) (Maybe Id)
@@ -141,6 +150,7 @@ data SessionRoute
   -- | AnnuaireContact AnnuaireId DocId
   | PhyloAPI Id
   | Members
+  | ShareURL Id NodeType
 
 
 ------------------------------------------------------

src/Gargantext/Sessions/Types.purs

@@ -62,9 +62,7 @@ instance JSON.WriteForeign Session where
       JSON.writeImpl { backend, caches: caches', token, treeId, username, userId }
     where
       caches' = JSON.writeImpl $ Object.fromFoldable (GUT.first show <$> Map.toUnfoldable caches :: Array (Tuple String NT.CacheState))
-
 instance Eq Session where eq = genericEq
-
 instance Show Session where
   show (Session {backend, username}) = username <> "@" <> (cleanBackendUrl backend)
 
@@ -74,7 +72,6 @@ cleanBackendUrl (Backend {baseUrl}) =
    $ DST.replace (DST.Pattern "https://") (DST.Replacement "") baseUrl
 
 instance ToUrl Session SessionRoute where toUrl (Session {backend}) r = backendUrl backend (sessionPath r)
-
 instance ToUrl Session NodePath where toUrl (Session {backend}) np = backendUrl backend (nodePath np)
 instance ToUrl Session String where toUrl = sessionUrl
 

src/Gargantext/Types.purs

@@ -2,6 +2,7 @@ module Gargantext.Types where
 
 import Gargantext.Prelude
 
+import Data.Argonaut as Argonaut
 import Data.Array as A
 import Data.Eq.Generic (genericEq)
 import Data.Generic.Rep (class Generic)
@@ -16,6 +17,7 @@ import Foreign as F
 import Gargantext.Components.Lang (class Translate, Lang(..))
 import Gargantext.Config.REST (RESTError, AffRESTError)
 import Gargantext.Utils.Glyphicon (classNamePrefix, glyphiconToCharCode)
+import Gargantext.Utils.SimpleJSON (encodeJsonArgonaut)
 import GraphQL.Client.Args (class ArgGql)
 import GraphQL.Client.Variables.TypeName (class VarTypeName)
 import Prim.Row (class Union)
@@ -169,6 +171,8 @@ instance JSON.ReadForeign NodeType where
       Nothing -> F.fail $ F.ErrorAtProperty s $ F.ForeignError "unknown property"
       Just nt -> pure nt
 instance JSON.WriteForeign NodeType where writeImpl = JSON.writeImpl <<< show
+instance Argonaut.EncodeJson NodeType where encodeJson = encodeJsonArgonaut
+instance ArgGql String NodeType
 instance ArgGql NodeType NodeType
 instance VarTypeName NodeType where
   varTypeName _ = "NodeType!"
@@ -237,32 +241,31 @@ prettyNodeType Url_Document      = "Document"
 
 
 instance Read NodeType where
-  read "NodeUser"          = Just NodeUser
+  read "Calc"              = Just Calc
+  read "Context"           = Just Context
+  read "Document"          = Just Url_Document
+  read "Individu"          = Just Individu
+  read "Node"              = Just Node
+  read "NodeAnnuaire"      = Just Annuaire
+  read "NodeContact"       = Just NodeContact
+  read "NodeCorpus"        = Just Corpus
+  read "NodeDashboard"     = Just Dashboard
+  read "NodeFile"          = Just NodeFile
   read "NodeFolder"        = Just Folder
   read "NodeFolderPrivate" = Just FolderPrivate
-  read "NodeFolderShared"  = Just FolderShared
   read "NodeFolderPublic"  = Just FolderPublic
-  read "NodeAnnuaire"      = Just Annuaire
-  read "NodeDashboard"     = Just Dashboard
-  read "Document"          = Just Url_Document
+  read "NodeFolderShared"  = Just FolderShared
+  read "NodeFrameNotebook" = Just NodeFrameNotebook
+  read "NodeFrameVisio"    = Just NodeFrameVisio
   read "NodeGraph"         = Just Graph
+  read "NodeList"          = Just NodeList
   read "NodePhylo"         = Just Phylo
-  read "Individu"          = Just Individu
-  read "Node"              = Just Node
-  read "Nodes"             = Just Nodes
-  read "Context"           = Just Context
-  read "NodeCorpus"        = Just Corpus
-  read "NodeContact"       = Just NodeContact
-  read "Tree"              = Just Tree
   read "NodeTeam"          = Just Team
-  read "NodeList"          = Just NodeList
   read "NodeTexts"         = Just NodeTexts
-  read "Annuaire"          = Just Annuaire
-  read "Notes"    = Just Notes
-  read "Calc"     = Just Calc
-  read "NodeFrameNotebook" = Just NodeFrameNotebook
-  read "NodeFrameVisio"    = Just NodeFrameVisio
-  read "NodeFile"          = Just NodeFile
+  read "NodeUser"          = Just NodeUser
+  read "Nodes"             = Just Nodes
+  read "Notes"             = Just Notes
+  read "Tree"              = Just Tree
   -- TODO NodePublic read ?
   read _                   = Nothing
 

src/Gargantext/Utils/SimpleJSON.purs

@@ -4,6 +4,8 @@ import Prelude
 
 import Control.Alt ((<|>))
 import Control.Monad.Except (throwError, withExcept)
+import Data.Argonaut as Argonaut
+import Data.Either (fromRight)
 import Data.Generic.Rep as GR
 import Data.List as L
 import Data.List.Types (NonEmptyList(..))
@@ -96,3 +98,8 @@ instance untaggedSumRepArgument ::
 throwJSONError :: forall a. Foreign.ForeignError -> Foreign.F a
 throwJSONError err =
   throwError $ NonEmptyList $ NonEmpty err L.Nil
+
+
+-- A SimpleJSON.ReadForeign instance should is also compatible with argonaut
+encodeJsonArgonaut :: forall a. JSON.WriteForeign a => a -> Argonaut.Json
+encodeJsonArgonaut x = fromRight Argonaut.jsonEmptyObject $ Argonaut.jsonParser $ JSON.writeJSON x