Skip to content
Snippets Groups Projects
Commit 574cefde authored by Esko Ikkala's avatar Esko Ikkala
Browse files

Seperate suggestions and results

parent 357c5d2a
No related branches found
No related tags found
No related merge requests found
...@@ -75,19 +75,18 @@ const IntegrationAutosuggest = (props) => { ...@@ -75,19 +75,18 @@ const IntegrationAutosuggest = (props) => {
const handleOnChange = (event, { newValue }) => { const handleOnChange = (event, { newValue }) => {
props.clearSuggestions(); props.clearSuggestions();
props.updateQuery(newValue); props.updateQuery(newValue);
//if (newValue.length < 3) {
// }
}; };
const handleOnSuggestionSelected = () => { const handleOnSuggestionSelected = () => {
props.clearSuggestions(); // TODO: input should lose focus
console.log('fetching results');
props.fetchResults(); props.fetchResults();
}; };
const handleOnKeyDown = (event) => { const handleOnKeyDown = (event) => {
if (event.key === 'Enter') { if (event.key === 'Enter') {
props.clearSuggestions(); // TODO: input should lose focus
console.log('fetching results');
props.fetchResults(); props.fetchResults();
} }
}; };
...@@ -98,16 +97,13 @@ const IntegrationAutosuggest = (props) => { ...@@ -98,16 +97,13 @@ const IntegrationAutosuggest = (props) => {
// }; // };
const handleOnSuggestionsFetchRequested = ({ value }) => { const handleOnSuggestionsFetchRequested = ({ value }) => {
// console.log(value)
// console.log(reason)
// console.log(props.search.suggestionsQuery)
if (props.search.suggestionsQuery != value ) { if (props.search.suggestionsQuery != value ) {
// console.log('fetching suggestions'); console.log('fetching suggestions');
props.fetchSuggestions(); props.fetchSuggestions();
} }
// else { else {
// console.log('using old suggestions'); console.log('using old suggestions');
// } }
}; };
const shouldRenderSuggestions = (value) => { const shouldRenderSuggestions = (value) => {
...@@ -118,7 +114,6 @@ const IntegrationAutosuggest = (props) => { ...@@ -118,7 +114,6 @@ const IntegrationAutosuggest = (props) => {
//console.log('SuggestionsClearRequested'); //console.log('SuggestionsClearRequested');
//props.clearSuggestions(); //props.clearSuggestions();
}; };
//alwaysRenderSuggestions={true}
const { classes } = props; const { classes } = props;
......
...@@ -25,6 +25,11 @@ const search = (state = INITIAL_STATE, action) => { ...@@ -25,6 +25,11 @@ const search = (state = INITIAL_STATE, action) => {
case UPDATE_DATASETS: case UPDATE_DATASETS:
return { ...state, datasets: action.datasets || [] }; return { ...state, datasets: action.datasets || [] };
case CLEAR_SUGGESTIONS: case CLEAR_SUGGESTIONS:
return {
...state,
suggestions: [],
suggestionsQuery: '',
};
case UPDATE_SUGGESTIONS: case UPDATE_SUGGESTIONS:
return { return {
...state, ...state,
...@@ -32,10 +37,14 @@ const search = (state = INITIAL_STATE, action) => { ...@@ -32,10 +37,14 @@ const search = (state = INITIAL_STATE, action) => {
suggestionsQuery: state.query suggestionsQuery: state.query
}; };
case CLEAR_RESULTS: case CLEAR_RESULTS:
return {
...state,
results: [],
resultsQuery: '',
};
case UPDATE_RESULTS: case UPDATE_RESULTS:
return { return {
...state, ...state,
suggestions: [],
results: results(state.results, action), results: results(state.results, action),
resultsQuery: state.query resultsQuery: state.query
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment