Merge pull request #2230 from weaveworks/2227-search-help

Fix help menu not opening from 'search' hint

client/app/scripts/components/search.js

@@ -140,7 +140,7 @@ class Search extends React.Component {
           {!showPinnedSearches && <div className="search-hint">
             {getHint(nodes)} <span
               className="search-help-link fa fa-question-circle"
-              onClick={onClickHelp} />
+              onMouseDown={onClickHelp} />
           </div>}
         </div>
       </div>

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

@@ -271,7 +271,7 @@ export function getSearchableFields(nodes) {
 
   const tableRowLabels = nodes.reduce((labels, node) => (
     labels.union(get(node, 'tables').flatMap(t => (t.get('rows') || makeList)
-      .map(f => f.get('label'))
+      .map(f => f.getIn(['entries', 'label']))
     ))
   ), makeSet());