@appbaseio/reactivesearch-vue 1.16.0-alpha.3 → 1.16.0-alpha.32

package/dist/cjs/ReactiveComponent.js

@@ -6,15 +6,19 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 var configureStore = require('@appbaseio/reactivecore');
 var configureStore__default = _interopDefault(configureStore);
-var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-280a574c.js');
+var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-4abdbfff.js');
 var VueTypes = _interopDefault(require('vue-types'));
 var constants = require('@appbaseio/reactivecore/lib/utils/constants');
-var vueTypes = require('./vueTypes-c21f265b.js');
+var vueTypes = require('./vueTypes-6de9d2a9.js');
 require('@appbaseio/reactivecore/lib/utils/transform');
 require('redux');
-var index = require('./index-e0583d76.js');
-var ComponentWrapper = require('./ComponentWrapper-5a0a8849.js');
+var index = require('./index-d44a0a21.js');
+var ComponentWrapper = require('./ComponentWrapper-7302fe1a.js');
 
+var _excluded = ["options"],
+    _excluded2 = ["query"],
+    _excluded3 = ["query"],
+    _excluded4 = ["query"];
 var updateQuery = configureStore.Actions.updateQuery,
     setQueryOptions = configureStore.Actions.setQueryOptions,
     setCustomQuery = configureStore.Actions.setCustomQuery,
@@ -38,7 +42,8 @@ var ReactiveComponent = {
     showFilter: VueTypes.bool.def(true),
     URLParams: VueTypes.bool.def(false),
     distinctField: vueTypes.types.string,
-    distinctFieldConfig: vueTypes.types.props
+    distinctFieldConfig: vueTypes.types.props,
+    index: VueTypes.string
   },
   created: function created() {
     var _this = this;
@@ -47,25 +52,30 @@ var ReactiveComponent = {
     this.internalComponent = null;
     this.$defaultQuery = null; // Set custom query in store
 
-    index.updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, undefined);
+    index.updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.selectedValue);
     var customQuery = props.customQuery,
         componentId = props.componentId,
         filterLabel = props.filterLabel,
         showFilter = props.showFilter,
         URLParams = props.URLParams,
         distinctField = props.distinctField,
-        distinctFieldConfig = props.distinctFieldConfig;
+        distinctFieldConfig = props.distinctFieldConfig,
+        index$1 = props.index;
 
