);
}
-});
-module.exports = Results;
\ No newline at end of file
+}
diff --git a/scripts/components/results/resultsList.jsx b/scripts/components/results/resultsList.jsx
index cac2565..51937a3 100644
--- a/scripts/components/results/resultsList.jsx
+++ b/scripts/components/results/resultsList.jsx
@@ -5,6 +5,7 @@ import _ from "lodash";
import {resultTypes} from "gramene-search-client";
import QueryActions from "../../actions/queryActions";
import docStore from "../../stores/docStore";
+import searchStore from "../../stores/searchStore";
import Result from "./../result/result.jsx";
@@ -24,6 +25,13 @@ export default class ResultsList extends React.Component {
componentWillMount() {
QueryActions.setResultType('list', this.getResultType());
+ this.unsubscribeFromSearchStore = searchStore.listen((searchState) =>
+ {
+ if (searchState.results) {
+ this.setState({results: searchState.results})
+ }
+ }
+ );
this.unsubDocs = docStore.listen(
(docs) => this.setState({docs})
);
@@ -32,6 +40,9 @@ export default class ResultsList extends React.Component {
componentWillUnmount() {
QueryActions.removeResultType('list');
+ if (this.unsubscribeFromSearchStore) {
+ this.unsubscribeFromSearchStore();
+ }
if (this.unsubDocs) {
this.unsubDocs();
}
@@ -44,7 +55,7 @@ export default class ResultsList extends React.Component {
render() {
const docs = this.state.docs;
const geneDocs = _.get(docs, 'genes') || {};
- const list = this.props.results.list;
+ const list = this.state.results ? this.state.results.list : undefined;
if (list && list.length) {
var searchResults = list.map(function (searchResult) {
@@ -73,8 +84,8 @@ export default class ResultsList extends React.Component {
}
moreButton() {
- const list = this.props.results.list;
- const totalResults = this.props.results.metadata.count;
+ const list = this.state.results.list;
+ const totalResults = this.state.results.metadata.count;
if (list.length < totalResults) {
return (
@@ -87,6 +98,3 @@ export default class ResultsList extends React.Component {
}
}
-ResultsList.propTypes = {
- results: React.PropTypes.object.isRequired,
-};
\ No newline at end of file
diff --git a/scripts/components/search/search.jsx b/scripts/components/search/search.jsx
index c0820f8..d59278e 100644
--- a/scripts/components/search/search.jsx
+++ b/scripts/components/search/search.jsx
@@ -7,7 +7,7 @@ import SearchBox from "./searchBox.jsx";
import QueryActions from "../../actions/queryActions";
import Suggest from "../suggest/suggest.jsx";
import Filters from "./filters.jsx";
-
+import searchStore from "../../stores/searchStore";
export default class Search extends React.Component {
constructor(props) {
@@ -27,6 +27,16 @@ export default class Search extends React.Component {
]);
}
+ componentWillMount() {
+ this.unsubscribeFromSearchStore = searchStore.listen((searchState) =>
+ this.setState({search: searchState})
+ );
+ }
+
+ componentWillUnmount() {
+ this.unsubscribeFromSearchStore();
+ }
+
componentDidMount() {
// listen directly to an action method.
@@ -39,6 +49,12 @@ export default class Search extends React.Component {
// of app state and we must manually clear it here if the query string is
// removed (e.g. when a suggestion is picked)
QueryActions.removeQueryString.listen(this.clearInputString);
+ QueryActions.setFilter.listen(this.clearInputString);
+ QueryActions.setAllFilters.listen(this.clearInputString);
+ QueryActions.removeFilter.listen(this.clearInputString);
+ QueryActions.removeFilters.listen(this.clearInputString);
+ QueryActions.removeAllFilters.listen(this.clearInputString);
+ QueryActions.toggleFilter.listen(this.clearInputString);
}
handleQueryChange(queryString) {
@@ -55,6 +71,8 @@ export default class Search extends React.Component {
clearInputString() {
this.refs.searchBox.clearSearchString();
+ this.refs.searchBox.focus();
+ window.scrollTo(0,0);
this.setState({
suggestionsVisible: false
});
@@ -75,13 +93,11 @@ export default class Search extends React.Component {
}
render() {
- var search = this.props.search;
return (
);
}
-});
-
-module.exports = Summary;
\ No newline at end of file
+}
diff --git a/scripts/components/suggest/suggest.jsx b/scripts/components/suggest/suggest.jsx
index d538ef8..d43739d 100644
--- a/scripts/components/suggest/suggest.jsx
+++ b/scripts/components/suggest/suggest.jsx
@@ -39,7 +39,7 @@ var Suggest = React.createClass({
No suggestions found. You may still attempt a full text search, though it is unlikely to find any genes for you.