[FIX] toUrl to remove hard coded links.

src/Gargantext/Components/Tree.purs

@@ -23,7 +23,7 @@ import React (ReactElement)
 import React.DOM (a, button, div, h5, i, input, li, span, text, ul)
 import React.DOM.Props (Props, _id, _type, className, href, title, onClick, onInput, placeholder, style, value, _data)
 import Thermite (PerformAction, Render, Spec, cotransform, defaultPerformAction, defaultRender, modifyState, simpleSpec)
-import Gargantext.Config (toUrl, End(Front), NodeType(..))
+import Gargantext.Config (toUrl, End(..), NodeType(..), defaultRoot)
 type Name = String
 type Open = Boolean
 type URL  = String
@@ -351,7 +351,7 @@ toHtml d s@(NTree (LNode {id, name, nodeType, open, popOver, renameNodeValue, cr
     li []
     [
 
-      a [ href (toUrl Front nodeType id)]
+      a [ href (toUrl Front nodeType (Just id))]
       ( [ text (name <> "    ")
         ]
       )
@@ -407,7 +407,7 @@ instance decodeJsonFTree :: DecodeJson (NTree LNode) where
 loadDefaultNode :: Aff (Either String (NTree LNode))
 loadDefaultNode = do
   res <- request $ defaultRequest
-         { url = "http://localhost:8008/api/v1.0/tree/1"     --- http://localhost:8008/api/v1.0/tree/1
+         { url = toUrl Back Tree (Just defaultRoot)
          , responseFormat = ResponseFormat.json
          , method = Left GET
          , headers = []
@@ -439,7 +439,7 @@ instance encodeJsonRenameValue :: EncodeJson RenameValue where
 renameNode :: Int -> RenameValue -> Aff (Either String Unit)     --- need to change return type herre
 renameNode renameNodeId reqbody = do
   res <- request $ defaultRequest
-         { url = "http://localhost:8008/api/v1.0/node/" <> show renameNodeId  <> "/rename"
+         { url = toUrl Back Node (Just renameNodeId)  <> "/rename"
          , responseFormat = ResponseFormat.json
          , method = Left PUT
          , headers = []
@@ -461,7 +461,7 @@ renameNode renameNodeId reqbody = do
 deleteNode :: Int -> Aff (Either String (Int))
 deleteNode renameNodeId = do
   res <- request $ defaultRequest
-         { url = "http://localhost:8008/api/v1.0/node/" <> show renameNodeId
+         { url = toUrl Back Node (Just renameNodeId)
          , responseFormat = ResponseFormat.json
          , method = Left DELETE
          , headers = []
@@ -483,7 +483,7 @@ deleteNode renameNodeId = do
 deleteNodes :: String -> Aff (Either String  Int)
 deleteNodes reqbody = do
   res <- request $ defaultRequest
-         { url = "http://localhost:8008/api/v1.0/nodes"
+         { url = toUrl Back Nodes Nothing
          , responseFormat = ResponseFormat.json
          , method = Left DELETE
          , headers = []
@@ -504,7 +504,7 @@ deleteNodes reqbody = do
 createNode :: String -> Aff (Either String (Int))
 createNode  reqbody= do
   res <- request $ defaultRequest
-         { url = "http://localhost:8008/api/v1.0/node/"
+         { url = toUrl Back Node Nothing
          , responseFormat = ResponseFormat.json
          , method = Left POST
          , headers = []

src/Gargantext/Config.purs

@@ -92,21 +92,21 @@ doUrl b p ps = b <> p <> ps
 ------------------------------------------------------------
 endBaseUrl :: End -> EndConfig -> UrlBase
 endBaseUrl Back  c = baseUrl c.back
-endBaseUrl Front c = baseUrl c.front
+endBaseUrl Front c = ""
 
 baseUrl :: Config -> UrlBase
 baseUrl conf = conf.proto <> conf.domain <> ":" <> show conf.port
 ------------------------------------------------------------
-endPathUrl :: End -> EndConfig -> NodeType -> Id -> UrlPath
+endPathUrl :: End -> EndConfig -> NodeType -> Maybe Id -> UrlPath
 endPathUrl Back  c nt i = pathUrl c.back  nt i
 endPathUrl Front c nt i = pathUrl c.front nt i
 
-pathUrl :: Config -> NodeType -> Id -> UrlPath
+pathUrl :: Config -> NodeType -> Maybe Id -> UrlPath
 pathUrl c nt@(Tab _ _ _ _) i = pathUrl c Node i <> "/" <> show nt
 pathUrl c nt@(Ngrams _ _) i = pathUrl c Node i <> "/" <> show nt
-pathUrl c nt i = c.prePath <> urlConfig nt <> "/" <> show i
+pathUrl c nt i = c.prePath <> urlConfig nt <> (maybe "" (\i' -> "/" <> show i') i)
 ------------------------------------------------------------
-toUrl :: End -> NodeType -> Id -> Url
+toUrl :: End -> NodeType -> Maybe Id -> Url
 toUrl e nt i = doUrl base path params
   where
     base   = endBaseUrl e endConfig
@@ -126,6 +126,7 @@ data NodeType = NodeUser
               | Graph
               | Individu
               | Node
+              | Nodes
               | Tree
 data End = Back | Front
 type Id  = Int
@@ -171,6 +172,7 @@ urlConfig Folder    = show Folder
 urlConfig Graph     = show Graph
 urlConfig Individu  = show Individu
 urlConfig Node      = show Node
+urlConfig Nodes      = show Nodes
 urlConfig NodeUser  = show NodeUser
 urlConfig Tree      = show Tree
 ------------------------------------------------------------
@@ -185,6 +187,7 @@ instance showNodeType :: Show NodeType where
   show Graph     = "graph"
   show Individu  = "individu"
   show Node      = "node"
+  show Nodes      = "nodes"
   show NodeUser  = "user"
   show Tree      = "tree"
   show (Tab t o l s) = "table?view=" <> show t <> "&offset=" <> show o
@@ -212,6 +215,7 @@ readNodeType "NodeFolder"     = Folder
 readNodeType "NodeGraph"      = Graph
 readNodeType "Individu"   = Individu
 readNodeType "Node"       = Node
+readNodeType "Nodes"       = Nodes
 readNodeType "NodeCorpus" = Corpus
 readNodeType "NodeCorpusV3" = CorpusV3
 readNodeType "NodeUser"   = NodeUser

src/Gargantext/Pages/Annuaire.purs

@@ -145,7 +145,7 @@ pageLoader props = React.createElement pageLoaderClass props []
 
 renderContactCells :: Contact -> Array ReactElement
 renderContactCells (Contact { id, hyperdata : HyperData contact }) =
-  [ a [ href (toUrl Front NodeUser id) ] [ text $ maybe' contact.nom <> " " <> maybe' contact.prenom ]
+  [ a [ href (toUrl Front NodeUser (Just id)) ] [ text $ maybe' contact.nom <> " " <> maybe' contact.prenom ]
   , text $ maybe' contact.fonction
   , text $ maybe' contact.service
   , text $ maybe' contact.groupe
@@ -202,12 +202,12 @@ instance decodeAnnuaireTable :: DecodeJson AnnuaireTable where
     pure $ AnnuaireTable { annuaireTable : rows}
 ------------------------------------------------------------------------
 loadPage :: PageParams -> Aff AnnuaireTable
-loadPage {nodeId, params} = get $ toUrl Back (Tab TabDocs 0 10 Nothing) nodeId
+loadPage {nodeId, params} = get $ toUrl Back (Tab TabDocs 0 10 Nothing) (Just nodeId)
  -- TODO Tab TabDocs is not the right API call
  -- TODO params, see loadPage in Documents
 
 getAnnuaireInfo :: Int -> Aff AnnuaireInfo
-getAnnuaireInfo id = get $ toUrl Back Node id
+getAnnuaireInfo id = get $ toUrl Back Node (Just id)
 ------------------------------------------------------------------------------
 
 annuaireLoaderClass :: ReactClass (Loader.Props Int AnnuaireInfo)

src/Gargantext/Pages/Annuaire/User/Contacts/API.purs

@@ -15,11 +15,11 @@ import Gargantext.Prelude
 import Gargantext.Pages.Annuaire.User.Contacts.Types (Action(..), State, Contact, _contact)
 import Thermite (PerformAction, modifyState)
 
-getContact :: Int -> Aff Contact
+getContact :: Maybe Int -> Aff Contact
 getContact id = get $ toUrl Back Node id
 
 fetchContact :: Int -> StateCoTransformer State Unit
 fetchContact contactId = do
-  contact <- lift $ getContact contactId
+  contact <- lift $ getContact (Just contactId)
   void $ modifyState $ _contact ?~ contact
   logs "Fetching contact..."

src/Gargantext/Pages/Corpus.purs

@@ -3,7 +3,7 @@ module Gargantext.Pages.Corpus where
 
 import Data.Either (Either(..))
 import Data.Lens (Lens', Prism', lens, prism)
-import Data.Maybe (maybe)
+import Data.Maybe (Maybe(..),maybe)
 import Effect.Aff (Aff)
 import React as React
 import React (ReactClass, ReactElement)
@@ -82,7 +82,7 @@ corpusHeaderSpec = simpleSpec defaultPerformAction render
 ------------------------------------------------------------------------
 
 getCorpus :: Int -> Aff (NodePoly CorpusInfo)
-getCorpus = get <<< toUrl Back Corpus
+getCorpus = get <<< toUrl Back Corpus <<< Just
 
 corpusLoaderClass :: ReactClass (Loader.Props Int (NodePoly CorpusInfo))
 corpusLoaderClass = createLoaderClass "CorpusLoader" getCorpus

src/Gargantext/Pages/Corpus/Document.purs

@@ -262,14 +262,14 @@ instance decodeDocument :: DecodeJson Document
 ------------------------------------------------------------------------
 performAction :: PerformAction State {} Action
 performAction (Load nId) _ _ = do
-  node <- lift $ getNode nId
+  node <- lift $ getNode (Just nId)
   void $ modifyState $ _document ?~ node
   logs $ "Node Document " <> show nId <> " fetched."
 performAction (ChangeString ps) _ _ = pure unit
 performAction (SetInput ps) _ _ = void <$> modifyState $ _ { inputValue = ps }
 
 
-getNode :: Int -> Aff (NodePoly Document)
+getNode :: Maybe Int -> Aff (NodePoly Document)
 getNode = get <<< toUrl Back Node
 
 _document :: Lens' State (Maybe (NodePoly Document))

src/Gargantext/Pages/Corpus/Tabs/Documents.purs

@@ -193,7 +193,7 @@ loadPage :: PageParams -> Aff (Array DocumentsView)
 loadPage {nodeId, params: {limit, offset, orderBy}} = do
   logs "loading documents page: loadPage with Offset and limit"
   --res <- get $ toUrl Back (Children Url_Document offset limit) nodeId
-  res <- get $ toUrl Back (Tab TabDocs offset limit (convOrderBy <$> orderBy)) nodeId
+  res <- get $ toUrl Back (Tab TabDocs offset limit (convOrderBy <$> orderBy)) (Just nodeId)
   let docs = res2corpus <$> res
   _ <- logs "Ok: loading page documents"
   _ <- logs $ map show docs
@@ -270,9 +270,9 @@ renderPage loaderDispatch {corpusInfo, dispatch} {currentPath: {nodeId}, loaded:
                       else
                         div [ ][text r.date]
                     , if (r.delete) then
-                        a [ href (toUrl Front Url_Document r._id), style {textDecoration : "line-through"} ] [ text r.title ]
+                        a [ href (toUrl Front Url_Document (Just r._id)), style {textDecoration : "line-through"} ] [ text r.title ]
                       else
-                        a [ href (toUrl Front Url_Document r._id) ] [ text r.title ]
+                        a [ href (toUrl Front Url_Document (Just r._id)) ] [ text r.title ]
                     , if (r.delete) then
                         div [style {textDecoration : "line-through"}] [ text r.source]
                       else
@@ -341,13 +341,13 @@ instance encodeJsonDDQuery :: EncodeJson DeleteDocumentQuery where
        ~> jsonEmptyObject
 
 putFavorites :: Int -> FavoriteQuery -> Aff (Array Int)
-putFavorites nodeId = put (toUrl Back Node nodeId <> "/favorites")
+putFavorites nodeId = put (toUrl Back Node (Just nodeId) <> "/favorites")
 
 deleteFavorites :: Int -> FavoriteQuery -> Aff (Array Int)
-deleteFavorites nodeId = deleteWithBody (toUrl Back Node nodeId <> "/favorites")
+deleteFavorites nodeId = deleteWithBody (toUrl Back Node (Just nodeId) <> "/favorites")
 
 deleteDocuments :: Int -> DeleteDocumentQuery -> Aff (Array Int)
-deleteDocuments nodeId = deleteWithBody (toUrl Back Node nodeId <> "/documents")
+deleteDocuments nodeId = deleteWithBody (toUrl Back Node (Just nodeId) <> "/documents")
 
 -- TODO: not optimal but Data.Set lacks some function (Set.alter)
 toggleSet :: forall a. Ord a => a -> Set a -> Set a

src/Gargantext/Pages/Corpus/Tabs/Ngrams/NgramsTable.purs

@@ -331,11 +331,11 @@ type PageLoaderProps =
 --, corpusInfo :: Maybe (NodePoly CorpusInfo)
   }
 
-getNgramsTable :: Int -> Aff NgramsTable
+getNgramsTable :: Maybe Int -> Aff NgramsTable
 getNgramsTable = get <<< toUrl Back (Ngrams TabTerms Nothing)
 
 loadPage :: PageParams -> Aff NgramsTable
-loadPage {nodeId} = getNgramsTable nodeId -- TODO this ignores params
+loadPage {nodeId} = getNgramsTable (Just nodeId) -- TODO this ignores params
 
 ngramsLoaderClass :: ReactClass (Loader.Props PageParams NgramsTable)
 ngramsLoaderClass = Loader.createLoaderClass "NgramsLoader" loadPage