Merge branch 'dev-contact' into dev

src/Gargantext/Components/App.purs

@@ -58,14 +58,14 @@ appCpt = R.hooksComponent "G.C.App.app" cpt where
         case fst route of
           Home  -> forested $ homeLayout EN
           Login -> login { sessions, backends, visible: showLogin }
-          Folder sid _ -> withSession sid $ \_ -> forested (folder {})
+          Folder sid _      -> withSession sid $ \_ -> forested (folder {})
           Corpus sid nodeId -> withSession sid $ \_ -> forested $ corpusLayout { nodeId }
-          Texts sid nodeId -> withSession sid $ \session -> forested $ textsLayout { nodeId, session, frontends }
-          Lists sid nodeId -> withSession sid $ \session -> forested $ listsLayout { nodeId, session }
-          Dashboard sid _nodeId -> withSession sid $ \session -> forested $ dashboardLayout {}
-          Annuaire sid nodeId -> withSession sid $ \session -> forested $ annuaireLayout { nodeId, session }
-          UserPage sid nodeId -> withSession sid $ \session -> forested $ userLayout { frontends, nodeId, session }
-          ContactPage sid nodeId -> withSession sid $ \session -> forested $ userLayout { frontends, nodeId, session }
+          Texts sid nodeId  -> withSession sid $ \session -> forested $ textsLayout { nodeId, session, frontends }
+          Lists sid nodeId  -> withSession sid $ \session -> forested $ listsLayout { nodeId, session }
+          Dashboard sid _nodeId  -> withSession sid $ \session -> forested $ dashboardLayout {}
+          Annuaire sid nodeId    -> withSession sid $ \session -> forested $ annuaireLayout { frontends, nodeId, session }
+          UserPage sid nodeId    -> withSession sid $ \session -> forested $ userLayout { frontends, nodeId, session }
+          ContactPage sid _aId nodeId -> withSession sid $ \session -> forested $ userLayout { frontends, nodeId, session }
           CorpusDocument sid corpusId listId nodeId ->
             withSession sid $ \session -> forested $ documentLayout { nodeId, listId, session, corpusId: Just corpusId }
           Document sid listId nodeId ->

src/Gargantext/Components/Nodes/Annuaire.purs

@@ -11,8 +11,9 @@ import Reactix as R
 import Reactix.DOM.HTML as H
 import Gargantext.Components.Nodes.Annuaire.User.Contacts.Types (Contact(..), HyperdataContact(..), ContactWhere(..))
 import Gargantext.Components.Table as T
-import Gargantext.Ends (url)
+import Gargantext.Ends (url, Frontends)
 import Gargantext.Routes (SessionRoute(..))
+import Gargantext.Routes as Routes
 import Gargantext.Sessions (Session, sessionId, get)
 import Gargantext.Types (NodePath(..), NodeType(..))
 import Gargantext.Hooks.Loader (useLoader)
@@ -29,7 +30,7 @@ toRows (AnnuaireTable a) = a.annuaireTable
 
 -- | Top level layout component. Loads an annuaire by id and renders
 -- | the annuaire using the result
-type LayoutProps = ( nodeId :: Int, session :: Session )
+type LayoutProps = ( nodeId :: Int, session :: Session, frontends :: Frontends )
 
 annuaireLayout :: Record LayoutProps -> R.Element
 annuaireLayout props = R.createElement annuaireLayoutCpt props []
@@ -37,15 +38,17 @@ annuaireLayout props = R.createElement annuaireLayoutCpt props []
 annuaireLayoutCpt :: R.Component LayoutProps
 annuaireLayoutCpt = R.hooksComponent "G.P.Annuaire.annuaireLayout" cpt
   where
-    cpt {nodeId, session} _ = do
+    cpt {nodeId, session, frontends} _ = do
       path <- R.useState' nodeId
       useLoader (fst path) (getAnnuaireInfo session) $
