From fc2fcfb29838de4bb786f47d42a1aaf7ec0cf2b1 Mon Sep 17 00:00:00 2001
From: Simon Howe <footless@gmail.com>
Date: Tue, 9 Aug 2016 18:20:43 +0200
Subject: [PATCH] Adds support for filtering node/table by relatives

Now that they are available in the summary data.
---
 client/app/scripts/charts/node.js                     |  6 ++++--
 client/app/scripts/components/node-details.js         |  4 +++-
 .../node-details/node-details-relatives-link.js       |  3 ++-
 .../components/node-details/node-details-relatives.js | 11 +++++++++--
 client/app/scripts/utils/search-utils.js              |  9 +++++++++
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/client/app/scripts/charts/node.js b/client/app/scripts/charts/node.js
index 4b243e8dd0..6944694328 100644
--- a/client/app/scripts/charts/node.js
+++ b/client/app/scripts/charts/node.js
@@ -2,7 +2,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { connect } from 'react-redux';
 import classnames from 'classnames';
-import { Map as makeMap } from 'immutable';
+import { Map as makeMap, List as makeList } from 'immutable';
 
 import { clickNode, enterNode, leaveNode } from '../actions/app-actions';
 import { getNodeColor } from '../utils/color-utils';
@@ -110,6 +110,8 @@ class Node extends React.Component {
       onMouseEnter: this.handleMouseEnter,
       onMouseLeave: this.handleMouseLeave,
     };
+    const matchedNodeDetails = matches.get('metadata', makeList())
+      .concat(matches.get('parents', makeList()));
 
     return (
       <g className={nodeClassName} transform={transform}>
@@ -127,7 +129,7 @@ class Node extends React.Component {
               <div className={subLabelClassName}>
                 <MatchedText text={subLabel} match={matches.get('sublabel')} />
               </div>
-              {!blurred && <MatchedResults matches={matches.get('metadata')} />}
+              {!blurred && <MatchedResults matches={matchedNodeDetails} />}
             </div>
           </foreignObject>}
 
diff --git a/client/app/scripts/components/node-details.js b/client/app/scripts/components/node-details.js
index 7278e3a581..6226bd420d 100644
--- a/client/app/scripts/components/node-details.js
+++ b/client/app/scripts/components/node-details.js
@@ -158,7 +158,9 @@ export class NodeDetails extends React.Component {
               <MatchedText text={details.label} match={nodeMatches.get('label')} />
             </h2>
             <div className="node-details-header-relatives">
-              {details.parents && <NodeDetailsRelatives relatives={details.parents} />}
+              {details.parents && <NodeDetailsRelatives
+                matches={nodeMatches.get('parents')}
+                relatives={details.parents} />}
             </div>
           </div>
         </div>
diff --git a/client/app/scripts/components/node-details/node-details-relatives-link.js b/client/app/scripts/components/node-details/node-details-relatives-link.js
index 81c9d43d7d..3505ac7738 100644
--- a/client/app/scripts/components/node-details/node-details-relatives-link.js
+++ b/client/app/scripts/components/node-details/node-details-relatives-link.js
@@ -3,6 +3,7 @@ import ReactDOM from 'react-dom';
 import { connect } from 'react-redux';
 
 import { clickRelative } from '../../actions/app-actions';
+import MatchedText from '../matched-text';
 
 class NodeDetailsRelativesLink extends React.Component {
 
@@ -21,7 +22,7 @@ class NodeDetailsRelativesLink extends React.Component {
     const title = `View in ${this.props.topologyId}: ${this.props.label}`;
     return (
       <span className="node-details-relatives-link" title={title} onClick={this.handleClick}>
-        {this.props.label}
+        <MatchedText text={this.props.label} match={this.props.match} />
       </span>
     );
   }
diff --git a/client/app/scripts/components/node-details/node-details-relatives.js b/client/app/scripts/components/node-details/node-details-relatives.js
index 864a3b9709..06c3038a5e 100644
--- a/client/app/scripts/components/node-details/node-details-relatives.js
+++ b/client/app/scripts/components/node-details/node-details-relatives.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import { Map as makeMap } from 'immutable';
 
 import NodeDetailsRelativesLink from './node-details-relatives-link';
 
@@ -20,7 +21,9 @@ export default class NodeDetailsRelatives extends React.Component {
   }
 
   render() {
-    let relatives = this.props.relatives;
+    let { relatives } = this.props;
+    const { matches = makeMap() } = this.props;
+
     const limited = this.state.limit > 0 && relatives.length > this.state.limit;
     const showLimitAction = limited || (this.state.limit === 0
       && relatives.length > this.DEFAULT_LIMIT);
@@ -31,7 +34,11 @@ export default class NodeDetailsRelatives extends React.Component {
 
     return (
       <div className="node-details-relatives">
-        {relatives.map(relative => <NodeDetailsRelativesLink {...relative} key={relative.id} />)}
+        {relatives.map(relative => (
+          <NodeDetailsRelativesLink
+            key={relative.id}
+            match={matches.get(relative.id)}
+            {...relative} />))}
         {showLimitAction && <span className="node-details-relatives-more"
           onClick={this.handleLimitClick}>{limitActionText}</span>}
       </div>
diff --git a/client/app/scripts/utils/search-utils.js b/client/app/scripts/utils/search-utils.js
index ca7bba3690..93c537c8aa 100644
--- a/client/app/scripts/utils/search-utils.js
+++ b/client/app/scripts/utils/search-utils.js
@@ -139,6 +139,15 @@ export function searchTopology(nodes, { prefix, query, metric, comp, value }) {
         });
       }
 
+      // parents and relatives
+      if (node.get('parents')) {
+        node.get('parents').forEach(parent => {
+          const keyPath = [nodeId, 'parents', parent.get('id')];
+          nodeMatches = findNodeMatch(nodeMatches, keyPath, parent.get('label'),
+            query, prefix, parent.get('topologyId'));
+        });
+      }
+
       // tables (envvars and labels)
       const tables = node.get('tables');
       if (tables) {