@appbaseio/reactivesearch-vue 1.16.0-alpha.38 → 1.16.0-alpha.40

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

@@ -5057,7 +5057,9 @@
 	          if (typeof comp !== 'string') {
 	            return getQuery(comp, queryList);
 	          } else if (comp in queryList) {
-	            return queryList[comp];
+	            if (queryList[comp] && Object.keys(queryList[comp]).length) {
+	              return queryList[comp];
+	            }
 	          }
 
 	          return null;
@@ -5066,7 +5068,7 @@
 	        });
 	        var boolQuery = createBoolQuery(operation, queryArr);
 
-	        if (boolQuery) {
+	        if (boolQuery && Object.keys(boolQuery).length) {
 	          query = [].concat(_toConsumableArray(query), [boolQuery]);
 	        }
 	      } else if (typeof react[conjunction] === 'string') {
@@ -5074,13 +5076,13 @@
 
 	        var _boolQuery = createBoolQuery(_operation, queryList[react[conjunction]]);
 
-	        if (_boolQuery) {
+	        if (_boolQuery && Object.keys(_boolQuery).length) {
 	          query = [].concat(_toConsumableArray(query), [_boolQuery]);
 	        }
 	      } else if (typeof react[conjunction] === 'object' && react[conjunction] !== null) {
 	        var _boolQuery2 = getQuery(react[conjunction], queryList);
 
-	        if (_boolQuery2) {
+	        if (_boolQuery2 && Object.keys(_boolQuery2).length) {
 	          query = [].concat(_toConsumableArray(query), [_boolQuery2]);
 	        }
 	      }
@@ -8871,6 +8873,8 @@
 	          }, options, queryOptions[component]);
 
 	          var oldQuery = queryLog[component];
