Merge branch 'dev-warnings-cleanup' into dev

dist/styles/Login.css

@@ -79,18 +79,6 @@ li#rename #rename-a {
   width: 1300px;
 }
 
-#search-popup-tooltip {
-  position: absolute;
-  left: 300px;
-  top: -300px;
-  background-color: white;
-  z-index: 1000;
-}
-#search-popup-tooltip:hover {
-  border: none;
-  text-decoration: none;
-}
-
 #create-node-tooltip {
   position: absolute;
   left: 96px;
@@ -216,6 +204,11 @@ li:hover a#rename-leaf {
   justify-content: center;
 }
 
+.flex-center {
+  display: flex;
+  justify-content: space-between;
+}
+
 a:focus, a:hover {
   cursor: pointer;
 }

dist/styles/range-slider.css

 .range {
   width: 400px;
+  /* some space for the right knob */
+  padding-right: 30px;
 }
 .range .range-slider {
   position: relative;

dist/styles/range-slider.sass

 .range
   width: 400px
+  /* some space for the right knob */
+  padding-right: 30px
 
   .range-slider
     position: relative

src/Gargantext/Components/Graph.purs

@@ -4,7 +4,9 @@ module Gargantext.Components.Graph
   -- , forceAtlas2Settings, ForceAtlas2Settings, ForceAtlas2OptionalSettings
   -- )
   where
-import Prelude (bind, const, discard, pure, ($), unit)
+import Prelude (bind, const, discard, pure, ($), unit, map)
+
+import Data.Array as A
 import Data.Either (Either(..))
 import Data.Maybe (Maybe(..))
 import Data.Nullable (Nullable)
@@ -22,20 +24,18 @@ import Gargantext.Hooks.Sigmax.Sigma as Sigma
 
 type OnProps  = ()
 
-type Graph = SigmaxTypes.Graph SigmaxTypes.Node SigmaxTypes.Edge
-
 data Stage = Init | Ready | Cleanup
 
 type Props sigma forceatlas2 =
   ( elRef :: R.Ref (Nullable Element)
   , forceAtlas2Settings :: forceatlas2
-  , graph :: Graph
-  , selectedEdgeIds :: R.State SigmaxTypes.SelectedEdgeIds
+  , graph :: SigmaxTypes.SGraph
+  , multiSelectEnabledRef :: R.Ref Boolean
   , selectedNodeIds :: R.State SigmaxTypes.SelectedNodeIds
   , sigmaRef :: R.Ref Sigmax.Sigma
   , sigmaSettings :: sigma
   , stage :: R.State Stage
-  , transformedGraph :: Graph
+  , transformedGraph :: SigmaxTypes.SGraph
   )
 
 graph :: forall s fa2. Record (Props s fa2) -> R.Element
@@ -54,9 +54,8 @@ graphCpt = R.hooksComponent "Graph" cpt
         Nothing -> RH.div {} []
         Just el -> R.createPortal [] el
 
-    stageHooks props@{stage: (Init /\ setStage)} = do
+    stageHooks props@{multiSelectEnabledRef, selectedNodeIds, sigmaRef, stage: (Init /\ setStage)} = do
       R.useEffectOnce $ do
-        log "[graphCpt] effect once"
         let rSigma = R.readRef props.sigmaRef
 
         case Sigmax.readSigma rSigma of
@@ -67,7 +66,7 @@ graphCpt = R.hooksComponent "Graph" cpt
               Right sig -> do
                 Sigmax.writeSigma rSigma $ Just sig
 
