[CLEAN] Towards bipartite graph

src/Gargantext/Components/Forest/Tree/Node/Action/Update.purs

@@ -119,12 +119,14 @@ updateGraphCpt = here.component "updateGraph" cpt where
                                  , callback: \val -> T.write_ val methodGraphNodeType1
                                  , print: show } []
 
-                 , H.text "NodeType 2 ?"
+ --}
+                 , H.text "Ngrams ?"
                  , formChoiceSafe { items: [GT.CTabTerms, GT.CTabSources, GT.CTabAuthors, GT.CTabInstitutes]
                                  , default: methodGraphNodeType2'
                                  , callback: \val -> T.write_ val methodGraphNodeType2
                                  , print: show } []
 
+{-
                  , H.text "Show Strong (expected) links or weak (maybe unexpected) links?"
                  , formChoiceSafe { items: [Strong, Weak]
                                  , default: methodGraphEdgesStrength'

src/Gargantext/Components/GraphExplorer/Layout.purs

@@ -370,12 +370,12 @@ convert (GET.GraphData r) = Tuple r.metaData $ SigmaxT.Graph {nodes, edges}
 
 -- | See sigmajs/plugins/sigma.renderers.customShapes/shape-library.js
 modeGraphType :: Types.Mode -> String
-modeGraphType Types.Authors     = "square"
-modeGraphType Types.Institutes  = "equilateral"
-modeGraphType Types.Sources     = "star"
+modeGraphType Types.Authors     = "ccircle"
+modeGraphType Types.Institutes  = "square"
+modeGraphType Types.Sources     = "diamond"
 --modeGraphType Types.Terms       = "def"
 --modeGraphType Types.Terms       = "circle"
-modeGraphType Types.Terms       = "ccircle"
+modeGraphType Types.Terms       = "triangle"
 
 --------------------------------------------------------------
 
@@ -437,7 +437,7 @@ transformGraph graph { edgeConfluence'
     selectedEdgeIds =
       Set.fromFoldable
         $ Seq.map _.id
-        $ SigmaxT.neighbouringEdges graph selectedNodeIds'
+        $ SigmaxT.neighboringEdges graph selectedNodeIds'
     hasSelection = not $ Set.isEmpty selectedNodeIds'
 
     newEdges' = Seq.filter edgeFilter $ Seq.map (

src/Gargantext/Components/GraphExplorer/Sidebar.purs

@@ -529,7 +529,7 @@ neighborhoodCpt = R.memo' $ here.component "neighborhood" cpt where
       let refreshed = neighbourBadges graph' selectedNodeIds'
       let count     = Seq.length refreshed
       let ordered   = A.sortWith (\n -> -n.size) $ Seq.toUnfoldable refreshed
-      T.write_ count   termCountBox
+      T.write_ (count-1)   termCountBox
       T.write_ ordered termListBox
       T.write_ false showMoreBox
 
@@ -704,8 +704,9 @@ badges :: SigmaxT.SGraph -> SigmaxT.NodeIds -> Seq.Seq (Record SigmaxT.Node)
 badges graph selectedNodeIds = SigmaxT.graphNodes $ SigmaxT.nodesById graph selectedNodeIds
 
 neighbourBadges :: SigmaxT.SGraph -> SigmaxT.NodeIds -> Seq.Seq (Record SigmaxT.Node)
-neighbourBadges graph selectedNodeIds = SigmaxT.neighbours graph selectedNodes' where
-  selectedNodes' = SigmaxT.graphNodes $ SigmaxT.nodesById graph selectedNodeIds
+neighbourBadges graph selectedNodeIds = SigmaxT.neighbors graph selectedNodes'
+  where
+    selectedNodes' = SigmaxT.graphNodes $ SigmaxT.nodesById graph selectedNodeIds
 
 ---------------------------------------------------------
 

src/Gargantext/Hooks/Sigmax/Types.purs

@@ -14,7 +14,7 @@ import Data.Traversable (class Traversable)
 import Data.Tuple (Tuple(..))
 import Effect (Effect)
 import Partial.Unsafe (unsafePartial)
-import Prelude (class Eq, class Show, map, ($), (&&), (==), (||), (<$>), (<), mod, not, pure)
+import Prelude (class Eq, class Show, map, ($), (&&), (==), (||), (<$>), (<), mod, not, pure, (<=))
 import Record.Unsafe (unsafeGet, unsafeSet)
 
 import Gargantext.Components.Bootstrap.Types (ComponentStatus(..))
@@ -171,7 +171,8 @@ graphEdges (Graph {edges}) = edges
 graphNodes :: SGraph -> Seq.Seq (Record Node)
 graphNodes (Graph {nodes}) = nodes
 
-idMap :: forall r t. Traversable t => t { id :: String | r } -> Map.Map String { id :: String | r }
+idMap :: forall r t. Traversable t
+      => t { id :: String | r } -> Map.Map String { id :: String | r }
 idMap xs = Map.fromFoldable $ (\x@{ id } -> Tuple id x) <$> xs
 
 edgesGraphMap :: SGraph -> EdgesMap
@@ -204,16 +205,16 @@ sub graph (Graph {nodes, edges}) = newGraph
     filteredEdges = edgesFilter edgeFilterFunc graph
     newGraph = nodesFilter (\n -> not (Set.member n.id nodeIds)) filteredEdges
 
-neighbours :: SGraph -> Seq.Seq (Record Node) -> Seq.Seq (Record Node)
-neighbours g nodes = Seq.fromFoldable $ Set.unions [Set.fromFoldable nodes, sources, targets]
+neighbors :: SGraph -> Seq.Seq (Record Node) -> Seq.Seq (Record Node)
+neighbors g nodes = Seq.fromFoldable $ Set.unions [if Set.size sources <= 1 then targets else sources]
   where
     nodeIds = Set.fromFoldable $ Seq.map _.id nodes
-    selectedEdges = neighbouringEdges g nodeIds
+    selectedEdges = neighboringEdges g nodeIds
     sources = Set.fromFoldable $ graphNodes $ nodesById g $ Set.fromFoldable $ Seq.map _.source selectedEdges
     targets = Set.fromFoldable $ graphNodes $ nodesById g $ Set.fromFoldable $ Seq.map _.target selectedEdges
 
-neighbouringEdges :: SGraph -> NodeIds -> Seq.Seq (Record Edge)
-neighbouringEdges g nodeIds = Seq.filter condition $ graphEdges g
+neighboringEdges :: SGraph -> NodeIds -> Seq.Seq (Record Edge)
+neighboringEdges g nodeIds = Seq.filter condition $ graphEdges g
   where
     condition {source, target} = (Set.member source nodeIds) || (Set.member target nodeIds)