Merge pull request #1912 from weaveworks/1844-visually-duplicate-rows

Add label_minor to tooltips in connections table

client/app/scripts/charts/nodes-grid.js

@@ -66,7 +66,7 @@ function renderIdCell(props) {
       <div style={iconStyle}><i className="fa fa-square" /></div>
       <div className="truncate">
         {props.label} {showSubLabel &&
-          <span className="nodes-grid-label-minor">{props.label_minor}</span>}
+          <span className="nodes-grid-label-minor">{props.labelMinor}</span>}
       </div>
     </div>
   );

client/app/scripts/components/debug-toolbar.js

@@ -54,7 +54,7 @@ const deltaAdd = (
   node_count: nodeCount,
   id: name,
   label: name,
-  label_minor: name,
+  labelMinor: name,
   latest: {},
   origins: [],
   rank: name,

client/app/scripts/components/node-details/node-details-table-node-link.js

@@ -18,17 +18,20 @@ class NodeDetailsTableNodeLink extends React.Component {
   }
 
   render() {
-    if (this.props.linkable) {
+    const { label, labelMinor, linkable } = this.props;
+    const title = !labelMinor ? label : `${label} (${labelMinor})`;
+
+    if (linkable) {
       return (
-        <span className="node-details-table-node-link" title={this.props.label}
+        <span className="node-details-table-node-link" title={title}
           onClick={this.handleClick}>
-          {this.props.label}
+          {label}
         </span>
       );
     }
     return (
-      <span className="node-details-table-node" title={this.props.label}>
-        {this.props.label}
+      <span className="node-details-table-node" title={title}>
+        {label}
       </span>
     );
   }

client/app/scripts/reducers/__tests__/root-test.js

@@ -30,7 +30,7 @@ describe('RootReducer', () => {
       adjacency: ['n1', 'n2'],
       pseudo: undefined,
       label: undefined,
-      label_minor: undefined,
+      labelMinor: undefined,
       filtered: false,
       metrics: undefined,
       node_count: undefined,
@@ -43,7 +43,7 @@ describe('RootReducer', () => {
       adjacency: undefined,
       pseudo: undefined,
       label: undefined,
-      label_minor: undefined,
+      labelMinor: undefined,
       filtered: false,
       metrics: undefined,
       node_count: undefined,

client/app/scripts/selectors/chartSelectors.js

@@ -84,7 +84,7 @@ export const dataNodesSelector = createSelector(
     id,
     label: node.get('label'),
     pseudo: node.get('pseudo'),
-    subLabel: node.get('label_minor'),
+    subLabel: node.get('labelMinor'),
     nodeCount: node.get('node_count'),
     metrics: node.get('metrics'),
     rank: node.get('rank'),

client/app/scripts/utils/search-utils.js

@@ -6,7 +6,7 @@ import { slugify } from './string-utils';
 // topolevel search fields
 const SEARCH_FIELDS = makeMap({
   label: 'label',
-  sublabel: 'label_minor'
+  sublabel: 'labelMinor'
 });
 
 const COMPARISONS = makeMap({