-                Sigmax.dependOnContainer props.elRef "[graphCpt] container not found" $ \c -> do
+                Sigmax.dependOnContainer props.elRef "[graphCpt (Ready)] container not found" $ \c -> do
                   _ <- Sigma.addRenderer sig {
                       "type": "canvas"
                     , container: c
@@ -76,28 +75,28 @@ graphCpt = R.hooksComponent "Graph" cpt
 
                 Sigmax.refreshData sig $ Sigmax.sigmafy props.graph
 
+                Sigmax.dependOnSigma (R.readRef sigmaRef) "[graphCpt (Ready)] no sigma" $ \sigma -> do
+                  -- bind the click event only initially, when ref was empty
+                  Sigmax.bindSelectedNodesClick sigma selectedNodeIds multiSelectEnabledRef
+
                 Sigmax.setEdges sig false
                 Sigma.startForceAtlas2 sig props.forceAtlas2Settings
-
-                -- bind the click event only initially, when ref was empty
-                Sigmax.bindSelectedNodesClick props.sigmaRef props.selectedNodeIds
-                Sigmax.bindSelectedEdgesClick props.sigmaRef props.selectedEdgeIds
           Just sig -> do
             pure unit
 
-        setStage $ const $ Ready
+        setStage $ const Ready
 
         delay unit $ \_ -> do
           log "[graphCpt] cleanup"
           pure $ pure unit
 
-    stageHooks props@{stage: (Ready /\ setStage)} = do
-      let tEdgesMap = SigmaxTypes.edgesGraphMap props.transformedGraph
-      let tNodesMap = SigmaxTypes.nodesGraphMap props.transformedGraph
+    stageHooks props@{sigmaRef, stage: (Ready /\ setStage), transformedGraph} = do
+      let tEdgesMap = SigmaxTypes.edgesGraphMap transformedGraph
+      let tNodesMap = SigmaxTypes.nodesGraphMap transformedGraph
 
       -- TODO Probably this can be optimized to re-mark selected nodes only when they changed
       R.useEffect' $ do
-        Sigmax.dependOnSigma (R.readRef props.sigmaRef) "[graphCpt] no sigma" $ \sigma -> do
+        Sigmax.dependOnSigma (R.readRef sigmaRef) "[graphCpt (Ready)] no sigma" $ \sigma -> do
           Sigmax.updateEdges sigma tEdgesMap
           Sigmax.updateNodes sigma tNodesMap
 

src/Gargantext/Components/GraphExplorer/Controls.purs

@@ -7,10 +7,11 @@ module Gargantext.Components.GraphExplorer.Controls
  , getShowTree, setShowTree
  , getShowControls, setShowControls
  , getCursorSize, setCursorSize
- , getMultiNodeSelect, setMultiNodeSelect
  ) where
 
-import Data.Maybe (Maybe(..))
+import Data.Array as A
+import Data.Maybe (Maybe(..), maybe)
+import Data.Sequence as Seq
 import Data.Set as Set
 import Data.Tuple (fst, snd)
 import Data.Tuple.Nested ((/\), get1)
@@ -22,9 +23,10 @@ import Reactix.DOM.HTML as RH
 
 import Gargantext.Components.Graph as Graph
 import Gargantext.Components.GraphExplorer.Button (centerButton)
-import Gargantext.Components.GraphExplorer.RangeControl (edgeSizeControl, nodeSizeControl)
+import Gargantext.Components.GraphExplorer.RangeControl (edgeConfluenceControl, edgeWeightControl, nodeSizeControl)
+import Gargantext.Components.GraphExplorer.Search (nodeSearchControl)
 import Gargantext.Components.GraphExplorer.SlideButton (cursorSizeButton, labelSizeButton)
-import Gargantext.Components.GraphExplorer.ToggleButton (edgesToggleButton, pauseForceAtlasButton)
+import Gargantext.Components.GraphExplorer.ToggleButton (multiSelectEnabledButton, edgesToggleButton, pauseForceAtlasButton)
 import Gargantext.Components.GraphExplorer.Types as GET
 import Gargantext.Hooks.Sigmax as Sigmax
 import Gargantext.Hooks.Sigmax.Types as SigmaxTypes
