github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 02:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hide the opened help panel when clicking on the search bar icon. (#2406)

Browse Source
This commit is contained in:
Filip Barl
2017-03-28 13:04:41 +02:00
committed by GitHub
parent 2ee4dac97b
commit 3e039a3143
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/app/scripts/actions/app-actions.js
View File

@@ -35,15 +35,16 @@ import {
RESOURCE_VIEW_MODE,
} from '../constants/naming';
const log = debug('scope:app-actions');
export function showHelp() {
return {type: ActionTypes.SHOW_HELP};
return { type: ActionTypes.SHOW_HELP };
}
export function hideHelp() {
return {type: ActionTypes.HIDE_HELP};
return { type: ActionTypes.HIDE_HELP };
}

10
client/app/scripts/components/search.js
View File

@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
import classnames from 'classnames';
import { debounce } from 'lodash';
import { blurSearch, doSearch, focusSearch, showHelp } from '../actions/app-actions';
import { blurSearch, doSearch, focusSearch, toggleHelp } from '../actions/app-actions';
import { searchMatchCountByTopologySelector } from '../selectors/search';
import { isResourceViewModeSelector } from '../selectors/topology';
import { slugify } from '../utils/string-utils';
@@ -103,8 +103,8 @@ class Search extends React.Component {
}
render() {
const { nodes, pinnedSearches, searchFocused, searchMatchCountByTopology, isResourceViewMode,
searchQuery, topologiesLoaded, onClickHelp, inputId = 'search' } = this.props;
const { nodes, pinnedSearches, searchFocused, searchMatchCountByTopology,
isResourceViewMode, searchQuery, topologiesLoaded, inputId = 'search' } = this.props;
const hidden = !topologiesLoaded || isResourceViewMode;
const disabled = this.props.isTopologyEmpty && !hidden;
const matchCount = searchMatchCountByTopology
@@ -143,7 +143,7 @@ class Search extends React.Component {
{!showPinnedSearches && <div className="search-hint">
{getHint(nodes)} <span
className="search-help-link fa fa-question-circle"
onMouseDown={onClickHelp} />
onMouseDown={this.props.toggleHelp} />
</div>}
</div>
</div>
@@ -163,5 +163,5 @@ export default connect(
searchQuery: state.get('searchQuery'),
searchMatchCountByTopology: searchMatchCountByTopologySelector(state),
}),
{ blurSearch, doSearch, focusSearch, onClickHelp: showHelp }
{ blurSearch, doSearch, focusSearch, toggleHelp }
)(Search);