@appbaseio/reactivesearch-vue 1.23.0 → 1.23.4

package/dist/@appbaseio/reactivesearch-vue.umd.js

@@ -5517,7 +5517,7 @@
 	    }, size > 0 ? {
 	      numberOfPages: Math.ceil(total / size)
 	    } : null, {
-	      time: time,
+	      time: time || 0,
 	      hidden: hidden,
 	      promoted: promotedResults && promotedResults.length
 	    });
@@ -8636,7 +8636,7 @@
 	      componentList.forEach(function (component) {
 	        var componentProps = props[component];
 
-	        if (selectedValues[componentId] && selectedValues[componentId].reference !== 'URL' && [constants$1.componentTypes.reactiveList, constants$1.componentTypes.reactiveMap].includes(componentProps.componentType)) {
+	        if (selectedValues[componentId] && selectedValues[componentId].reference !== 'URL' && componentProps && [constants$1.componentTypes.reactiveList, constants$1.componentTypes.reactiveMap].includes(componentProps.componentType)) {
 	          dispatch((0, value.setValue)(component, null));
 	        }
 
@@ -8721,8 +8721,9 @@
 	                }
 	              }
 	            } else {
+	              var preference = config && config.analyticsConfig && config.analyticsConfig.userId ? config.analyticsConfig.userId + '_' + component : component;
 	              finalQuery = [].concat(_toConsumableArray(finalQuery), [{
-	                preference: component
+	                preference: preference
 	              }, currentQuery]);
 	            }
 	          }
@@ -8927,8 +8928,9 @@
 	          appendToAggs: appendToAggs
 	        }));
 	      } else {
+	        var preference = store.config && store.config.analyticsConfig && store.config.analyticsConfig.userId ? store.config.analyticsConfig.userId + '_' + component : component;
 	        var _finalQuery = [{
-	          preference: component
+	          preference: preference
 	        }, currentQuery];
 	        dispatch(msearch(_finalQuery, [component], appendToHits, false, appendToAggs));
 	      }
