Merge remote-tracking branch 'origin/user-form' into annuaire

src/Gargantext/Pages/Annuaire.purs

@@ -15,7 +15,8 @@ import Thermite (Render, Spec
 import Gargantext.Prelude
 import Gargantext.Config      (toUrl, NodeType(..), TabType(..), End(..))
 import Gargantext.Config.REST (get)
-import Gargantext.Pages.Annuaire.User.Users.Types (User(..), HyperData(..))
+import Gargantext.Pages.Annuaire.User.Contacts.Types (Contact(..), HyperData(..))
+import Gargantext.Utils.DecodeMaybe ((.?|))
 import Data.Argonaut (class DecodeJson, decodeJson, (.?))
 ------------------------------------------------------------------------------
 type State = { info  :: Maybe AnnuaireInfo
@@ -68,7 +69,7 @@ defaultAnnuaireInfo = AnnuaireInfo { id : 0
                                    , hyperdata : ""
                                    }
 ------------------------------------------------------------------------------
-toRows :: AnnuaireTable -> Array (Maybe User)
+toRows :: AnnuaireTable -> Array (Maybe Contact)
 toRows (AnnuaireTable a) = a.annuaireTable
 
 layoutAnnuaire :: Spec State {} Action
@@ -130,14 +131,14 @@ layoutAnnuaire = simpleSpec performAction render
                           individuals = maybe (toRows defaultAnnuaireTable) toRows state.stable
 
 
-showRow :: Maybe User -> ReactElement
+showRow :: Maybe Contact -> ReactElement
 showRow Nothing = tr [][]
-showRow (Just (User { id : id, hyperdata : (HyperData user) })) =
+showRow (Just (Contact { id : id, hyperdata : (HyperData contact) })) =
   tr []
-  [ td [] [ a [ href (toUrl Front NodeUser id) ] [ text $ maybe' user.nom <> " " <> maybe' user.prenom ] ]
-  , td [] [text $ maybe' user.fonction]
-  , td [] [text $ maybe' user.service]
-  , td [] [text $ maybe' user.groupe]
+  [ 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]
   ]
     where
       maybe' = maybe "" identity
@@ -173,7 +174,7 @@ instance decodeAnnuaireInfo :: DecodeJson AnnuaireInfo where
                         }
 
 
-newtype AnnuaireTable  = AnnuaireTable  { annuaireTable :: Array (Maybe User)}
+newtype AnnuaireTable  = AnnuaireTable  { annuaireTable :: Array (Maybe Contact)}
 instance decodeAnnuaireTable :: DecodeJson AnnuaireTable where
   decodeJson json = do
     rows <- decodeJson json

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

+module Gargantext.Pages.Annuaire.User.Contacts
+       (module Gargantext.Pages.Annuaire.User.Contacts.Types,
+        module Gargantext.Pages.Annuaire.User.Contacts.Specs)
+       where
+
+import Gargantext.Pages.Annuaire.User.Contacts.Types
+import Gargantext.Pages.Annuaire.User.Contacts.Specs

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

-module Gargantext.Pages.Annuaire.User.Users.API where
+module Gargantext.Pages.Annuaire.User.Contacts.API where
 
 import Control.Monad.Trans.Class (lift)
 import Data.Either (Either(..))
@@ -11,14 +11,15 @@ import Thermite (StateCoTransformer, modifyState)
 
 import Gargantext.Config (toUrl, NodeType(..), End(..))
 import Gargantext.Config.REST (get)
-import Gargantext.Pages.Annuaire.User.Users.Types (Action(..), State, User, _user)
 import Gargantext.Prelude
+import Gargantext.Pages.Annuaire.User.Contacts.Types (Action(..), State, Contact, _contact)
+import Thermite (PerformAction, modifyState)
 
-getUser :: Int -> Aff User
-getUser id = get $ toUrl Back Node id
+getContact :: Int -> Aff Contact
+getContact id = get $ toUrl Back Node id
 
-fetchUser :: Int -> StateCoTransformer State Unit
-fetchUser userId = do
-  user <- lift $ getUser userId
-  void $ modifyState $ _user ?~ user
-  logs "Fetching user..."
+fetchContact :: Int -> StateCoTransformer State Unit
+fetchContact contactId = do
+  contact <- lift $ getContact contactId
+  void $ modifyState $ _contact ?~ contact
+  logs "Fetching contact..."

src/Gargantext/Pages/Annuaire/User/Users/Specs.purs → src/Gargantext/Pages/Annuaire/User/Contacts/Specs.purs

-module Gargantext.Pages.Annuaire.User.Users.Specs
-       (module Gargantext.Pages.Annuaire.User.Users.Specs.Renders,
+module Gargantext.Pages.Annuaire.User.Contacts.Specs
+       (module Gargantext.Pages.Annuaire.User.Contacts.Specs.Renders,
         brevetSpec,
         projectSpec,
         facets,
@@ -13,16 +13,16 @@ import Thermite (Render, PerformAction, Spec, focus, noState, defaultPerformActi
 import Gargantext.Prelude
 import Gargantext.Components.Tab as Tab
 import Gargantext.Pages.Annuaire.User.Brevets as B
-import Gargantext.Pages.Annuaire.User.Users.Specs.Documents as P
-import Gargantext.Pages.Annuaire.User.Users.Types (Action(..), State, _tablens, _tabAction)
-import Gargantext.Pages.Annuaire.User.Users.API (fetchUser)
-import Gargantext.Pages.Annuaire.User.Users.Specs.Renders (render)
+import Gargantext.Pages.Annuaire.User.Contacts.Specs.Documents as P
+import Gargantext.Pages.Annuaire.User.Contacts.Types (Action(..), State, _tablens, _tabAction)
+import Gargantext.Pages.Annuaire.User.Contacts.API (fetchContact)
+import Gargantext.Pages.Annuaire.User.Contacts.Specs.Renders (render)
 
 layoutUser :: Spec State {} Action
 layoutUser = simpleSpec performAction render
   where
     performAction :: PerformAction State {} Action
-    performAction (FetchUser userId) _ _ = fetchUser userId
+    performAction (FetchContact contactId) _ _ = fetchContact contactId
     performAction (TabA _) _ _ = pure unit
 
 brevetSpec :: Spec State {} Action

src/Gargantext/Pages/Annuaire/User/Users/Specs/Documents.purs → src/Gargantext/Pages/Annuaire/User/Contacts/Specs/Documents.purs

-module Gargantext.Pages.Annuaire.User.Users.Specs.Documents where
+module Gargantext.Pages.Annuaire.User.Contacts.Specs.Documents where
 
 import Prelude
 import React.DOM (table, tbody, td, text, th, thead, tr)

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

-module Gargantext.Pages.Annuaire.User.Users.Specs.Renders
+module Gargantext.Pages.Annuaire.User.Contacts.Specs.Renders
        where
 
-import Gargantext.Pages.Annuaire.User.Users.Types
+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.Tuple (Tuple(..))
-import Prelude (($), (<<<))
+import Data.Tuple (Tuple(..), uncurry)
+import Prelude (($), (<<<), (<$>), flip, class Ord)
 import React (ReactElement)
 import React.DOM (div, h3, img, li, span, text, ul)
 import React.DOM.Props (_id, className, src)
@@ -16,53 +20,57 @@ render :: Render State {} Action
 render dispatch _ state _ =
   [
           div [className "col-md-12"]
-          $ case state.user of
-            (Just (User user)) -> display user.name [userInfos user.hyperdata]
-            Nothing -> display "User not found" []
+          $ case state.contact of
+            (Just (Contact contact)) -> display contact.name [contactInfos contact.hyperdata]
+            Nothing -> display "Contact not found" []
   ]
 
 display :: String -> Array ReactElement -> Array ReactElement
 display title elems =
   [ div [className "container-fluid"]
-    [ div [className "row", _id "user-page-header"]
+    [ div [className "row", _id "contact-page-header"]
           [ div [className "col-md-6"] [ h3 [] [text title] ]
           , div [className "col-md-8"] []
           , div [className "col-md-2"] [ span [] [text ""] ]
           ]
-    , div [className "row", _id "user-page-info"]
+    , div [className "row", _id "contact-page-info"]
           [ div [className "col-md-12"]
             [ div [className "row"]
               [ div [className "col-md-2"]
                     [ img [src "/images/Gargantextuel-212x300.jpg"] ]
               , div [className "col-md-1"] []
-              , div [className "col-md-8"] elems
+              , div [className "col-mdData.Unfoldable-8"] elems
               ]
             ]
           ]
      ]
   ]
 
-userInfos :: HyperData -> ReactElement
-userInfos (HyperData user) =
-    ul [className "list-group"]
-    [
-      listElement <<< infoRender <<< Tuple "Fonction: "        $ checkMaybe user.fonction
-    , listElement <<< infoRender <<< Tuple "Entité, service: " $ checkMaybe user.entite
-    , listElement <<< infoRender <<< Tuple "Téléphone: "       $ checkMaybe user.atel
-    , listElement <<< infoRender <<< Tuple "Courriel: "        $ checkMaybe user.mail
-    , listElement <<< infoRender <<< Tuple "Bureau: "          $ checkMaybe user.bureau
-    , listElement <<< infoRender <<< Tuple "Appelation: "      $ checkMaybe user.fonction
-    , listElement <<< infoRender $   Tuple "Lieu: "            $ checkMaybe user.lieu
-    ]
+mapMyMap :: forall k v x f. Ord k => Unfoldable f => (k -> v -> x) -> Map k v -> f x
+mapMyMap f m = toUnfoldable
+               $ zipWith f mapKeys
+               (catMaybes $ flip lookup m <$> mapKeys)
+  where mapKeys = S.toUnfoldable $ keys m
+
+infixl 4 mapMyMap as <.~$>
+
+contactInfos :: HyperData -> ReactElement
+contactInfos hyperdata =
+    ul [className "list-group"] [] {- $
+    listInfo <.~$> hyperdata
   where
-    checkMaybe (Nothing) = ""
-    checkMaybe (Just a) = a
+    checkMaybe (Nothing) = empty
+    checkMaybe (Just (HyperData a)) = a
+-}
 
-    listElement :: Array ReactElement -> ReactElement
-    listElement = li [className "list-group-item justify-content-between"]
+listInfo :: Tuple String String -> ReactElement
+listInfo s = listElement $ infoRender s
 
-    infoRender :: Tuple String String -> Array ReactElement
-    infoRender (Tuple title content) =
-      [ span [] [text title]
-      , span [className "badge badge-default badge-pill"] [text content]
-      ]
+listElement :: Array ReactElement -> ReactElement
+listElement = li [className "list-group-item justify-content-between"]
+
+infoRender :: Tuple String String -> Array ReactElement
+infoRender (Tuple title content) =
+  [ span [] [text title]
+  , span [className "badge badge-default badge-pill"] [text content]
+  ]

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

-module Gargantext.Pages.Annuaire.User.Users.Types where
+module Gargantext.Pages.Annuaire.User.Contacts.Types where
 
 import Prelude
 
@@ -10,15 +10,15 @@ import Data.Maybe (Maybe(..))
 import Gargantext.Components.Tab as Tab
 import Gargantext.Utils.DecodeMaybe ((.?|))
 
-newtype User =
-  User { id        :: Int
-       , typename  :: Maybe Int
-       , userId    :: Int
-       , parentId  :: Int
-       , name      :: String
-       , date      :: Maybe String
-       , hyperdata :: HyperData
-       }
+newtype Contact = Contact
+  { id        :: Int
+  , typename  :: Maybe Int
+  , userId    :: Int
+  , parentId  :: Int
+  , name      :: String
+  , date      :: Maybe String
+  , hyperdata :: HyperData
+  }
 
 newtype HyperData =
   HyperData
@@ -79,7 +79,7 @@ instance decodeUserHyperData :: DecodeJson HyperData where
                      , entite2, mail
                      }
 
-instance decodeUser :: DecodeJson User where
+instance decodeUser :: DecodeJson Contact where
   decodeJson json = do
     obj      <- decodeJson json
     id       <- obj .? "id"
@@ -89,28 +89,28 @@ instance decodeUser :: DecodeJson User where
     name     <- obj .? "name"
     date     <- obj .?| "date"
     hyperdata <- obj .? "hyperdata"
-    pure $ User { id, typename, userId
-                , parentId, name, date
-                , hyperdata
-                }
+    pure $ Contact { id, typename, userId
+                   , parentId, name, date
+                   , hyperdata
+                   }
 
 data Action
   = TabA Tab.Action
-  | FetchUser Int
+  | FetchContact Int
 
 type State =
   { activeTab :: Int
-  , user :: Maybe User
+  , contact :: Maybe Contact
   }
 
 initialState :: State
 initialState =
   { activeTab : 0
-  , user: Nothing
+  , contact: Nothing
   }
 
-_user :: Lens' State (Maybe User)
-_user = lens (\s -> s.user) (\s ss -> s{user = ss})
+_contact :: Lens' State (Maybe Contact)
+_contact = lens (\s -> s.contact) (\s ss -> s{contact = ss})
 
 _tablens :: Lens' State Tab.State
 _tablens = lens (\s -> s.activeTab) (\s ss -> s {activeTab = ss})

src/Gargantext/Pages/Annuaire/User/Users.purs

-module Gargantext.Pages.Annuaire.User.Users
-       (module Gargantext.Pages.Annuaire.User.Users.Types,
-        module Gargantext.Pages.Annuaire.User.Users.Specs)
-       where
-
-import Gargantext.Pages.Annuaire.User.Users.Types
-import Gargantext.Pages.Annuaire.User.Users.Specs

src/Gargantext/Pages/Layout.purs

@@ -10,7 +10,7 @@ import Gargantext.Pages.Corpus.Document       as Document
 import Gargantext.Pages.Corpus.Graph          as GE
 -- import Gargantext.Pages.Corpus.Tabs.Terms.NgramsTable as NG
 
-import Gargantext.Pages.Annuaire.User.Users as U
+import Gargantext.Pages.Annuaire.User.Contacts as C
 import Gargantext.Pages.Annuaire   as Annuaire
 -- import Gargantext.Pages.Home as L
 -- import Gargantext.Pages.Layout.Specs.Search as S
@@ -44,7 +44,7 @@ dispatchAction dispatcher _ SearchView = do
 dispatchAction dispatcher _ (UserPage id) = do
   dispatcher $ SetRoute $ UserPage id
   -- dispatcher $ UserPageA TODO
-  dispatcher $ UserPageA $ U.FetchUser id
+  dispatcher $ UserPageA $ C.FetchContact id
 
 dispatchAction dispatcher _ (Annuaire id) = do
   dispatcher $ SetRoute       $ Annuaire id

src/Gargantext/Pages/Layout/Actions.purs

@@ -12,7 +12,7 @@ import Gargantext.Components.Login                  as LN
 import Gargantext.Components.Modals.Modal              (modalShow)
 import Gargantext.Components.Tree                   as Tree
 import Gargantext.Pages.Annuaire             as Annuaire
-import Gargantext.Pages.Annuaire.User.Users           as U
+import Gargantext.Pages.Annuaire.User.Contacts      as C
 import Gargantext.Pages.Corpus.Document       as D
 import Gargantext.Pages.Corpus.Graph     as GE
 import Gargantext.Pages.Layout.Specs.AddCorpus      as AC
@@ -34,7 +34,7 @@ data Action
     | GraphExplorerA     GE.Action
     | DocumentViewA D.Action
   | AnnuaireAction     Annuaire.Action
-    | UserPageA  U.Action
+    | UserPageA  C.Action
   | Go
   | ShowLogin
   | ShowAddcorpus
@@ -101,7 +101,7 @@ _searchAction = prism SearchA \action ->
     SearchA caction -> Right caction
     _-> Left action
 
-_userPageAction :: Prism' Action U.Action
+_userPageAction :: Prism' Action C.Action
 _userPageAction = prism UserPageA \action ->
   case action of
     UserPageA caction -> Right caction

src/Gargantext/Pages/Layout/Specs.purs

@@ -16,7 +16,7 @@ import Gargantext.Components.Login as LN
 import Gargantext.Components.Tree  as Tree
 import Gargantext.Folder           as F
 import Gargantext.Pages.Annuaire   as A
-import Gargantext.Pages.Annuaire.User.Users as U
+import Gargantext.Pages.Annuaire.User.Contacts as C
 import Gargantext.Pages.Corpus     as Corpus
 import Gargantext.Pages.Corpus.Document as Annotation
 import Gargantext.Pages.Corpus.Dashboard as Dsh
@@ -63,7 +63,7 @@ pagesComponent s = case s.currentRoute of
     selectSpec Dashboard         = layout0 $ noState Dsh.layoutDashboard
     
     selectSpec (Annuaire i)      = layout0 $ focus _annuaireState _annuaireAction A.layoutAnnuaire
-    selectSpec (UserPage i)      = layout0 $ focus _userPageState  _userPageAction  U.layoutUser
+    selectSpec (UserPage i)      = layout0 $ focus _userPageState  _userPageAction  C.layoutUser
     -- To be removed
     selectSpec NGramsTable       = layout0 $ noState NG.ngramsTableSpec
 

src/Gargantext/Pages/Layout/States.purs

@@ -11,7 +11,7 @@ import Gargantext.Pages.Corpus.Document       as D
 import Gargantext.Pages.Annuaire                    as Annuaire
 import Gargantext.Pages.Corpus.Tabs.Documents as DV
 import Gargantext.Pages.Corpus.Graph     as GE
-import Gargantext.Pages.Annuaire.User.Users         as U
+import Gargantext.Pages.Annuaire.User.Contacts      as C
 import Gargantext.Pages.Layout.Specs.AddCorpus      as AC
 import Gargantext.Pages.Layout.Specs.Search         as S
 import Gargantext.Router                               (Routes(..))
@@ -22,8 +22,8 @@ type AppState =
   , addCorpusState :: AC.State
   , docViewState   :: DV.State
   , searchState    :: S.State
-  , userPageState  :: U.State
-  , documentState :: D.State
+  , userPageState  :: C.State
+  , documentState  :: D.State
   , annuaireState  :: Annuaire.State
   , ntreeState     :: Tree.State
   , search         :: String
@@ -40,8 +40,8 @@ initAppState =
   , addCorpusState : AC.initialState
   , docViewState   : DV.initialState
   , searchState    : S.initialState
-  , userPageState  : U.initialState
-  , documentState : D.initialState
+  , userPageState  : C.initialState
+  , documentState  : D.initialState
   , ntreeState     : Tree.exampleTree
   , annuaireState  : Annuaire.initialState
   , search         : ""
@@ -64,7 +64,7 @@ _docViewState = lens (\s -> s.docViewState) (\s ss -> s{docViewState = ss})
 _searchState :: Lens' AppState S.State
 _searchState = lens (\s -> s.searchState) (\s ss -> s{searchState = ss})
 
-_userPageState :: Lens' AppState U.State
+_userPageState :: Lens' AppState C.State
 _userPageState = lens (\s -> s.userPageState) (\s ss -> s{userPageState = ss})
 
 _annuaireState :: Lens' AppState Annuaire.State