@appbaseio/reactivesearch-vue 1.16.0-alpha.36 → 1.16.0-alpha.37

package/dist/cjs/DataSearch.js

@@ -881,7 +881,8 @@ var updateQuery = configureStore.Actions.updateQuery,
 var debounce = configureStore.helper.debounce,
     checkValueChange = configureStore.helper.checkValueChange,
     getClassName$1 = configureStore.helper.getClassName,
-    getOptionsFromQuery = configureStore.helper.getOptionsFromQuery,
+    extractQueryFromCustomQuery = configureStore.helper.extractQueryFromCustomQuery,
+    getOptionsForCustomQuery = configureStore.helper.getOptionsForCustomQuery,
     isEqual = configureStore.helper.isEqual,
     getCompositeAggsQuery = configureStore.helper.getCompositeAggsQuery,
     withClickIds = configureStore.helper.withClickIds,
@@ -1339,12 +1340,13 @@ var DataSearch = {
 
       if (this.defaultQuery) {
         var defaultQueryToBeSet = this.defaultQuery(value, props) || {};
+        var defaultQueryObj = extractQueryFromCustomQuery(defaultQueryToBeSet);
 
-        if (defaultQueryToBeSet.query) {
-          query = defaultQueryToBeSet.query;
+        if (defaultQueryObj) {
+          query = defaultQueryObj;
         }
 
-        defaultQueryOptions = getOptionsFromQuery(defaultQueryToBeSet); // Update calculated default query in store
+        defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet); // Update calculated default query in store
 
         index.updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
       }
@@ -1368,13 +1370,13 @@ var DataSearch = {
 
       if (customQuery) {
         var customQueryTobeSet = customQuery(value, props);
-        var queryTobeSet = customQueryTobeSet.query;
+        var queryTobeSet = extractQueryFromCustomQuery(customQueryTobeSet);
 
         if (queryTobeSet) {
           query = queryTobeSet;
         }
 
-        customQueryOptions = getOptionsFromQuery(customQueryTobeSet);
+        customQueryOptions = getOptionsForCustomQuery(customQueryTobeSet);
         index.updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
         this.setQueryOptions(componentId, _rollupPluginBabelHelpers._extends({}, this.queryOptions, customQueryOptions), false);
       }
@@ -2063,6 +2065,10 @@ DataSearch.highlightQuery = function (props) {
   };
 };
 
+DataSearch.hasInternalComponent = function () {
+  return true;
+};
+
 var mapStateToProps = function mapStateToProps(state, props) {
   return {
     selectedValue: state.selectedValues[props.componentId] && state.selectedValues[props.componentId].value || null,
@@ -2100,7 +2106,7 @@ var mapDispatchToProps = {
 };
 var DSConnected = ComponentWrapper.ComponentWrapper(index.connect(mapStateToProps, mapDispatchToProps)(DataSearch), {
   componentType: constants.componentTypes.dataSearch,
-  internalComponent: true
+  internalComponent: DataSearch.hasInternalComponent()
 });
 
 DataSearch.install = function (Vue) {

package/dist/cjs/DynamicRangeSlider.js

@@ -29,9 +29,10 @@ var addComponent = configureStore.Actions.addComponent,
     updateComponentProps = configureStore.Actions.updateComponentProps;
 var checkValueChange = configureStore.helper.checkValueChange,
     getClassName = configureStore.helper.getClassName,
-    getOptionsFromQuery = configureStore.helper.getOptionsFromQuery,
     isEqual = configureStore.helper.isEqual,
-    checkSomePropChange = configureStore.helper.checkSomePropChange;
+    checkSomePropChange = configureStore.helper.checkSomePropChange,
+    extractQueryFromCustomQuery = configureStore.helper.extractQueryFromCustomQuery,
+    getOptionsForCustomQuery = configureStore.helper.getOptionsForCustomQuery;
 var DynamicRangeSlider = {
   name: 'DynamicRangeSlider',
   components: ssr.getComponents(),
@@ -242,19 +243,23 @@ var DynamicRangeSlider = {
       var customQueryOptions;
 
       if (this.$props.customQuery) {
-        var _ref2 = this.$props.customQuery(value, this.$props) || {};
+        var customQueryTobeSet = this.$props.customQuery(value, this.$props);
+        var queryTobeSet = extractQueryFromCustomQuery(customQueryTobeSet);
 
-        query = _ref2.query;
-        customQueryOptions = getOptionsFromQuery(this.$props.customQuery(value, this.$props));
+        if (queryTobeSet) {
+          query = queryTobeSet;
+        }
+
+        customQueryOptions = getOptionsForCustomQuery(customQueryTobeSet);
         index.updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, value);
       }
 
-      var _ref3 = this.range || {
+      var _ref2 = this.range || {
         start: value[0],
         end: value[1]
       },
-          start = _ref3.start,
-          end = _ref3.end;
+          start = _ref2.start,
+          end = _ref2.end;
 
       var currentStart = value[0],
           currentEnd = value[1]; // check if the slider is at its initial position
@@ -307,13 +312,13 @@ var DynamicRangeSlider = {
     range: function range(newValue, oldValue) {
       if (isEqual(newValue, oldValue) || !this.currentValue) return;
 
-      var _ref4 = this.currentValue || [],
-          currentStart = _ref4[0],
-          currentEnd = _ref4[1];
+      var _ref3 = this.currentValue || [],
+          currentStart = _ref3[0],
+          currentEnd = _ref3[1];
 
-      var _ref5 = oldValue || {},
-          oldStart = _ref5.start,
-          oldEnd = _ref5.end;
+      var _ref4 = oldValue || {},
+          oldStart = _ref4.start,
+          oldEnd = _ref4.end;
 
       var newStart = currentStart === oldStart ? newValue.start : currentStart;
       var newEnd = currentEnd === oldEnd ? newValue.end : currentEnd;
@@ -408,6 +413,10 @@ DynamicRangeSlider.parseValue = function (value) {
   return [];
 };
 
+DynamicRangeSlider.hasInternalComponent = function () {
+  return true;
+};
+
 var mapStateToProps = function mapStateToProps(state, props) {
   var componentId = state.aggregations[props.componentId];
   var internalRange = state.aggregations[props.componentId + "__range__internal"];

package/dist/cjs/MultiDropdownList.js

@@ -37,8 +37,9 @@ var isEqual = configureStore.helper.isEqual,
     checkValueChange = configureStore.helper.checkValueChange,
     checkPropChange = configureStore.helper.checkPropChange,
     getClassName = configureStore.helper.getClassName,
-    getOptionsFromQuery = configureStore.helper.getOptionsFromQuery,
-    getCompositeAggsQuery = configureStore.helper.getCompositeAggsQuery;
+    getCompositeAggsQuery = configureStore.helper.getCompositeAggsQuery,
+    extractQueryFromCustomQuery = configureStore.helper.extractQueryFromCustomQuery,
+    getOptionsForCustomQuery = configureStore.helper.getOptionsForCustomQuery;
 var MultiDropdownList = {
   name: 'MultiDropdownList',
   data: function data() {
@@ -367,12 +368,13 @@ var MultiDropdownList = {
 
       if (this.defaultQuery) {
         var defaultQueryToBeSet = this.defaultQuery(value, props) || {};
+        var defaultQueryObj = extractQueryFromCustomQuery(defaultQueryToBeSet);
 
-        if (defaultQueryToBeSet.query) {
-          query = defaultQueryToBeSet.query;
+        if (defaultQueryObj) {
+          query = defaultQueryObj;
         }
 
-        defaultQueryOptions = getOptionsFromQuery(defaultQueryToBeSet); // Update calculated default query in store
+        defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet); // Update calculated default query in store
 
         index.updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
       }
@@ -391,10 +393,9 @@ var MultiDropdownList = {
       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);
+        customQueryOptions = getOptionsForCustomQuery(customQueryCalc);
         index.updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
       }
 
@@ -432,7 +433,7 @@ var MultiDropdownList = {
 
       if (props.defaultQuery) {
         var value = Object.keys(this.$data.currentValue);
-        var defaultQueryOptions = getOptionsFromQuery(props.defaultQuery(value, props));
+        var defaultQueryOptions = getOptionsForCustomQuery(props.defaultQuery(value, props));
         this.setQueryOptions(this.internalComponent, _rollupPluginBabelHelpers._extends({}, queryOptions, defaultQueryOptions));
       } else {
         this.setQueryOptions(this.internalComponent, queryOptions);
@@ -491,12 +492,12 @@ MultiDropdownList.defaultQuery = function (value, props) {
 
     if (props.queryFormat === 'or') {
       if (props.showMissing) {
-        var _type, _ref2;
+        var _type, _ref;
 
         var hasMissingTerm = value.includes(props.missingLabel);
-        var should = [(_ref2 = {}, _ref2[type] = (_type = {}, _type[props.dataField] = value.filter(function (item) {
+        var should = [(_ref = {}, _ref[type] = (_type = {}, _type[props.dataField] = value.filter(function (item) {
           return item !== props.missingLabel;
-        }), _type), _ref2)];
+        }), _type), _ref)];
 
         if (hasMissingTerm) {
           should = should.concat({
@@ -523,9 +524,9 @@ MultiDropdownList.defaultQuery = function (value, props) {
     } else {
       // adds a sub-query with must as an array of objects for each term/value
       var queryArray = value.map(function (item) {
-        var _type3, _ref3;
+        var _type3, _ref2;
 
-        return _ref3 = {}, _ref3[type] = (_type3 = {}, _type3[props.dataField] = item, _type3), _ref3;
+        return _ref2 = {}, _ref2[type] = (_type3 = {}, _type3[props.dataField] = item, _type3), _ref2;
       });
       listQuery = {
         bool: {
@@ -560,6 +561,10 @@ MultiDropdownList.generateQueryOptions = function (props, after) {
   }) : utils.getAggsQuery(queryOptions, props);
 };
 
+MultiDropdownList.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],
@@ -581,7 +586,7 @@ var mapDispatchtoProps = {
 };
 var ListConnected = ComponentWrapper.ComponentWrapper(index.connect(mapStateToProps, mapDispatchtoProps)(MultiDropdownList), {
   componentType: constants.componentTypes.multiDropdownList,
-  internalComponent: true
+  internalComponent: MultiDropdownList.hasInternalComponent()
 });
 
 MultiDropdownList.install = function (Vue) {

package/dist/cjs/MultiList.js

@@ -32,7 +32,8 @@ var isEqual = configureStore.helper.isEqual,
     getQueryOptions = configureStore.helper.getQueryOptions,
     checkValueChange = configureStore.helper.checkValueChange,
     getClassName = configureStore.helper.getClassName,
-    getOptionsFromQuery = configureStore.helper.getOptionsFromQuery;
+    extractQueryFromCustomQuery = configureStore.helper.extractQueryFromCustomQuery,
+    getOptionsForCustomQuery = configureStore.helper.getOptionsForCustomQuery;
 var MultiList = {
   name: 'MultiList',
   props: {
@@ -351,12 +352,13 @@ var MultiList = {
 
       if (this.defaultQuery) {
         var defaultQueryToBeSet = this.defaultQuery(value, props) || {};
+        var defaultQueryObj = extractQueryFromCustomQuery(defaultQueryToBeSet);
 
-        if (defaultQueryToBeSet.query) {
-          query = defaultQueryToBeSet.query;
+        if (defaultQueryObj) {
+          query = defaultQueryObj;
         }
 
-        defaultQueryOptions = getOptionsFromQuery(defaultQueryToBeSet); // Update calculated default query in store
+        defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet); // Update calculated default query in store
 
         index.updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
       }
@@ -375,10 +377,9 @@ var MultiList = {
       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);
+        customQueryOptions = getOptionsForCustomQuery(customQueryCalc);
         index.updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
       }
 
@@ -402,7 +403,7 @@ var MultiList = {
 
       if (props.defaultQuery) {
         var value = Object.keys(this.$data.currentValue);
-        var defaultQueryOptions = getOptionsFromQuery(props.defaultQuery(value, props));
+        var defaultQueryOptions = getOptionsForCustomQuery(props.defaultQuery(value, props));
         this.setQueryOptions(this.internalComponent, _rollupPluginBabelHelpers._extends({}, queryOptions, defaultQueryOptions));
       } else {
         this.setQueryOptions(this.internalComponent, queryOptions);
@@ -511,12 +512,12 @@ MultiList.defaultQuery = function (value, props) {
 
     if (props.queryFormat === 'or') {
       if (props.showMissing) {
-        var _type, _ref2;
+        var _type, _ref;
 
         var hasMissingTerm = value.includes(props.missingLabel);
-        var should = [(_ref2 = {}, _ref2[type] = (_type = {}, _type[props.dataField] = value.filter(function (item) {
+        var should = [(_ref = {}, _ref[type] = (_type = {}, _type[props.dataField] = value.filter(function (item) {
           return item !== props.missingLabel;
-        }), _type), _ref2)];
+        }), _type), _ref)];
 
         if (hasMissingTerm) {
           should = should.concat({
@@ -543,9 +544,9 @@ MultiList.defaultQuery = function (value, props) {
     } else {
       // adds a sub-query with must as an array of objects for each term/value
       var queryArray = value.map(function (item) {
-        var _type3, _ref3;
+        var _type3, _ref2;
 
-        return _ref3 = {}, _ref3[type] = (_type3 = {}, _type3[props.dataField] = item, _type3), _ref3;
+        return _ref2 = {}, _ref2[type] = (_type3 = {}, _type3[props.dataField] = item, _type3), _ref2;
       });
       listQuery = {
         bool: {
@@ -595,9 +596,14 @@ var mapDispatchtoProps = {
   setCustomQuery: setCustomQuery,
   setDefaultQuery: setDefaultQuery
 };
+
+MultiList.hasInternalComponent = function () {
+  return true;
+};
+
 var ListConnected = ComponentWrapper.ComponentWrapper(index.connect(mapStateToProps, mapDispatchtoProps)(MultiList), {
   componentType: constants.componentTypes.multiList,
-  internalComponent: true
+  internalComponent: MultiList.hasInternalComponent()
 });
 
 MultiList.install = function (Vue) {

package/dist/cjs/ReactiveComponent.js

@@ -15,10 +15,7 @@ require('redux');
 var index = require('./index-d44a0a21.js');
 var ComponentWrapper = require('./ComponentWrapper-7302fe1a.js');
 
-var _excluded = ["options"],
-    _excluded2 = ["query"],
-    _excluded3 = ["query"],
-    _excluded4 = ["query"];
+var _excluded = ["options"];
 var updateQuery = configureStore.Actions.updateQuery,
     setQueryOptions = configureStore.Actions.setQueryOptions,
     setCustomQuery = configureStore.Actions.setCustomQuery,
@@ -26,8 +23,9 @@ 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: {
@@ -76,25 +74,16 @@ var ReactiveComponent = {
 
     if (customQuery) {
       var calcCustomQuery = customQuery(this.selectedValue, props);
-
-      var _ref = calcCustomQuery || {},
-          query = _ref.query;
-
-      var customQueryOptions = calcCustomQuery ? getOptionsFromQuery(calcCustomQuery) : null;
+      var query = extractQueryFromCustomQuery(calcCustomQuery);
+      var customQueryOptions = calcCustomQuery ? getOptionsForCustomQuery(calcCustomQuery) : null;
 
       if (customQueryOptions) {
         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: queryToSet,
+        query: query,
         value: this.selectedValue || null,
         label: filterLabel,
         showFilter: showFilter,
@@ -102,9 +91,9 @@ var ReactiveComponent = {
       });
     }
 
-    this.setQuery = function (_ref2) {
-      var options = _ref2.options,
-          obj = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref2, _excluded);
+    this.setQuery = function (_ref) {
+      var options = _ref.options,
+          obj = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref, _excluded);
 
       if (options) {
         _this.setQueryOptions(props.componentId, _rollupPluginBabelHelpers._extends({}, options, _this.getAggsQuery()), false);
@@ -114,17 +103,17 @@ var ReactiveComponent = {
 
       if (obj && obj.query && obj.query.query) {
         queryToBeSet = obj.query.query;
-      } // Update customQuery field for RS API
+      }
 
+      var customQueryCalc = _rollupPluginBabelHelpers._extends({}, options); // Update customQuery field for RS API
 
-      if (obj && obj.query || options) {
-        var customQueryCalc = _rollupPluginBabelHelpers._extends({}, options);
 
-        if (obj && obj.query) {
-          if (obj.query.id) {
+      if (queryToBeSet || options) {
+        if (queryToBeSet.query) {
+          if (queryToBeSet.id) {
             customQueryCalc = queryToBeSet;
           } else {
-            customQueryCalc.query = obj.query;
+            customQueryCalc.query = queryToBeSet;
           }
         }
 
@@ -132,6 +121,7 @@ var ReactiveComponent = {
       }
 
       _this.updateQuery(_rollupPluginBabelHelpers._extends({}, obj, {
+        query: customQueryCalc,
         componentId: props.componentId,
         label: props.filterLabel,
         showFilter: props.showFilter,
@@ -147,24 +137,16 @@ var ReactiveComponent = {
     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 _ref3 = this.$defaultQuery || {},
-          query = _ref3.query,
-          queryOptions = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref3, _excluded2);
+      var query = extractQueryFromCustomQuery(this.$defaultQuery);
+      var queryOptions = getOptionsForCustomQuery(this.$defaultQuery);
 
       if (queryOptions) {
         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: queryToSet
+        query: query
       });
     }
   },
@@ -212,10 +194,8 @@ var ReactiveComponent = {
     defaultQuery: function defaultQuery(newVal, oldVal) {
       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, _excluded3);
+        var query = extractQueryFromCustomQuery(this.$defaultQuery);
+        var queryOptions = getOptionsForCustomQuery(this.$defaultQuery);
 
         if (queryOptions) {
           this.setQueryOptions(this.internalComponent, _rollupPluginBabelHelpers._extends({}, queryOptions, this.getAggsQuery()), false);
@@ -223,15 +203,9 @@ var ReactiveComponent = {
 
 
         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: queryToSet
+          query: query
         });
       }
     },
@@ -239,10 +213,8 @@ var ReactiveComponent = {
       if (newVal && !index.isQueryIdentical(newVal, oldVal, this.selectedValue, this.$props)) {
         var componentId = this.$props.componentId;
         this.$customQuery = newVal(this.selectedValue, this.$props);
-
-        var _ref5 = this.$customQuery || {},
-            query = _ref5.query,
-            queryOptions = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref5, _excluded4);
+        var query = extractQueryFromCustomQuery(this.$customQuery);
+        var queryOptions = getOptionsForCustomQuery(this.$customQuery);
 
         if (queryOptions) {
           this.setQueryOptions(componentId, _rollupPluginBabelHelpers._extends({}, queryOptions, this.getAggsQuery()), false);
@@ -250,15 +222,9 @@ var ReactiveComponent = {
 
 
         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: queryToSet
+          query: query
         });
       }
     }
@@ -338,6 +304,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,