From 18342634c8fe35f06fec8bdad535a9ffefa5fb98 Mon Sep 17 00:00:00 2001
From: Filip Barl <filip.barl@gmail.com>
Date: Tue, 7 Aug 2018 17:01:40 +0200
Subject: [PATCH] Made networks overlay work.

---
 client/app/scripts/charts/node-container.js    | 18 ++++++++++++++++--
 .../scripts/charts/node-networks-overlay.js    |  6 ++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/client/app/scripts/charts/node-container.js b/client/app/scripts/charts/node-container.js
index a6d0a90a2..f87d89c59 100644
--- a/client/app/scripts/charts/node-container.js
+++ b/client/app/scripts/charts/node-container.js
@@ -13,6 +13,8 @@ import { getNodeColor } from '../utils/color-utils';
 import MatchedResults from '../components/matched-results';
 import { GRAPH_VIEW_MODE } from '../constants/naming';
 
+import NodeNetworksOverlay from './node-networks-overlay';
+
 class NodeContainer extends React.Component {
   saveRef = (ref) => {
     this.ref = ref;
@@ -28,6 +30,15 @@ class NodeContainer extends React.Component {
     this.props.clickNode(nodeId, this.props.label, this.ref.getBoundingClientRect());
   };
 
+  renderPrependedInfo = () => {
+    const { showingNetworks, networks } = this.props;
+    if (!showingNetworks) return null;
+
+    return (
+      <NodeNetworksOverlay networks={networks} />
+    );
+  };
+
   renderAppendedInfo = () => {
     const matchedMetadata = this.props.matches.get('metadata', makeList());
     const matchedParents = this.props.matches.get('parents', makeList());
@@ -39,10 +50,11 @@ class NodeContainer extends React.Component {
 
   render() {
     const {
-      rank, label, pseudo, metric
+      rank, label, pseudo, metric, showingNetworks, networks
     } = this.props;
     const { hasMetric, height, formattedValue } = getMetricValue(metric);
     const metricFormattedValue = !pseudo && hasMetric ? formattedValue : '';
+    const labelOffset = (showingNetworks && networks) ? 10 : 0;
 
     return (
       <GraphNode
@@ -50,6 +62,7 @@ class NodeContainer extends React.Component {
         shape={this.props.shape}
         label={this.props.label}
         labelMinor={this.props.labelMinor}
+        labelOffset={labelOffset}
         stacked={this.props.stacked}
         highlighted={this.props.highlighted}
         color={getNodeColor(rank, label, pseudo)}
@@ -61,11 +74,12 @@ class NodeContainer extends React.Component {
         metricColor={getMetricColor(metric)}
         metricFormattedValue={metricFormattedValue}
         metricNumericValue={height}
-        graphNodeRef={this.saveRef}
+        renderPrependedInfo={this.renderPrependedInfo}
         renderAppendedInfo={this.renderAppendedInfo}
         onMouseEnter={this.props.enterNode}
         onMouseLeave={this.props.leaveNode}
         onClick={this.handleMouseClick}
+        graphNodeRef={this.saveRef}
         x={this.props.x}
         y={this.props.y}
       />
diff --git a/client/app/scripts/charts/node-networks-overlay.js b/client/app/scripts/charts/node-networks-overlay.js
index 0522a83e0..6d57c3426 100644
--- a/client/app/scripts/charts/node-networks-overlay.js
+++ b/client/app/scripts/charts/node-networks-overlay.js
@@ -4,7 +4,6 @@ import { List as makeList } from 'immutable';
 import { connect } from 'react-redux';
 
 import { getNetworkColor } from '../utils/color-utils';
-import { NODE_BASE_SIZE } from '../constants/styles';
 
 // Min size is about a quarter of the width, feels about right.
 const minBarWidth = 0.25;
@@ -14,7 +13,7 @@ const borderRadius = 0.01;
 const offset = 0.67;
 const x = scaleBand();
 
-function NodeNetworksOverlay({ stack, networks = makeList(), contrastMode }) {
+function NodeNetworksOverlay({ networks = makeList() }) {
   const barWidth = Math.max(1, minBarWidth * networks.size);
   const yPosition = offset - (barHeight * 0.5);
 
@@ -38,9 +37,8 @@ function NodeNetworksOverlay({ stack, networks = makeList(), contrastMode }) {
     />
   ));
 
-  const translateY = stack && contrastMode ? 0.15 : 0;
   return (
-    <g transform={`translate(0, ${translateY}) scale(${NODE_BASE_SIZE})`}>
+    <g transform="translate(0, -5) scale(60)">
       {bars.toJS()}
     </g>
   );