From 574cefde185bad4ede677b5ce287c2c4ed7dfd50 Mon Sep 17 00:00:00 2001
From: Esko Ikkala <esko.ikkala@aalto.fi>
Date: Wed, 6 Jun 2018 17:16:36 +0300
Subject: [PATCH] Seperate suggestions and results
---
src/components/IntegrationAutosuggest.js | 21 ++++++++-------------
src/reducers/search.js | 11 ++++++++++-
2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/components/IntegrationAutosuggest.js b/src/components/IntegrationAutosuggest.js
index cb7b5f70..038651b0 100644
--- a/src/components/IntegrationAutosuggest.js
+++ b/src/components/IntegrationAutosuggest.js
@@ -75,19 +75,18 @@ const IntegrationAutosuggest = (props) => {
const handleOnChange = (event, { newValue }) => {
props.clearSuggestions();
props.updateQuery(newValue);
- //if (newValue.length < 3) {
-
- // }
};
const handleOnSuggestionSelected = () => {
- props.clearSuggestions();
+ // TODO: input should lose focus
+ console.log('fetching results');
props.fetchResults();
};
const handleOnKeyDown = (event) => {
if (event.key === 'Enter') {
- props.clearSuggestions();
+ // TODO: input should lose focus
+ console.log('fetching results');
props.fetchResults();
}
};
@@ -98,16 +97,13 @@ const IntegrationAutosuggest = (props) => {
// };
const handleOnSuggestionsFetchRequested = ({ value }) => {
- // console.log(value)
- // console.log(reason)
- // console.log(props.search.suggestionsQuery)
if (props.search.suggestionsQuery != value ) {
- // console.log('fetching suggestions');
+ console.log('fetching suggestions');
props.fetchSuggestions();
}
- // else {
- // console.log('using old suggestions');
- // }
+ else {
+ console.log('using old suggestions');
+ }
};
const shouldRenderSuggestions = (value) => {
@@ -118,7 +114,6 @@ const IntegrationAutosuggest = (props) => {
//console.log('SuggestionsClearRequested');
//props.clearSuggestions();
};
- //alwaysRenderSuggestions={true}
const { classes } = props;
diff --git a/src/reducers/search.js b/src/reducers/search.js
index dcf09469..0ac90bef 100644
--- a/src/reducers/search.js
+++ b/src/reducers/search.js
@@ -25,6 +25,11 @@ const search = (state = INITIAL_STATE, action) => {
case UPDATE_DATASETS:
return { ...state, datasets: action.datasets || [] };
case CLEAR_SUGGESTIONS:
+ return {
+ ...state,
+ suggestions: [],
+ suggestionsQuery: '',
+ };
case UPDATE_SUGGESTIONS:
return {
...state,
@@ -32,10 +37,14 @@ const search = (state = INITIAL_STATE, action) => {
suggestionsQuery: state.query
};
case CLEAR_RESULTS:
+ return {
+ ...state,
+ results: [],
+ resultsQuery: '',
+ };
case UPDATE_RESULTS:
return {
...state,
- suggestions: [],
results: results(state.results, action),
resultsQuery: state.query
};
--
GitLab