[Graph] edgeWeight selector by edge weight index in sorted list

src/Gargantext/Components/GraphExplorer.purs

@@ -2,8 +2,7 @@ module Gargantext.Components.GraphExplorer where
 
 import Gargantext.Prelude hiding (max,min)
 
-import DOM.Simple.Types (Element)
-import Data.Foldable (foldMap)
+import Data.Array as A
 import Data.FoldableWithIndex (foldMapWithIndex)
 import Data.Int (toNumber)
 import Data.Map as Map
@@ -13,6 +12,7 @@ import Data.Sequence as Seq
 import Data.Set as Set
 import Data.Tuple (fst, snd, Tuple(..))
 import Data.Tuple.Nested ((/\))
+import DOM.Simple.Types (Element)
 import Effect.Aff (Aff)
 import Math (log)
 import Partial.Unsafe (unsafePartial)
@@ -251,17 +251,19 @@ convert (GET.GraphData r) = Tuple r.metaData $ SigmaxTypes.Graph {nodes, edges}
         color = GET.intColor (cDef n.attributes)
         gargType =  unsafePartial $ fromJust $ Types.modeFromString n.type_
     nodesMap = SigmaxTypes.nodesMap nodes
-    edges = foldMap edgeFn r.edges
-    edgeFn (GET.Edge e) = Seq.singleton { id : e.id_
-                                        , color
-                                        , confluence : e.confluence
-                                        , hidden : false
-                                        , size: 1.0
-                                        , source : e.source
-                                        , sourceNode
-                                        , target : e.target
-                                        , targetNode
-                                        , weight : e.weight }
+    edges = foldMapWithIndex edgeFn $ A.sortWith (\(GET.Edge {weight}) -> weight) r.edges
+    edgeFn i (GET.Edge e) = Seq.singleton { id : e.id_
+                                          , color
+                                          , confluence : e.confluence
+                                          , hidden : false
+                                          , size: 1.0
+                                          , source : e.source
+                                          , sourceNode
+                                          , target : e.target
+                                          , targetNode
+                                          , weight : e.weight
+                                          , weightIdx: i
+                                          }
       where
         sourceNode = unsafePartial $ fromJust $ Map.lookup e.source nodesMap
         targetNode = unsafePartial $ fromJust $ Map.lookup e.target nodesMap
@@ -325,7 +327,7 @@ transformGraph controls graph = SigmaxTypes.Graph {nodes: newNodes, edges: newEd
     --  else
     --    edge { hidden = true }
     edgeWeightFilter :: Record SigmaxTypes.Edge -> Boolean
-    edgeWeightFilter edge@{ weight } = Range.within (fst controls.edgeWeight) weight
+    edgeWeightFilter edge@{ weightIdx } = Range.within (fst controls.edgeWeight) $ toNumber weightIdx
 
     edgeInGraph :: SigmaxTypes.SelectedNodeIds -> Record SigmaxTypes.Edge -> Boolean
     edgeInGraph nodeIds e = (Set.member e.source nodeIds) && (Set.member e.target nodeIds)

src/Gargantext/Components/GraphExplorer/Controls.purs

@@ -8,6 +8,7 @@ module Gargantext.Components.GraphExplorer.Controls
  ) where
 
 import Data.Array as A
+import Data.Int as I
 import Data.Maybe (Maybe(..), maybe)
 import Data.Sequence as Seq
 import Data.Set as Set
@@ -116,10 +117,14 @@ controlsCpt = R.hooksComponent "GraphControls" cpt
       let edgeConfluenceMax = maybe 100.0 _.confluence $ A.last edgesConfluenceSorted
       let edgeConfluenceRange = Range.Closed { min: edgeConfluenceMin, max: edgeConfluenceMax }
 
-      let edgesWeightSorted = A.sortWith (_.weight) $ Seq.toUnfoldable $ SigmaxTypes.graphEdges props.graph
-      let edgeWeightMin = maybe 0.0 _.weight $ A.head edgesWeightSorted
-      let edgeWeightMax = maybe 100.0 _.weight $ A.last edgesWeightSorted
-      let edgeWeightRange = Range.Closed { min: edgeWeightMin, max: edgeWeightMax }
+      --let edgesWeightSorted = A.sortWith (_.weight) $ Seq.toUnfoldable $ SigmaxTypes.graphEdges props.graph
+      --let edgeWeightMin = maybe 0.0 _.weight $ A.head edgesWeightSorted
+      --let edgeWeightMax = maybe 100.0 _.weight $ A.last edgesWeightSorted
+      --let edgeWeightRange = Range.Closed { min: edgeWeightMin, max: edgeWeightMax }
+      let edgeWeightRange = Range.Closed {
+           min: 0.0
+         , max: I.toNumber $ Seq.length $ SigmaxTypes.graphEdges props.graph
+         }
 
       let nodesSorted = A.sortWith (_.size) $ Seq.toUnfoldable $ SigmaxTypes.graphNodes props.graph
       let nodeSizeMin = maybe 0.0 _.size $ A.head nodesSorted
@@ -159,7 +164,10 @@ controlsCpt = R.hooksComponent "GraphControls" cpt
 useGraphControls :: SigmaxTypes.SGraph -> R.Hooks (Record Controls)
 useGraphControls graph = do
   edgeConfluence <- R.useState' $ Range.Closed { min: 0.0, max: 1.0 }
-  edgeWeight <- R.useState' $ Range.Closed { min: 0.0, max: 1.0 }
+  edgeWeight <- R.useState' $ Range.Closed {
+      min: 0.0
+    , max: I.toNumber $ Seq.length $ SigmaxTypes.graphEdges graph
+    }
   forceAtlasState <- R.useState' SigmaxTypes.InitialRunning
   graphStage      <- R.useState' Graph.Init
   multiSelectEnabled <- R.useState' false

src/Gargantext/Components/GraphExplorer/RangeControl.purs

@@ -54,7 +54,7 @@ edgeWeightControl (Range.Closed { min, max }) (state /\ setState) =
     , sliderProps: {
         bounds: Range.Closed { min, max }
       , initialValue: state
-      , epsilon: 0.01
+      , epsilon: 1.0
       , step: 1.0
       , width: 10.0
       , height: 5.0

src/Gargantext/Components/GraphExplorer/Types.purs

@@ -24,11 +24,11 @@ newtype Cluster = Cluster { clustDefault :: Int }
 derive instance newtypeCluster :: Newtype Cluster _
 
 newtype Edge = Edge
-  { id_ :: String
+  { confluence :: Number
+  , id_ :: String
   , source :: String
   , target :: String
   , weight :: Number
-  , confluence :: Number
   }
 
 derive instance newtypeEdge :: Newtype Edge _

src/Gargantext/Hooks/Sigmax/Types.purs

@@ -53,7 +53,9 @@ type Edge =
   , sourceNode :: Record Node
   , target :: NodeId
   , targetNode :: Record Node
-  , weight :: Number )
+  , weight :: Number
+  , weightIdx :: Int
+  )
 
 type SelectedNodeIds = Set.Set NodeId
 type SelectedEdgeIds = Set.Set EdgeId