[FIX] Contact Page (WIP)

src/Gargantext/Components/App.purs

@@ -13,7 +13,8 @@ import Gargantext.Components.GraphExplorer (explorerLayout)
 import Gargantext.Components.Lang (LandingLang(..))
 import Gargantext.Components.Login (login)
 import Gargantext.Components.Nodes.Annuaire (annuaireLayout)
-import Gargantext.Components.Nodes.Annuaire.User.Contacts (annuaireUserLayout, userLayout)
+import Gargantext.Components.Nodes.Annuaire.User (userLayout)
+import Gargantext.Components.Nodes.Annuaire.User.Contact (contactLayout)
 import Gargantext.Components.Nodes.Corpus (corpusLayout)
 import Gargantext.Components.Nodes.Corpus.Dashboard (dashboardLayout)
 import Gargantext.Components.Nodes.Corpus.Document (documentMainLayout)
@@ -101,17 +102,6 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where
           Annuaire sid nodeId        -> withSession sid $ \session -> forested [
             annuaireLayout { frontends, nodeId, session }
           ]
-          ContactPage sid aId nodeId                -> withSession sid $ \session -> forested [
-            annuaireUserLayout {
-                annuaireId: aId
-              , appReload
-              , asyncTasksRef
-              , frontends
-              , nodeId
-              , session
-              , treeReloadRef
-              }
-            ]
           Corpus sid nodeId        -> withSession sid $ \session -> forested [
             corpusLayout { nodeId, session }
           ]
@@ -204,6 +194,8 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where
                     , sessionUpdate
                 }
               } []
+----------------------------------------------------------------------------------------
+-- | TODO refact UserPage and ContactPage
           UserPage sid nodeId        -> withSession sid $ \session -> forested [
             userLayout {
                 appReload
@@ -214,3 +206,17 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where
               , treeReloadRef
               }
             ]
+
+          ContactPage sid aId nodeId                -> withSession sid $ \session -> forested [
+            contactLayout {
+                annuaireId: aId
+              , appReload
+              , asyncTasksRef
+              , frontends
+              , nodeId
+              , session
+              , treeReloadRef
+              }
+            ]
+
+

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

@@ -15,7 +15,7 @@ import Gargantext.Components.DocsTable as DT
 import Gargantext.Components.NgramsTable as NT
 import Gargantext.Components.NgramsTable.Core as NTC
 import Gargantext.Components.Tab as Tab
