@appbaseio/reactivesearch-vue 1.16.0-alpha.6 → 1.16.0-alpha.62

package/dist/cjs/ReactiveComponent.js

@@ -6,15 +6,16 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 var configureStore = require('@appbaseio/reactivecore');
 var configureStore__default = _interopDefault(configureStore);
-var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-4abdbfff.js');
+var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-c705cbe6.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-baca18c4.js');
-var ComponentWrapper = require('./ComponentWrapper-603848ed.js');
+var index = require('./index-6a167fe0.js');
+var ComponentWrapper = require('./ComponentWrapper-ad3dad02.js');
 
+var _excluded = ["options"];
 var updateQuery = configureStore.Actions.updateQuery,
     setQueryOptions = configureStore.Actions.setQueryOptions,
     setCustomQuery = configureStore.Actions.setCustomQuery,
@@ -22,15 +23,16 @@ var updateQuery = configureStore.Actions.updateQuery,
 var parseHits = configureStore.helper.parseHits,
     isEqual = configureStore.helper.isEqual,
     getCompositeAggsQuery = configureStore.helper.getCompositeAggsQuery,
-    getOptionsFromQuery = configureStore.helper.getOptionsFromQuery,
-    getResultStats = configureStore.helper.getResultStats;
+    getResultStats = configureStore.helper.getResultStats,
+    extractQueryFromCustomQuery = configureStore.helper.extractQueryFromCustomQuery,
+    getOptionsForCustomQuery = configureStore.helper.getOptionsForCustomQuery;
 var ReactiveComponent = {
   name: 'ReactiveComponent',
   props: {
     componentId: vueTypes.types.stringRequired,
     aggregationField: vueTypes.types.string,
     aggregationSize: VueTypes.number,
-    size: VueTypes.number.def(20),
+    size: VueTypes.number,
     defaultQuery: vueTypes.types.func,
     customQuery: vueTypes.types.func,
     filterLabel: vueTypes.types.string,
@@ -38,7 +40,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,33 +50,35 @@ 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 (customQuery) {
-      var calcCustomQuery = customQuery(props);
-
-      var _ref = calcCustomQuery || {},
-          query = _ref.query;
+    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`.');
+    }
 
-      var customQueryOptions = calcCustomQuery ? getOptionsFromQuery(calcCustomQuery) : null;
+    if (customQuery) {
+      var calcCustomQuery = customQuery(this.selectedValue, props);
+      var query = extractQueryFromCustomQuery(calcCustomQuery);
+      var customQueryOptions = calcCustomQuery ? getOptionsForCustomQuery(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);
 
       this.updateQuery({
@@ -86,26 +91,35 @@ var ReactiveComponent = {
       });
     }
 
-    this.setQuery = function (_ref2) {
-      var options = _ref2.options,
-          obj = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref2, ["options"]);
+    this.setQuery = function (_ref) {
+      var options = _ref.options,
+          obj = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref, _excluded);
 
-      if (options) {
-        _this.setQueryOptions(props.componentId, _rollupPluginBabelHelpers._extends(_rollupPluginBabelHelpers._extends({}, options), _this.getAggsQuery()), false);
-      } // Update customQuery field for RS API
+      var queryToBeSet = obj.query; // when enableAppbase is true, Backend throws error because of repeated query in request body
 
+      if (queryToBeSet && queryToBeSet.query) {
+        queryToBeSet = queryToBeSet.query;
+      }
 
-      if (obj && obj.query || options) {
-        var customQueryCalc = _rollupPluginBabelHelpers._extends({}, options);
+      var customQueryCalc = _rollupPluginBabelHelpers._extends({}, options, {
+        query: queryToBeSet
+      });
 
-        if (obj && obj.query) {
-          customQueryCalc.query = obj.query;
-        }
+      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, _rollupPluginBabelHelpers._extends({}, _this.getAggsQuery(), options), false);
       }
 
-      _this.updateQuery(_rollupPluginBabelHelpers._extends(_rollupPluginBabelHelpers._extends({}, obj), {}, {
+      _this.updateQuery(_rollupPluginBabelHelpers._extends({}, obj, {
+        query: customQueryCalc.query,
         componentId: props.componentId,
         label: props.filterLabel,
         showFilter: props.showFilter,
@@ -116,23 +130,22 @@ 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, 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"]);
+      var _query = extractQueryFromCustomQuery(this.$defaultQuery);
+
+      var queryOptions = getOptionsForCustomQuery(this.$defaultQuery);
 
       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);
 
       this.updateQuery({
         componentId: this.internalComponent,
-        query: query || null
+        query: _query
       });
     }
   },
@@ -178,43 +191,39 @@ var ReactiveComponent = {
       }
     },
     defaultQuery: function defaultQuery(newVal, oldVal) {
-      if (newVal && !index.isQueryIdentical(newVal, oldVal, undefined, this.$props)) {
-        this.$defaultQuery = newVal();
-
-        var _ref4 = this.$defaultQuery || {},
-            query = _ref4.query,
-            queryOptions = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref4, ["query"]);
+      if (newVal && !index.isQueryIdentical(newVal, oldVal, this.selectedValue, this.$props)) {
+        this.$defaultQuery = newVal(this.selectedValue, this.$props);
+        var query = extractQueryFromCustomQuery(this.$defaultQuery);
+        var queryOptions = getOptionsForCustomQuery(this.$defaultQuery);
 
         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);
         this.updateQuery({
           componentId: this.internalComponent,
-          query: query || null
+          query: query
         });
       }
     },
     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);
-
-        var _ref5 = this.$customQuery || {},
-            query = _ref5.query,
-            queryOptions = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref5, ["query"]);
+        this.$customQuery = newVal(this.selectedValue, this.$props);
+        var query = extractQueryFromCustomQuery(this.$customQuery);
+        var queryOptions = getOptionsForCustomQuery(this.$customQuery);
 
         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);
         this.updateQuery({
           componentId: componentId,
-          query: query || null
+          query: query
         });
       }
     }
@@ -228,10 +237,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
       });
@@ -294,6 +303,10 @@ var ReactiveComponent = {
   }
 };
 
+ReactiveComponent.hasInternalComponent = function (props) {
+  return !!props.defaultQuery;
+};
+
 var mapStateToProps = function mapStateToProps(state, props) {
   return {
     aggregations: state.aggregations[props.componentId] && state.aggregations[props.componentId] || null,
@@ -308,7 +321,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
   };
 };