-        \info -> annuaire {session, path, info}
+        \info -> annuaire {session, path, info, frontends}
 
 type AnnuaireProps =
-  ( session :: Session
-  , path :: R.State Int
-  , info :: AnnuaireInfo )
+  ( session   :: Session
+  , path      :: R.State Int
+  , info      :: AnnuaireInfo
+  , frontends :: Frontends
+  )
 
 -- | Renders a basic table and the page loader
 annuaire :: Record AnnuaireProps -> R.Element
@@ -55,24 +58,29 @@ annuaire props = R.createElement annuaireCpt props []
 annuaireCpt :: R.Component AnnuaireProps
 annuaireCpt = R.staticComponent "G.P.Annuaire.annuaire" cpt
   where
-    cpt {session, path, info: info@(AnnuaireInfo {name, date: date'})} _ = R.fragment
+    cpt {session, path, info: info@(AnnuaireInfo {name, date: date'}), frontends} _ = R.fragment
       [ T.tableHeaderLayout headerProps
       , H.p {} []
       , H.div {className: "col-md-3"}
         [ H.text "    Filter ", H.input { className: "form-control", style } ]
       , H.br {}
-      , pageLayout { info, session, annuairePath: path } ]
+      , pageLayout { info, session, annuairePath: path, frontends} ]
       where
         headerProps = { title: name, desc: name, query: "", date, user: ""}
         date = "Last update: " <> date'
         style = {width: "250px", display: "inline-block"}
 
-type PagePath = { nodeId :: Int, params :: T.Params }
+type PagePath = { nodeId :: Int
+                , params :: T.Params
+                , frontends :: Frontends
+                }
 
 type PageLayoutProps =
-  ( session :: Session
+  ( session      :: Session
   , annuairePath :: R.State Int
-  , info :: AnnuaireInfo )
+  , info         :: AnnuaireInfo
+  , frontends    :: Frontends
+  )
 
 pageLayout :: Record PageLayoutProps -> R.Element
 pageLayout props = R.createElement pageLayoutCpt props []
@@ -80,18 +88,19 @@ pageLayout props = R.createElement pageLayoutCpt props []
 pageLayoutCpt :: R.Component PageLayoutProps
 pageLayoutCpt = R.hooksComponent "G.P.Annuaire.pageLayout" cpt
   where
-    cpt {annuairePath, info, session} _ = do
-      pagePath <- R.useState' (initialPagePath (fst annuairePath))
+    cpt {annuairePath, info, session, frontends} _ = do
+      pagePath <- R.useState' (initialPagePath frontends (fst annuairePath))
       useLoader (fst pagePath) (loadPage session) $
         \table -> page {session, table, pagePath, annuairePath}
-    initialPagePath nodeId = {nodeId, params: T.initialParams}
+    initialPagePath frontends nodeId = {nodeId, params: T.initialParams, frontends}
 
 type PageProps = 
   ( session :: Session
   , annuairePath :: R.State Int
   , pagePath :: R.State PagePath
   -- , info :: AnnuaireInfo
-  , table :: AnnuaireTable )
+  , table :: AnnuaireTable
+  )
 
 page :: Record PageProps -> R.Element
 page props = R.createElement pageCpt props []
@@ -100,26 +109,31 @@ pageCpt :: R.Component PageProps
 pageCpt = R.staticComponent "LoadedAnnuairePage" cpt
   where
     cpt { session, annuairePath, pagePath
-        , table: (AnnuaireTable {annuaireTable}) } _ = do
+        , table: (AnnuaireTable {annuaireTable})} _ = do
       T.table { rows, params, container, colNames, totalRecords, wrapColElts }
       where
         totalRecords = 4361 -- TODO
-        rows = (\c -> {row: contactCells session c, delete: false}) <$> annuaireTable
+        path = fst pagePath
+        rows = (\c -> {row: contactCells session path.frontends path.nodeId c, delete: false}) <$> annuaireTable
         container = T.defaultContainer { title: "Annuaire" } -- TODO
         colNames = T.ColumnName <$> [ "", "Name", "Company", "Service", "Role"]
         wrapColElts = const identity
-        setParams f = snd pagePath $ \{nodeId, params: ps} ->
-          {params: f ps, nodeId: fst annuairePath}
+        setParams f = snd pagePath $ \pp@{nodeId, params: ps} ->
+          pp {params = f ps, nodeId = fst annuairePath}
         params = T.initialParams /\ setParams
 
-contactCells :: Session -> Maybe Contact -> Array R.Element
-contactCells session = maybe [] render
+type AnnuaireId = Int
+
+contactCells :: Session -> Frontends -> AnnuaireId -> Maybe Contact -> Array R.Element
+contactCells session frontends aId = maybe [] render
   where
     render (Contact { id, hyperdata : (HyperdataContact contact@{who: who, ou:ou} ) }) =
-      let nodepath = NodePath (sessionId session) NodeContact (Just id)
-          href = url session nodepath in
+      --let nodepath = NodePath (sessionId session) NodeContact (Just id)
+      let nodepath = Routes.ContactPage (sessionId session) aId id
+          href = url frontends nodepath in
       [ H.text ""
-      , H.a { href, target: "blank" } [ H.text $ maybe "name" identity contact.title ]
+      , H.a { href} [ H.text $ maybe "name" identity contact.title ]
+      --, H.a { href, target: "blank" } [ H.text $ maybe "name" identity contact.title ]
       , H.text $ maybe "No ContactWhere" contactWhereOrg  (head $ ou)
       , H.text $ maybe "No ContactWhere" contactWhereDept (head $ ou)
       , H.div {className: "nooverflow"}

src/Gargantext/Components/Nodes/Annuaire/User/Contacts/Tabs.purs

@@ -64,9 +64,9 @@ tabsCpt = R.hooksComponent "G.P.Annuaire.User.Contacts.Tabs.tabs" cpt
           ]
           where
             patentsView = {session, defaultListId, nodeId, mode: Patents}
-            booksView = {session, defaultListId, nodeId, mode: Books}
-            commView = {session, defaultListId, nodeId, mode: Communication}
-            chart = mempty
+            booksView   = {session, defaultListId, nodeId, mode: Books}
+            commView    = {session, defaultListId, nodeId, mode: Communication}
+            chart       = mempty
             totalRecords = 4736 -- TODO
             docs = DT.docViewLayout
               { frontends, session, nodeId, chart, totalRecords
@@ -88,4 +88,4 @@ ngramsView {session,mode, defaultListId, nodeId} =
   { nodeId, defaultListId, tabType, session, tabNgramType }
   where
     tabNgramType = modeTabType' mode
-    tabType = TabPairing $ TabNgramType $ modeTabType mode
+    tabType      = TabPairing $ TabNgramType $ modeTabType mode

src/Gargantext/Components/Nodes/Annuaire/User/Contacts/Types.purs

@@ -17,7 +17,8 @@ newtype Contact =
   , parentId :: Maybe Int
   , name :: Maybe String
   , date :: Maybe String
-  , hyperdata :: HyperdataContact }
+  , hyperdata :: HyperdataContact
+  }
 
 derive instance newtypeContact :: Newtype Contact _
 

src/Gargantext/Components/Nodes/Corpus.purs

 module Gargantext.Components.Nodes.Corpus where
 
 import Prelude ((<<<))
-import Data.Argonaut (class DecodeJson, decodeJson, (.:), (.??))
+import Data.Argonaut (class DecodeJson, decodeJson, (.:), (.:?))
 import Data.Array (head)
 import Data.Maybe (Maybe(..))
 import Effect.Aff (Aff, throwError)
@@ -24,10 +24,9 @@ corpusLayoutCpt = R.staticComponent "G.P.Corpus.corpusLayout" cpt
   where
     cpt {nodeId} _ =
       H.div {}
-      [ H.h1 {} [H.text "Corpus Description"]
-      , H.p  {} [H.text "Soon: corpus synthesis here (when all others charts/features will be stabilized)."]
+      [ H.iframe { src: gargMd , width: "100%", height: "100%"} []
       ]
-
+    gargMd = "https://hackmd.iscpif.fr/g9Aah4iwQtCayIzsKQjA0Q#"
 newtype CorpusInfo =
   CorpusInfo
   { title        :: String
@@ -65,7 +64,7 @@ instance decodeCorpusInfo :: DecodeJson CorpusInfo where
     desc  <- obj .: "desc"
     query <- obj .: "query"
     authors <- obj .: "authors"
-    chart   <- obj .?? "chart"
+    chart   <- obj .:? "chart"
     let totalRecords = 47361 -- TODO
     pure $ CorpusInfo {title, desc, query, authors, chart, totalRecords}
 

src/Gargantext/Components/Nodes/Texts.purs

@@ -17,7 +17,6 @@ import Gargantext.Components.Nodes.Corpus.Chart.Histo (histo)
 import Gargantext.Components.Tab as Tab
 import Gargantext.Components.Table as Table
 import Gargantext.Ends (Frontends)
-import Gargantext.Routes (AppRoute)
 import Gargantext.Sessions (Session)
 import Gargantext.Types (CTabNgramType(..), TabSubType(..), TabType(..))
 

src/Gargantext/Ends.purs

@@ -166,6 +166,7 @@ sessionPath (R.Chart {chartType, tabType} i) =
     <> "?ngramsType=" <> showTabType' tabType
     <> "&listType=GraphTerm" -- <> show listId
     -- <> maybe "" (\x -> "&limit=" <> show x) limit
+-- sessionPath (R.NodeAPI (NodeContact s a i) i) = sessionPath $ "annuaire/" <> show a <> "/contact/" <> show i
 
 ------- misc routing stuff
 

src/Gargantext/Prelude.purs

@@ -7,7 +7,9 @@ import Effect.Class (class MonadEffect, liftEffect)
 
 
 logs:: forall message effect.
-       (MonadEffect effect) => Show message => message 
+       (MonadEffect effect)
+       => Show message
+       => message 
        -> effect Unit
 logs = liftEffect <<< log <<< show
 

src/Gargantext/Router.purs

@@ -14,7 +14,7 @@ router = oneOf
   , CorpusDocument   <$> (route "corpus"     *> sid) <*> int
                         <*> (lit "list" *> int)
                         <*> (lit "document" *> int)
-  , Corpus           <$> (route "corpus"     *> sid) <*> int
+  , Corpus            <$> (route "corpus"     *> sid) <*> int
      , Document       <$> (route "list"      *> sid) <*> int 
                         <*> (lit "document" *> int)
      , Dashboard      <$> (route "dashboard" *> sid) <*> int
@@ -23,13 +23,16 @@ router = oneOf
      , Lists          <$> (route "lists"     *> sid) <*> int
   , Annuaire          <$> (route "annuaire"  *> sid) <*> int
     , UserPage        <$> (route "user"      *> sid) <*> int
-    , ContactPage     <$> (route "contact"   *> sid) <*> int
+    , ContactPage     <$> (route "annuaire"   *> sid) <*> int
+                          <*> (lit "contact" *> int)
   , Home              <$   lit ""
   ]
  where
     route str      = lit "" *> lit str
+
     int :: Match Int
     int = floor <$> num
+
     sid :: Match SessionId
     sid = SessionId <$> str
 

src/Gargantext/Routes.purs

@@ -17,7 +17,10 @@ data AppRoute
     | Lists          SessionId Int
   | Annuaire SessionId Int
     | UserPage       SessionId Int
-    | ContactPage    SessionId Int
+    | ContactPage    SessionId AnnuaireId ContactId
+
+type AnnuaireId = Int
+type ContactId = Int
 
 data SessionRoute
   = Tab TabType (Maybe Id)
@@ -38,25 +41,25 @@ instance showAppRoute :: Show AppRoute where
   show (Corpus s i)             = "Corpus"   <> show i <> " (" <> show s <> ")"
   show (Document _ s i)         = "Document" <> show i <> " (" <> show s <> ")"
   show (CorpusDocument s _ _ i) = "CorpusDocument" <> show i <> " (" <> show s <> ")"
-  show (PGraphExplorer s i)     = "graphExplorer" <> show i <> " (" <> show s <> ")"
-  show (Dashboard      s i)     = "Dashboard" <> show i <> " (" <> show s <> ")"
-  show (Texts s i)              = "texts" <> show i <> " (" <> show s <> ")"
-  show (Lists s i)              = "lists" <> show i <> " (" <> show s <> ")"
+  show (PGraphExplorer s i)     = "graphExplorer"  <> show i <> " (" <> show s <> ")"
+  show (Dashboard      s i)     = "Dashboard"      <> show i <> " (" <> show s <> ")"
+  show (Texts s i)              = "texts"    <> show i <> " (" <> show s <> ")"
+  show (Lists s i)              = "lists"    <> show i <> " (" <> show s <> ")"
   show (Annuaire s i)           = "Annuaire" <> show i <> " (" <> show s <> ")"
   show (UserPage s i)           = "User"     <> show i <> " (" <> show s <> ")"
-  show (ContactPage s i)        = "Contact"  <> show i <> " (" <> show s <> ")"
+  show (ContactPage s _a i)      = "Contact"  <> show i <> " (" <> show s <> ")"
 
 appPath :: AppRoute -> String
-appPath Home       = ""
-appPath Login      = "login"
-appPath (Folder s i) = "folder/" <> show s <> "/" <> show i
+appPath Home                 = ""
+appPath Login                = "login"
+appPath (Folder s i)         = "folder/"     <> show s <> "/" <> show i
 appPath (CorpusDocument s c l i) = "corpus/" <> show s <> "/" <> show c <> "/list/" <> show l <> "/document/" <> show i
-appPath (Corpus s i)         = "corpus/" <> show s <> "/" <> show i
-appPath (Document s l i)     = "list/" <> show s <> "/" <> show l <> "/document/" <> show i
-appPath (Dashboard s i)      = "dashboard/" <> show s <> "/" <> show i
-appPath (PGraphExplorer s i) = "graph/" <> show s <> "/" <> show i
-appPath (Texts s i)    = "texts/" <> show s <> "/" <> show i
-appPath (Lists s i)    = "lists/" <> show s <> "/" <> show i
-appPath (Annuaire s i) = "annuaire/" <> show s <> "/" <> show i
-appPath (UserPage s i) = "user/" <> show s <> "/" <> show i
-appPath (ContactPage s i) = "contact/" <> show s <> "/" <> show i
+appPath (Corpus s i)         = "corpus/"     <> show s <> "/" <> show i
+appPath (Document s l i)     = "list/"       <> show s <> "/" <> show l <> "/document/" <> show i
+appPath (Dashboard s i)      = "dashboard/"  <> show s <> "/" <> show i
+appPath (PGraphExplorer s i) = "graph/"      <> show s <> "/" <> show i
+appPath (Texts s i)          = "texts/"      <> show s <> "/" <> show i
+appPath (Lists s i)          = "lists/"      <> show s <> "/" <> show i
+appPath (Annuaire s i)       = "annuaire/"   <> show s <> "/" <> show i
+appPath (UserPage s i)       = "user/"       <> show s <> "/" <> show i
+appPath (ContactPage s a i)  = "annuaire/"   <> show s <> "/" <> show a <> "/contact/" <> show i