-import Gargantext.Components.Nodes.Annuaire.User.Contacts.Types (ContactData)
+import Gargantext.Components.Nodes.Annuaire.User.Contacts.Types (ContactData')
 import Gargantext.Components.Nodes.Lists.Types as LTypes
 import Gargantext.Components.Nodes.Texts.Types as TTypes
 import Gargantext.Ends (Frontends)
@@ -52,7 +52,7 @@ type TabsProps = (
     appReload         :: GUR.ReloadS
   , asyncTasksRef     :: R.Ref (Maybe GAT.Reductor)
   , cacheState        :: R.State LTypes.CacheState
-  , contactData       :: ContactData
+  , contactData       :: ContactData'
   , frontends         :: Frontends
   , nodeId            :: Int
   , session           :: Session

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

@@ -23,14 +23,14 @@ newtype NodeContact =
 
 instance decodeNodeContact :: DecodeJson NodeContact where
   decodeJson json = do
-    obj <- decodeJson json
-    date <- obj .?| "date"
+    obj       <- decodeJson json
+    date      <- obj .?| "date"
     hyperdata <- obj .: "hyperdata"
-    id <- obj .: "id"
-    name <- obj .:! "name"
-    parentId <- obj .?| "parentId"
-    typename <- obj .?| "typename"
-    userId <- obj .:! "userId"
+    id        <- obj .: "id"
+    name      <- obj .:! "name"
+    parentId  <- obj .?| "parentId"
+    typename  <- obj .?| "typename"
+    userId    <- obj .:! "userId"
 
     pure $ NodeContact { id
                    , date
@@ -43,6 +43,40 @@ instance decodeNodeContact :: DecodeJson NodeContact where
 
 derive instance newtypeNodeContact :: Newtype NodeContact _
 
+----------------------------------------------------------------------------
+
+newtype Contact' =
+  Contact'
+  { id :: Int
+  , date :: Maybe String
+  , hyperdata :: HyperdataContact
+  , name :: Maybe String
+  , parentId :: Maybe Int
+  , typename :: Maybe Int
+  , userId :: Maybe Int
+  }
+
+
+instance decodeContact' :: DecodeJson Contact' where
+  decodeJson json = do
+    obj       <- decodeJson json
+    date      <- obj .?| "date"
+    hyperdata <- obj .: "hyperdata"
+    id        <- obj .: "id"
+    name      <- obj .:! "name"
+    parentId  <- obj .?| "parentId"
+    typename  <- obj .?| "typename"
+    userId    <- obj .:! "userId"
+
+    pure $ Contact' { id
+                   , date
+                   , hyperdata
+                   , name
+                   , parentId
+                   , typename
+                   , userId
+                   }
+
 
 
 newtype Contact =
@@ -57,17 +91,16 @@ newtype Contact =
   }
 
 
-
-instance decodeUser :: DecodeJson Contact where
+instance decodeContact :: DecodeJson Contact where
   decodeJson json = do
-    obj <- decodeJson json
-    date <- obj .?| "date"
+    obj       <- decodeJson json
+    date      <- obj .?| "date"
     hyperdata <- obj .: "hyperdata"
-    id <- obj .: "id"
-    name <- obj .:! "name"
-    parentId <- obj .?| "parentId"
-    typename <- obj .?| "typename"
-    userId <- obj .:! "userId"
+    id        <- obj .: "id"
+    name      <- obj .:! "name"
+    parentId  <- obj .?| "parentId"
+    typename  <- obj .?| "typename"
+    userId    <- obj .:! "userId"
 
     pure $ Contact { id
                    , date
@@ -78,7 +111,40 @@ instance decodeUser :: DecodeJson Contact where
                    , userId
                    }
 
-derive instance newtypeContact :: Newtype Contact _
+
+----------------------------------------------------------------------------
+newtype User =
+  User
+  { id :: Int
+  , date :: Maybe String
+  , hyperdata :: HyperdataUser
+  , name :: Maybe String
+  , parentId :: Maybe Int
+  , typename :: Maybe Int
+  , userId :: Maybe Int
+  }
+
+
+instance decodeUser :: DecodeJson User where
+  decodeJson json = do
+    obj       <- decodeJson json
+    date      <- obj .?| "date"
+    hyperdata <- obj .: "hyperdata"
+    id        <- obj .: "id"
+    name      <- obj .:! "name"
+    parentId  <- obj .?| "parentId"
+    typename  <- obj .?| "typename"
+    userId    <- obj .:! "userId"
+
+    pure $ User { id
+                , date
+                , hyperdata
+                , name
+                , parentId
+                , typename
+                , userId
+                }
+
 
 newtype ContactWho =
   ContactWho
@@ -130,15 +196,15 @@ newtype ContactWhere =
   ContactWhere
   { organization :: (Array String)
   , labTeamDepts :: (Array String)
-                  
+
   , role         :: Maybe String
-                    
+
   , office       :: Maybe String
   , country      :: Maybe String
   , city         :: Maybe String
-                    
+
   , touch        :: Maybe ContactTouch
-                    
+
   , entry        :: Maybe String
   , exit         :: Maybe String }
 
@@ -226,15 +292,15 @@ defaultContactTouch =
 
 
 newtype HyperdataContact =
-     HyperdataContact { bdd :: Maybe String
+     HyperdataContact { bdd            :: Maybe String
                       , lastValidation :: Maybe String
-                      , ou  :: (Array ContactWhere)
-                      , source :: Maybe String
-                      , title :: Maybe String
-                      , uniqId :: Maybe String
-                      , uniqIdBdd :: Maybe String
-                      , who :: Maybe ContactWho
-                    }
+                      , ou             :: (Array ContactWhere)
+                      , source         :: Maybe String
+                      , title          :: Maybe String
+                      , uniqId         :: Maybe String
+                      , uniqIdBdd      :: Maybe String
+                      , who            :: Maybe ContactWho
+                      }
 derive instance newtypeHyperdataContact :: Newtype HyperdataContact _
 
 instance decodeHyperdataContact :: DecodeJson HyperdataContact
@@ -321,6 +387,7 @@ defaultHyperdataUser =
 --     pure $ HyperData {common, shared, specific}
 
 type ContactData = {contactNode :: Contact, defaultListId :: Int}
+type ContactData' = {contactNode :: Contact', defaultListId :: Int}
 
 _shared :: Lens' HyperdataUser HyperdataContact
 _shared = lens getter setter