Merge remote-tracking branch 'origin/689-dev-graph-legend-improvements' into dev

src/Gargantext/Components/GraphExplorer/Sidebar.purs

@@ -130,10 +130,6 @@ sideTabLegendCpt = here.component "sideTabLegend" cpt where
 
     legend' /\ legendBox <- R2.useBox' legend
 
-    -- | Computed
-    -- |
-    let
-      maxItemPerCluster = 4
 
     -- | Hooks
     -- |
@@ -144,7 +140,6 @@ sideTabLegendCpt = here.component "sideTabLegend" cpt where
       (   getter _.id_
       >>> GEU.takeGreatestNodeByCluster
             hyperdataGraph
-            maxItemPerCluster
       )
 
     -- For each provided Cluster (see Legend), count the number of nodes

src/Gargantext/Components/GraphExplorer/Sidebar/Legend.purs

@@ -175,11 +175,6 @@ selectedNodesCpt = here.component "selectedNodes" cpt where
             )
         # isJust
 
-      countValue
-        =   extractedNodeList
-        #   A.length
-        #   (nodeCount - _)
-
     -- | Behaviors
     -- |
     let
@@ -212,7 +207,7 @@ selectedNodesCpt = here.component "selectedNodes" cpt where
           ]
 
       ,
-        R2.when (eq countValue 0) $
+        R2.when (eq nodeCount 0) $
 
           H.li
           { className: intercalate " "
@@ -221,10 +216,10 @@ selectedNodesCpt = here.component "selectedNodes" cpt where
               ]
           }
           [
-            H.text "0 node"
+            H.text "0 nodes"
           ]
       ,
-        R2.when (not $ eq countValue 0) $
+        R2.when (not $ eq nodeCount 0) $
 
           H.li
           { className: intercalate " "
@@ -233,14 +228,14 @@ selectedNodesCpt = here.component "selectedNodes" cpt where
               ]
           }
           [
-            H.text "+"
+            H.text "|"
           ,
             H.text $ nbsp 1
           ,
-            H.text $ show countValue
+            H.text $ show nodeCount
           ,
             H.text $ nbsp 1
           ,
-            H.text $ eq countValue 1 ? "node" $ "nodes"
+            H.text $ eq nodeCount 1 ? "node" $ "nodes"
           ]
       ]

src/Gargantext/Components/GraphExplorer/Utils.purs

@@ -78,8 +78,8 @@ normalizeNodeSize minSize maxSize ns = over traversed (over sizeLens (\s -> minS
 
 ------------------------------------------------------------------------
 
-takeGreatestNodeByCluster :: GET.HyperdataGraph -> Int -> Int -> Array GEGT.Node
-takeGreatestNodeByCluster graphData take clusterId
+takeGreatestNodeByCluster :: GET.HyperdataGraph -> Int -> Array GEGT.Node
+takeGreatestNodeByCluster graphData clusterId
   =   graphData
   #   getter _.graph
   >>> getter _.nodes
@@ -91,7 +91,6 @@ takeGreatestNodeByCluster graphData take clusterId
   >>> A.sortWith
       ( getter _.size
       )
-  >>> A.takeEnd take
   >>> A.reverse
 
 countNodeByCluster :: GET.HyperdataGraph -> Int -> GEGT.ClusterCount