@@ -13882,18 +13884,17 @@
 	    ResultCardsWrapper: ResultCardsWrapper
 	  },
 	  data: function data() {
-	    var props = this.$props;
 	    var currentPageState = 0;
+	    var defaultPage = this.defaultPage || -1;
 
-	    if (props.defaultPage >= 0) {
-	      currentPageState = props.defaultPage;
-	    } else if (props.currentPage) {
-	      currentPageState = Math.max(props.currentPage - 1, 0);
+	    if (defaultPage >= 0) {
+	      currentPageState = defaultPage;
+	    } else if (this.currentPage) {
+	      currentPageState = Math.max(this.currentPage - 1, 0);
 	    }
 
 	    this.__state = {
-	      from: currentPageState * props.size,
-	      isLoading: true,
+	      from: currentPageState * this.size,
 	      currentPageState: currentPageState
 	    };
 	    return this.__state;
@@ -13922,8 +13923,10 @@
 	      console.warn('Warning(ReactiveSearch): In order to use the `index` prop, the `enableAppbase` prop must be set to true in `ReactiveBase`.');
 	    }
 
-	    if (this.defaultPage >= 0) {
-	      this.currentPageState = this.defaultPage;
+	    var defaultPage = this.defaultPage || -1;
+
+	    if (defaultPage >= 0) {
+	      this.currentPageState = defaultPage;
 	      this.from = this.currentPageState * this.$props.size;
 	    }
 
@@ -13990,12 +13993,9 @@
 	      return this.$listeners && this.$listeners.resultStats;
 	    },
 	    stats: function stats() {
-	      var _this$getAllData = this.getAllData(),
-	          filteredResults = _this$getAllData.filteredResults;
-
 	      return _extends({}, getResultStats(this), {
 	        currentPage: this.currentPageState,
-	        displayedResults: filteredResults.length
+	        displayedResults: this.data.length
 	      });
 	    },
 	    hasCustomRender: function hasCustomRender() {
@@ -14004,6 +14004,27 @@
 	    showInfiniteScroll: function showInfiniteScroll() {
 	      // Pagination has higher priority then infinite scroll
 	      return this.infiniteScroll && !this.shouldRenderPagination;
+	    },
+	    data: function data() {
+	      var results = parseHits(this.hits) || [];
+	      var parsedPromotedResults = parseHits(this.promotedResults) || [];
+	      var filteredResults = results;
+
+	      if (parsedPromotedResults.length) {
+	        var ids = parsedPromotedResults.map(function (item) {
+	          return item._id;
+	        }).filter(Boolean);
+
+	        if (ids) {
+	          filteredResults = filteredResults.filter(function (item) {
+	            return !ids.includes(item._id);
+	          });
+	        }
+
+	        filteredResults = [].concat(parsedPromotedResults, filteredResults);
+	      }
+
+	      return helper_2(filteredResults);
 	    }
 	  },
 	  watch: {
@@ -14085,7 +14106,7 @@
 	      }
 	    },
 	    hits: function hits(newVal, oldVal) {
-	      this.$emit('data', this.getAllData());
+	      this.$emit('data', this.getData());
 
 	      if (this.shouldRenderPagination) {
 	        // called when page is changed
@@ -14270,13 +14291,10 @@
 
 	      var h = this.$createElement;
 	      var size = this.$props.size;
-	      var hits = this.$data.hits;
-	      var results = parseHits(hits) || [];
-	      var filteredResults = results;
 	      var renderItem = this.$scopedSlots.renderItem || this.$props.renderItem;
 	      var element = this.hasCustomRender ? this.getComponent() : h("div", {
 	        "class": this.$props.listClass + " " + getClassName$1(this.$props.innerClass, 'list')
-	      }, [[].concat(filteredResults).map(function (item, index) {
+	      }, [this.data.map(function (item, index) {
 	        return renderItem({
 	          item: item,
 	          triggerClickAnalytics: function triggerClickAnalytics() {
@@ -14287,7 +14305,7 @@
 
 	      return this.analytics ? h(ImpressionTracker$1, {
 	        "attrs": {
-	          "hits": filteredResults
+	          "hits": this.data
 	        }
 	      }, [element]) : element;
 	    },
@@ -14391,7 +14409,7 @@
 	      if (this.stats.numberOfResults) {
 	        return h("p", {
 	          "class": resultStats + " " + getClassName$1(this.$props.innerClass, 'resultStats')
-	        }, [this.stats.numberOfResults, " results found in ", this.stats.time, "ms"]);
+	        }, [this.stats.numberOfResults, " results found in ", this.stats.time || 0, "ms"]);
 	      }
 
 	      return null;
@@ -14467,8 +14485,8 @@
 	      })]);
 	    },
 	    withClickIds: function withClickIds(results) {
-	      var _this$getAllData2 = this.getAllData(),
-	          base = _this$getAllData2.base;
+	      var _this$getAllData = this.getAllData(),
+	          base = _this$getAllData.base;
 
 	      return results.map(function (result, index) {
 	        return _extends({}, result, {
@@ -14486,26 +14504,9 @@
 	          hits = this.hits;
 	      var results = parseHits(hits) || [];
 	      var parsedPromotedResults = parseHits(promotedResults) || [];
-	      var filteredResults = results;
 	      var base = currentPage * size;
-
-	      if (parsedPromotedResults.length) {
-	        var ids = parsedPromotedResults.map(function (item) {
-	          return item._id;
-	        }).filter(Boolean);
-
-	        if (ids) {
-	          filteredResults = filteredResults.filter(function (item) {
-	            return !ids.includes(item._id);
-	          });
-	        }
-
-	        filteredResults = [].concat(parsedPromotedResults, filteredResults);
-	      }
-
 	      return {
 	        results: results,
-	        filteredResults: filteredResults,
 	        customData: customData || {},
 	        promotedResults: parsedPromotedResults,
 	        aggregationData: aggregationData,
@@ -14515,16 +14516,15 @@
 	      };
 	    },
 	    getData: function getData() {
-	      var _this$getAllData3 = this.getAllData(),
-	          filteredResults = _this$getAllData3.filteredResults,
-	          promotedResults = _this$getAllData3.promotedResults,
-	          aggregationData = _this$getAllData3.aggregationData,
-	          customData = _this$getAllData3.customData;
+	      var _this$getAllData2 = this.getAllData(),
+	          promotedResults = _this$getAllData2.promotedResults,
+	          aggregationData = _this$getAllData2.aggregationData,
+	          customData = _this$getAllData2.customData;
 
 	      return {
-	        data: this.withClickIds(filteredResults),
+	        data: this.data,
 	        aggregationData: this.withClickIds(aggregationData || []),
-	        promotedData: this.withClickIds(promotedResults),
+	        promotedData: this.withClickIds(promotedResults || []),
 	        rawData: this.rawData,
 	        resultStats: this.stats,
 	        customData: customData
@@ -14536,7 +14536,7 @@
 
 	      var data = _extends({
 	        error: error,
-	        loading: isLoading,
+	        loading: isLoading || false,
 	        loadMore: this.loadMore,
 	        // TODO: Remove in v2
 	        triggerAnalytics: this.triggerClickAnalytics,
@@ -14551,13 +14551,13 @@
 
 	var mapStateToProps$1 = function mapStateToProps(state, props) {
 	  return {
-	    defaultPage: state.selectedValues[props.componentId] && state.selectedValues[props.componentId].value - 1 || -1,
+	    defaultPage: state.selectedValues[props.componentId] && state.selectedValues[props.componentId].value - 1,
 	    hits: state.hits[props.componentId] && state.hits[props.componentId].hits,
 	    rawData: state.rawData[props.componentId],
-	    aggregationData: state.compositeAggregations[props.componentId] || [],
-	    promotedResults: state.promotedResults[props.componentId] || [],
+	    aggregationData: state.compositeAggregations[props.componentId],
+	    promotedResults: state.promotedResults[props.componentId],
 	    customData: state.customData[props.componentId],
-	    time: state.hits[props.componentId] && state.hits[props.componentId].time || 0,
+	    time: state.hits[props.componentId] && state.hits[props.componentId].time,
 	    total: state.hits[props.componentId] && state.hits[props.componentId].total,
 	    hidden: state.hits[props.componentId] && state.hits[props.componentId].hidden,
 	    analytics: state.config && state.config.analytics,
@@ -14566,7 +14566,7 @@
 	    error: state.error[props.componentId],
 	    afterKey: state.aggregations[props.componentId] && state.aggregations[props.componentId][props.aggregationField] && state.aggregations[props.componentId][props.aggregationField].after_key,
 	    componentProps: state.props[props.componentId],
-	    isLoading: state.isLoading[props.componentId] || false
+	    isLoading: state.isLoading[props.componentId]
 	  };
 	};
 
@@ -23497,9 +23497,15 @@
 	        this.setQueryOptions(componentId, _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,
+	        queryToSet: queryToSet,
 	        value: this.selectedValue || null,
 	        label: filterLabel,
 	        showFilter: showFilter,
@@ -23513,6 +23519,12 @@
 
 	      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;
 	      } // Update customQuery field for RS API
 
 
@@ -23520,7 +23532,11 @@
 	        var customQueryCalc = _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);
@@ -23551,9 +23567,15 @@
 	        this.setQueryOptions(this.internalComponent, _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
 	      });
 	    }
 	  },
@@ -23612,9 +23634,15 @@
 
 
 	        updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, undefined);
+	        var queryToSet = query || null;
+
+	        if (!queryToSet && this.$defaultQuery && this.$defaultQuery.id) {
+	          queryToSet = this.$defaultQuery;
+	        }
+
 	        this.updateQuery({
 	          componentId: this.internalComponent,
-	          query: query || null
+	          query: queryToSet
 	        });
 	      }
 	    },
@@ -23633,9 +23661,15 @@
 
 
 	        updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, undefined);
+	        var queryToSet = query || null;
+
+	        if (this.$customQuery && this.$customQuery.id) {
+	          queryToSet = this.$customQuery;
+	        }
+
 	        this.updateQuery({
 	          componentId: componentId,
-	          query: query || null
+	          query: queryToSet
 	        });
 	      }
 	    }
@@ -25520,7 +25554,7 @@
 	  watch: {
 	    searchState: function searchState(newVal, oldVal) {
 	      if (this.isStateChanged(newVal, oldVal)) {
-	        this.$emit('change', newVal, oldVal);
+	        this.$emit('change', oldVal, newVal);
 	      }
 	    },
 	    selectedValues: function selectedValues(newVal, oldVal) {
@@ -25905,8 +25939,9 @@
 	            appbaseQuery = _extends({}, appbaseQuery, (_extends3 = {}, _extends3[component.componentId] = query, _extends3), transform_1(state, component.componentId, orderOfQueries));
 	          }
 	        } else {
+	          var preference = config && config.analyticsConfig && config.analyticsConfig.userId ? config.analyticsConfig.userId + "_" + component : component;
 	          finalQuery = [].concat(finalQuery, [{
-	            preference: component.componentId
+	            preference: preference
 	          }, currentQuery]);
 	        }
 	      }
@@ -26060,7 +26095,7 @@
 	  });
 	}
 
-	var version = "1.23.0";
+	var version = "1.23.4";
 
 	var _templateObject$n, _templateObject2$a;