@appbaseio/reactivesearch-vue 1.24.0 → 1.25.0

package/dist/es/ReactiveList.js

@@ -486,9 +486,14 @@ var ReactiveList = {
     }
 
     this.internalComponent = this.$props.componentId + "__internal";
-    this.sortOptionIndex = this.defaultSortOption ? this.sortOptions.findIndex(function (s) {
-      return s.label === _this.defaultSortOption;
-    }) : 0;
+    this.sortOptionIndex = 0;
+
+    if (this.defaultSortOption && this.sortOptions && Array.isArray(this.sortOptions)) {
+      this.sortOptionIndex = this.sortOptions.findIndex(function (s) {
+        return s.label === _this.defaultSortOption;
+      });
+    }
+
     this.updateComponentProps(this.componentId, {
       from: this.from
     }, componentTypes.reactiveList);
@@ -498,7 +503,7 @@ var ReactiveList = {
   },
   props: {
     currentPage: VueTypes.number.def(0),
-    includeFields: types.includeFields.def(['*']),
+    includeFields: types.includeFields,
     // component props
     className: types.string,
     componentId: types.stringRequired,
@@ -507,7 +512,7 @@ var ReactiveList = {
     aggregationSize: VueTypes.number,
     defaultQuery: types.func,
     defaultSortOption: types.string,
-    excludeFields: types.excludeFields.def([]),
+    excludeFields: types.excludeFields,
     innerClass: types.style,
     listClass: VueTypes.string.def(''),
     loader: types.title,
@@ -519,7 +524,7 @@ var ReactiveList = {
     pages: VueTypes.number.def(5),
     pagination: VueTypes.bool.def(false),
     infiniteScroll: VueTypes.bool.def(true),
-    paginationAt: types.paginationAt.def('bottom'),
+    paginationAt: VueTypes.oneOf(['top', 'bottom', 'both']).def('bottom'),
     react: types.react,
     scrollOnChange: VueTypes.bool.def(true),
     showResultStats: VueTypes.bool.def(true),
@@ -720,11 +725,11 @@ var ReactiveList = {
     var options = getQueryOptions(this.$props);
     options.from = this.$data.from;
 
-    if (this.$props.sortOptions) {
+    if (this.sortOptions && this.sortOptions[this.sortOptionIndex]) {
       var _ref2;
 
-      var sortField = this.$props.sortOptions[this.sortOptionIndex].dataField;
-      var sortBy = this.$props.sortOptions[this.sortOptionIndex].sortBy;
+      var sortField = this.sortOptions[this.sortOptionIndex].dataField;
+      var sortBy = this.sortOptions[this.sortOptionIndex].sortBy;
       options.sort = [(_ref2 = {}, _ref2[sortField] = {
         order: sortBy
       }, _ref2)]; // To handle sort options for RS API
@@ -794,10 +799,10 @@ var ReactiveList = {
       "class": this.$props.className
     }, [this.isLoading && this.shouldRenderPagination && this.showInfiniteScroll && (this.$scopedSlots.loader || this.$props.loader), this.renderErrorComponent(), h(Flex, {
       "attrs": {
-        "labelPosition": this.$props.sortOptions ? 'right' : 'left'
+        "labelPosition": this.sortOptions ? 'right' : 'left'
       },
       "class": getClassName$1(this.$props.innerClass, 'resultsInfo')
-    }, [this.$props.sortOptions ? this.renderSortOptions() : null, this.$props.showResultStats && results.length ? this.renderStats() : null]), !this.isLoading && results.length === 0 ? this.renderNoResult() : null, this.shouldRenderPagination && (this.$props.paginationAt === 'top' || this.$props.paginationAt === 'both') ? h(Pagination, {
+    }, [this.sortOptions ? this.renderSortOptions() : null, this.$props.showResultStats && results.length ? this.renderStats() : null]), !this.isLoading && results.length === 0 ? this.renderNoResult() : null, this.shouldRenderPagination && (this.$props.paginationAt === 'top' || this.$props.paginationAt === 'both') ? h(Pagination, {
       "attrs": {
         "pages": this.$props.pages,
         "totalPages": this.totalPages,
@@ -868,15 +873,18 @@ var ReactiveList = {
       var options = getQueryOptions(props);
       options.from = this.$data.from;
 
-      if (props.sortOptions) {
-        var _ref5;
-
+      if (props.sortOptions && Array.isArray(props.sortOptions)) {
         var sortOptionIndex = props.defaultSortOption ? props.sortOptions.findIndex(function (s) {
           return s.label === props.defaultSortOption;
         }) : 0;
-        options.sort = [(_ref5 = {}, _ref5[props.sortOptions[sortOptionIndex].dataField] = {
-          order: props.sortOptions[sortOptionIndex].sortBy
-        }, _ref5)];
+
+        if (props.sortOptions[sortOptionIndex]) {
+          var _ref5;
+
+          options.sort = [(_ref5 = {}, _ref5[props.sortOptions[sortOptionIndex].dataField] = {
+            order: props.sortOptions[sortOptionIndex].sortBy
+          }, _ref5)];
+        }
       } else if (props.sortBy) {
         var _ref6;
 
@@ -972,31 +980,39 @@ var ReactiveList = {
     renderNoResult: function renderNoResult() {
       var h = this.$createElement;
       var renderNoResults = this.$scopedSlots.renderNoResults || this.$props.renderNoResults;
+
+      if (this.$scopedSlots.renderNoResults) {
+        return isFunction(renderNoResults) ? renderNoResults() : renderNoResults;
+      }
+
       return h("p", {
         "class": getClassName$1(this.$props.innerClass, 'noResults') || null
       }, [isFunction(renderNoResults) ? renderNoResults() : renderNoResults]);
     },
     handleSortChange: function handleSortChange(e) {
-      var _ref7;
+      var index = e.target.value;
 
-      var index = e.target.value; // This fixes issue #371 (where sorting a multi-result page with infinite loader breaks)
+      if (this.sortOptions && this.sortOptions[index]) {
+        var _ref7;
 
-      var options = getQueryOptions(this.$props);
-      options.from = 0;
-      var sortField = this.$props.sortOptions[index].dataField;
-      var sortBy = this.$props.sortOptions[index].sortBy;
-      options.sort = [(_ref7 = {}, _ref7[sortField] = {
-        order: sortBy
-      }, _ref7)];
-      this.sortOptionIndex = index; // To handle sort options for RS API
-
-      this.updateComponentProps(this.componentId, {
-        dataField: sortField,
-        sortBy: sortBy
-      }, componentTypes.reactiveList);
-      this.setQueryOptions(this.$props.componentId, options, true);
-      this.currentPageState = 0;
-      this.from = 0;
+        // This fixes issue #371 (where sorting a multi-result page with infinite loader breaks)
+        var options = getQueryOptions(this.$props);
+        options.from = 0;
+        var sortField = this.sortOptions[index].dataField;
+        var sortBy = this.sortOptions[index].sortBy;
+        options.sort = [(_ref7 = {}, _ref7[sortField] = {
+          order: sortBy
+        }, _ref7)];
+        this.sortOptionIndex = index; // To handle sort options for RS API
+
+        this.updateComponentProps(this.componentId, {
+          dataField: sortField,
+          sortBy: sortBy
+        }, componentTypes.reactiveList);
+        this.setQueryOptions(this.$props.componentId, options, true);
+        this.currentPageState = 0;
+        this.from = 0;
+      }
     },
     triggerClickAnalytics: function triggerClickAnalytics(searchPosition, documentId) {
       var docId = documentId;
@@ -1030,7 +1046,7 @@ var ReactiveList = {
         "domProps": {
           "value": this.sortOptionIndex
         }
-      }, [this.$props.sortOptions.map(function (sort, index) {
+      }, [this.sortOptions.map(function (sort, index) {
         return h("option", {
           "key": sort.label,
           "domProps": {
@@ -1136,11 +1152,7 @@ var mapDispatchtoProps = {
 }; // Only used for SSR
 
 ReactiveList.generateQueryOptions = function (props) {
-  // simulate default (includeFields and excludeFields) props to generate consistent query
-  var options = getQueryOptions(_extends({
-    includeFields: ['*'],
-    excludeFields: []
-  }, props));
+  var options = getQueryOptions(props);
   var size = props.size,
       dataField = props.dataField,
       defaultSortOption = props.defaultSortOption,

package/dist/es/SingleDropdownList.js

@@ -12,12 +12,13 @@ import 'redux';
 import { f as updateCustomQuery, u as updateDefaultQuery, i as isQueryIdentical, a as isFunction, g as getComponent, h as hasCustomRenderer, c as connect } from './index-cb1950b6.js';
 import { C as ComponentWrapper } from './ComponentWrapper-4f85a67e.js';
 import { T as Title } from './Title-3522ff56.js';
+import './CancelSvg-e0cace2d.js';
 import './Input-08bb1bcf.js';
 import 'compute-scroll-into-view';
-import './DownShift-3558d402.js';
 import { C as Container } from './Container-18b03fde.js';
+import '@appbaseio/reactivecore/lib/utils/suggestions';
 import { g as getAggsQuery } from './utils-64a2e5f0.js';
-import { D as Dropdown } from './DropDown-035c804f.js';
+import { D as Dropdown } from './DropDown-1ee01031.js';
 
 var updateQuery = Actions.updateQuery,
     setQueryOptions = Actions.setQueryOptions,
@@ -73,10 +74,12 @@ var SingleDropdownList = {
     showMissing: VueTypes.bool.def(false),
     missingLabel: VueTypes.string.def('N/A'),
     showSearch: VueTypes.bool.def(false),
+    showClear: VueTypes.bool.def(false),
     showLoadMore: VueTypes.bool.def(false),
     loadMoreLabel: VueTypes.oneOfType([VueTypes.string, VueTypes.any]).def('Load More'),
     nestedField: types.string,
-    index: VueTypes.string
+    index: VueTypes.string,
+    searchPlaceholder: VueTypes.string.def('Type here to search...')
   },
   created: function created() {
     if (!this.enableAppbase && this.$props.index) {
@@ -190,7 +193,9 @@ var SingleDropdownList = {
     if (!this.hasCustomRenderer && this.$data.modifiedOptions.length === 0 && !this.isLoading) {
       if (renderNoResults && isFunction(renderNoResults)) {
         return h("div", [renderNoResults()]);
-      } else if (renderNoResults && !isFunction(renderNoResults)) {
+      }
+
+      if (renderNoResults && !isFunction(renderNoResults)) {
         return renderNoResults;
       }
 
@@ -228,6 +233,8 @@ var SingleDropdownList = {
         "renderNoResults": this.$scopedSlots.renderNoResults || this.$props.renderNoResults,
         "themePreset": this.themePreset,
         "showSearch": this.$props.showSearch,
+        "showClear": this.$props.showClear,
+        "searchPlaceholder": this.$props.searchPlaceholder,
         "transformData": this.$props.transformData,
         "footer": showLoadMore && !isLastBucket && h("div", {
           "attrs": {

package/dist/es/SingleList.js

@@ -13,6 +13,7 @@ import { C as ComponentWrapper } from './ComponentWrapper-4f85a67e.js';
 import { T as Title } from './Title-3522ff56.js';
 import { I as Input } from './Input-08bb1bcf.js';
 import { C as Container } from './Container-18b03fde.js';
+import { replaceDiacritics } from '@appbaseio/reactivecore/lib/utils/suggestions';
 import { U as UL, R as Radio } from './FormControlList-704f8dee.js';
 import { g as getAggsQuery } from './utils-64a2e5f0.js';
 
@@ -29,7 +30,7 @@ var SingleList = {
   name: 'SingleList',
   props: {
     beforeValueChange: types.func,
-    className: types.string.def(''),
+    className: VueTypes.string.def(''),
     componentId: types.stringRequired,
     customQuery: types.func,
     dataField: types.stringRequired,
@@ -49,7 +50,7 @@ var SingleList = {
     showFilter: VueTypes.bool.def(true),
     showRadio: VueTypes.bool.def(true),
     showSearch: VueTypes.bool.def(true),
-    size: VueTypes.number.def(100),
+    size: VueTypes.number,
     sortBy: VueTypes.oneOf(['asc', 'desc', 'count']).def('count'),
     title: types.title,
     URLParams: VueTypes.bool.def(false),
@@ -163,7 +164,7 @@ var SingleList = {
     var filteredItemsToRender = itemsToRender.filter(function (item) {
       if (String(item.key).length) {
         if (_this.$props.showSearch && _this.$data.searchTerm) {
-          return String(item.key).toLowerCase().includes(_this.$data.searchTerm.toLowerCase());
+          return replaceDiacritics(String(item.key)).toLowerCase().includes(replaceDiacritics(_this.$data.searchTerm.toLowerCase()));
         }
 
         return true;

package/dist/es/ToggleButton.js

@@ -28,7 +28,7 @@ var ToggleButton = {
     componentId: types.stringRequired,
     data: types.data,
     dataField: types.stringRequired,
-    defaultValue: types.stringOrArray,
+    defaultValue: types.any,
     value: types.stringOrArray,
     filterLabel: types.string,
     nestedField: types.string,

package/dist/es/index.js

@@ -24,16 +24,17 @@ import 'url-search-params-polyfill';
 export { default as ReactiveBase } from './ReactiveBase.js';
 import 'hotkeys-js';
 export { default as DataSearch } from './DataSearch.js';
+import './CancelSvg-e0cace2d.js';
 import './Input-08bb1bcf.js';
 import 'compute-scroll-into-view';
-import './DownShift-3558d402.js';
 import './Container-18b03fde.js';
 import 'vue-highlight-words';
+import '@appbaseio/reactivecore/lib/utils/suggestions';
 import './FormControlList-704f8dee.js';
 import './utils-64a2e5f0.js';
 export { default as SingleList } from './SingleList.js';
 export { default as MultiList } from './MultiList.js';
-import './DropDown-035c804f.js';
+import './DropDown-1ee01031.js';
 export { default as SingleDropdownList } from './SingleDropdownList.js';
 export { default as MultiDropdownList } from './MultiDropdownList.js';
 export { default as ToggleButton } from './ToggleButton.js';
@@ -51,6 +52,8 @@ export { default as StateProvider } from './StateProvider.js';
 import '@appbaseio/reactivecore/lib/reducers/valueReducer';
 import '@appbaseio/reactivecore/lib/reducers/queryReducer';
 import '@appbaseio/reactivecore/lib/reducers/queryOptionsReducer';
+import '@appbaseio/reactivecore/lib/reducers/compositeAggsReducer';
+import '@appbaseio/reactivecore/lib/constants';
 import '@appbaseio/reactivecore/lib/reducers/dependencyTreeReducer';
 import '@appbaseio/reactivecore/lib/utils/graphQL';
 import '@appbaseio/reactivecore/lib/actions/utils';

package/dist/es/initReactivesearch.js

@@ -6,6 +6,8 @@ import Appbase from 'appbase-js';
 import valueReducer from '@appbaseio/reactivecore/lib/reducers/valueReducer';
 import queryReducer from '@appbaseio/reactivecore/lib/reducers/queryReducer';
 import queryOptionsReducer from '@appbaseio/reactivecore/lib/reducers/queryOptionsReducer';
+import compositeAggsReducer from '@appbaseio/reactivecore/lib/reducers/compositeAggsReducer';
+import { UPDATE_COMPOSITE_AGGS } from '@appbaseio/reactivecore/lib/constants';
 import dependencyTreeReducer from '@appbaseio/reactivecore/lib/reducers/dependencyTreeReducer';
 import fetchGraphQL from '@appbaseio/reactivecore/lib/utils/graphQL';
 import { isPropertyDefined } from '@appbaseio/reactivecore/lib/actions/utils';
@@ -102,6 +104,7 @@ function initReactivesearch(componentCollection, searchState, settings) {
     var orderOfQueries = [];
     var hits = {};
     var aggregations = {};
+    var compositeAggregations = {};
     var state = {};
     var customQueries = {};
     var defaultQueries = {};
@@ -116,16 +119,7 @@ function initReactivesearch(componentCollection, searchState, settings) {
           compProps[key] = component[key];
         }
       });
-      var isInternalComponentPresent = false; // Set custom and default queries
-
-      if (component.customQuery && typeof component.customQuery === 'function') {
-        customQueries[component.componentId] = component.customQuery(component.value, compProps);
-      }
-
-      if (component.defaultQuery && typeof component.defaultQuery === 'function') {
-        defaultQueries[component.componentId] = component.defaultQuery(component.value, compProps);
-      }
-
+      var isInternalComponentPresent = false;
       var isResultComponent = resultComponents.includes(componentType);
       var internalComponent = component.componentId + "__internal";
       var label = component.filterLabel || component.componentId;
@@ -149,7 +143,16 @@ function initReactivesearch(componentCollection, searchState, settings) {
         reference: reference,
         showFilter: showFilter,
         URLParams: component.URLParams || false
-      }); // [2] set query options - main component query (valid for result components)
+      }); // Set custom and default queries
+
+      if (component.customQuery && typeof component.customQuery === 'function') {
+        customQueries[component.componentId] = component.customQuery(value, compProps);
+      }
+
+      if (component.defaultQuery && typeof component.defaultQuery === 'function') {
+        defaultQueries[component.componentId] = component.defaultQuery(value, compProps);
+      } // [2] set query options - main component query (valid for result components)
+
 
       if (componentsWithOptions.includes(componentType)) {
         var options = component.source.generateQueryOptions ? component.source.generateQueryOptions(component) : null;
@@ -236,7 +239,7 @@ function initReactivesearch(componentCollection, searchState, settings) {
 
 
       if (isResultComponent) {
-        var _getQuery = getQuery(component, null, componentType),
+        var _getQuery = getQuery(component, value, componentType),
             query = _getQuery.query;
 
         queryList = queryReducer(queryList, {
@@ -336,6 +339,11 @@ function initReactivesearch(componentCollection, searchState, settings) {
               var _extends4;
 
               aggregations = _extends({}, aggregations, (_extends4 = {}, _extends4[component] = response.aggregations, _extends4));
+              compositeAggregations = compositeAggsReducer(compositeAggregations, {
+                type: UPDATE_COMPOSITE_AGGS,
+                aggregations: response.aggregations,
+                append: false
+              });
             }
 
             hits = _extends({}, hits, (_extends5 = {}, _extends5[component] = {
@@ -362,6 +370,8 @@ function initReactivesearch(componentCollection, searchState, settings) {
       var promotedResults = {};
       var rawData = {};
       var customData = {};
+      var settingsResponse = {};
+      var timestamp = {};
       var allPromises = orderOfQueries.map(function (component) {
         return new Promise(function (responseResolve, responseReject) {
           handleTransformResponse(res[component], component).then(function (response) {
@@ -380,6 +390,11 @@ function initReactivesearch(componentCollection, searchState, settings) {
 
               if (response.customData) {
                 customData[component] = response.customData;
+              } // Update settings
+
+
+              if (response.settings) {
+                settingsResponse[component] = response.settings;
               }
 
               if (response.aggregations) {
@@ -388,6 +403,7 @@ function initReactivesearch(componentCollection, searchState, settings) {
                 aggregations = _extends({}, aggregations, (_extends6 = {}, _extends6[component] = response.aggregations, _extends6));
               }
 
+              timestamp[component] = res._timestamp;
               hits = _extends({}, hits, (_extends7 = {}, _extends7[component] = {
                 hits: response.hits.hits,
                 total: typeof response.hits.total === 'object' ? response.hits.total.value : response.hits.total,
@@ -403,8 +419,11 @@ function initReactivesearch(componentCollection, searchState, settings) {
       Promise.all(allPromises).then(function () {
         state = _extends({}, state, {
           hits: hits,
+          timestamp: timestamp,
           aggregations: aggregations,
+          compositeAggregations: compositeAggregations,
           promotedResults: promotedResults,
+          settings: settingsResponse,
           customData: customData,
           rawData: rawData
         });

package/dist/es/install.js

@@ -24,16 +24,17 @@ import 'url-search-params-polyfill';
 import ReactiveBase from './ReactiveBase.js';
 import 'hotkeys-js';
 import DataSearch from './DataSearch.js';
+import './CancelSvg-e0cace2d.js';
 import './Input-08bb1bcf.js';
 import 'compute-scroll-into-view';
-import './DownShift-3558d402.js';
 import './Container-18b03fde.js';
 import 'vue-highlight-words';
+import '@appbaseio/reactivecore/lib/utils/suggestions';
 import './FormControlList-704f8dee.js';
 import './utils-64a2e5f0.js';
 import SingleList from './SingleList.js';
 import MultiList from './MultiList.js';
-import './DropDown-035c804f.js';
+import './DropDown-1ee01031.js';
 import SingleDropdownList from './SingleDropdownList.js';
 import MultiDropdownList from './MultiDropdownList.js';
 import ToggleButton from './ToggleButton.js';

package/dist/es/version.js

@@ -1,3 +1,3 @@
-var version = "1.24.0";
+var version = "1.25.0";
 
 export default version;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@appbaseio/reactivesearch-vue",
-	"version": "1.24.0",
+	"version": "1.25.0",
 	"private": false,
 	"main": "dist/cjs/index.js",
 	"jsnext:main": "dist/es/index.js",
@@ -34,10 +34,10 @@
 	],
 	"sideEffects": false,
 	"dependencies": {
-		"@appbaseio/reactivecore": "9.13.0",
+		"@appbaseio/reactivecore": "9.13.3",
 		"@appbaseio/vue-emotion": "0.4.4",
 		"@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
-		"appbase-js": "^4.5.0",
+		"appbase-js": "^4.5.1",
 		"compute-scroll-into-view": "^1.0.11",
 		"emotion": "9.2.12",
 		"hotkeys-js": "^3.8.7",