Merge remote-tracking branch 'origin/689-dev-graph-legend-show-all-clusters' into dev

src/Gargantext/Core/Viz/Graph/API.hs

@@ -75,8 +75,9 @@ getGraph nId = do
         let defaultBridgenessMethod = BridgenessMethod_Basic
         graph' <- computeGraph cId defaultPartitionMethod defaultBridgenessMethod (withMetric defaultMetric) defaultEdgesStrength (NgramsTerms, NgramsTerms) repo
         mt     <- defaultGraphMetadata cId listId "Title" repo defaultMetric defaultEdgesStrength
+        let mt' = set gm_legend (generateLegend graph') mt
         let
-          graph'' = set graph_metadata (Just mt) graph'
+          graph'' = set graph_metadata (Just mt') graph'
           hg = HyperdataGraphAPI graph'' camera
        -- _      <- updateHyperdata nId hg
         _ <- updateHyperdata nId (HyperdataGraph (Just graph'') camera)
@@ -126,19 +127,26 @@ recomputeGraph nId partitionMethod bridgeMethod maybeSimilarity maybeStrength nt
 
   let computeG mt = do
         !g <- computeGraph cId partitionMethod bridgeMethod similarity strength (nt1,nt2) repo
-        let g' = set graph_metadata mt g
+        let mt' = set gm_legend (generateLegend g) mt
+        let g' = set graph_metadata (Just mt') g
         _nentries <- updateHyperdata nId (HyperdataGraph (Just g') camera)
         pure g'
 
   case graph of
     Nothing     -> do
       mt     <- defaultGraphMetadata cId listId "Title" repo (fromMaybe Order1 maybeSimilarity) strength
-      g <- computeG $ Just mt
+      g <- computeG mt
       pure $ trace ("[G.V.G.API.recomputeGraph] Graph empty, computed" :: Text) g
     Just graph' -> if (listVersion == Just v) && (not force')
                      then pure graph'
                      else do
-                       g <- computeG graphMetadata
+                       case graphMetadata of
+                         Nothing -> do
+                           mt <- defaultGraphMetadata cId listId "Title" repo (fromMaybe Order1 maybeSimilarity) strength
+                           g <- computeG mt
+                           pure $ trace ("[G.V.G.API] Graph exists, no metadata, recomputing" :: Text) g
+                         Just mt -> do
+                           g <- computeG mt
                            pure $ trace ("[G.V.G.API] Graph exists, recomputing" :: Text) g
 
 

src/Gargantext/Core/Viz/Graph/Tools.hs

@@ -34,7 +34,7 @@ import Gargantext.Core.Viz.Graph.Bridgeness (bridgeness, Bridgeness(..), Partiti
 import Gargantext.Core.Viz.Graph.Index (createIndices, toIndex, map2mat, mat2map, Index, MatrixShape(..))
 import Gargantext.Core.Viz.Graph.Tools.IGraph (mkGraphUfromEdges, spinglass, spinglass')
 import Gargantext.Core.Viz.Graph.Tools.Infomap (infomap)
-import Gargantext.Core.Viz.Graph.Types (Attributes(..), Edge(..), Graph(..), MultiPartite(..), Node(..), Partite(..), Strength(..))
+import Gargantext.Core.Viz.Graph.Types (Attributes(..), Edge(..), Graph(..), MultiPartite(..), Node(..), Partite(..), Strength(..), LegendField(..))
 import Gargantext.Core.Viz.Graph.Utils (edgesFilter, nodesFilter)
 import Gargantext.Prelude
 import Graph.BAC.ProxemyOptim qualified as BAC
@@ -377,3 +377,11 @@ filterByNeighbours threshold distanceMap = filteredMap
                                        $ Map.filterWithKey (\(from', _) _ -> idx == from') distanceMap
                            in List.take (round threshold) selected
                       ) indexes
+
+generateLegend :: Graph -> [LegendField]
+generateLegend (Graph { _graph_nodes = nodes }) = List.sortBy (\(LegendField {_lf_id = a}) (LegendField {_lf_id = b}) -> compare a b) $ foldl' f [] nodes
+  where
+    f :: [LegendField] -> Node -> [LegendField]
+    f acc (Node {node_attributes = Attributes {clust_default = i}}) = case List.find (\(LegendField {_lf_id}) -> _lf_id == i) acc of
+      Just _  -> acc
+      Nothing -> acc ++ [LegendField {_lf_id = i, _lf_label = "Cluster" <> show i, _lf_color = "#FFF"}]