@appbaseio/reactivesearch-vue 1.27.0 → 1.28.0

package/dist/es/SingleDropdownList.js

@@ -29,9 +29,10 @@ var getQueryOptions = helper.getQueryOptions,
     checkValueChange = helper.checkValueChange,
     checkPropChange = helper.checkPropChange,
     getClassName = helper.getClassName,
-    getOptionsFromQuery = helper.getOptionsFromQuery,
     isEqual = helper.isEqual,
-    getCompositeAggsQuery = helper.getCompositeAggsQuery;
+    getCompositeAggsQuery = helper.getCompositeAggsQuery,
+    extractQueryFromCustomQuery = helper.extractQueryFromCustomQuery,
+    getOptionsForCustomQuery = helper.getOptionsForCustomQuery;
 var SingleDropdownList = {
   name: 'SingleDropdownList',
   data: function data() {
@@ -68,7 +69,7 @@ var SingleDropdownList = {
     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),
@@ -280,22 +281,22 @@ var SingleDropdownList = {
       }
     },
     updateDefaultQueryHandler: function updateDefaultQueryHandler(value, props) {
-      var defaultQueryOptions;
       var query = SingleDropdownList.defaultQuery(value, props);
 
       if (this.defaultQuery) {
         var defaultQueryToBeSet = this.defaultQuery(value, props) || {};
+        var defaultQueryObj = extractQueryFromCustomQuery(defaultQueryToBeSet);
 
-        if (defaultQueryToBeSet.query) {
-          query = defaultQueryToBeSet.query;
-        }
+        if (defaultQueryObj) {
+          query = defaultQueryObj;
+        } // Update calculated default query in store
 
-        defaultQueryOptions = getOptionsFromQuery(defaultQueryToBeSet); // Update calculated default query in store
 
         updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
+        var defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet);
+        this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
       }
 
-      this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
       this.updateQuery({
         componentId: this.internalComponent,
         query: query,
@@ -306,17 +307,15 @@ var SingleDropdownList = {
     updateQueryHandler: function updateQueryHandler(value, props) {
       var customQuery = props.customQuery;
       var query = SingleDropdownList.defaultQuery(value, props);
-      var customQueryOptions;
 
       if (customQuery) {
-        var _ref = customQuery(value, props) || {};
-
-        query = _ref.query;
-        customQueryOptions = getOptionsFromQuery(customQuery(value, props));
+        var customQueryCalc = customQuery(value, props);
+        query = extractQueryFromCustomQuery(customQueryCalc);
         updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
+        var customQueryOptions = getOptionsForCustomQuery(customQueryCalc);
+        this.setQueryOptions(props.componentId, customQueryOptions, false);
       }
 
-      this.setQueryOptions(props.componentId, customQueryOptions, false);
       this.updateQuery({
         componentId: props.componentId,
         query: query,
@@ -350,7 +349,7 @@ var SingleDropdownList = {
 
       if (props.defaultQuery) {
         var value = this.$data.currentValue;
-        var defaultQueryOptions = getOptionsFromQuery(props.defaultQuery(value, props));
+        var defaultQueryOptions = getOptionsForCustomQuery(props.defaultQuery(value, props));
         this.setQueryOptions(this.internalComponent, _extends({}, queryOptions, defaultQueryOptions));
       } else {
         this.setQueryOptions(this.internalComponent, queryOptions);
@@ -442,6 +441,10 @@ SingleDropdownList.generateQueryOptions = function (props, after) {
   }) : getAggsQuery(queryOptions, props);
 };
 
+SingleDropdownList.hasInternalComponent = function () {
+  return true;
+};
+
 var mapStateToProps = function mapStateToProps(state, props) {
   return {
     options: props.nestedField && state.aggregations[props.componentId] ? state.aggregations[props.componentId].reactivesearch_nested : state.aggregations[props.componentId],
@@ -463,7 +466,7 @@ var mapDispatchtoProps = {
 };
 var ListConnected = ComponentWrapper(connect(mapStateToProps, mapDispatchtoProps)(SingleDropdownList), {
   componentType: componentTypes.singleDropdownList,
-  internalComponent: true
+  internalComponent: SingleDropdownList.hasInternalComponent()
 });
 
 SingleDropdownList.install = function (Vue) {

package/dist/es/SingleList.js

@@ -24,8 +24,9 @@ var updateQuery = Actions.updateQuery,
 var getQueryOptions = helper.getQueryOptions,
     checkValueChange = helper.checkValueChange,
     getClassName = helper.getClassName,
-    getOptionsFromQuery = helper.getOptionsFromQuery,
-    isEqual = helper.isEqual;
+    isEqual = helper.isEqual,
+    extractQueryFromCustomQuery = helper.extractQueryFromCustomQuery,
+    getOptionsForCustomQuery = helper.getOptionsForCustomQuery;
 var SingleList = {
   name: 'SingleList',
   props: {
@@ -262,22 +263,22 @@ var SingleList = {
       checkValueChange(props.componentId, value, props.beforeValueChange, performUpdate);
     },
     updateDefaultQueryHandler: function updateDefaultQueryHandler(value, props) {
-      var defaultQueryOptions;
       var query = SingleList.defaultQuery(value, props);
 
       if (this.defaultQuery) {
         var defaultQueryToBeSet = this.defaultQuery(value, props) || {};
+        var defaultQueryObj = extractQueryFromCustomQuery(defaultQueryToBeSet);
 
-        if (defaultQueryToBeSet.query) {
-          query = defaultQueryToBeSet.query;
-        }
+        if (defaultQueryObj) {
+          query = defaultQueryObj;
+        } // Update calculated default query in store
 
-        defaultQueryOptions = getOptionsFromQuery(defaultQueryToBeSet); // Update calculated default query in store
 
         updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
+        var defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet);
+        this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
       }
 
-      this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
       this.updateQuery({
         componentId: this.internalComponent,
         query: query,
@@ -288,17 +289,15 @@ var SingleList = {
     updateQueryHandler: function updateQueryHandler(value, props) {
       var customQuery = props.customQuery;
       var query = SingleList.defaultQuery(value, props);
-      var customQueryOptions;
 
       if (customQuery) {
-        var _ref = customQuery(value, props) || {};
-
-        query = _ref.query;
-        customQueryOptions = getOptionsFromQuery(customQuery(value, props));
+        var customQueryCalc = customQuery(value, props);
+        query = extractQueryFromCustomQuery(customQueryCalc);
+        var customQueryOptions = getOptionsForCustomQuery(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,
@@ -318,7 +317,7 @@ var SingleList = {
 
       if (props.defaultQuery) {
         var value = this.$data.currentValue;
-        var defaultQueryOptions = getOptionsFromQuery(props.defaultQuery(value, props));
+        var defaultQueryOptions = getOptionsForCustomQuery(props.defaultQuery(value, props));
         this.setQueryOptions(this.internalComponent, _extends({}, queryOptions, defaultQueryOptions));
       } else {
         this.setQueryOptions(this.internalComponent, queryOptions);
@@ -463,6 +462,10 @@ SingleList.defaultQuery = function (value, props) {
   return query;
 };
 
+SingleList.hasInternalComponent = function () {
+  return true;
+};
+
 var mapStateToProps = function mapStateToProps(state, props) {
   return {
     options: props.nestedField && state.aggregations[props.componentId] ? state.aggregations[props.componentId].reactivesearch_nested : state.aggregations[props.componentId],
@@ -484,7 +487,7 @@ var mapDispatchtoProps = {
 };
 var ListConnected = ComponentWrapper(connect(mapStateToProps, mapDispatchtoProps)(SingleList), {
   componentType: componentTypes.singleList,
-  internalComponent: true
+  internalComponent: SingleList.hasInternalComponent()
 });
 
 SingleList.install = function (Vue) {

package/dist/es/SingleRange.js

@@ -150,17 +150,16 @@ var SingleRange = {
     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(customQuery(value, props));
+        var customQueryOptions = getOptionsFromQuery(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,

package/dist/es/initReactivesearch.js

@@ -1,7 +1,7 @@
 import { a as _extends, b as _objectWithoutPropertiesLoose } from './_rollupPluginBabelHelpers-0f24d612.js';
 import { validProps, componentTypes } from '@appbaseio/reactivecore/lib/utils/constants';
-import { pushToAndClause, buildQuery } from '@appbaseio/reactivecore/lib/utils/helper';
-import { getRSQuery, extractPropsFromState, getDependentQueries } from '@appbaseio/reactivecore/lib/utils/transform';
+import { pushToAndClause, buildQuery, extractQueryFromCustomQuery, getOptionsForCustomQuery } from '@appbaseio/reactivecore/lib/utils/helper';
+import { isSearchComponent, getRSQuery, extractPropsFromState, getDependentQueries } from '@appbaseio/reactivecore/lib/utils/transform';
 import Appbase from 'appbase-js';
 import valueReducer from '@appbaseio/reactivecore/lib/reducers/valueReducer';
 import queryReducer from '@appbaseio/reactivecore/lib/reducers/queryReducer';
@@ -12,10 +12,10 @@ import dependencyTreeReducer from '@appbaseio/reactivecore/lib/reducers/dependen
 import fetchGraphQL from '@appbaseio/reactivecore/lib/utils/graphQL';
 import { isPropertyDefined } from '@appbaseio/reactivecore/lib/actions/utils';
 
-var _excluded = ["aggs", "size"];
+var _excluded = ["aggs", "size"],
+    _excluded2 = ["query"],
+    _excluded3 = ["query"];
 var X_SEARCH_CLIENT = 'ReactiveSearch Vue';
-var componentsWithHighlightQuery = [componentTypes.dataSearch, componentTypes.categorySearch];
-var componentsWithOptions = [componentTypes.reactiveList, componentTypes.reactiveMap, componentTypes.singleList, componentTypes.multiList, componentTypes.tagCloud].concat(componentsWithHighlightQuery);
 var componentsWithoutFilters = [componentTypes.numberBox, componentTypes.ratingsFilter];
 var resultComponents = [componentTypes.reactiveList, componentTypes.reactiveMap];
 
@@ -49,23 +49,40 @@ function parseValue(value, component) {
   }
 
   return value;
-}
+} // Returns query DSL with query property and other options
+
+
+function getDefaultQuery(component, value) {
+  // get custom or default query of sensor components
+  var currentValue = parseValue(value, component); // get default query of result components
+
+  if (component.defaultQuery) {
+    var defaultQuery = component.defaultQuery(currentValue, component);
+    return _extends({
+      query: extractQueryFromCustomQuery(defaultQuery)
+    }, getOptionsForCustomQuery(defaultQuery));
+  }
 
-function getQuery(component, value, componentType) {
-  // get default query of result components
-  if (resultComponents.includes(componentType)) {
-    return component.defaultQuery ? component.defaultQuery() : {};
-  } // get custom or default query of sensor components
+  return component.source.defaultQuery ? {
+    query: component.source.defaultQuery(currentValue, component)
+  } : {};
+} // Only results the query part
 
 
+function getCustomQuery(component, value) {
+  // get custom or default query of sensor components
   var currentValue = parseValue(value, component);
 
   if (component.customQuery) {
     var customQuery = component.customQuery(currentValue, component);
-    return customQuery && customQuery.query;
+    return _extends({
+      query: extractQueryFromCustomQuery(customQuery)
+    }, getOptionsForCustomQuery(customQuery));
   }
 
-  return component.source.defaultQuery ? component.source.defaultQuery(currentValue, component) : {};
+  return component.source.defaultQuery ? {
+    query: component.source.defaultQuery(currentValue, component)
+  } : null;
 }
 
 function initReactivesearch(componentCollection, searchState, settings) {
@@ -120,6 +137,11 @@ function initReactivesearch(componentCollection, searchState, settings) {
         }
       });
       var isInternalComponentPresent = false;
+
+      if (component.source.hasInternalComponent) {
+        isInternalComponentPresent = component.source.hasInternalComponent(component);
+      }
+
       var isResultComponent = resultComponents.includes(componentType);
       var internalComponent = component.componentId + "__internal";
       var label = component.filterLabel || component.componentId;
@@ -151,74 +173,66 @@ function initReactivesearch(componentCollection, searchState, settings) {
 
       if (component.defaultQuery && typeof component.defaultQuery === 'function') {
         defaultQueries[component.componentId] = component.defaultQuery(value, compProps);
-      } // [2] set query options - main component query (valid for result components)
-
+      }
 
-      if (componentsWithOptions.includes(componentType)) {
-        var options = component.source.generateQueryOptions ? component.source.generateQueryOptions(component) : null;
-        var highlightQuery = {};
+      var componentQueryOptions = {}; // [2] set query options - main component query (valid for result components)
 
-        if (componentsWithHighlightQuery.includes(componentType) && component.highlight) {
-          highlightQuery = component.source.highlightQuery(component);
-        }
+      if (component && component.source.generateQueryOptions) {
+        componentQueryOptions = _extends({}, componentQueryOptions, component.source.generateQueryOptions(component));
+      }
 
-        if (options && Object.keys(options).length || highlightQuery && Object.keys(highlightQuery).length) {
-          // eslint-disable-next-line
-          var _ref = options || {},
-              aggs = _ref.aggs,
-              size = _ref.size,
-              otherQueryOptions = _objectWithoutPropertiesLoose(_ref, _excluded);
-
-          if (aggs && Object.keys(aggs).length) {
-            isInternalComponentPresent = true; // query should be applied on the internal component
-            // to enable feeding the data to parent component
-
-            queryOptions = queryOptionsReducer(queryOptions, {
-              type: 'SET_QUERY_OPTIONS',
-              component: internalComponent,
-              options: {
-                aggs: aggs,
-                size: typeof size === 'undefined' ? 100 : size
-              }
-            });
-          } // sort, highlight, size, from - query should be applied on the main component
+      var highlightQuery = {};
 
+      if (component.source.highlightQuery) {
+        highlightQuery = component.source.highlightQuery(component);
+      }
 
-          if (otherQueryOptions && Object.keys(otherQueryOptions).length || highlightQuery && Object.keys(highlightQuery).length) {
-            if (!otherQueryOptions) otherQueryOptions = {};
-            if (!highlightQuery) highlightQuery = {};
+      if (componentQueryOptions && Object.keys(componentQueryOptions).length || highlightQuery && Object.keys(highlightQuery).length) {
+        // eslint-disable-next-line
+        var _ref = componentQueryOptions || {},
+            aggs = _ref.aggs,
+            size = _ref.size,
+            otherQueryOptions = _objectWithoutPropertiesLoose(_ref, _excluded);
+
+        if (aggs && Object.keys(aggs).length) {
+          isInternalComponentPresent = true;
+          componentQueryOptions = _extends({}, componentQueryOptions, {
+            aggs: aggs,
+            size: typeof size === 'undefined' ? 100 : size
+          });
+        } // sort, highlight, size, from - query should be applied on the main component
 
-            var mainQueryOptions = _extends({}, otherQueryOptions, highlightQuery, {
-              size: size
-            });
 
-            if (isInternalComponentPresent) {
-              mainQueryOptions = _extends({}, otherQueryOptions, highlightQuery);
-            }
+        if (otherQueryOptions && Object.keys(otherQueryOptions).length || highlightQuery && Object.keys(highlightQuery).length) {
+          if (!otherQueryOptions) otherQueryOptions = {};
+          if (!highlightQuery) highlightQuery = {};
 
-            if (isResultComponent) {
-              var currentPage = component.currentPage ? component.currentPage - 1 : 0;
+          var mainQueryOptions = _extends({}, otherQueryOptions, highlightQuery, {
+            size: size
+          });
 
-              if (selectedValues[component.componentId] && selectedValues[component.componentId].value) {
-                currentPage = selectedValues[component.componentId].value - 1 || 0;
-              }
+          if (isInternalComponentPresent) {
+            mainQueryOptions = _extends({}, otherQueryOptions, highlightQuery);
+          }
 
-              var resultSize = component.size || 10;
-              var from = currentPage * resultSize; // Update props for RS API
+          if (isResultComponent) {
+            var currentPage = component.currentPage ? component.currentPage - 1 : 0;
 
-              compProps.from = from;
-              mainQueryOptions = _extends({}, mainQueryOptions, highlightQuery, {
-                size: resultSize,
-                from: from
-              });
+            if (selectedValues[component.componentId] && selectedValues[component.componentId].value) {
+              currentPage = selectedValues[component.componentId].value - 1 || 0;
             }
 
-            queryOptions = queryOptionsReducer(queryOptions, {
-              type: 'SET_QUERY_OPTIONS',
-              component: component.componentId,
-              options: _extends({}, mainQueryOptions)
+            var resultSize = component.size || 10;
+            var from = currentPage * resultSize; // Update props for RS API
+
+            compProps.from = from;
+            mainQueryOptions = _extends({}, mainQueryOptions, highlightQuery, {
+              size: resultSize,
+              from: from
             });
           }
+
+          componentQueryOptions = _extends({}, componentQueryOptions, mainQueryOptions);
         }
       } // [3] set dependency tree
 
@@ -236,25 +250,42 @@ function initReactivesearch(componentCollection, searchState, settings) {
           react: react
         });
       } // [4] set query list
+      // Do not set default query for suggestions
 
 
-      if (isResultComponent) {
-        var _getQuery = getQuery(component, value, componentType),
-            query = _getQuery.query;
+      if (isInternalComponentPresent && !isSearchComponent(component.componentType)) {
+        var _ref2 = getDefaultQuery(component, value) || {},
+            defaultQuery = _ref2.query,
+            defaultQueryOptions = _objectWithoutPropertiesLoose(_ref2, _excluded2);
 
         queryList = queryReducer(queryList, {
           type: 'SET_QUERY',
           component: internalComponent,
-          query: query
+          query: defaultQuery
         });
-      } else {
-        queryList = queryReducer(queryList, {
-          type: 'SET_QUERY',
-          component: component.componentId,
-          query: getQuery(component, value, componentType)
+        queryOptions = queryOptionsReducer(queryOptions, {
+          type: 'SET_QUERY_OPTIONS',
+          component: internalComponent,
+          options: _extends({}, componentQueryOptions, defaultQueryOptions)
         });
-      } // Set component type in component props
+      }
+
+      var _ref3 = getCustomQuery(component, value) || {},
+          query = _ref3.query,
+          options = _objectWithoutPropertiesLoose(_ref3, _excluded3);
 
+      var customQuery = query; // set custom query for main component
+
+      queryList = queryReducer(queryList, {
+        type: 'SET_QUERY',
+        component: component.componentId,
+        query: customQuery
+      });
+      queryOptions = queryOptionsReducer(queryOptions, {
+        type: 'SET_QUERY_OPTIONS',
+        component: component.componentId,
+        options: _extends({}, options)
+      }); // Set component type in component props
 
       compProps.componentType = componentType;
       componentProps[component.componentId] = compProps;
@@ -277,9 +308,10 @@ function initReactivesearch(componentCollection, searchState, settings) {
           queryObj = _buildQuery.queryObj,
           options = _buildQuery.options;
 
-      var validOptions = ['aggs', 'from', 'sort']; // check if query or options are valid - non-empty
+      var componentQueryOptions = options;
+      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;
@@ -294,7 +326,7 @@ function initReactivesearch(componentCollection, searchState, settings) {
 
         var currentQuery = _extends({
           query: _extends({}, queryObj)
-        }, options, queryOptions[component.componentId]);
+        }, componentQueryOptions, queryOptions[component.componentId]);
 
         queryLog = _extends({}, queryLog, (_extends2 = {}, _extends2[component.componentId] = currentQuery, _extends2));
 

package/dist/es/version.js

@@ -1,3 +1,3 @@
-var version = "1.27.0";
+var version = "1.28.0";
 
 export default version;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@appbaseio/reactivesearch-vue",
-	"version": "1.27.0",
+	"version": "1.28.0",
 	"private": false,
 	"main": "dist/cjs/index.js",
 	"jsnext:main": "dist/es/index.js",
@@ -34,7 +34,7 @@
 	],
 	"sideEffects": false,
 	"dependencies": {
-		"@appbaseio/reactivecore": "9.14.0",
+		"@appbaseio/reactivecore": "9.14.4",
 		"@appbaseio/vue-emotion": "0.4.4",
 		"@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
 		"appbase-js": "^5.0.0",