@appbaseio/reactivesearch-vue 1.23.0 → 1.23.4

package/dist/cjs/DataSearch.js

@@ -9,6 +9,7 @@ var configureStore__default = _interopDefault(configureStore);
 var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-f127c8b7.js');
 var VueTypes = _interopDefault(require('vue-types'));
 var constants = require('@appbaseio/reactivecore/lib/utils/constants');
+var helper = require('@appbaseio/reactivecore/lib/utils/helper');
 require('emotion');
 var styled = require('@appbaseio/vue-emotion');
 var styled__default = _interopDefault(styled);
@@ -20,7 +21,6 @@ var index = require('./index-89c39a9e.js');
 var ComponentWrapper = require('./ComponentWrapper-32481890.js');
 var Title = require('./Title-584a8cc8.js');
 var Flex = require('./Flex-f146cdad.js');
-var helper = require('@appbaseio/reactivecore/lib/utils/helper');
 var hotkeys = _interopDefault(require('hotkeys-js'));
 var Input = require('./Input-3cc3fa59.js');
 require('compute-scroll-into-view');

package/dist/cjs/ReactiveBase.js

@@ -9,13 +9,13 @@ var configureStore__default = _interopDefault(configureStore);
 var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-f127c8b7.js');
 var VueTypes = _interopDefault(require('vue-types'));
 require('@appbaseio/reactivecore/lib/utils/constants');
+var helper = require('@appbaseio/reactivecore/lib/utils/helper');
 var styled = require('@appbaseio/vue-emotion');
 var styled__default = _interopDefault(styled);
 var vueTypes = require('./vueTypes-22b4fd3a.js');
 require('redux');
 var index = require('./index-89c39a9e.js');
 var _mergeJSXProps = _interopDefault(require('@vue/babel-helper-vue-jsx-merge-props'));
-var helper = require('@appbaseio/reactivecore/lib/utils/helper');
 var analytics = require('@appbaseio/reactivecore/lib/actions/analytics');
 var Appbase = _interopDefault(require('appbase-js'));
 require('url-search-params-polyfill');

package/dist/cjs/ReactiveComponent.js

@@ -86,9 +86,15 @@ var ReactiveComponent = {
         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: query,
+        queryToSet: queryToSet,
         value: this.selectedValue || null,
         label: filterLabel,
         showFilter: showFilter,
@@ -102,6 +108,12 @@ var ReactiveComponent = {
 
       if (options) {
         _this.setQueryOptions(props.componentId, _rollupPluginBabelHelpers._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
 
 
@@ -109,7 +121,11 @@ var ReactiveComponent = {
         var customQueryCalc = _rollupPluginBabelHelpers._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);
@@ -140,9 +156,15 @@ var ReactiveComponent = {
         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: query || null
+        query: queryToSet
       });
     }
   },
@@ -201,9 +223,15 @@ var ReactiveComponent = {
 
 
         index.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
         });
       }
     },
@@ -222,9 +250,15 @@ var ReactiveComponent = {
 
 
         index.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
         });
       }
     }

package/dist/cjs/ReactiveList.js

@@ -9,6 +9,7 @@ var configureStore__default = _interopDefault(configureStore);
 var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-f127c8b7.js');
 var VueTypes = _interopDefault(require('vue-types'));
 var constants = require('@appbaseio/reactivecore/lib/utils/constants');
+var helper = require('@appbaseio/reactivecore/lib/utils/helper');
 var emotion = require('emotion');
 var styled = require('@appbaseio/vue-emotion');
 var styled__default = _interopDefault(styled);
@@ -446,18 +447,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;
@@ -486,8 +486,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;
     }
 
