Merge branch 'dev-graph-sidebar-styling-fixes' of...

Merge branch 'dev-graph-sidebar-styling-fixes' of ssh://gitlab.iscpif.fr:20022/gargantext/purescript-gargantext into dev-merge

src/Gargantext/Components/Graph.purs

@@ -255,7 +255,7 @@ sigmaSettings =
   --, labelSize : "proportional" -- alt : proportional, fixed
   , labelSize: "fixed"
   , labelSizeRatio: 2.0               -- label size in ratio of node size
-  , labelThreshold: 7.0               -- min node cam size to start showing label
+  , labelThreshold: 6.0               -- min node cam size to start showing label
   , maxEdgeSize: 1.0
   , maxNodeSize: 8.0
   , minEdgeSize: 0.5              -- in fact used in tina as edge size

src/Gargantext/Components/GraphExplorer/Sidebar.purs

@@ -133,36 +133,46 @@ sideTab _ _  = H.div {} []
 -------------------------------------------
 -- TODO
 -- selectedNodes :: Record Props -> Map.Map String Nodes -> R.Element
-selectedNodes props nodesMap = R2.row [ R2.col 12
-                  [ RH.ul { id: "myTab", className: "nav nav-tabs", role: "tablist"}
+selectedNodes props nodesMap =
+  R2.row [ R2.col 12
+          [ RH.ul { className: "nav nav-tabs d-flex justify-content-center"
+                  , id: "myTab"
+                  , role: "tablist" }
             [ RH.div { className: "tab-content" }
-                      [ RH.div { className: "", role: "tabpanel" }
+              [ RH.div { className: "d-flex flex-wrap justify-content-center"
+                       , role: "tabpanel" }
                        ( Seq.toUnfoldable
                        $ ( Seq.map (badge              props.selectedNodeIds)
                                    (badges props.graph props.selectedNodeIds)
                          )
                        )
+              , H.br {}
               ]
-                    , RH.div { className: "tab-content flex-space-between" }
-                             [ removeButton "Move as candidate" CandidateTerm props nodesMap
-                             , removeButton "Move as stop"      StopTerm      props nodesMap
             ]
+            , RH.div { className: "tab-content flex-space-between" }
+                     [ removeButton "primary" "Move as candidate" CandidateTerm props nodesMap
+                     , H.br {}
+                     , removeButton "danger"  "Move as stop"      StopTerm      props nodesMap
                      ]
            ]
        ]
 neighborhood props = RH.div { className: "tab-content", id: "myTabContent" }
-                            [ RH.div { className: "", id: "home", role: "tabpanel" }
+                            [ RH.div { -- className: "flex-space-around d-flex justify-content-center"
+                                       className: "d-flex flex-wrap flex-space-around"
+                                     , id: "home"
+                                     , role: "tabpanel"
+                                     }
                               (Seq.toUnfoldable $ Seq.map (badge props.selectedNodeIds)
                                                 $ neighbourBadges props.graph props.selectedNodeIds
                                )
                             ]
 
 
-removeButton text rType props' nodesMap' =
+removeButton btnType text rType props' nodesMap' =
   if Set.isEmpty $ fst props'.selectedNodeIds then
     RH.div {} []
   else
-    RH.button { className: "btn btn-info"
+    RH.button { className: "btn btn-sm btn-" <> btnType
               , on: { click: onClickRemove rType props' nodesMap' }
               }
               [ RH.text text ]
@@ -332,6 +342,3 @@ Global/local view:
     To explore the neighborhood of a selection click on the 'change level' button.
 -}
 
-
-
-

src/Gargantext/Components/Nodes/Annuaire.purs

@@ -213,7 +213,7 @@ contactCellsCpt = R.hooksComponentWithModule thisModule "contactCells" cpt
 
         pure $ T.makeRow [
           H.text ""
-          , H.text $ fromMaybe "First Name" firstName
+          , H.a { target: "_blank", href: contactUrl annuaireId id} [H.text $ fromMaybe "First Name" firstName]
           , H.text $ fromMaybe "First Name" lastName
           -- , H.a { href } [ H.text $ fromMaybe "name" contact.title ]
             --, H.a { href, target: "blank" } [ H.text $ fromMaybe "name" contact.title ]
@@ -226,6 +226,7 @@ contactCellsCpt = R.hooksComponentWithModule thisModule "contactCells" cpt
             --nodepath = NodePath (sessionId session) NodeContact (Just id)
             nodepath = Routes.ContactPage (sessionId session) annuaireId id
             href = url frontends nodepath
+            contactUrl aId id = url frontends $ Routes.ContactPage (sessionId session) annuaireId id
 
             contactWhereOrg (CT.ContactWhere { organization: [] }) = "No Organization"
             contactWhereOrg (CT.ContactWhere { organization: orga }) =

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

@@ -150,8 +150,8 @@ contactInfoItemCpt = R.hooksComponentWithModule thisModule "contactInfoItem" cpt
 listElement :: Array R.Element -> R.Element
 listElement = H.li { className: "list-group-item justify-content-between" }
 
-type LayoutProps = (
-    appReload     :: GUR.ReloadS
+type LayoutProps =
+  ( appReload     :: GUR.ReloadS
   , asyncTasksRef :: R.Ref (Maybe GAT.Reductor)
   , frontends     :: Frontends
   , nodeId        :: Int
@@ -219,7 +219,7 @@ userLayoutWithKeyCpt = R.hooksComponentWithModule thisModule "userLayoutWithKey"
             _ <- saveContactHyperdata session nodeId hd
             liftEffect $ GUR.bump reload
 
--- | toUrl to get data
+-- | toUrl to get data XXX
 getContact :: Session -> Int -> Aff ContactData
 getContact session id = do
   contactNode <- get session $ Routes.NodeAPI Node (Just id) ""
@@ -240,9 +240,8 @@ saveContactHyperdata session id h = do
   put session (Routes.NodeAPI Node (Just id) "") h
 
 
-type AnnuaireLayoutProps = (
-    annuaireId :: Int
-  | LayoutProps )
+type AnnuaireLayoutProps = ( annuaireId :: Int | LayoutProps )
+type AnnuaireKeyLayoutProps = ( key :: String | AnnuaireLayoutProps )
 
 
 annuaireUserLayout :: Record AnnuaireLayoutProps -> R.Element
@@ -251,6 +250,21 @@ annuaireUserLayout props = R.createElement annuaireUserLayoutCpt props []
 annuaireUserLayoutCpt :: R.Component AnnuaireLayoutProps
 annuaireUserLayoutCpt = R.hooksComponentWithModule thisModule "annuaireUserLayout" cpt
   where
+    cpt { annuaireId, appReload, asyncTasksRef, frontends, nodeId, session, treeReloadRef } _ = do
+      let sid = sessionId session
+
+      pure $ annuaireUserLayoutWithKey { annuaireId,
+          appReload
+        , asyncTasksRef
+        , frontends
+        , key: show sid <> "-" <> show nodeId
+        , nodeId
+        , session
+        , treeReloadRef
+        }
+
+
+{-
     cpt { annuaireId, appReload, asyncTasksRef, frontends, nodeId, session, treeReloadRef } _ = do
       cacheState <- R.useState' LT.CacheOn
 
@@ -260,8 +274,7 @@ annuaireUserLayoutCpt = R.hooksComponentWithModule thisModule "annuaireUserLayou
         \contactData@{contactNode: Contact {name, hyperdata}} ->
           H.ul { className: "col-md-12 list-group" } [
             display { title: fromMaybe "no name" name } (contactInfos hyperdata onUpdateHyperdata)
-          , Tabs.tabs {
-                 appReload
+          , Tabs.tabs { appReload
                       , asyncTasksRef
                       , cacheState
                       , contactData
@@ -276,10 +289,51 @@ annuaireUserLayoutCpt = R.hooksComponentWithModule thisModule "annuaireUserLayou
       where
         onUpdateHyperdata :: HyperdataUser -> Effect Unit
         onUpdateHyperdata _ = pure unit
+        -}
+
+annuaireUserLayoutWithKey :: Record AnnuaireKeyLayoutProps -> R.Element
+annuaireUserLayoutWithKey props = R.createElement annuaireUserLayoutWithKeyCpt props []
+
+annuaireUserLayoutWithKeyCpt :: R.Component AnnuaireKeyLayoutProps
+annuaireUserLayoutWithKeyCpt = R.hooksComponentWithModule thisModule "annuaireUserLayoutWithKey" cpt
+  where
+    cpt { annuaireId, appReload, asyncTasksRef, frontends, nodeId, session, treeReloadRef } _ = do
+      reload <- GUR.new
+
+      cacheState <- R.useState' LT.CacheOn
+
+      sidePanelTriggers <- LT.emptySidePanelTriggers
+
+      useLoader nodeId (getAnnuaireContact session annuaireId) $
+        \contactData@{contactNode: Contact {name, hyperdata}} ->
+          H.ul { className: "col-md-12 list-group" } [
+            display { title: fromMaybe "no name" name } (contactInfos hyperdata (onUpdateHyperdata reload))
+          , Tabs.tabs {
+                 appReload
+               , asyncTasksRef
+               , cacheState
+               , contactData
+               , frontends
+               , nodeId
+               , session
+               , sidePanelTriggers
+               , treeReloadRef
+               }
+          ]
+      where
+        onUpdateHyperdata :: GUR.ReloadS -> HyperdataUser -> Effect Unit
+        onUpdateHyperdata reload hd = do
+          launchAff_ $ do
+            _ <- saveContactHyperdata session nodeId hd
+            liftEffect $ GUR.bump reload
+
+
+
+
 
 getAnnuaireContact :: Session -> Int -> Int -> Aff ContactData
 getAnnuaireContact session annuaireId id = do
-  contactNode <- get session $ Routes.NodeAPI Annuaire (Just annuaireId) $ "contact/" <> (show id)
+  contactNode <- get session $ Routes.NodeAPI Annuaire (Just annuaireId) $ 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

src/Gargantext/Components/Nodes/Lists.purs

@@ -122,7 +122,7 @@ listsLayoutWithKey props = R.createElement listsLayoutWithKeyCpt props []
         , treeReloadRef } _ = do
       let path = { nodeId, session }
 
-      cacheState <- R.useState' $ getCacheState CacheOff session nodeId
+      cacheState <- R.useState' $ getCacheState CacheOn session nodeId
 
       useLoader path loadCorpusWithChild $
         \corpusData@{ corpusId, corpusNode: NodePoly poly, defaultListId } ->

src/Gargantext/Components/Search.purs

@@ -58,8 +58,7 @@ instance encodeJsonSearchResult :: Argonaut.EncodeJson SearchResult where
 
 
 ------------------------------------------------------------------------
-data SearchResultTypes = 
-                        SearchResultDoc     { docs     :: Array Document}
+data SearchResultTypes = SearchResultDoc     { docs     :: Array Document}
                        | SearchNoResult      { message  :: String        }
                        | SearchResultContact { contacts :: Array Contact }
 
@@ -132,6 +131,7 @@ data Contact =
            , c_created    :: String
            , c_hyperdata  :: HyperdataRowContact
            , c_score      :: Int
+           , c_annuaireId :: Int
            }
 
 derive instance eqContact :: Eq Contact

src/Gargantext/Components/Tab.purs

@@ -29,17 +29,23 @@ tabsCpt = R.hooksComponentWithModule thisModule "tabs" cpt
       pure $
         H.div {}
         [ H.nav {}
-          [ H.div { className: "nav nav-tabs"
-                  , title    : "Tab for ngrams"
-                  }
-            (mapWithIndex (button setActiveTab activeTab) props.tabs) ]
-        , H.div { className: "tab-content" } $ mapWithIndex (item activeTab) props.tabs ]
+        [ H.br {}
+        , H.div { className: "nav nav-tabs"
+                  , title    : "Search result"
+                  } [H.text "" ]
+              -- (mapWithIndex (button setActiveTab activeTab) props.tabs) 
+          ]
+        , H.div { className: "tab-content" }
+                $ mapWithIndex (item activeTab) props.tabs
+        ]
+    {-
     button setActiveTab selected index (name /\ _) =
       H.a { className, on: { click } } [ H.text name ]
       where
         eq = index == selected
         className = "nav-item nav-link" <> (if eq then " active" else "")
         click e = setActiveTab (const index)
+    -}
     item selected index (_ /\ cpt') = tab { selected, index } [ cpt' ]
 
 -- TODO: document what these are (selection, item indices)

src/Gargantext/Ends.purs

@@ -222,6 +222,7 @@ sessionPath (R.ChartHash { chartType, listId, tabType } i) =
     <> defaultListAddMaybe listId
 -- sessionPath (R.NodeAPI (NodeContact s a i) i) = sessionPath $ "annuaire/" <> show a <> "/contact/" <> show i
 
+
 ------- misc routing stuff
 
 defaultList :: Int -> String

src/Gargantext/Routes.purs

@@ -5,7 +5,7 @@ import Prelude
 import Data.Maybe (Maybe(..))
 
 import Gargantext.Types (ChartOpts, ChartType, CorpusMetricOpts, CTabNgramType, Id, Limit,
-                         ListId, NgramsGetOpts, NgramsGetTableAllOpts, NodeType,
+                         ListId, DocId, ContactId, NgramsGetOpts, NgramsGetTableAllOpts, NodeType,
                          Offset, OrderBy, SearchOpts, SessionId, TabSubType, TabType, TermList)
 import Gargantext.Types as GT
 
@@ -35,9 +35,6 @@ data AppRoute
 
 derive instance eqAppRoute :: Eq AppRoute
 
-type AnnuaireId = Int
-type ContactId = Int
-
 data SessionRoute
   = Tab TabType (Maybe Id)
   | Children NodeType Offset Limit (Maybe OrderBy) (Maybe Id)
@@ -53,12 +50,13 @@ data SessionRoute
   | TreeFirstLevel (Maybe Id) String
   | GraphAPI      Id String
   | ListsRoute    ListId
-  | ListDocument (Maybe ListId) (Maybe Id)
+  | ListDocument (Maybe ListId) (Maybe DocId)
   | Search        SearchOpts (Maybe Id)
   | CorpusMetrics CorpusMetricOpts  (Maybe Id)
   | CorpusMetricsHash { listId :: ListId, tabType :: TabType }  (Maybe Id)
   | Chart ChartOpts (Maybe Id)
   | ChartHash { chartType :: ChartType, listId :: Maybe ListId, tabType :: TabType } (Maybe Id)
+  -- | AnnuaireContact AnnuaireId DocId
 
 instance showAppRoute :: Show AppRoute where
   show Home                     = "Home"

src/Gargantext/Types.purs

@@ -333,8 +333,11 @@ nodeTypePath (NodePublic nt) = nodeTypePath nt
 nodeTypePath NodeFile        = "file"
 
 ------------------------------------------------------------
-
+type CorpusId   = Int
+type DocId      = Int
 type ListId     = Int
+type AnnuaireId = Int
+type ContactId  = Int
 
 data ScoreType = Occurrences