+	          console.log('OLD QUERY', component, JSON.stringify(oldQuery));
+	          console.log('NEW QUERY', component, JSON.stringify(currentQuery));
 
 	          if (mustExecuteMapQuery || !(0, helper.isEqual)(currentQuery, oldQuery)) {
 	            orderOfQueries = [].concat(_toConsumableArray(orderOfQueries), [component]);
@@ -21233,7 +21237,7 @@
 	    showCount: VueTypes.bool.def(true),
 	    showFilter: VueTypes.bool.def(true),
 	    showSearch: VueTypes.bool.def(true),
-	    size: VueTypes.number.def(100),
+	    size: VueTypes.number,
 	    sortBy: VueTypes.oneOf(['asc', 'desc', 'count']).def('count'),
 	    title: types.title,
 	    URLParams: VueTypes.bool.def(false),
@@ -21662,7 +21666,13 @@
 
 	MultiList.defaultQuery = function (value, props) {
 	  var query = null;
-	  var type = props.queryFormat === 'or' ? 'terms' : 'term';
+	  var queryFormat = props.queryFormat;
+
+	  if (queryFormat === undefined) {
+	    queryFormat = 'or';
+	  }
+
+	  var type = queryFormat === 'or' ? 'terms' : 'term';
 
 	  if (!Array.isArray(value) || value.length === 0) {
 	    return null;
@@ -21683,7 +21693,7 @@
 	  } else if (value) {
 	    var listQuery;
 
-	    if (props.queryFormat === 'or') {
+	    if (queryFormat === 'or') {
 	      if (props.showMissing) {
 	        var _type, _ref;
 
@@ -22143,7 +22153,7 @@
 	    selectAllLabel: types.string,
 	    showCount: VueTypes.bool.def(true),
 	    showFilter: VueTypes.bool.def(true),
-	    size: VueTypes.number.def(100),
+	    size: VueTypes.number,
 	    sortBy: VueTypes.oneOf(['asc', 'desc', 'count']).def('count'),
 	    title: types.title,
 	    URLParams: VueTypes.bool.def(false),
@@ -22601,7 +22611,7 @@
 	    selectAllLabel: types.string,
 	    showCount: VueTypes.bool.def(true),
 	    showFilter: VueTypes.bool.def(true),
-	    size: VueTypes.number.def(100),
+	    size: VueTypes.number,
 	    sortBy: VueTypes.oneOf(['asc', 'desc', 'count']).def('count'),
 	    title: types.title,
 	    URLParams: VueTypes.bool.def(false),
@@ -22993,7 +23003,13 @@
 
 	MultiDropdownList.defaultQuery = function (value, props) {
 	  var query = null;
-	  var type = props.queryFormat === 'or' ? 'terms' : 'term';
+	  var queryFormat = props.queryFormat;
+
+	  if (queryFormat === undefined) {
+	    queryFormat = 'or';
+	  }
+
+	  var type = queryFormat === 'or' ? 'terms' : 'term';
 
 	  if (!Array.isArray(value) || value.length === 0) {
 	    return null;
@@ -23014,7 +23030,7 @@
 	  } else if (value) {
 	    var listQuery;
 
-	    if (props.queryFormat === 'or') {
+	    if (queryFormat === 'or') {
 	      if (props.showMissing) {
 	        var _type, _ref;
 
@@ -23467,7 +23483,7 @@
 	    componentId: types.stringRequired,
 	    aggregationField: types.string,
 	    aggregationSize: VueTypes.number,
-	    size: VueTypes.number.def(20),
+	    size: VueTypes.number,
 	    defaultQuery: types.func,
 	    customQuery: types.func,
 	    filterLabel: types.string,
@@ -32478,7 +32494,8 @@
 	ReactiveGoogleMap.componentType = constants_1$1.reactiveMap;
 
 	var _excluded$5 = ["aggs", "size"],
-	    _excluded2 = ["query"];
+	    _excluded2 = ["query"],
+	    _excluded3 = ["aggs", "size"];
 	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];
@@ -32640,6 +32657,7 @@
 	        componentQueryOptions = _extends({}, componentQueryOptions, component.source.generateQueryOptions(component));
 	      }
 
+	      console.log('QUERY LOG componentQueryOptions', component.componentId, componentQueryOptions);
 	      var highlightQuery = {};
 
 	      if (component.source.highlightQuery) {
@@ -32763,9 +32781,23 @@
 	          queryObj = _buildQuery.queryObj,
 	          options = _buildQuery.options;
 
-	      var validOptions = ['aggs', 'from', 'sort']; // check if query or options are valid - non-empty
+	      var componentQueryOptions = options;
+	      var componentType = component.source.componentType;
+	      console.log('COMPONENT TYPE', componentType);
+
+	      if (componentType !== constants_1$1.reactiveComponent) {
+	        // don't merge aggs, size
+	        var _ref3 = options || {},
+	            aggs = _ref3.aggs,
+	            size = _ref3.size,
+	            rest = _objectWithoutPropertiesLoose(_ref3, _excluded3);
+
+	        componentQueryOptions = rest;
+	      }
+
+	      var validOptions = ['aggs', 'from', 'sort']; // check if query or componentQueryOptions are valid - non-empty
 
-	      if (queryObj && !!Object.keys(queryObj).length || options && Object.keys(options).some(function (item) {
+	      if (queryObj && !!Object.keys(queryObj).length || componentQueryOptions && Object.keys(componentQueryOptions).some(function (item) {
 	        return validOptions.includes(item);
 	      })) {
 	        var _extends2;
@@ -32780,8 +32812,12 @@
 
 	        var currentQuery = _extends({
 	          query: _extends({}, queryObj)
-	        }, options, queryOptions[component.componentId]);
+	        }, componentQueryOptions, queryOptions[component.componentId]);
 
+	        console.log('QUERY LOG build QUERY', component.componentId, queryObj);
+	        console.log('QUERY LOG build OPTIONS', component.componentId, componentQueryOptions);
+	        console.log('QUERY LOG OPTIONS (component)', component.componentId, queryOptions[component.componentId]);
+	        console.log('QUERY LOG', component.componentId, currentQuery);
 	        queryLog = _extends({}, queryLog, (_extends2 = {}, _extends2[component.componentId] = currentQuery, _extends2));
 
 	        if (settings.enableAppbase) {
@@ -32968,7 +33004,7 @@
 	  });
 	}
 
-	var version = "1.16.0-alpha.38";
+	var version = "1.16.0-alpha.40";
 
 	var _templateObject$o, _templateObject2$b;