@@ -554,12 +556,9 @@ var ReactiveList = {
       return this.$listeners && this.$listeners.resultStats;
     },
     stats: function stats() {
-      var _this$getAllData = this.getAllData(),
-          filteredResults = _this$getAllData.filteredResults;
-
       return _rollupPluginBabelHelpers._extends({}, getResultStats(this), {
         currentPage: this.currentPageState,
-        displayedResults: filteredResults.length
+        displayedResults: this.data.length
       });
     },
     hasCustomRender: function hasCustomRender() {
@@ -568,6 +567,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 helper.withClickIds(filteredResults);
     }
   },
   watch: {
@@ -649,7 +669,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
@@ -834,13 +854,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() {
@@ -851,7 +868,7 @@ var ReactiveList = {
 
       return this.analytics ? h(ImpressionTracker$1, {
         "attrs": {
-          "hits": filteredResults
+          "hits": this.data
         }
       }, [element]) : element;
     },
@@ -955,7 +972,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;
@@ -1031,8 +1048,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 _rollupPluginBabelHelpers._extends({}, result, {
@@ -1050,26 +1067,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,
@@ -1079,16 +1079,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
@@ -1100,7 +1099,7 @@ var ReactiveList = {
 
       var data = _rollupPluginBabelHelpers._extends({
         error: error,
-        loading: isLoading,
+        loading: isLoading || false,
         loadMore: this.loadMore,
         // TODO: Remove in v2
         triggerAnalytics: this.triggerClickAnalytics,
@@ -1115,13 +1114,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,
@@ -1130,7 +1129,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/StateProvider.js

@@ -96,7 +96,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/cjs/index.js

@@ -6,6 +6,7 @@ require('@appbaseio/reactivecore');
 require('./_rollupPluginBabelHelpers-f127c8b7.js');
 require('vue-types');
 require('@appbaseio/reactivecore/lib/utils/constants');
+require('@appbaseio/reactivecore/lib/utils/helper');
 require('emotion');
 require('@appbaseio/vue-emotion');
 require('polished');
@@ -21,7 +22,6 @@ require('./Title-584a8cc8.js');
 require('./ListItem-b40adb04.js');
 require('./Card-fd94ef07.js');
 require('./Flex-f146cdad.js');
-require('@appbaseio/reactivecore/lib/utils/helper');
 require('@appbaseio/reactivecore/lib/actions/analytics');
 require('appbase-js');
 require('url-search-params-polyfill');

package/dist/cjs/initReactivesearch.js

@@ -6,8 +6,8 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-f127c8b7.js');
 var constants = require('@appbaseio/reactivecore/lib/utils/constants');
-var transform = require('@appbaseio/reactivecore/lib/utils/transform');
 var helper = require('@appbaseio/reactivecore/lib/utils/helper');
+var transform = require('@appbaseio/reactivecore/lib/utils/transform');
 var Appbase = _interopDefault(require('appbase-js'));
 var valueReducer = _interopDefault(require('@appbaseio/reactivecore/lib/reducers/valueReducer'));
 var queryReducer = _interopDefault(require('@appbaseio/reactivecore/lib/reducers/queryReducer'));
@@ -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/install.js

@@ -6,6 +6,7 @@ require('@appbaseio/reactivecore');
 require('./_rollupPluginBabelHelpers-f127c8b7.js');
 require('vue-types');
 require('@appbaseio/reactivecore/lib/utils/constants');
+require('@appbaseio/reactivecore/lib/utils/helper');
 require('emotion');
 require('@appbaseio/vue-emotion');
 require('polished');
@@ -21,7 +22,6 @@ require('./Title-584a8cc8.js');
 require('./ListItem-b40adb04.js');
 require('./Card-fd94ef07.js');
 require('./Flex-f146cdad.js');
-require('@appbaseio/reactivecore/lib/utils/helper');
 require('@appbaseio/reactivecore/lib/actions/analytics');
 require('appbase-js');
 require('url-search-params-polyfill');

package/dist/cjs/version.js

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

package/dist/es/DataSearch.js

@@ -2,6 +2,7 @@ import { helper, Actions, causes } 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 { getQueryOptions } from '@appbaseio/reactivecore/lib/utils/helper';
 import 'emotion';
 import styled, { css, cx, injectGlobal } from '@appbaseio/vue-emotion';
 import 'polished';
@@ -12,7 +13,6 @@ import { g as getComponent, h as hasCustomRenderer, f as updateCustomQuery, u as
 import { C as ComponentWrapper } from './ComponentWrapper-4f85a67e.js';
 import { T as Title } from './Title-3522ff56.js';
 import { F as Flex } from './Flex-8770345d.js';
-import { getQueryOptions } from '@appbaseio/reactivecore/lib/utils/helper';
 import hotkeys from 'hotkeys-js';
 import { n as noSuggestions, s as suggestionsContainer, I as Input, a as suggestions } from './Input-08bb1bcf.js';
 import 'compute-scroll-into-view';

package/dist/es/ReactiveBase.js

@@ -2,12 +2,12 @@ import configureStore, { Actions, helper } from '@appbaseio/reactivecore';
 import { _ as _taggedTemplateLiteralLoose, a as _extends } from './_rollupPluginBabelHelpers-0f24d612.js';
 import VueTypes from 'vue-types';
 import '@appbaseio/reactivecore/lib/utils/constants';
+import { isEqual as isEqual$1 } from '@appbaseio/reactivecore/lib/utils/helper';
 import styled from '@appbaseio/vue-emotion';
 import { t as types } from './vueTypes-e89c8a3c.js';
 import 'redux';
 import { c as connect, e as composeThemeObject, X as X_SEARCH_CLIENT } from './index-cb1950b6.js';
 import _mergeJSXProps from '@vue/babel-helper-vue-jsx-merge-props';
-import { isEqual as isEqual$1 } from '@appbaseio/reactivecore/lib/utils/helper';
 import { updateAnalyticsConfig } from '@appbaseio/reactivecore/lib/actions/analytics';
 import Appbase from 'appbase-js';
 import 'url-search-params-polyfill';

package/dist/es/ReactiveComponent.js

@@ -79,9 +79,15 @@ var ReactiveComponent = {
         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,
@@ -95,6 +101,12 @@ var ReactiveComponent = {
 
       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
 
 
@@ -102,7 +114,11 @@ var ReactiveComponent = {
         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);
@@ -133,9 +149,15 @@ var ReactiveComponent = {
         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
       });
     }
   },
@@ -194,9 +216,15 @@ var ReactiveComponent = {
 
 
         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
         });
       }
     },
@@ -215,9 +243,15 @@ var ReactiveComponent = {
 
 
         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
         });
       }
     }