@@ -33,11 +35,13 @@ import Gargantext.Utils.Reactix as R2
 
 type Controls =
   ( cursorSize      :: R.State Number
+  , edgeConfluence :: R.State Range.NumberRange
+  , edgeWeight :: R.State Range.NumberRange
+  , graph           :: SigmaxTypes.SGraph
   , graphStage      :: R.State Graph.Stage
-  , multiNodeSelect :: R.Ref Boolean
+  , multiSelectEnabled :: R.State Boolean
   , nodeSize        :: R.State Range.NumberRange
-  , selectedEdgeIds :: R.State (Set.Set String)
-  , selectedNodeIds :: R.State (Set.Set String)
+  , selectedNodeIds :: R.State SigmaxTypes.SelectedNodeIds
   , showControls    :: R.State Boolean
   , showSidePanel   :: R.State GET.SidePanelState
   , showTree        :: R.State Boolean
@@ -48,23 +52,21 @@ controlsToSigmaSettings :: Record Controls -> Record Graph.SigmaSettings
 controlsToSigmaSettings { cursorSize: (cursorSize /\ _)} = Graph.sigmaSettings
 
 type LocalControls =
-  ( edgeSize :: R.State Range.NumberRange
-  , labelSize :: R.State Number
+  ( labelSize :: R.State Number
   , pauseForceAtlas :: R.State Boolean
   , showEdges :: R.State Boolean
   )
 
 initialLocalControls :: R.Hooks (Record LocalControls)
 initialLocalControls = do
-  edgeSize <- R.useState' $ Range.Closed { min: 0.5, max: 1.0 }
   labelSize <- R.useState' 14.0
   --nodeSize <- R.useState' $ Range.Closed { min: 0.0, max: 10.0 }
   pauseForceAtlas <- R.useState' true
+  search <- R.useState' ""
   showEdges <- R.useState' true
 
   pure $ {
-    edgeSize
-  , labelSize
+    labelSize
   --, nodeSize
   , pauseForceAtlas
   , showEdges
@@ -107,6 +109,11 @@ controlsCpt = R.hooksComponent "GraphControls" cpt
         R.setRef mFAPauseRef $ Just timeoutId
         pure unit
 
+      let nodesSorted = A.sortWith (_.size) $ Seq.toUnfoldable $ SigmaxTypes.graphNodes props.graph
+      let nodeSizeMin = maybe 0.0 _.size $ A.head nodesSorted
+      let nodeSizeMax = maybe 100.0 _.size $ A.last nodesSorted
+      let nodeSizeRange = Range.Closed { min: nodeSizeMin, max: nodeSizeMax }
+
       pure $ case getShowControls props of
         false -> RH.div {} []
         true -> RH.div { className: "col-md-12", style: { paddingBottom: "10px" } }
@@ -116,7 +123,8 @@ controlsCpt = R.hooksComponent "GraphControls" cpt
                   RH.li {} [ centerButton props.sigmaRef ]
                 , RH.li {} [ pauseForceAtlasButton props.sigmaRef localControls.pauseForceAtlas ] -- spatialization (pause ForceAtlas2)
                 , RH.li {} [ edgesToggleButton props.sigmaRef localControls.showEdges ]
-                , RH.li {} [ edgeSizeControl props.sigmaRef localControls.edgeSize ] -- edge size : 0-3
+                , RH.li {} [ edgeConfluenceControl props.sigmaRef props.edgeConfluence ]
+                , RH.li {} [ edgeWeightControl props.sigmaRef props.edgeWeight ]
                   -- change level
                   -- file upload
                   -- run demo
@@ -124,33 +132,40 @@ controlsCpt = R.hooksComponent "GraphControls" cpt
                   -- search topics
                 , RH.li {} [ cursorSizeButton props.cursorSize ] -- cursor size: 0-100
                 , RH.li {} [ labelSizeButton props.sigmaRef localControls.labelSize ] -- labels size: 1-4
-                , RH.li {} [ nodeSizeControl props.nodeSize ]
+                , RH.li {} [ nodeSizeControl nodeSizeRange props.nodeSize ]
                   -- zoom: 0 -100 - calculate ratio
-                  -- toggle multi node selection
+                , RH.li {} [ multiSelectEnabledButton props.multiSelectEnabled ]  -- toggle multi node selection
                   -- save button
+                , RH.li {} [ nodeSearchControl { selectedNodeIds: props.selectedNodeIds } ]
                 ]
               ]
             ]
 
-useGraphControls :: R.Hooks (Record Controls)
-useGraphControls = do
+useGraphControls :: SigmaxTypes.SGraph -> R.Hooks (Record Controls)
+useGraphControls graph = do
+  let edges = SigmaxTypes.graphEdges graph
+  let nodes = SigmaxTypes.graphNodes graph
+
   cursorSize      <- R.useState' 10.0
+  edgeConfluence <- R.useState' $ Range.Closed { min: 0.0, max: 1.0 }
+  edgeWeight <- R.useState' $ Range.Closed { min: 0.0, max: 1.0 }
   graphStage      <- R.useState' Graph.Init
