@appbaseio/reactivesearch-vue 1.16.0-alpha.44 → 1.16.0-alpha.47

package/dist/@appbaseio/reactivesearch-vue.umd.js

@@ -5209,7 +5209,7 @@
 	    }
 
 	    return {
-	      _term: sortBy
+	      _key: sortBy
 	    };
 	  }
 
@@ -20973,7 +20973,6 @@
 	      checkValueChange$1(props.componentId, value, props.beforeValueChange, performUpdate);
 	    },
 	    updateDefaultQueryHandler: function updateDefaultQueryHandler(value, props) {
-	      var defaultQueryOptions;
 	      var query = SingleList.defaultQuery(value, props);
 
 	      if (this.defaultQuery) {
@@ -20982,14 +20981,14 @@
 
 	        if (defaultQueryObj) {
 	          query = defaultQueryObj;
-	        }
+	        } // Update calculated default query in store
 
-	        defaultQueryOptions = getOptionsForCustomQuery$2(defaultQueryToBeSet); // Update calculated default query in store
 
 	        updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
+	        var defaultQueryOptions = getOptionsForCustomQuery$2(defaultQueryToBeSet);
+	        this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
 	      }
 
-	      this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
 	      this.updateQuery({
 	        componentId: this.internalComponent,
 	        query: query,
@@ -21000,16 +20999,15 @@
 	    updateQueryHandler: function updateQueryHandler(value, props) {
 	      var customQuery = props.customQuery;
 	      var query = SingleList.defaultQuery(value, props);
-	      var customQueryOptions;
 
 	      if (customQuery) {
 	        var customQueryCalc = customQuery(value, props);
 	        query = extractQueryFromCustomQuery$2(customQueryCalc);
-	        customQueryOptions = getOptionsForCustomQuery$2(customQueryCalc);
+	        var customQueryOptions = getOptionsForCustomQuery$2(customQueryCalc);
 	        updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
+	        this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      }
 
-	      this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      this.updateQuery({
 	        componentId: props.componentId,
 	        query: query,
@@ -21532,7 +21530,6 @@
 	      checkValueChange$2(props.componentId, finalValues, props.beforeValueChange, performUpdate);
 	    },
 	    updateDefaultQueryHandler: function updateDefaultQueryHandler(value, props) {
-	      var defaultQueryOptions;
 	      var query = MultiList.defaultQuery(value, props);
 
 	      if (this.defaultQuery) {
@@ -21541,14 +21538,14 @@
 
 	        if (defaultQueryObj) {
 	          query = defaultQueryObj;
-	        }
+	        } // Update calculated default query in store
 
-	        defaultQueryOptions = getOptionsForCustomQuery$3(defaultQueryToBeSet); // Update calculated default query in store
 
 	        updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
+	        var defaultQueryOptions = getOptionsForCustomQuery$3(defaultQueryToBeSet);
+	        this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
 	      }
 
-	      this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
 	      this.updateQuery({
 	        componentId: this.internalComponent,
 	        query: query,
@@ -21559,16 +21556,15 @@
 	    updateQueryHandler: function updateQueryHandler(value, props) {
 	      var customQuery = props.customQuery;
 	      var query = MultiList.defaultQuery(value, props);
-	      var customQueryOptions;
 
 	      if (customQuery) {
 	        var customQueryCalc = customQuery(value, props);
 	        query = extractQueryFromCustomQuery$3(customQueryCalc);
-	        customQueryOptions = getOptionsForCustomQuery$3(customQueryCalc);
 	        updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
+	        var customQueryOptions = getOptionsForCustomQuery$3(customQueryCalc);
+	        this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      }
 
-	      this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      this.updateQuery({
 	        componentId: props.componentId,
 	        query: query,
@@ -22373,7 +22369,6 @@
 	      }
 	    },
 	    updateDefaultQueryHandler: function updateDefaultQueryHandler(value, props) {
-	      var defaultQueryOptions;
 	      var query = SingleDropdownList.defaultQuery(value, props);
 
 	      if (this.defaultQuery) {
@@ -22382,14 +22377,14 @@
 
 	        if (defaultQueryObj) {
 	          query = defaultQueryObj;
-	        }
+	        } // Update calculated default query in store
 
-	        defaultQueryOptions = getOptionsForCustomQuery$4(defaultQueryToBeSet); // Update calculated default query in store
 
 	        updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
+	        var defaultQueryOptions = getOptionsForCustomQuery$4(defaultQueryToBeSet);
+	        this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
 	      }
 
-	      this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
 	      this.updateQuery({
 	        componentId: this.internalComponent,
 	        query: query,
@@ -22400,16 +22395,15 @@
 	    updateQueryHandler: function updateQueryHandler(value, props) {
 	      var customQuery = props.customQuery;
 	      var query = SingleDropdownList.defaultQuery(value, props);
-	      var customQueryOptions;
 
 	      if (customQuery) {
 	        var customQueryCalc = customQuery(value, props);
 	        query = extractQueryFromCustomQuery$4(customQueryCalc);
-	        customQueryOptions = getOptionsForCustomQuery$4(customQueryCalc);
 	        updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
+	        var customQueryOptions = getOptionsForCustomQuery$4(customQueryCalc);
+	        this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      }
 
-	      this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      this.updateQuery({
 	        componentId: props.componentId,
 	        query: query,
@@ -22905,7 +22899,6 @@
 	      checkValueChange$4(props.componentId, finalValues, props.beforeValueChange, performUpdate);
 	    },
 	    updateDefaultQueryHandler: function updateDefaultQueryHandler(value, props) {
-	      var defaultQueryOptions;
 	      var query = MultiDropdownList.defaultQuery(value, props);
 
 	      if (this.defaultQuery) {
@@ -22914,14 +22907,14 @@
 
 	        if (defaultQueryObj) {
 	          query = defaultQueryObj;
-	        }
+	        } // Update calculated default query in store
 
-	        defaultQueryOptions = getOptionsForCustomQuery$5(defaultQueryToBeSet); // Update calculated default query in store
 
 	        updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
+	        var defaultQueryOptions = getOptionsForCustomQuery$5(defaultQueryToBeSet);
+	        this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
 	      }
 
-	      this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
 	      this.updateQuery({
 	        componentId: this.internalComponent,
 	        query: query,
@@ -22932,16 +22925,15 @@
 	    updateQueryHandler: function updateQueryHandler(value, props) {
 	      var customQuery = props.customQuery;
 	      var query = MultiDropdownList.defaultQuery(value, props);
-	      var customQueryOptions;
 
 	      if (customQuery) {
 	        var customQueryCalc = customQuery(value, props);
 	        query = extractQueryFromCustomQuery$5(customQueryCalc);
-	        customQueryOptions = getOptionsForCustomQuery$5(customQueryCalc);
 	        updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
+	        var customQueryOptions = getOptionsForCustomQuery$5(customQueryCalc);
+	        this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      }
 
-	      this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      this.updateQuery({
 	        componentId: props.componentId,
 	        query: query,
@@ -23562,10 +23554,16 @@
 
 	      var customQueryCalc = _extends({}, options, {
 	        query: queryToBeSet
-	      }); // Update customQuery field for RS API
+	      });
+
+	      var rsAPIQuery = customQueryCalc; // handle stored queries
 
+	      if (queryToBeSet && queryToBeSet.id) {
+	        rsAPIQuery = queryToBeSet;
+	      } // Update customQuery field for RS API
 
-	      _this.setCustomQuery(props.componentId, customQueryCalc);
+
+	      _this.setCustomQuery(props.componentId, rsAPIQuery);
 
 	      if (options) {
 	        _this.setQueryOptions(props.componentId, _extends({}, _this.getAggsQuery(), options), false);
@@ -24096,17 +24094,16 @@
 	    updateQueryHandler: function updateQueryHandler(value, props) {
 	      var customQuery = props.customQuery;
 	      var query = SingleRange.defaultQuery(value, props);
-	      var customQueryOptions;
 
 	      if (customQuery) {
 	        var _ref = customQuery(value, props) || {};
 
 	        query = _ref.query;
-	        customQueryOptions = getOptionsFromQuery$1(customQuery(value, props));
+	        var customQueryOptions = getOptionsFromQuery$1(customQuery(value, props));
 	        updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.currentValue);
+	        this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      }
 
-	      this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      this.updateQuery({
 	        componentId: props.componentId,
 	        query: query,
@@ -24305,17 +24302,16 @@
 	    updateQueryHandler: function updateQueryHandler(value, props) {
 	      var customQuery = props.customQuery;
 	      var query = MultiRange.defaultQuery(value, props);
-	      var customQueryOptions;
 
 	      if (customQuery) {
 	        var _ref = customQuery(value, props) || {};
 
 	        query = _ref.query;
-	        customQueryOptions = getOptionsFromQuery$2(customQuery(value, props));
+	        var customQueryOptions = getOptionsFromQuery$2(customQuery(value, props));
 	        updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.currentValue);
+	        this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      }
 
-	      this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      this.updateQuery({
 	        componentId: props.componentId,
 	        query: query,
@@ -24896,14 +24892,14 @@
 	    updateQueryHandler: function updateQueryHandler(value, props) {
 	      var customQuery = props.customQuery;
 	      var query = RangeSlider.defaultQuery(value, props);
-	      var customQueryOptions;
 
 	      if (customQuery) {
 	        var _ref = customQuery(value, props) || {};
 
 	        query = _ref.query;
-	        customQueryOptions = getOptionsFromQuery$3(customQuery(value, props));
+	        var customQueryOptions = getOptionsFromQuery$3(customQuery(value, props));
 	        updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.currentValue);
+	        this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      }
 
 	      var showFilter = props.showFilter,
@@ -24914,7 +24910,6 @@
 	          currentEnd = value[1]; // check if the slider is at its initial position
 
 	      var isInitialValue = currentStart === start && currentEnd === end;
-	      this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      this.updateQuery({
 	        componentId: props.componentId,
 	        query: query,
@@ -25299,7 +25294,6 @@
 	    },
 	    updateQueryHandler: function updateQueryHandler(value) {
 	      var query = DynamicRangeSlider.defaultQuery(value, this.$props);
-	      var customQueryOptions;
 
 	      if (this.$props.customQuery) {
 	        var customQueryTobeSet = this.$props.customQuery(value, this.$props);
@@ -25309,8 +25303,9 @@
 	          query = queryTobeSet;
 	        }
 
-	        customQueryOptions = getOptionsForCustomQuery$7(customQueryTobeSet);
+	        var customQueryOptions = getOptionsForCustomQuery$7(customQueryTobeSet);
 	        updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, value);
+	        this.setQueryOptions(this.$props.componentId, customQueryOptions, false);
 	      }
 
 	      var _ref2 = this.range || {
@@ -25324,7 +25319,6 @@
 	          currentEnd = value[1]; // check if the slider is at its initial position
 
 	      var isInitialValue = currentStart === start && currentEnd === end;
-	      this.setQueryOptions(this.$props.componentId, customQueryOptions, false);
 	      this.updateQuery({
 	        componentId: this.$props.componentId,
 	        query: query,
@@ -32496,8 +32490,7 @@
 
 	var _excluded$5 = ["aggs", "size"],
 	    _excluded2 = ["query"],
-	    _excluded3 = ["query"],
-	    _excluded4 = ["aggs", "size"];
+	    _excluded3 = ["query"];
 	var X_SEARCH_CLIENT$1 = 'ReactiveSearch Vue';
 	var componentsWithoutFilters = [constants_1$1.numberBox, constants_1$1.ratingsFilter];
 	var resultComponents = [constants_1$1.reactiveList, constants_1$1.reactiveMap];
@@ -32767,7 +32760,7 @@
 	      queryOptions = queryOptionsReducer(queryOptions, {
 	        type: 'SET_QUERY_OPTIONS',
 	        component: component.componentId,
-	        options: _extends({}, componentQueryOptions, options)
+	        options: _extends({}, options)
 	      }); // Set component type in component props
 
 	      compProps.componentType = componentType;
@@ -32792,18 +32785,6 @@
 	          options = _buildQuery.options;
 
 	      var componentQueryOptions = options;
-	      var componentType = component.source.componentType;
-
-	      if (componentType !== constants_1$1.reactiveComponent) {
-	        // don't merge aggs, size
-	        var _ref4 = options || {},
-	            aggs = _ref4.aggs,
-	            size = _ref4.size,
-	            rest = _objectWithoutPropertiesLoose(_ref4, _excluded4);
-
-	        componentQueryOptions = rest;
-	      }
-
 	      var validOptions = ['aggs', 'from', 'sort']; // check if query or componentQueryOptions are valid - non-empty
 
 	      if (queryObj && !!Object.keys(queryObj).length || componentQueryOptions && Object.keys(componentQueryOptions).some(function (item) {
@@ -32991,6 +32972,7 @@
 	        rsAPISettings.customEvents = utils_2(config.analyticsConfig.customEvents) ? config.analyticsConfig.customEvents : undefined;
 	      }
 
+	      console.log('FINAL QUERY', JSON.stringify(finalQuery));
 	      appbaseRef.reactiveSearchv3(finalQuery, rsAPISettings).then(function (res) {
 	        handleRSResponse(res);
 	      })["catch"](function (err) {
@@ -33009,7 +32991,7 @@
 	  });
 	}
 
-	var version = "1.16.0-alpha.44";
+	var version = "1.16.0-alpha.47";
 
 	var _templateObject$o, _templateObject2$b;