@appbaseio/reactivesearch-vue 1.16.0-alpha.23 → 1.16.0-alpha.24

package/dist/cjs/ReactiveList.js

@@ -281,18 +281,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;
@@ -321,8 +320,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;
     }
 
@@ -790,7 +791,7 @@ var ReactiveList = {
       if (this.stats.numberOfResults) {
         return h("p", {
           "class": resultStats + " " + getClassName(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;
@@ -923,7 +924,7 @@ var ReactiveList = {
       return {
         data: this.withClickIds(filteredResults),
         aggregationData: this.withClickIds(aggregationData || []),
-        promotedData: this.withClickIds(promotedResults),
+        promotedData: this.withClickIds(promotedResults || []),
         rawData: this.rawData,
         resultStats: this.stats,
         customData: customData
@@ -935,7 +936,7 @@ var ReactiveList = {
 
       var data = _rollupPluginBabelHelpers._extends({
         error: error,
-        loading: isLoading,
+        loading: isLoading || false,
         loadMore: this.loadMore,
         // TODO: Remove in v2
         triggerAnalytics: this.triggerClickAnalytics,
@@ -950,13 +951,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,
@@ -965,7 +966,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/cjs/initReactivesearch.js

@@ -313,8 +313,9 @@ function initReactivesearch(componentCollection, searchState, settings) {
             appbaseQuery = _rollupPluginBabelHelpers._extends({}, appbaseQuery, (_extends3 = {}, _extends3[component.componentId] = query, _extends3), transform.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/cjs/version.js

@@ -2,6 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "1.16.0-alpha.23";
+var version = "1.16.0-alpha.24";
 
 exports.default = version;

package/dist/es/ReactiveList.js

@@ -273,18 +273,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;
@@ -313,8 +312,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;
     }
 
@@ -782,7 +783,7 @@ var ReactiveList = {
       if (this.stats.numberOfResults) {
         return h("p", {
           "class": resultStats + " " + getClassName(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;
@@ -915,7 +916,7 @@ var ReactiveList = {
       return {
         data: this.withClickIds(filteredResults),
         aggregationData: this.withClickIds(aggregationData || []),
-        promotedData: this.withClickIds(promotedResults),
+        promotedData: this.withClickIds(promotedResults || []),
         rawData: this.rawData,
         resultStats: this.stats,
         customData: customData
@@ -927,7 +928,7 @@ var ReactiveList = {
 
       var data = _extends({
         error: error,
-        loading: isLoading,
+        loading: isLoading || false,
         loadMore: this.loadMore,
         // TODO: Remove in v2
         triggerAnalytics: this.triggerClickAnalytics,
@@ -942,13 +943,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,
@@ -957,7 +958,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/initReactivesearch.js

@@ -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/version.js

@@ -1,3 +1,3 @@
-var version = "1.16.0-alpha.23";
+var version = "1.16.0-alpha.24";
 
 export default version;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@appbaseio/reactivesearch-vue",
-	"version": "1.16.0-alpha.23",
+	"version": "1.16.0-alpha.24",
 	"private": false,
 	"main": "dist/cjs/index.js",
 	"jsnext:main": "dist/es/index.js",
@@ -34,7 +34,7 @@
 	],
 	"sideEffects": false,
 	"dependencies": {
-		"@appbaseio/reactivecore": "9.12.7",
+		"@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",