working on the decodeJson instance

src/Gargantext/Pages/Annuaire.purs

@@ -3,6 +3,7 @@ module Gargantext.Pages.Annuaire where
 import Control.Monad.Trans.Class (lift)
 import Data.Lens (Lens', lens, (?~))
 import Data.Maybe (Maybe(..), maybe)
+import Data.Map (lookup)
 import React (ReactElement)
 import React.DOM (a, b, b', br', div, h3, hr, i, input, p, table, tbody, td, text, th, thead, tr)
 import React.DOM.Props (className, href, scope, style)
@@ -69,7 +70,7 @@ defaultAnnuaireInfo = AnnuaireInfo { id : 0
                                    , hyperdata : ""
                                    }
 ------------------------------------------------------------------------------
-toRows :: AnnuaireTable -> Array (Maybe Contact)
+toRows :: AnnuaireTable -> Array (Maybe (Contact Void Void))
 toRows (AnnuaireTable a) = a.annuaireTable
 
 layoutAnnuaire :: Spec State {} Action
@@ -131,17 +132,24 @@ layoutAnnuaire = simpleSpec performAction render
                           individuals = maybe (toRows defaultAnnuaireTable) toRows state.stable
 
 
-showRow :: Maybe Contact -> ReactElement
+showRow :: Maybe (Contact Void Void) -> ReactElement
 showRow Nothing = tr [][]
-showRow (Just (Contact { id : id, hyperdata : (HyperData contact) })) =
+showRow (Just (Contact {id: id, hyperdata: (HyperData {specific: contact}) })) =
   tr []
-  [ td [] [ a [ href (toUrl Front NodeUser id) ] [ text $ maybe' contact.nom <> " " <> maybe' contact.prenom ] ]
-  , td [] [text $ maybe' contact.fonction]
-  , td [] [text $ maybe' contact.service]
-  , td [] [text $ maybe' contact.groupe]
+  [ td [] [ a [ href (toUrl Front NodeUser id) ] [
+               text $
+               (maybe' $ lookInContact "prenom")
+               <> " "
+               <> (maybe'$ lookInContact "nom")
+               ]
+          ]
+  , td [] [text $ maybe' $ lookInContact "fonction"]
+  , td [] [text $ maybe' $ lookInContact "service"]
+  , td [] [text $ maybe' $ lookInContact "groupe"]
   ]
     where
       maybe' = maybe "" identity
+      lookInContact key = lookup key contact
 
 
 ------------------------------------------------------------------------------
@@ -174,7 +182,7 @@ instance decodeAnnuaireInfo :: DecodeJson AnnuaireInfo where
                         }
 
 
-newtype AnnuaireTable  = AnnuaireTable  { annuaireTable :: Array (Maybe Contact)}
+newtype AnnuaireTable  = AnnuaireTable  { annuaireTable :: Array (Maybe (Contact Void Void))}
 instance decodeAnnuaireTable :: DecodeJson AnnuaireTable where
   decodeJson json = do
     rows <- decodeJson json

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

@@ -15,7 +15,7 @@ import Gargantext.Prelude
 import Gargantext.Pages.Annuaire.User.Contacts.Types (Action(..), State, Contact, _contact)
 import Thermite (PerformAction, modifyState)
 
-getContact :: Int -> Aff Contact
+getContact :: Int -> Aff (Contact Void Void)
 getContact id = get $ toUrl Back Node id
 
 fetchContact :: Int -> StateCoTransformer State Unit

src/Gargantext/Pages/Annuaire/User/Contacts/Specs/Renders.purs

@@ -4,11 +4,12 @@ module Gargantext.Pages.Annuaire.User.Contacts.Specs.Renders
 import Gargantext.Pages.Annuaire.User.Contacts.Types
 
 import Data.List (List, zipWith, catMaybes, toUnfoldable)
-import Data.Unfoldable (class Unfoldable)
 import Data.Map (Map, empty, keys, values, lookup)
-import Data.Set (toUnfoldable) as S
 import Data.Maybe (Maybe(..))
+import Data.Set (toUnfoldable) as S
 import Data.Tuple (Tuple(..), uncurry)
+import Data.Unfoldable (class Unfoldable)
+import Prelude (Void)
 import Prelude (($), (<<<), (<$>), flip, class Ord)
 import React (ReactElement)
 import React.DOM (div, h3, img, li, span, text, ul)
@@ -54,7 +55,7 @@ mapMyMap f m = toUnfoldable
 
 infixl 4 mapMyMap as <.~$>
 
-contactInfos :: HyperData -> ReactElement
+contactInfos :: HyperData Void Void -> ReactElement
 contactInfos hyperdata =
     ul [className "list-group"] [] {- $
     listInfo <.~$> hyperdata

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

@@ -6,88 +6,50 @@ import Data.Argonaut (class DecodeJson, decodeJson, (.?))
 import Data.Either (Either(..))
 import Data.Lens (Lens', Prism', lens, prism)
 import Data.Maybe (Maybe(..))
+import Data.Map (Map(..))
+
+import React (ReactElement)
+import React.DOM (div)
 
 import Gargantext.Components.Tab as Tab
 import Gargantext.Utils.DecodeMaybe ((.?|))
+import Gargantext.Utils.Renderable
 
-newtype Contact = Contact
-  { id        :: Int
-  , typename  :: Maybe Int
-  , userId    :: Int
-  , parentId  :: Int
-  , name      :: String
-  , date      :: Maybe String
-  , hyperdata :: HyperData
+data Contact c s = Contact {
+  id :: Int
+  , typename :: Maybe Int
+  , userId :: Int
+  , parentId :: Maybe Int
+  , name :: String
+  , date :: Maybe String
+  , hyperdata :: HyperData c s
   }
 
-newtype HyperData =
+data HyperData c s =
   HyperData
-  { bureau :: Maybe String
-  , atel   :: Maybe String
-  , fax    :: Maybe String
-  , aprecision :: Maybe String
-  , service    :: Maybe String
-  , service2   :: Maybe String
-  , groupe     :: Maybe String
-  , lieu       :: Maybe String
-  , pservice   :: Maybe String
-  , date_modification :: Maybe String
-  , fonction          :: Maybe String
-  , pfonction         :: Maybe String
-  , url               :: Maybe String
-  , prenom            :: Maybe String
-  , nom               :: Maybe String
-  , idutilentite      :: Maybe String
-  , afonction         :: Maybe String
-  , grprech           :: Maybe String
-  , entite            :: Maybe String
-  , entite2           :: Maybe String
-  , mail              :: Maybe String
+  { common :: c
+  , shared :: s
+  , specific :: Map String String
   }
 
-instance decodeUserHyperData :: DecodeJson HyperData where
+instance decodeUserHyperData :: (DecodeJson c, DecodeJson s) =>
+                                DecodeJson (HyperData c s) where
   decodeJson json = do
-    obj <- decodeJson json
-    bureau <- obj .?| "bureau"
-    atel   <- obj .?| "atel"
-    fax    <- obj .?| "fax"
-    aprecision <- obj .?| "aprecision"
-    service    <- obj .?| "service"
-    service2   <- obj .?| "service2"
-    groupe     <- obj .?| "groupe"
-    lieu       <- obj .?| "lieu"
-    pservice   <- obj .?| "pservice"
-    date_modification <- obj .?| "date_modification"
-    fonction          <- obj .?| "fonction"
-    pfonction         <- obj .?| "pfonction"
-    url               <- obj .?| "url"
-    prenom            <- obj .?| "prenom"
-    nom               <- obj .?| "nom"
-    idutilentite    <- obj .?| "idutilentite"
-    afonction       <- obj .?| "afonction"
-    grprech         <- obj .?| "grprech"
-    entite          <- obj .?| "entite"
-    entite2         <- obj .?| "entite2"
-    mail            <- obj .?| "mail"
-    pure $ HyperData { bureau, atel, fax
-                     , aprecision, service
-                     , service2, groupe, lieu
-                     , pservice, date_modification
-                     , fonction, pfonction, url
-                     , prenom, nom, idutilentite
-                     , afonction, grprech, entite
-                     , entite2, mail
-                     }
+    common <- decodeJson json
+    shared <- decodeJson json
+    specific <- decodeJson json
+    pure $ HyperData {common, shared, specific}
 
-instance decodeUser :: DecodeJson Contact where
+instance decodeUser :: (DecodeJson c, DecodeJson s) =>
+                       DecodeJson (Contact c s) where
   decodeJson json = do
-    obj      <- decodeJson json
-    id       <- obj .? "id"
+    obj <- decodeJson json
+    id <- obj .? "id"
     typename <- obj .?| "typename"
-    userId   <- obj .? "userId"
-    parentId <- obj .? "parentId"
-    name     <- obj .? "name"
-    date     <- obj .?| "date"
+    userId <- obj .? "userId"
+    parentId <- obj .?| "parentId"
+    name <- obj .? "name"
+    date <- obj .?| "date"
     hyperdata <- obj .? "hyperdata"
     pure $ Contact { id, typename, userId
                    , parentId, name, date
@@ -100,7 +62,7 @@ data Action
 
 type State =
   { activeTab :: Int
-  , contact :: Maybe Contact
+  , contact :: Maybe (Contact )
   }
 
 initialState :: State
@@ -109,7 +71,7 @@ initialState =
   , contact: Nothing
   }
 
-_contact :: Lens' State (Maybe Contact)
+_contact :: Lens' State (Maybe (Contact Unit Unit))
 _contact = lens (\s -> s.contact) (\s ss -> s{contact = ss})
 
 _tablens :: Lens' State Tab.State