-    if (this.config.enableAppbase && this.aggregationField && this.aggregationField !== '') {
+    if (this.enableAppbase && this.aggregationField && this.aggregationField !== '') {
       console.warn('Warning(ReactiveSearch): The `aggregationField` prop has been marked as deprecated, please use the `distinctField` prop instead.');
     }
 
-    if (!this.config.enableAppbase && (distinctField || distinctFieldConfig)) {
+    if (!this.enableAppbase && (distinctField || distinctFieldConfig)) {
       console.warn('Warning(ReactiveSearch): In order to use the `distinctField` and `distinctFieldConfig` props, the `enableAppbase` prop must be set to true in `ReactiveBase`.');
     }
 
+    if (!this.enableAppbase && index$1) {
+      console.warn('Warning(ReactiveSearch): In order to use the `index` prop, the `enableAppbase` prop must be set to true in `ReactiveBase`.');
+    }
+
     if (customQuery) {
-      var calcCustomQuery = customQuery(props);
+      var calcCustomQuery = customQuery(this.selectedValue, props);
 
       var _ref = calcCustomQuery || {},
           query = _ref.query;
@@ -73,12 +83,18 @@ var ReactiveComponent = {
       var customQueryOptions = calcCustomQuery ? getOptionsFromQuery(calcCustomQuery) : null;
 
       if (customQueryOptions) {
-        this.setQueryOptions(componentId, _rollupPluginBabelHelpers._extends(_rollupPluginBabelHelpers._extends({}, customQueryOptions), this.getAggsQuery()), false);
+        this.setQueryOptions(componentId, _rollupPluginBabelHelpers._extends({}, customQueryOptions, this.getAggsQuery()), false);
       } else this.setQueryOptions(componentId, this.getAggsQuery(), false);
 
+      var queryToSet = query || null;
+
+      if (calcCustomQuery && calcCustomQuery.id) {
+        queryToSet = calcCustomQuery;
+      }
+
       this.updateQuery({
         componentId: componentId,
-        query: query,
+        query: queryToSet,
         value: this.selectedValue || null,
         label: filterLabel,
         showFilter: showFilter,
@@ -88,10 +104,16 @@ var ReactiveComponent = {
 
     this.setQuery = function (_ref2) {
       var options = _ref2.options,
-          obj = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref2, ["options"]);
+          obj = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref2, _excluded);
 
       if (options) {
-        _this.setQueryOptions(props.componentId, _rollupPluginBabelHelpers._extends(_rollupPluginBabelHelpers._extends({}, options), _this.getAggsQuery()), false);
+        _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;
       } // Update customQuery field for RS API
 
 
@@ -99,13 +121,17 @@ var ReactiveComponent = {
         var customQueryCalc = _rollupPluginBabelHelpers._extends({}, options);
 
         if (obj && obj.query) {
-          customQueryCalc.query = obj.query;
+          if (obj.query.id) {
+            customQueryCalc = queryToBeSet;
+          } else {
+            customQueryCalc.query = obj.query;
+          }
         }
 
         _this.setCustomQuery(props.componentId, customQueryCalc);
       }
 
-      _this.updateQuery(_rollupPluginBabelHelpers._extends(_rollupPluginBabelHelpers._extends({}, obj), {}, {
+      _this.updateQuery(_rollupPluginBabelHelpers._extends({}, obj, {
         componentId: props.componentId,
         label: props.filterLabel,
         showFilter: props.showFilter,
@@ -119,20 +145,26 @@ var ReactiveComponent = {
   },
   beforeMount: function beforeMount() {
     if (this.internalComponent && this.$props.defaultQuery) {
-      index.updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, undefined);
-      this.$defaultQuery = this.$props.defaultQuery();
+      index.updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, this.selectedValue);
+      this.$defaultQuery = this.$props.defaultQuery(this.selectedValue, this.$props);
 
       var _ref3 = this.$defaultQuery || {},
           query = _ref3.query,
-          queryOptions = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref3, ["query"]);
+          queryOptions = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref3, _excluded2);
 
       if (queryOptions) {
-        this.setQueryOptions(this.internalComponent, _rollupPluginBabelHelpers._extends(_rollupPluginBabelHelpers._extends({}, queryOptions), this.getAggsQuery()), false);
+        this.setQueryOptions(this.internalComponent, _rollupPluginBabelHelpers._extends({}, queryOptions, this.getAggsQuery()), false);
       } else this.setQueryOptions(this.internalComponent, this.getAggsQuery(), false);
 
+      var queryToSet = query || null;
+
+      if (!queryToSet && this.$defaultQuery && this.$defaultQuery.id) {
+        queryToSet = this.$defaultQuery;
+      }
+
       this.updateQuery({
         componentId: this.internalComponent,
-        query: query || null
+        query: queryToSet
       });
     }
   },
@@ -178,43 +210,55 @@ var ReactiveComponent = {
       }
     },
     defaultQuery: function defaultQuery(newVal, oldVal) {
-      if (newVal && !index.isQueryIdentical(newVal, oldVal, undefined, this.$props)) {
-        this.$defaultQuery = newVal();
+      if (newVal && !index.isQueryIdentical(newVal, oldVal, this.selectedValue, this.$props)) {
+        this.$defaultQuery = newVal(this.selectedValue, this.$props);
 
         var _ref4 = this.$defaultQuery || {},
             query = _ref4.query,
-            queryOptions = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref4, ["query"]);
+            queryOptions = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref4, _excluded3);
 
         if (queryOptions) {
-          this.setQueryOptions(this.internalComponent, _rollupPluginBabelHelpers._extends(_rollupPluginBabelHelpers._extends({}, queryOptions), this.getAggsQuery()), false);
+          this.setQueryOptions(this.internalComponent, _rollupPluginBabelHelpers._extends({}, queryOptions, this.getAggsQuery()), false);
         } else this.setQueryOptions(this.internalComponent, this.getAggsQuery(), false); // Update default query for RS API
 
 
-        index.updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, undefined);
+        index.updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, this.selectedValue);
+        var queryToSet = query || null;
+
+        if (!queryToSet && this.$defaultQuery && this.$defaultQuery.id) {
+          queryToSet = this.$defaultQuery;
+        }
+
         this.updateQuery({
           componentId: this.internalComponent,
-          query: query || null
+          query: queryToSet
         });
       }
     },
     customQuery: function customQuery(newVal, oldVal) {
-      if (newVal && !index.isQueryIdentical(newVal, oldVal, undefined, this.$props)) {
+      if (newVal && !index.isQueryIdentical(newVal, oldVal, this.selectedValue, this.$props)) {
         var componentId = this.$props.componentId;
-        this.$customQuery = newVal(this.$props);
+        this.$customQuery = newVal(this.selectedValue, this.$props);
 
         var _ref5 = this.$customQuery || {},
             query = _ref5.query,
-            queryOptions = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref5, ["query"]);
+            queryOptions = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref5, _excluded4);
 
         if (queryOptions) {
-          this.setQueryOptions(componentId, _rollupPluginBabelHelpers._extends(_rollupPluginBabelHelpers._extends({}, queryOptions), this.getAggsQuery()), false);
+          this.setQueryOptions(componentId, _rollupPluginBabelHelpers._extends({}, queryOptions, this.getAggsQuery()), false);
         } else this.setQueryOptions(componentId, this.getAggsQuery(), false); // Update custom query for RS API
 
 
-        index.updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, undefined);
+        index.updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.selectedValue);
+        var queryToSet = query || null;
+
+        if (this.$customQuery && this.$customQuery.id) {
+          queryToSet = this.$customQuery;
+        }
+
         this.updateQuery({
           componentId: componentId,
-          query: query || null
+          query: queryToSet
         });
       }
     }
@@ -228,10 +272,10 @@ var ReactiveComponent = {
           isLoading = this.isLoading,
           selectedValue = this.selectedValue;
 
-      var propsToBePassed = _rollupPluginBabelHelpers._extends(_rollupPluginBabelHelpers._extends({
+      var propsToBePassed = _rollupPluginBabelHelpers._extends({
         error: error,
         loading: isLoading
-      }, this.getData()), {}, {
+      }, this.getData(), {
         value: selectedValue,
         setQuery: this.setQuery
       });
@@ -308,7 +352,7 @@ var mapStateToProps = function mapStateToProps(state, props) {
     total: state.hits[props.componentId] && state.hits[props.componentId].total,
     hidden: state.hits[props.componentId] && state.hits[props.componentId].hidden,
     componentProps: state.props[props.componentId],
-    config: state.config
+    enableAppbase: state.config.enableAppbase
   };
 };