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

package/dist/cjs/ReactiveComponent.js

@@ -95,33 +95,25 @@ var ReactiveComponent = {
       var options = _ref.options,
           obj = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref, _excluded);
 
-      if (options) {
-        _this.setQueryOptions(props.componentId, _rollupPluginBabelHelpers._extends({}, options, _this.getAggsQuery()), false);
-      }
-
       var queryToBeSet = obj.query; // when enableAppbase is true, Backend throws error because of repeated query in request body
 
-      if (obj && obj.query && obj.query.query) {
-        queryToBeSet = obj.query.query;
+      if (queryToBeSet && queryToBeSet.query) {
+        queryToBeSet = queryToBeSet.query;
       }
 
-      var customQueryCalc = _rollupPluginBabelHelpers._extends({}, options); // Update customQuery field for RS API
+      var customQueryCalc = _rollupPluginBabelHelpers._extends({}, options, {
+        query: extractQueryFromCustomQuery(queryToBeSet)
+      }); // Update customQuery field for RS API
 
 
-      if (queryToBeSet || options) {
-        if (queryToBeSet.query) {
-          if (queryToBeSet.id) {
-            customQueryCalc = queryToBeSet;
-          } else {
-            customQueryCalc.query = queryToBeSet;
-          }
-        }
+      _this.setCustomQuery(props.componentId, customQueryCalc);
 
-        _this.setCustomQuery(props.componentId, customQueryCalc);
+      if (options) {
+        _this.setQueryOptions(props.componentId, _rollupPluginBabelHelpers._extends({}, _this.getAggsQuery(), options), false);
       }
 
       _this.updateQuery(_rollupPluginBabelHelpers._extends({}, obj, {
-        query: customQueryCalc,
+        query: customQueryCalc.query,
         componentId: props.componentId,
         label: props.filterLabel,
         showFilter: props.showFilter,
@@ -132,12 +124,13 @@ var ReactiveComponent = {
     if (props.defaultQuery) {
       this.internalComponent = props.componentId + "__internal";
     }
-  },
-  beforeMount: function beforeMount() {
+
     if (this.internalComponent && this.$props.defaultQuery) {
       index.updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, this.selectedValue);
       this.$defaultQuery = this.$props.defaultQuery(this.selectedValue, this.$props);
-      var query = extractQueryFromCustomQuery(this.$defaultQuery);
+
+      var _query = extractQueryFromCustomQuery(this.$defaultQuery);
+
       var queryOptions = getOptionsForCustomQuery(this.$defaultQuery);
 
       if (queryOptions) {
@@ -146,7 +139,7 @@ var ReactiveComponent = {
 
       this.updateQuery({
         componentId: this.internalComponent,
-        query: query
+        query: _query
       });
     }
   },

package/dist/cjs/initReactivesearch.js

@@ -20,7 +20,8 @@ var utils = require('@appbaseio/reactivecore/lib/actions/utils');
 
 var _excluded = ["aggs", "size"],
     _excluded2 = ["query"],
-    _excluded3 = ["aggs", "size"];
+    _excluded3 = ["query"],
+    _excluded4 = ["aggs", "size"];
 var X_SEARCH_CLIENT = 'ReactiveSearch Vue';
 var componentsWithoutFilters = [constants.componentTypes.numberBox, constants.componentTypes.ratingsFilter];
 var resultComponents = [constants.componentTypes.reactiveList, constants.componentTypes.reactiveMap];
@@ -80,10 +81,15 @@ function getCustomQuery(component, value) {
   var currentValue = parseValue(value, component);
 
   if (component.customQuery) {
-    return helper.extractQueryFromCustomQuery(component.customQuery(currentValue, component));
+    var customQuery = component.customQuery(currentValue, component);
+    return _rollupPluginBabelHelpers._extends({
+      query: helper.extractQueryFromCustomQuery(customQuery)
+    }, helper.getOptionsForCustomQuery(customQuery));
   }
 
-  return component.source.defaultQuery ? component.source.defaultQuery(currentValue, component) : null;
+  return component.source.defaultQuery ? {
+    query: component.source.defaultQuery(currentValue, component)
+  } : null;
 }
 
 function initReactivesearch(componentCollection, searchState, settings) {
@@ -182,7 +188,6 @@ function initReactivesearch(componentCollection, searchState, settings) {
         componentQueryOptions = _rollupPluginBabelHelpers._extends({}, componentQueryOptions, component.source.generateQueryOptions(component));
       }
 
-      console.log('QUERY LOG componentQueryOptions', component.componentId, componentQueryOptions);
       var highlightQuery = {};
 
       if (component.source.highlightQuery) {
@@ -272,7 +277,11 @@ function initReactivesearch(componentCollection, searchState, settings) {
         });
       }
 
-      var customQuery = getCustomQuery(component, value); // set custom query for main component
+      var _ref3 = getCustomQuery(component, value) || {},
+          query = _ref3.query,
+          options = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref3, _excluded3);
+
+      var customQuery = query; // set custom query for main component
 
       queryList = queryReducer(queryList, {
         type: 'SET_QUERY',
@@ -282,7 +291,7 @@ function initReactivesearch(componentCollection, searchState, settings) {
       queryOptions = queryOptionsReducer(queryOptions, {
         type: 'SET_QUERY_OPTIONS',
         component: component.componentId,
-        options: _rollupPluginBabelHelpers._extends({}, componentQueryOptions)
+        options: _rollupPluginBabelHelpers._extends({}, componentQueryOptions, options)
       }); // Set component type in component props
 
       compProps.componentType = componentType;
@@ -308,14 +317,13 @@ function initReactivesearch(componentCollection, searchState, settings) {
 
       var componentQueryOptions = options;
       var componentType = component.source.componentType;
-      console.log('COMPONENT TYPE', componentType);
 
       if (componentType !== constants.componentTypes.reactiveComponent) {
         // don't merge aggs, size
-        var _ref3 = options || {},
-            aggs = _ref3.aggs,
-            size = _ref3.size,
-            rest = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref3, _excluded3);
+        var _ref4 = options || {},
+            aggs = _ref4.aggs,
+            size = _ref4.size,
+            rest = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref4, _excluded4);
 
         componentQueryOptions = rest;
       }
@@ -339,10 +347,6 @@ function initReactivesearch(componentCollection, searchState, settings) {
           query: _rollupPluginBabelHelpers._extends({}, queryObj)
         }, 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 = _rollupPluginBabelHelpers._extends({}, queryLog, (_extends2 = {}, _extends2[component.componentId] = currentQuery, _extends2));
 
         if (settings.enableAppbase) {

package/dist/cjs/version.js

@@ -2,6 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "1.16.0-alpha.40";
+var version = "1.16.0-alpha.43";
 
 exports.default = version;

package/dist/es/ReactiveComponent.js

@@ -88,33 +88,25 @@ var ReactiveComponent = {
       var options = _ref.options,
           obj = _objectWithoutPropertiesLoose(_ref, _excluded);
 
-      if (options) {
-        _this.setQueryOptions(props.componentId, _extends({}, options, _this.getAggsQuery()), false);
-      }
-
       var queryToBeSet = obj.query; // when enableAppbase is true, Backend throws error because of repeated query in request body
 
-      if (obj && obj.query && obj.query.query) {
-        queryToBeSet = obj.query.query;
+      if (queryToBeSet && queryToBeSet.query) {
+        queryToBeSet = queryToBeSet.query;
       }
 
-      var customQueryCalc = _extends({}, options); // Update customQuery field for RS API
+      var customQueryCalc = _extends({}, options, {
+        query: extractQueryFromCustomQuery(queryToBeSet)
+      }); // Update customQuery field for RS API
 
 
-      if (queryToBeSet || options) {
-        if (queryToBeSet.query) {
-          if (queryToBeSet.id) {
-            customQueryCalc = queryToBeSet;
-          } else {
-            customQueryCalc.query = queryToBeSet;
-          }
-        }
+      _this.setCustomQuery(props.componentId, customQueryCalc);
 
-        _this.setCustomQuery(props.componentId, customQueryCalc);
+      if (options) {
+        _this.setQueryOptions(props.componentId, _extends({}, _this.getAggsQuery(), options), false);
       }
 
       _this.updateQuery(_extends({}, obj, {
-        query: customQueryCalc,
+        query: customQueryCalc.query,
         componentId: props.componentId,
         label: props.filterLabel,
         showFilter: props.showFilter,
@@ -125,12 +117,13 @@ var ReactiveComponent = {
     if (props.defaultQuery) {
       this.internalComponent = props.componentId + "__internal";
     }
-  },
-  beforeMount: function beforeMount() {
+
     if (this.internalComponent && this.$props.defaultQuery) {
       updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, this.selectedValue);
       this.$defaultQuery = this.$props.defaultQuery(this.selectedValue, this.$props);
-      var query = extractQueryFromCustomQuery(this.$defaultQuery);
+
+      var _query = extractQueryFromCustomQuery(this.$defaultQuery);
+
       var queryOptions = getOptionsForCustomQuery(this.$defaultQuery);
 
       if (queryOptions) {
@@ -139,7 +132,7 @@ var ReactiveComponent = {
 
       this.updateQuery({
         componentId: this.internalComponent,
-        query: query
+        query: _query
       });
     }
   },

package/dist/es/initReactivesearch.js

@@ -14,7 +14,8 @@ import { isPropertyDefined } from '@appbaseio/reactivecore/lib/actions/utils';
 
 var _excluded = ["aggs", "size"],
     _excluded2 = ["query"],
-    _excluded3 = ["aggs", "size"];
+    _excluded3 = ["query"],
+    _excluded4 = ["aggs", "size"];
 var X_SEARCH_CLIENT = 'ReactiveSearch Vue';
 var componentsWithoutFilters = [componentTypes.numberBox, componentTypes.ratingsFilter];
 var resultComponents = [componentTypes.reactiveList, componentTypes.reactiveMap];
@@ -74,10 +75,15 @@ function getCustomQuery(component, value) {
   var currentValue = parseValue(value, component);
 
   if (component.customQuery) {
-    return extractQueryFromCustomQuery(component.customQuery(currentValue, component));
+    var customQuery = component.customQuery(currentValue, component);
+    return _extends({
+      query: extractQueryFromCustomQuery(customQuery)
+    }, getOptionsForCustomQuery(customQuery));
   }
 
-  return component.source.defaultQuery ? component.source.defaultQuery(currentValue, component) : null;
+  return component.source.defaultQuery ? {
+    query: component.source.defaultQuery(currentValue, component)
+  } : null;
 }
 
 function initReactivesearch(componentCollection, searchState, settings) {
@@ -176,7 +182,6 @@ function initReactivesearch(componentCollection, searchState, settings) {
         componentQueryOptions = _extends({}, componentQueryOptions, component.source.generateQueryOptions(component));
       }
 
-      console.log('QUERY LOG componentQueryOptions', component.componentId, componentQueryOptions);
       var highlightQuery = {};
 
       if (component.source.highlightQuery) {
@@ -266,7 +271,11 @@ function initReactivesearch(componentCollection, searchState, settings) {
         });
       }
 
-      var customQuery = getCustomQuery(component, value); // set custom query for main component
+      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',
@@ -276,7 +285,7 @@ function initReactivesearch(componentCollection, searchState, settings) {
       queryOptions = queryOptionsReducer(queryOptions, {
         type: 'SET_QUERY_OPTIONS',
         component: component.componentId,
-        options: _extends({}, componentQueryOptions)
+        options: _extends({}, componentQueryOptions, options)
       }); // Set component type in component props
 
       compProps.componentType = componentType;
@@ -302,14 +311,13 @@ function initReactivesearch(componentCollection, searchState, settings) {
 
       var componentQueryOptions = options;
       var componentType = component.source.componentType;
-      console.log('COMPONENT TYPE', componentType);
 
       if (componentType !== componentTypes.reactiveComponent) {
         // don't merge aggs, size
-        var _ref3 = options || {},
-            aggs = _ref3.aggs,
-            size = _ref3.size,
-            rest = _objectWithoutPropertiesLoose(_ref3, _excluded3);
+        var _ref4 = options || {},
+            aggs = _ref4.aggs,
+            size = _ref4.size,
+            rest = _objectWithoutPropertiesLoose(_ref4, _excluded4);
 
         componentQueryOptions = rest;
       }
@@ -333,10 +341,6 @@ function initReactivesearch(componentCollection, searchState, settings) {
           query: _extends({}, queryObj)
         }, 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) {

package/dist/es/version.js

@@ -1,3 +1,3 @@
-var version = "1.16.0-alpha.40";
+var version = "1.16.0-alpha.43";
 
 export default version;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@appbaseio/reactivesearch-vue",
-	"version": "1.16.0-alpha.40",
+	"version": "1.16.0-alpha.43",
 	"private": false,
 	"main": "dist/cjs/index.js",
 	"jsnext:main": "dist/es/index.js",