Improved searchEpic (#1667)

* Improved searchEpic * fixed test
geosolutions-it · Mar 31, 2017 · cf9d474 · cf9d474
1 parent 966c6a5
commit cf9d474
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/web/client/components/mapcontrols/search/SearchBar.jsx b/web/client/components/mapcontrols/search/SearchBar.jsx
@@ -120,7 +120,7 @@ let SearchBar = React.createClass({
         }
     },
     onFocus() {
-        if (this.props.typeAhead ) {
+        if (this.props.typeAhead && this.props.searchText ) {
             this.search();
         }
     },

diff --git a/web/client/epics/__tests__/search-test.js b/web/client/epics/__tests__/search-test.js
@@ -106,9 +106,9 @@ describe('search Epics', () => {
 
         let actions = store.getActions();
         expect(actions.length).toBe(4);
-        expect(actions[1].type).toBe(CHANGE_MAP_VIEW);
-        expect(actions[2].type).toBe(TEXT_SEARCH_ADD_MARKER);
-        expect(actions[3].type).toBe(TEXT_SEARCH_RESULTS_PURGE);
+        expect(actions[1].type).toBe(TEXT_SEARCH_RESULTS_PURGE);
+        expect(actions[2].type).toBe(CHANGE_MAP_VIEW);
+        expect(actions[3].type).toBe(TEXT_SEARCH_ADD_MARKER);
     });
 
     it('searchItemSelected epic with nested services', () => {

diff --git a/web/client/epics/search.js b/web/client/epics/search.js
@@ -63,8 +63,8 @@ const searchEpic = action$ =>
         .mergeAll()
         .scan( (oldRes, newRes) => [...oldRes, ...newRes].sort( (a, b) => get(b, "__PRIORITY__") - get(a, "__PRIORITY__") ) .slice(0, 15))
         .map((results) => searchResultLoaded(results, false))
-        .takeUntil(action$.ofType([ TEXT_SEARCH_RESULTS_PURGE, TEXT_SEARCH_RESET, TEXT_SEARCH_ITEM_SELECTED]))
         .startWith(searchTextLoading(true))
+        .takeUntil(action$.ofType( TEXT_SEARCH_RESULTS_PURGE, TEXT_SEARCH_RESET, TEXT_SEARCH_ITEM_SELECTED))
         .concat([searchTextLoading(false)])
         .catch(e => Rx.Observable.from([searchResultError(e), searchTextLoading(false)]))
 );
@@ -144,7 +144,7 @@ const searchItemSelected = action$ =>
         let searchTextTemplate = item.__SERVICE__ && item.__SERVICE__.searchTextTemplate;
         let searchTextStream = searchTextTemplate ? Rx.Observable.of(searchTextChanged(generateTemplateString(searchTextTemplate)(item))) : Rx.Observable.empty();
 
-        return Rx.Observable.merge(itemSelectionStream, Rx.Observable.of(resultsPurge()), nestedServicesStream, searchTextStream);
+        return Rx.Observable.of(resultsPurge()).concat(itemSelectionStream, nestedServicesStream, searchTextStream);
     });
 
     /**