-  multiNodeSelect <- R.useRef false
-  nodeSize <- R.useState' $ Range.Closed { min: 0.0, max: 10.0 }
+  multiSelectEnabled <- R.useState' false
+  nodeSize <- R.useState' $ Range.Closed { min: 0.0, max: 100.0 }
   showTree <- R.useState' false
   selectedNodeIds <- R.useState' $ Set.empty
-  selectedEdgeIds <- R.useState' $ Set.empty
   showControls    <- R.useState' false
   showSidePanel   <- R.useState' GET.InitialClosed
   sigma <- Sigmax.initSigma
   sigmaRef <- R.useRef sigma
 
   pure { cursorSize
+       , edgeConfluence
+       , edgeWeight
+       , graph
        , graphStage
-       , multiNodeSelect
+       , multiSelectEnabled
        , nodeSize
-       , selectedEdgeIds
        , selectedNodeIds
        , showControls
        , showSidePanel
@@ -167,9 +182,6 @@ getShowTree { showTree: ( should /\ _ ) } = should
 getCursorSize :: Record Controls -> Number
 getCursorSize { cursorSize: ( size /\ _ ) } = size
 
-getMultiNodeSelect :: Record Controls -> Boolean
-getMultiNodeSelect { multiNodeSelect } = R.readRef multiNodeSelect
-
 setShowControls :: Record Controls -> Boolean -> Effect Unit
 setShowControls { showControls: ( _ /\ set ) } v = set $ const v
 
@@ -178,6 +190,3 @@ setShowTree { showTree: ( _ /\ set ) } v = set $ not <<< const v
 
 setCursorSize :: Record Controls -> Number -> Effect Unit
 setCursorSize { cursorSize: ( _ /\ setSize ) } v = setSize $ const v
-
-setMultiNodeSelect :: Record Controls -> Boolean -> Effect Unit
-setMultiNodeSelect { multiNodeSelect } = R.setRef multiNodeSelect

src/Gargantext/Components/GraphExplorer/RangeControl.purs

 module Gargantext.Components.GraphExplorer.RangeControl
   ( Props
   , rangeControl
-  , edgeSizeControl
+  , edgeConfluenceControl
+  , edgeWeightControl
   , nodeSizeControl
   ) where
 
@@ -33,34 +34,50 @@ rangeControlCpt = R.hooksComponent "RangeButton" cpt
           , RS.rangeSlider sliderProps
           ]
 
-edgeSizeControl :: R.Ref Sigmax.Sigma -> R.State Range.NumberRange -> R.Element
-edgeSizeControl sigmaRef (state /\ setState) =
+edgeConfluenceControl :: R.Ref Sigmax.Sigma -> R.State Range.NumberRange -> R.Element
+edgeConfluenceControl sigmaRef (state /\ setState) =
   rangeControl {
-      caption: "Edge Size"
+      caption: "Edge Confluence Weight"
     , sliderProps: {
-        bounds: Range.Closed { min: 0.0, max: 3.0 }
+        bounds: Range.Closed { min: 0.0, max: 1.0 }
       , initialValue: state
-      , epsilon: 0.1
+      , epsilon: 0.01
       , step: 1.0
       , width: 10.0
       , height: 5.0
-      , onChange: \range@(Range.Closed {min, max}) -> do
-          let sigma = R.readRef sigmaRef
-          Sigmax.dependOnSigma sigma "[edgeSizeControl] sigma: Nothing" $ \s -> do
-            Sigma.setSettings s {
-              minEdgeSize: min
-            , maxEdgeSize: max
+      , onChange: setState <<< const
       }
-          setState $ const range
+    }
+
+edgeWeightControl :: R.Ref Sigmax.Sigma -> R.State Range.NumberRange -> R.Element
+edgeWeightControl sigmaRef (state /\ setState) =
+  rangeControl {
+      caption: "Edge Weight"
+    , sliderProps: {
+        bounds: Range.Closed { min: 0.0, max: 3.0 }
+      , initialValue: state
+      , epsilon: 0.01
+      , step: 1.0
+      , width: 10.0
+      , height: 5.0
+      , onChange: setState <<< const
+      -- , onChange: \range@(Range.Closed {min, max}) -> do
+      --     let sigma = R.readRef sigmaRef
+      --     Sigmax.dependOnSigma sigma "[edgeWeightControl] sigma: Nothing" $ \s -> do
+      --       Sigma.setSettings s {
+      --         minEdgeSize: min
+      --       , maxEdgeSize: max
+      --       }
+      --     setState $ const range
       }
     }
 
-nodeSizeControl :: R.State Range.NumberRange -> R.Element
-nodeSizeControl (state /\ setState) =
+nodeSizeControl :: Range.NumberRange -> R.State Range.NumberRange -> R.Element
+nodeSizeControl (Range.Closed { min: rangeMin, max: rangeMax }) (state /\ setState) =
   rangeControl {
       caption: "Node Size"
     , sliderProps: {
-        bounds: Range.Closed { min: 0.0, max: 15.0 }
+        bounds: Range.Closed { min: rangeMin, max: rangeMax }
       , initialValue: state
       , epsilon: 0.1
       , step: 1.0

src/Gargantext/Components/GraphExplorer/Search.purs

+module Gargantext.Components.GraphExplorer.Search
+  ( Props
+  , nodeSearchControl
+  ) where
+
+import Global (readFloat)
+import Prelude
+import Data.Set as Set
+import Data.Tuple (snd)
+import Data.Tuple.Nested ((/\))
+import DOM.Simple.Console (log2)
+import Effect (Effect)
+import FFI.Simple ((..))
+import Reactix as R
+import Reactix.DOM.HTML as H
+
+import Gargantext.Hooks.Sigmax as Sigmax
+import Gargantext.Hooks.Sigmax.Sigma as Sigma
+import Gargantext.Hooks.Sigmax.Types as SigmaxTypes
+import Gargantext.Utils.Reactix as R2
+
+type Props = (
+    selectedNodeIds :: R.State SigmaxTypes.SelectedNodeIds
+  )
+
+nodeSearchControl :: Record Props -> R.Element
+nodeSearchControl props = R.createElement sizeButtonCpt props []
+
+sizeButtonCpt :: R.Component Props
+sizeButtonCpt = R.hooksComponent "NodeSearchControl" cpt
+  where
+    cpt {selectedNodeIds} _ = do
+      (search /\ setSearch) <- R.useState' ""
+
+      pure $
+        H.div { className: "form-group" }
+          [ H.div { className: "input-group" }
+            [ H.input { type: "text"
+                      , className: "form-control"
+                      , defaultValue: search
+                      , on: { input: \e -> setSearch $ const $ e .. "target" .. "value" }
+                      }
+            , H.div { className: "btn input-group-addon"
+                    , on: { click: \_ -> log2 "[sizeButtonCpt] search" search }
+                    }
+              [ H.span { className: "fa fa-search" } [] ]
+            ]
+          ]
+
+-- TODO Wherefrom do I get graph nodes?
+-- How to implement filtering here? I want to set selectedNodeIds based on graph data.

src/Gargantext/Components/GraphExplorer/Sidebar.purs

@@ -14,7 +14,6 @@ import Reactix.DOM.HTML as RH
 import Gargantext.Data.Array (catMaybes)
 import Gargantext.Components.RandomText (words)
 import Gargantext.Components.Nodes.Corpus.Graph.Tabs as GT
-import Gargantext.Components.Graph as Graph
 import Gargantext.Components.GraphExplorer.Types as GET
 import Gargantext.Ends (Frontends)
 import Gargantext.Hooks.Sigmax.Types as SigmaxTypes
@@ -22,7 +21,7 @@ import Gargantext.Sessions (Session)
 
 type Props =
   ( frontends :: Frontends
-  , graph :: Graph.Graph
+  , graph :: SigmaxTypes.SGraph
   , metaData :: GET.MetaData
   , selectedNodeIds :: R.State SigmaxTypes.SelectedNodeIds
   , session :: Session

src/Gargantext/Components/GraphExplorer/ToggleButton.purs

 module Gargantext.Components.GraphExplorer.ToggleButton
-  ( Props, toggleButton, toggleButtonCpt
+  ( Props
+  , toggleButton
+  , toggleButtonCpt
+  , multiSelectEnabledButton
   , controlsToggleButton
   , edgesToggleButton
   , sidebarToggleButton
@@ -66,6 +69,15 @@ edgesToggleButton sigmaRef state =
       setToggled not
     }
 
+multiSelectEnabledButton :: R.State Boolean -> R.Element
+multiSelectEnabledButton state =
+  toggleButton {
+      state: state
+    , onMessage: "Single-node"
+    , offMessage: "Multi-node"
+    , onClick: \_ -> snd state not
+    }
+
 pauseForceAtlasButton :: R.Ref Sigmax.Sigma -> R.State Boolean -> R.Element
 pauseForceAtlasButton sigmaRef state =
   toggleButton {

src/Gargantext/Components/GraphExplorer/Types.purs

@@ -88,7 +88,7 @@ type State = (
   --, showSidePanel :: R.State Boolean
   --, showControls :: R.State Boolean
   --, showTree :: R.State Boolean
-  --, sigmaGraphData :: R.State (Maybe Graph.Graph)
+  --, sigmaGraphData :: R.State (Maybe SigmaxTypes.SGraph)
   --, sigmaSettings :: R.State ({|Graph.SigmaSettings})
     --treeId :: R.State (Maybe TreeId)
   )

src/Gargantext/Hooks/Sigmax.purs

 module Gargantext.Hooks.Sigmax
   where
 
+import Prelude (Unit, bind, discard, flip, pure, unit, ($), (*>), (<<<), (<>), (>>=), (||), not, const, map)
+
 import Data.Array as A
 import Data.Either (either)
-import Data.Foldable (sequence_)
+import Data.Foldable (sequence_, foldl)
 import Data.Map as Map
 import Data.Maybe (Maybe(..))
 import Data.Nullable (Nullable)
@@ -20,9 +22,8 @@ import Effect.Class.Console (error)
 import Effect.Timer (TimeoutId, clearTimeout)
 import FFI.Simple ((.=))
 import Gargantext.Hooks.Sigmax.Sigma as Sigma
-import Gargantext.Hooks.Sigmax.Types (Graph(..), EdgesMap, NodesMap, SelectedNodeIds, SelectedEdgeIds)
+import Gargantext.Hooks.Sigmax.Types (Graph(..), SGraph, EdgesMap, NodesMap, SelectedNodeIds, SelectedEdgeIds, graphEdges)
 import Gargantext.Utils.Reactix as R2
-import Prelude (Unit, bind, discard, flip, pure, unit, ($), (*>), (<<<), (<>), (>>=), not)
 import Reactix as R
 
 type Sigma =
@@ -190,8 +191,9 @@ updateEdges sigma edgesMap = do
     let mTEdge = Map.lookup e.id edgesMap
     case mTEdge of
       Nothing -> error $ "Edge id " <> e.id <> " not found in edgesMap"
-      (Just tEdge@{color: tColor}) -> do
+      (Just {color: tColor, hidden: tHidden}) -> do
         _ <- pure $ (e .= "color") tColor
+        _ <- pure $ (e .= "hidden") tHidden
         pure unit
   Sigma.refresh sigma
 
@@ -202,28 +204,38 @@ updateNodes sigma nodesMap = do
     let mTNode = Map.lookup n.id nodesMap
     case mTNode of
       Nothing -> error $ "Node id " <> n.id <> " not found in nodesMap"
-      (Just tNode@{color: tColor, hidden: tHidden}) -> do
+      (Just {color: tColor, hidden: tHidden}) -> do
         _ <- pure $ (n .= "color") tColor
         _ <- pure $ (n .= "hidden") tHidden
         pure unit
   Sigma.refresh sigma
 
 
-bindSelectedNodesClick :: R.Ref Sigma -> R.State SelectedNodeIds -> Effect Unit
-bindSelectedNodesClick sigmaRef (_ /\ setSelectedNodeIds) =
-  dependOnSigma (R.readRef sigmaRef) "[graphCpt] no sigma" $ \sigma -> do
-    Sigma.bindClickNode sigma $ \node -> do
-      setSelectedNodeIds \nids ->
-        if Set.member node.id nids then
-          Set.delete node.id nids
+-- | Toggles item visibility in the selected set
+multiSelectUpdate :: SelectedNodeIds -> SelectedNodeIds -> SelectedNodeIds
+multiSelectUpdate new selected = foldl fld selected new
+  where
+    fld selectedAcc item =
+      if Set.member item selectedAcc then
+        Set.delete item selectedAcc
+      else
+        Set.insert item selectedAcc
+
+
+bindSelectedNodesClick :: Sigma.Sigma -> R.State SelectedNodeIds -> R.Ref Boolean -> Effect Unit
+bindSelectedNodesClick sigma (_ /\ setSelectedNodeIds) multiSelectEnabledRef =
+  Sigma.bindClickNodes sigma $ \nodes -> do
+    let multiSelectEnabled = R.readRef multiSelectEnabledRef
+    let nodeIds = Set.fromFoldable $ map _.id nodes
+    if multiSelectEnabled then
+      setSelectedNodeIds $ multiSelectUpdate nodeIds
     else
-          Set.insert node.id nids
+      setSelectedNodeIds $ const nodeIds
 
 bindSelectedEdgesClick :: R.Ref Sigma -> R.State SelectedEdgeIds -> Effect Unit
 bindSelectedEdgesClick sigmaRef (_ /\ setSelectedEdgeIds) =
   dependOnSigma (R.readRef sigmaRef) "[graphCpt] no sigma" $ \sigma -> do
     Sigma.bindClickEdge sigma $ \edge -> do
-      log2 "[bindClickEdge] edge" edge
       setSelectedEdgeIds \eids ->
         if Set.member edge.id eids then
           Set.delete edge.id eids

src/Gargantext/Hooks/Sigmax/Sigma.purs

@@ -142,6 +142,14 @@ bindClickNode s f = bind_ s "clickNode" $ \e -> do
 unbindClickNode :: Sigma -> Effect Unit
 unbindClickNode s = unbind_ s "clickNode"
 
+bindClickNodes :: Sigma -> (Array (Record Types.Node) -> Effect Unit) -> Effect Unit
+bindClickNodes s f = bind_ s "clickNodes" $ \e -> do
+  let nodes = e .. "data" .. "node" :: Array (Record Types.Node)
+  f nodes
+
+unbindClickNodes :: Sigma -> Effect Unit
+unbindClickNodes s = unbind_ s "clickNodes"
+
 bindOverNode :: Sigma -> (Record Types.Node -> Effect Unit) -> Effect Unit
 bindOverNode s f = bind_ s "overNode" $ \e -> do
   let node = e .. "data" .. "node" :: Record Types.Node

src/Gargantext/Hooks/Sigmax/Types.purs

 module Gargantext.Hooks.Sigmax.Types where
 
-import Prelude (map, ($), (&&), (==))
+import Prelude (map, ($), (&&), (==), class Ord, Ordering, compare)
 import Data.Map as Map
 import Data.Sequence (Seq)
 import Data.Set as Set
@@ -30,27 +30,36 @@ type Node =
 type Edge =
   ( id :: String
   , color :: String
+  , confluence :: Number
+  , hidden :: Boolean
   , size :: Number
   , source :: String
-  , target :: String )
+  , target :: String
+  , weight :: Number )
 
 type SelectedNodeIds = Set.Set String
 type SelectedEdgeIds = Set.Set String
 type EdgesMap = Map.Map String (Record Edge)
 type NodesMap = Map.Map String (Record Node)
 
+type SGraph = Graph Node Edge
+
+graphEdges :: SGraph -> Seq (Record Edge)
+graphEdges (Graph {edges}) = edges
+
+graphNodes :: SGraph -> Seq (Record Node)
+graphNodes (Graph {nodes}) = nodes
+
 edgesGraphMap :: Graph Node Edge -> EdgesMap
-edgesGraphMap graph = do
-  let (Graph {edges}) = graph
-  Map.fromFoldable $ map (\e -> Tuple e.id e) edges
+edgesGraphMap graph =
+  Map.fromFoldable $ map (\e -> Tuple e.id e) $ graphEdges graph
 
 nodesMap :: Seq (Record Node) -> NodesMap
 nodesMap nodes = Map.fromFoldable $ map (\n -> Tuple n.id n) nodes
 
 nodesGraphMap :: Graph Node Edge -> NodesMap
-nodesGraphMap graph = do
-  let (Graph {nodes}) = graph
-  nodesMap nodes
+nodesGraphMap graph =
+  nodesMap $ graphNodes graph
 
 eqGraph :: (Graph Node Edge) -> (Graph Node Edge) -> Boolean
 eqGraph (Graph {nodes: n1, edges: e1}) (Graph {nodes: n2, edges: e2}) = (n1 == n2) && (e1 == e2)