Merge branch 'dev-contact' into dev

src/Gargantext/Components/App.purs

@@ -17,7 +17,7 @@ import Gargantext.Components.Login (login)
 import Gargantext.Config (defaultFrontends, defaultBackends)
 import Gargantext.Components.Folder (folder)
 import Gargantext.Components.Nodes.Annuaire (annuaireLayout)
-import Gargantext.Components.Nodes.Annuaire.User.Contacts (userLayout)
+import Gargantext.Components.Nodes.Annuaire.User.Contacts (annuaireUserLayout, userLayout)
 import Gargantext.Components.Nodes.Corpus (corpusLayout)
 import Gargantext.Components.Nodes.Corpus.Document (documentLayout)
 import Gargantext.Components.Nodes.Corpus.Dashboard (dashboardLayout)
@@ -48,7 +48,7 @@ appCpt = R.hooksComponent "G.C.App.app" cpt where
     showLogin  <- R.useState' false
     showCorpus <- R.useState' false
     
-    let forested          = forestLayout frontends (fst sessions) (fst route) (snd showLogin)
+    let forested      = forestLayout frontends (fst sessions) (fst route) (snd showLogin)
     let mCurrentRoute = fst route
     let backends      = fromFoldable defaultBackends
     let withSession = \sid f -> maybe' (\_ -> forested $ homeLayout EN) f $ Sessions.lookup sid (fst sessions)
@@ -65,7 +65,7 @@ appCpt = R.hooksComponent "G.C.App.app" cpt where
           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 }
+          ContactPage sid aId nodeId -> withSession sid $ \session -> forested $ annuaireUserLayout { annuaireId: aId, 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/User/Contacts.purs

 module Gargantext.Components.Nodes.Annuaire.User.Contacts
   ( module Gargantext.Components.Nodes.Annuaire.User.Contacts.Types
+  , annuaireUserLayout
   , userLayout )
   where
 
-import Prelude (bind, pure, ($), (<<<), (<>), (<$>))
+import Prelude (bind, pure, ($), (<<<), (<>), (<$>), show, discard)
 import Data.Array (head)
 import Data.Maybe (Maybe(..), fromMaybe, maybe)
 import Data.Tuple (Tuple(..))
 import Data.Tuple.Nested ((/\))
 import Data.Newtype (unwrap)
 import Data.String (joinWith)
+import DOM.Simple.Console (log2)
 import Effect.Aff (Aff)
 import Reactix as R
 import Reactix.DOM.HTML as H
@@ -18,6 +20,7 @@ import Gargantext.Components.Nodes.Annuaire.User.Contacts.Types
   ( Contact(..), ContactData, ContactTouch(..), ContactWhere(..)
   , ContactWho(..), HyperData(..), HyperdataContact(..) )
 import Gargantext.Components.Nodes.Annuaire.User.Contacts.Tabs as Tabs
+import Gargantext.Hooks.Loader (useLoader)
 import Gargantext.Routes
 import Gargantext.Ends (Frontends)
 import Gargantext.Sessions (Session, get)
@@ -151,3 +154,33 @@ getContact session id = do
   --    throwError $ error "Missing default list"
   pure {contactNode, defaultListId: 424242}
 
+
+type AnnuaireLayoutProps =
+  ( annuaireId :: Int
+  | LayoutProps )
+
+
+annuaireUserLayout :: Record AnnuaireLayoutProps -> R.Element
+annuaireUserLayout props = R.createElement annuaireUserLayoutCpt props []
+
+annuaireUserLayoutCpt :: R.Component AnnuaireLayoutProps
+annuaireUserLayoutCpt = R.hooksComponent "G.C.Nodes.Annuaire.User.Contacts.annuaireUserLayout" cpt
+  where
+    cpt {annuaireId, frontends, nodeId, session} _ = do
+      useLoader nodeId (getAnnuaireContact session annuaireId) $
+        \contactData@{contactNode: Contact {name, hyperdata}} ->
+          H.ul { className: "col-md-12 list-group" }
+          [ display (fromMaybe "no name" name) (contactInfos hyperdata)
+          , Tabs.tabs {frontends, nodeId, contactData, session} ]
+
+getAnnuaireContact :: Session -> Int -> Int -> Aff ContactData
+getAnnuaireContact session annuaireId id = do
+  contactNode <- get session $ NodeAPI Annuaire (Just annuaireId) $ "contact/" <> (show id)
+  -- TODO: we need a default list for the pairings
+  --defaultListIds <- get $ toUrl endConfigStateful Back (Children NodeList 0 1 Nothing) $ Just id
+  --case (head defaultListIds :: Maybe (NodePoly HyperdataList)) of
+  --  Just (NodePoly { id: defaultListId }) ->
+  --    pure {contactNode, defaultListId}
+  --  Nothing ->
+  --    throwError $ error "Missing default list"
+  pure {contactNode, defaultListId: 424242}

src/Gargantext/Components/Nodes/Corpus.purs

@@ -24,7 +24,7 @@ corpusLayoutCpt = R.staticComponent "G.P.Corpus.corpusLayout" cpt
   where
     cpt {nodeId} _ =
       H.div {}
-      [ H.iframe { src: gargMd , width: "100%", height: "100%"} []
+      [ H.iframe { src: gargMd , width: "100%", height: "100%", style: {"border-style": "none"}} []
       ]
     gargMd = "https://hackmd.iscpif.fr/g9Aah4iwQtCayIzsKQjA0Q#"
 newtype CorpusInfo =

src/Gargantext/Router.purs

@@ -21,10 +21,10 @@ router = oneOf
      , PGraphExplorer <$> (route "graph"     *> sid) <*> int
      , Texts          <$> (route "texts"     *> sid) <*> int
      , Lists          <$> (route "lists"     *> sid) <*> int
+    , ContactPage     <$> (route "annuaire"  *> sid) <*> int
+                          <*> (lit "contact" *> int)
   , Annuaire          <$> (route "annuaire"  *> sid) <*> int
     , UserPage        <$> (route "user"      *> sid) <*> int
-    , ContactPage     <$> (route "annuaire"   *> sid) <*> int
-                          <*> (lit "contact" *> int)
   , Home              <$   lit ""
   ]
  where

src/Gargantext/Routes.purs

@@ -17,7 +17,7 @@ data AppRoute
     | Lists          SessionId Int
   | Annuaire SessionId Int
     | UserPage       SessionId Int
-    | ContactPage    SessionId AnnuaireId ContactId
+    | ContactPage    SessionId Int Int
 
 type AnnuaireId = Int
 type ContactId = Int
@@ -47,7 +47,7 @@ instance showAppRoute :: Show AppRoute where
   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 _a i)      = "Contact"  <> show i <> " (" <> show s <> ")"
+  show (ContactPage s a i)      = "Contact"  <> show a <> "::" <> show i <> " (" <> show s <> ")"
 
 appPath :: AppRoute -> String
 appPath Home                 = ""