@appbaseio/reactivesearch-vue 1.23.0 → 1.23.4

package/dist/es/ReactiveList.js

@@ -2,6 +2,7 @@ import { helper, Actions } from '@appbaseio/reactivecore';
 import { _ as _taggedTemplateLiteralLoose, a as _extends } from './_rollupPluginBabelHelpers-0f24d612.js';
 import VueTypes from 'vue-types';
 import { componentTypes } from '@appbaseio/reactivecore/lib/utils/constants';
+import { withClickIds } from '@appbaseio/reactivecore/lib/utils/helper';
 import { css } from 'emotion';
 import styled from '@appbaseio/vue-emotion';
 import 'polished';
@@ -438,18 +439,17 @@ var ReactiveList = {
     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;
@@ -478,8 +478,10 @@ var ReactiveList = {
       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;
     }
 
@@ -546,12 +548,9 @@ var ReactiveList = {
       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() {
@@ -560,6 +559,27 @@ var ReactiveList = {
     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 withClickIds(filteredResults);
     }
   },
   watch: {
@@ -641,7 +661,7 @@ var ReactiveList = {
       }
     },
     hits: function hits(newVal, oldVal) {
-      this.$emit('data', this.getAllData());
+      this.$emit('data', this.getData());
 
       if (this.shouldRenderPagination) {
         // called when page is changed
@@ -826,13 +846,10 @@ var ReactiveList = {
 
       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() {
@@ -843,7 +860,7 @@ var ReactiveList = {
 
       return this.analytics ? h(ImpressionTracker$1, {
         "attrs": {
-          "hits": filteredResults
+          "hits": this.data
         }
       }, [element]) : element;
     },
@@ -947,7 +964,7 @@ var ReactiveList = {
       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;
@@ -1023,8 +1040,8 @@ var ReactiveList = {
       })]);
     },
     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, {
@@ -1042,26 +1059,9 @@ var ReactiveList = {
           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,
@@ -1071,16 +1071,15 @@ var ReactiveList = {
       };
     },
     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
@@ -1092,7 +1091,7 @@ var ReactiveList = {
 
       var data = _extends({
         error: error,
-        loading: isLoading,
+        loading: isLoading || false,
         loadMore: this.loadMore,
         // TODO: Remove in v2
         triggerAnalytics: this.triggerClickAnalytics,
@@ -1107,13 +1106,13 @@ var ReactiveList = {
 
 var mapStateToProps = 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,
@@ -1122,7 +1121,7 @@ var mapStateToProps = function mapStateToProps(state, props) {
     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]
   };
 };
 

package/dist/es/StateProvider.js

@@ -89,7 +89,7 @@ var StateProvider = {
   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) {

package/dist/es/index.js

@@ -2,6 +2,7 @@ import '@appbaseio/reactivecore';
 import './_rollupPluginBabelHelpers-0f24d612.js';
 import 'vue-types';
 import '@appbaseio/reactivecore/lib/utils/constants';
+import '@appbaseio/reactivecore/lib/utils/helper';
 import 'emotion';
 import '@appbaseio/vue-emotion';
 import 'polished';
@@ -17,7 +18,6 @@ import './Title-3522ff56.js';
 import './ListItem-8e8fb535.js';
 import './Card-6446f1b7.js';
 import './Flex-8770345d.js';
-import '@appbaseio/reactivecore/lib/utils/helper';
 import '@appbaseio/reactivecore/lib/actions/analytics';
 import 'appbase-js';
 import 'url-search-params-polyfill';

package/dist/es/initReactivesearch.js

@@ -1,7 +1,7 @@
 import { a as _extends, b as _objectWithoutPropertiesLoose } from './_rollupPluginBabelHelpers-0f24d612.js';
 import { validProps, componentTypes } from '@appbaseio/reactivecore/lib/utils/constants';
-import { getRSQuery, extractPropsFromState, getDependentQueries } from '@appbaseio/reactivecore/lib/utils/transform';
 import { pushToAndClause, buildQuery } from '@appbaseio/reactivecore/lib/utils/helper';
+import { getRSQuery, extractPropsFromState, getDependentQueries } from '@appbaseio/reactivecore/lib/utils/transform';
 import Appbase from 'appbase-js';
 import valueReducer from '@appbaseio/reactivecore/lib/reducers/valueReducer';
 import queryReducer from '@appbaseio/reactivecore/lib/reducers/queryReducer';
@@ -307,8 +307,9 @@ function initReactivesearch(componentCollection, searchState, settings) {
             appbaseQuery = _extends({}, appbaseQuery, (_extends3 = {}, _extends3[component.componentId] = query, _extends3), getDependentQueries(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]);
         }
       }

package/dist/es/install.js

@@ -2,6 +2,7 @@ import '@appbaseio/reactivecore';
 import './_rollupPluginBabelHelpers-0f24d612.js';
 import 'vue-types';
 import '@appbaseio/reactivecore/lib/utils/constants';
+import '@appbaseio/reactivecore/lib/utils/helper';
 import 'emotion';
 import '@appbaseio/vue-emotion';
 import 'polished';
@@ -17,7 +18,6 @@ import './Title-3522ff56.js';
 import './ListItem-8e8fb535.js';
 import './Card-6446f1b7.js';
 import './Flex-8770345d.js';
-import '@appbaseio/reactivecore/lib/utils/helper';
 import '@appbaseio/reactivecore/lib/actions/analytics';
 import 'appbase-js';
 import 'url-search-params-polyfill';

package/dist/es/version.js

@@ -1,3 +1,3 @@
-var version = "1.23.0";
+var version = "1.23.4";
 
 export default version;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@appbaseio/reactivesearch-vue",
-	"version": "1.23.0",
+	"version": "1.23.4",
 	"private": false,
 	"main": "dist/cjs/index.js",
 	"jsnext:main": "dist/es/index.js",
@@ -34,7 +34,7 @@
 	],
 	"sideEffects": false,
 	"dependencies": {
-		"@appbaseio/reactivecore": "9.12.6",
+		"@appbaseio/reactivecore": "9.12.8",
 		"@appbaseio/vue-emotion": "0.4.4",
 		"@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
 		"appbase-js": "^4.4.1",