Merge branch 'dev' into 471-dev-node-multiterms

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

@@ -77,7 +77,7 @@ getGraph nId = do
         let defaultEdgesStrength   = Strong
         let defaultBridgenessMethod = BridgenessBasic
         graph' <- computeGraph cId defaultBridgenessMethod (withMetric defaultMetric) defaultEdgesStrength (NgramsTerms, NgramsTerms) repo
-        mt     <- defaultGraphMetadata cId listId "Title" repo defaultMetric defaultEdgesStrength
+        mt     <- defaultGraphMetadata cId listId "Title" repo defaultMetric defaultEdgesStrength defaultBridgenessMethod
         let mt' = set gm_legend (generateLegend graph') mt
         let
           graph'' = set graph_metadata (Just mt') graph'
@@ -138,7 +138,7 @@ recomputeGraph nId bridgeMethod maybeSimilarity maybeStrength nt1 nt2 force' = d
 
   case graph of
     Nothing     -> do
-      mt     <- defaultGraphMetadata cId listId "Title" repo (fromMaybe Order1 maybeSimilarity) strength
+      mt     <- defaultGraphMetadata cId listId "Title" repo (fromMaybe Order1 maybeSimilarity) strength bridgeMethod
       g <- computeG mt
       pure $ trace ("[G.V.G.API.recomputeGraph] Graph empty, computed" :: Text) g
     Just graph' -> if (listVersion == Just v) && (not force')
@@ -146,7 +146,7 @@ recomputeGraph nId bridgeMethod maybeSimilarity maybeStrength nt1 nt2 force' = d
                      else do
                        case graphMetadata of
                          Nothing -> do
-                           mt <- defaultGraphMetadata cId listId "Title" repo (fromMaybe Order1 maybeSimilarity) strength
+                           mt <- defaultGraphMetadata cId listId "Title" repo (fromMaybe Order1 maybeSimilarity) strength bridgeMethod
                            g <- computeG mt
                            pure $ trace ("[G.V.G.API] Graph exists, no metadata, recomputing" :: Text) g
                          Just mt -> do
@@ -206,12 +206,14 @@ defaultGraphMetadata :: HasNodeError err
                      -> NodeListStory
                      -> GraphMetric
                      -> Strength
+                     -> BridgenessMethod
                      -> DBCmd err GraphMetadata
-defaultGraphMetadata cId lId t repo gm str = do
+defaultGraphMetadata cId lId t repo gm str bm = do
   pure $ GraphMetadata { _gm_title         = t
                        , _gm_metric        = gm
                        , _gm_edgesStrength = Just str
                        , _gm_corpusId      = [cId]
+                       , _gm_bridgenessMethod = Just bm
                        , _gm_legend = [
                              LegendField 1 "#FFF" "Cluster1"
                            , LegendField 2 "#FFF" "Cluster2"

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

@@ -41,7 +41,6 @@ import IGraph qualified as Igraph
 import IGraph.Algorithms.Layout qualified as Layout
 import IGraph.Random ( Gen ) -- (Gen(..))
 
-
 -------------------------------------------------------------
 type Threshold = Double
 

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

@@ -144,6 +144,7 @@ data GraphMetadata =
   GraphMetadata { _gm_title            :: Text          -- title of the graph
                 , _gm_metric           :: GraphMetric
                 , _gm_edgesStrength    :: Maybe Strength
+                , _gm_bridgenessMethod :: Maybe BridgenessMethod
                 , _gm_corpusId         :: [NodeId]      -- we can map with different corpus
                 , _gm_legend           :: [LegendField] -- legend of the Graph
                 , _gm_list             :: ListForGraph