improved fetcher stream and wfs transaction when object is passed as …

…changed value
geosolutions-it · Sep 28, 2017 · b10c49f · b10c49f
1 parent 89335f6
commit b10c49f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/web/client/components/data/query/AutocompleteFieldHOC.jsx b/web/client/components/data/query/AutocompleteFieldHOC.jsx
@@ -124,7 +124,7 @@ class AutocompleteFieldHOC extends React.Component {
                 this.props.onUpdateField(this.props.filterField.rowId, "value", input.value, "string", {currentPage: 1, selected: "selected", delayDebounce: 0});
             }
         } else {
-            this.props.onUpdateField(this.props.filterField.rowId, "value", input, "string", {currentPage: 1, delayDebounce: 1000});
+            this.props.onUpdateField(this.props.filterField.rowId, "value", typeof input === "string" ? input : input.value, "string", {currentPage: 1, delayDebounce: 1000});
         }
     };
 

diff --git a/web/client/components/misc/AutocompleteCombobox.jsx b/web/client/components/misc/AutocompleteCombobox.jsx
@@ -72,21 +72,22 @@ const addStateHandlers = compose(
             if (state.selected && state.changingPage) {
                 return ({
                     ...state,
-                    delayDebounce: state.selected ? 0 : 1000,
+                    delayDebounce: state.selected ? 0 : 500,
                     selected: false,
                     changingPage: false,
                     performFetch: state.selected && !state.changingPage ? false : true,
                     value: state.value,
                     currentPage: !state.changingPage ? 1 : state.currentPage
                 });
             }
+            const value = typeof v === "string" ? v : v.value;
             return ({
                 ...state,
-                delayDebounce: state.selected ? 0 : 1000,
+                delayDebounce: state.selected ? 0 : 500,
                 selected: false,
                 changingPage: false,
                 performFetch: state.selected && !state.changingPage ? false : true,
-                value: state.selected ? v.value : v,
+                value: value,
                 currentPage: !state.changingPage ? 1 : state.currentPage
             });
         },

diff --git a/web/client/observables/autocomplete.js b/web/client/observables/autocomplete.js
@@ -21,7 +21,10 @@ const {getWpsPayload} = require('../utils/ogc/WPS/autocomplete');
  * @memberof observables.autocomplete
  * @return {external:Observable} the stream used for fetching data for the autocomplete editor
 */
-const createPagedUniqueAutompleteStream = (props$) => props$.debounce(props => Rx.Observable.timer(props.delayDebounce || 0))
+const createPagedUniqueAutompleteStream = (props$) => props$
+    .distinctUntilChanged( ({value, currentPage}, newProps = {}) => !(newProps.value !== value || newProps.currentPage !== currentPage))
+    .throttle(props => Rx.Observable.timer(props.delayDebounce || 0))
+    .merge(props$.debounce(props => Rx.Observable.timer(props.delayDebounce || 0))).distinctUntilChanged()
     .switchMap((p) => {
         if (p.performFetch) {
             const data = getWpsPayload({