@appbaseio/reactivesearch-vue 1.16.0-alpha.44 → 1.16.0-alpha.47
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/@appbaseio/reactivesearch-vue.umd.js +41 -59
- package/dist/@appbaseio/reactivesearch-vue.umd.js.map +1 -1
- package/dist/@appbaseio/reactivesearch-vue.umd.min.js +2 -2
- package/dist/@appbaseio/reactivesearch-vue.umd.min.js.map +1 -1
- package/dist/cjs/DynamicRangeSlider.js +2 -3
- package/dist/cjs/MultiDropdownList.js +5 -7
- package/dist/cjs/MultiList.js +5 -7
- package/dist/cjs/MultiRange.js +2 -3
- package/dist/cjs/RangeSlider.js +2 -3
- package/dist/cjs/ReactiveComponent.js +8 -2
- package/dist/cjs/SingleDropdownList.js +5 -7
- package/dist/cjs/SingleList.js +5 -7
- package/dist/cjs/SingleRange.js +2 -3
- package/dist/cjs/initReactivesearch.js +3 -15
- package/dist/cjs/version.js +1 -1
- package/dist/es/DynamicRangeSlider.js +2 -3
- package/dist/es/MultiDropdownList.js +5 -7
- package/dist/es/MultiList.js +5 -7
- package/dist/es/MultiRange.js +2 -3
- package/dist/es/RangeSlider.js +2 -3
- package/dist/es/ReactiveComponent.js +8 -2
- package/dist/es/SingleDropdownList.js +5 -7
- package/dist/es/SingleList.js +5 -7
- package/dist/es/SingleRange.js +2 -3
- package/dist/es/initReactivesearch.js +3 -15
- package/dist/es/version.js +1 -1
- package/package.json +2 -2
|
@@ -240,7 +240,6 @@ var DynamicRangeSlider = {
|
|
|
240
240
|
},
|
|
241
241
|
updateQueryHandler: function updateQueryHandler(value) {
|
|
242
242
|
var query = DynamicRangeSlider.defaultQuery(value, this.$props);
|
|
243
|
-
var customQueryOptions;
|
|
244
243
|
|
|
245
244
|
if (this.$props.customQuery) {
|
|
246
245
|
var customQueryTobeSet = this.$props.customQuery(value, this.$props);
|
|
@@ -250,8 +249,9 @@ var DynamicRangeSlider = {
|
|
|
250
249
|
query = queryTobeSet;
|
|
251
250
|
}
|
|
252
251
|
|
|
253
|
-
customQueryOptions = getOptionsForCustomQuery(customQueryTobeSet);
|
|
252
|
+
var customQueryOptions = getOptionsForCustomQuery(customQueryTobeSet);
|
|
254
253
|
index.updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, value);
|
|
254
|
+
this.setQueryOptions(this.$props.componentId, customQueryOptions, false);
|
|
255
255
|
}
|
|
256
256
|
|
|
257
257
|
var _ref2 = this.range || {
|
|
@@ -265,7 +265,6 @@ var DynamicRangeSlider = {
|
|
|
265
265
|
currentEnd = value[1]; // check if the slider is at its initial position
|
|
266
266
|
|
|
267
267
|
var isInitialValue = currentStart === start && currentEnd === end;
|
|
268
|
-
this.setQueryOptions(this.$props.componentId, customQueryOptions, false);
|
|
269
268
|
this.updateQuery({
|
|
270
269
|
componentId: this.$props.componentId,
|
|
271
270
|
query: query,
|
|
@@ -363,7 +363,6 @@ var MultiDropdownList = {
|
|
|
363
363
|
checkValueChange(props.componentId, finalValues, props.beforeValueChange, performUpdate);
|
|
364
364
|
},
|
|
365
365
|
updateDefaultQueryHandler: function updateDefaultQueryHandler(value, props) {
|
|
366
|
-
var defaultQueryOptions;
|
|
367
366
|
var query = MultiDropdownList.defaultQuery(value, props);
|
|
368
367
|
|
|
369
368
|
if (this.defaultQuery) {
|
|
@@ -372,14 +371,14 @@ var MultiDropdownList = {
|
|
|
372
371
|
|
|
373
372
|
if (defaultQueryObj) {
|
|
374
373
|
query = defaultQueryObj;
|
|
375
|
-
}
|
|
374
|
+
} // Update calculated default query in store
|
|
376
375
|
|
|
377
|
-
defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet); // Update calculated default query in store
|
|
378
376
|
|
|
379
377
|
index.updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
|
|
378
|
+
var defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet);
|
|
379
|
+
this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
|
|
380
380
|
}
|
|
381
381
|
|
|
382
|
-
this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
|
|
383
382
|
this.updateQuery({
|
|
384
383
|
componentId: this.internalComponent,
|
|
385
384
|
query: query,
|
|
@@ -390,16 +389,15 @@ var MultiDropdownList = {
|
|
|
390
389
|
updateQueryHandler: function updateQueryHandler(value, props) {
|
|
391
390
|
var customQuery = props.customQuery;
|
|
392
391
|
var query = MultiDropdownList.defaultQuery(value, props);
|
|
393
|
-
var customQueryOptions;
|
|
394
392
|
|
|
395
393
|
if (customQuery) {
|
|
396
394
|
var customQueryCalc = customQuery(value, props);
|
|
397
395
|
query = extractQueryFromCustomQuery(customQueryCalc);
|
|
398
|
-
customQueryOptions = getOptionsForCustomQuery(customQueryCalc);
|
|
399
396
|
index.updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
|
|
397
|
+
var customQueryOptions = getOptionsForCustomQuery(customQueryCalc);
|
|
398
|
+
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
400
399
|
}
|
|
401
400
|
|
|
402
|
-
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
403
401
|
this.updateQuery({
|
|
404
402
|
componentId: props.componentId,
|
|
405
403
|
query: query,
|
package/dist/cjs/MultiList.js
CHANGED
|
@@ -347,7 +347,6 @@ var MultiList = {
|
|
|
347
347
|
checkValueChange(props.componentId, finalValues, props.beforeValueChange, performUpdate);
|
|
348
348
|
},
|
|
349
349
|
updateDefaultQueryHandler: function updateDefaultQueryHandler(value, props) {
|
|
350
|
-
var defaultQueryOptions;
|
|
351
350
|
var query = MultiList.defaultQuery(value, props);
|
|
352
351
|
|
|
353
352
|
if (this.defaultQuery) {
|
|
@@ -356,14 +355,14 @@ var MultiList = {
|
|
|
356
355
|
|
|
357
356
|
if (defaultQueryObj) {
|
|
358
357
|
query = defaultQueryObj;
|
|
359
|
-
}
|
|
358
|
+
} // Update calculated default query in store
|
|
360
359
|
|
|
361
|
-
defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet); // Update calculated default query in store
|
|
362
360
|
|
|
363
361
|
index.updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
|
|
362
|
+
var defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet);
|
|
363
|
+
this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
|
|
364
364
|
}
|
|
365
365
|
|
|
366
|
-
this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
|
|
367
366
|
this.updateQuery({
|
|
368
367
|
componentId: this.internalComponent,
|
|
369
368
|
query: query,
|
|
@@ -374,16 +373,15 @@ var MultiList = {
|
|
|
374
373
|
updateQueryHandler: function updateQueryHandler(value, props) {
|
|
375
374
|
var customQuery = props.customQuery;
|
|
376
375
|
var query = MultiList.defaultQuery(value, props);
|
|
377
|
-
var customQueryOptions;
|
|
378
376
|
|
|
379
377
|
if (customQuery) {
|
|
380
378
|
var customQueryCalc = customQuery(value, props);
|
|
381
379
|
query = extractQueryFromCustomQuery(customQueryCalc);
|
|
382
|
-
customQueryOptions = getOptionsForCustomQuery(customQueryCalc);
|
|
383
380
|
index.updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
|
|
381
|
+
var customQueryOptions = getOptionsForCustomQuery(customQueryCalc);
|
|
382
|
+
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
384
383
|
}
|
|
385
384
|
|
|
386
|
-
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
387
385
|
this.updateQuery({
|
|
388
386
|
componentId: props.componentId,
|
|
389
387
|
query: query,
|
package/dist/cjs/MultiRange.js
CHANGED
|
@@ -138,17 +138,16 @@ var MultiRange = {
|
|
|
138
138
|
updateQueryHandler: function updateQueryHandler(value, props) {
|
|
139
139
|
var customQuery = props.customQuery;
|
|
140
140
|
var query = MultiRange.defaultQuery(value, props);
|
|
141
|
-
var customQueryOptions;
|
|
142
141
|
|
|
143
142
|
if (customQuery) {
|
|
144
143
|
var _ref = customQuery(value, props) || {};
|
|
145
144
|
|
|
146
145
|
query = _ref.query;
|
|
147
|
-
customQueryOptions = getOptionsFromQuery(customQuery(value, props));
|
|
146
|
+
var customQueryOptions = getOptionsFromQuery(customQuery(value, props));
|
|
148
147
|
index.updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.currentValue);
|
|
148
|
+
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
149
149
|
}
|
|
150
150
|
|
|
151
|
-
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
152
151
|
this.updateQuery({
|
|
153
152
|
componentId: props.componentId,
|
|
154
153
|
query: query,
|
package/dist/cjs/RangeSlider.js
CHANGED
|
@@ -115,14 +115,14 @@ var RangeSlider = {
|
|
|
115
115
|
updateQueryHandler: function updateQueryHandler(value, props) {
|
|
116
116
|
var customQuery = props.customQuery;
|
|
117
117
|
var query = RangeSlider.defaultQuery(value, props);
|
|
118
|
-
var customQueryOptions;
|
|
119
118
|
|
|
120
119
|
if (customQuery) {
|
|
121
120
|
var _ref = customQuery(value, props) || {};
|
|
122
121
|
|
|
123
122
|
query = _ref.query;
|
|
124
|
-
customQueryOptions = getOptionsFromQuery(customQuery(value, props));
|
|
123
|
+
var customQueryOptions = getOptionsFromQuery(customQuery(value, props));
|
|
125
124
|
index.updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.currentValue);
|
|
125
|
+
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
126
126
|
}
|
|
127
127
|
|
|
128
128
|
var showFilter = props.showFilter,
|
|
@@ -133,7 +133,6 @@ var RangeSlider = {
|
|
|
133
133
|
currentEnd = value[1]; // check if the slider is at its initial position
|
|
134
134
|
|
|
135
135
|
var isInitialValue = currentStart === start && currentEnd === end;
|
|
136
|
-
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
137
136
|
this.updateQuery({
|
|
138
137
|
componentId: props.componentId,
|
|
139
138
|
query: query,
|
|
@@ -103,10 +103,16 @@ var ReactiveComponent = {
|
|
|
103
103
|
|
|
104
104
|
var customQueryCalc = _rollupPluginBabelHelpers._extends({}, options, {
|
|
105
105
|
query: queryToBeSet
|
|
106
|
-
});
|
|
106
|
+
});
|
|
107
|
+
|
|
108
|
+
var rsAPIQuery = customQueryCalc; // handle stored queries
|
|
109
|
+
|
|
110
|
+
if (queryToBeSet && queryToBeSet.id) {
|
|
111
|
+
rsAPIQuery = queryToBeSet;
|
|
112
|
+
} // Update customQuery field for RS API
|
|
107
113
|
|
|
108
114
|
|
|
109
|
-
_this.setCustomQuery(props.componentId,
|
|
115
|
+
_this.setCustomQuery(props.componentId, rsAPIQuery);
|
|
110
116
|
|
|
111
117
|
if (options) {
|
|
112
118
|
_this.setQueryOptions(props.componentId, _rollupPluginBabelHelpers._extends({}, _this.getAggsQuery(), options), false);
|
|
@@ -288,7 +288,6 @@ var SingleDropdownList = {
|
|
|
288
288
|
}
|
|
289
289
|
},
|
|
290
290
|
updateDefaultQueryHandler: function updateDefaultQueryHandler(value, props) {
|
|
291
|
-
var defaultQueryOptions;
|
|
292
291
|
var query = SingleDropdownList.defaultQuery(value, props);
|
|
293
292
|
|
|
294
293
|
if (this.defaultQuery) {
|
|
@@ -297,14 +296,14 @@ var SingleDropdownList = {
|
|
|
297
296
|
|
|
298
297
|
if (defaultQueryObj) {
|
|
299
298
|
query = defaultQueryObj;
|
|
300
|
-
}
|
|
299
|
+
} // Update calculated default query in store
|
|
301
300
|
|
|
302
|
-
defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet); // Update calculated default query in store
|
|
303
301
|
|
|
304
302
|
index.updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
|
|
303
|
+
var defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet);
|
|
304
|
+
this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
|
|
305
305
|
}
|
|
306
306
|
|
|
307
|
-
this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
|
|
308
307
|
this.updateQuery({
|
|
309
308
|
componentId: this.internalComponent,
|
|
310
309
|
query: query,
|
|
@@ -315,16 +314,15 @@ var SingleDropdownList = {
|
|
|
315
314
|
updateQueryHandler: function updateQueryHandler(value, props) {
|
|
316
315
|
var customQuery = props.customQuery;
|
|
317
316
|
var query = SingleDropdownList.defaultQuery(value, props);
|
|
318
|
-
var customQueryOptions;
|
|
319
317
|
|
|
320
318
|
if (customQuery) {
|
|
321
319
|
var customQueryCalc = customQuery(value, props);
|
|
322
320
|
query = extractQueryFromCustomQuery(customQueryCalc);
|
|
323
|
-
customQueryOptions = getOptionsForCustomQuery(customQueryCalc);
|
|
324
321
|
index.updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
|
|
322
|
+
var customQueryOptions = getOptionsForCustomQuery(customQueryCalc);
|
|
323
|
+
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
325
324
|
}
|
|
326
325
|
|
|
327
|
-
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
328
326
|
this.updateQuery({
|
|
329
327
|
componentId: props.componentId,
|
|
330
328
|
query: query,
|
package/dist/cjs/SingleList.js
CHANGED
|
@@ -270,7 +270,6 @@ var SingleList = {
|
|
|
270
270
|
checkValueChange(props.componentId, value, props.beforeValueChange, performUpdate);
|
|
271
271
|
},
|
|
272
272
|
updateDefaultQueryHandler: function updateDefaultQueryHandler(value, props) {
|
|
273
|
-
var defaultQueryOptions;
|
|
274
273
|
var query = SingleList.defaultQuery(value, props);
|
|
275
274
|
|
|
276
275
|
if (this.defaultQuery) {
|
|
@@ -279,14 +278,14 @@ var SingleList = {
|
|
|
279
278
|
|
|
280
279
|
if (defaultQueryObj) {
|
|
281
280
|
query = defaultQueryObj;
|
|
282
|
-
}
|
|
281
|
+
} // Update calculated default query in store
|
|
283
282
|
|
|
284
|
-
defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet); // Update calculated default query in store
|
|
285
283
|
|
|
286
284
|
index.updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
|
|
285
|
+
var defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet);
|
|
286
|
+
this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
|
|
287
287
|
}
|
|
288
288
|
|
|
289
|
-
this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
|
|
290
289
|
this.updateQuery({
|
|
291
290
|
componentId: this.internalComponent,
|
|
292
291
|
query: query,
|
|
@@ -297,16 +296,15 @@ var SingleList = {
|
|
|
297
296
|
updateQueryHandler: function updateQueryHandler(value, props) {
|
|
298
297
|
var customQuery = props.customQuery;
|
|
299
298
|
var query = SingleList.defaultQuery(value, props);
|
|
300
|
-
var customQueryOptions;
|
|
301
299
|
|
|
302
300
|
if (customQuery) {
|
|
303
301
|
var customQueryCalc = customQuery(value, props);
|
|
304
302
|
query = extractQueryFromCustomQuery(customQueryCalc);
|
|
305
|
-
customQueryOptions = getOptionsForCustomQuery(customQueryCalc);
|
|
303
|
+
var customQueryOptions = getOptionsForCustomQuery(customQueryCalc);
|
|
306
304
|
index.updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
|
|
305
|
+
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
307
306
|
}
|
|
308
307
|
|
|
309
|
-
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
310
308
|
this.updateQuery({
|
|
311
309
|
componentId: props.componentId,
|
|
312
310
|
query: query,
|
package/dist/cjs/SingleRange.js
CHANGED
|
@@ -157,17 +157,16 @@ var SingleRange = {
|
|
|
157
157
|
updateQueryHandler: function updateQueryHandler(value, props) {
|
|
158
158
|
var customQuery = props.customQuery;
|
|
159
159
|
var query = SingleRange.defaultQuery(value, props);
|
|
160
|
-
var customQueryOptions;
|
|
161
160
|
|
|
162
161
|
if (customQuery) {
|
|
163
162
|
var _ref = customQuery(value, props) || {};
|
|
164
163
|
|
|
165
164
|
query = _ref.query;
|
|
166
|
-
customQueryOptions = getOptionsFromQuery(customQuery(value, props));
|
|
165
|
+
var customQueryOptions = getOptionsFromQuery(customQuery(value, props));
|
|
167
166
|
index.updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.currentValue);
|
|
167
|
+
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
168
168
|
}
|
|
169
169
|
|
|
170
|
-
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
171
170
|
this.updateQuery({
|
|
172
171
|
componentId: props.componentId,
|
|
173
172
|
query: query,
|
|
@@ -20,8 +20,7 @@ var utils = require('@appbaseio/reactivecore/lib/actions/utils');
|
|
|
20
20
|
|
|
21
21
|
var _excluded = ["aggs", "size"],
|
|
22
22
|
_excluded2 = ["query"],
|
|
23
|
-
_excluded3 = ["query"]
|
|
24
|
-
_excluded4 = ["aggs", "size"];
|
|
23
|
+
_excluded3 = ["query"];
|
|
25
24
|
var X_SEARCH_CLIENT = 'ReactiveSearch Vue';
|
|
26
25
|
var componentsWithoutFilters = [constants.componentTypes.numberBox, constants.componentTypes.ratingsFilter];
|
|
27
26
|
var resultComponents = [constants.componentTypes.reactiveList, constants.componentTypes.reactiveMap];
|
|
@@ -291,7 +290,7 @@ function initReactivesearch(componentCollection, searchState, settings) {
|
|
|
291
290
|
queryOptions = queryOptionsReducer(queryOptions, {
|
|
292
291
|
type: 'SET_QUERY_OPTIONS',
|
|
293
292
|
component: component.componentId,
|
|
294
|
-
options: _rollupPluginBabelHelpers._extends({},
|
|
293
|
+
options: _rollupPluginBabelHelpers._extends({}, options)
|
|
295
294
|
}); // Set component type in component props
|
|
296
295
|
|
|
297
296
|
compProps.componentType = componentType;
|
|
@@ -316,18 +315,6 @@ function initReactivesearch(componentCollection, searchState, settings) {
|
|
|
316
315
|
options = _buildQuery.options;
|
|
317
316
|
|
|
318
317
|
var componentQueryOptions = options;
|
|
319
|
-
var componentType = component.source.componentType;
|
|
320
|
-
|
|
321
|
-
if (componentType !== constants.componentTypes.reactiveComponent) {
|
|
322
|
-
// don't merge aggs, size
|
|
323
|
-
var _ref4 = options || {},
|
|
324
|
-
aggs = _ref4.aggs,
|
|
325
|
-
size = _ref4.size,
|
|
326
|
-
rest = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref4, _excluded4);
|
|
327
|
-
|
|
328
|
-
componentQueryOptions = rest;
|
|
329
|
-
}
|
|
330
|
-
|
|
331
318
|
var validOptions = ['aggs', 'from', 'sort']; // check if query or componentQueryOptions are valid - non-empty
|
|
332
319
|
|
|
333
320
|
if (queryObj && !!Object.keys(queryObj).length || componentQueryOptions && Object.keys(componentQueryOptions).some(function (item) {
|
|
@@ -515,6 +502,7 @@ function initReactivesearch(componentCollection, searchState, settings) {
|
|
|
515
502
|
rsAPISettings.customEvents = utils.isPropertyDefined(config.analyticsConfig.customEvents) ? config.analyticsConfig.customEvents : undefined;
|
|
516
503
|
}
|
|
517
504
|
|
|
505
|
+
console.log('FINAL QUERY', JSON.stringify(finalQuery));
|
|
518
506
|
appbaseRef.reactiveSearchv3(finalQuery, rsAPISettings).then(function (res) {
|
|
519
507
|
handleRSResponse(res);
|
|
520
508
|
})["catch"](function (err) {
|
package/dist/cjs/version.js
CHANGED
|
@@ -233,7 +233,6 @@ var DynamicRangeSlider = {
|
|
|
233
233
|
},
|
|
234
234
|
updateQueryHandler: function updateQueryHandler(value) {
|
|
235
235
|
var query = DynamicRangeSlider.defaultQuery(value, this.$props);
|
|
236
|
-
var customQueryOptions;
|
|
237
236
|
|
|
238
237
|
if (this.$props.customQuery) {
|
|
239
238
|
var customQueryTobeSet = this.$props.customQuery(value, this.$props);
|
|
@@ -243,8 +242,9 @@ var DynamicRangeSlider = {
|
|
|
243
242
|
query = queryTobeSet;
|
|
244
243
|
}
|
|
245
244
|
|
|
246
|
-
customQueryOptions = getOptionsForCustomQuery(customQueryTobeSet);
|
|
245
|
+
var customQueryOptions = getOptionsForCustomQuery(customQueryTobeSet);
|
|
247
246
|
updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, value);
|
|
247
|
+
this.setQueryOptions(this.$props.componentId, customQueryOptions, false);
|
|
248
248
|
}
|
|
249
249
|
|
|
250
250
|
var _ref2 = this.range || {
|
|
@@ -258,7 +258,6 @@ var DynamicRangeSlider = {
|
|
|
258
258
|
currentEnd = value[1]; // check if the slider is at its initial position
|
|
259
259
|
|
|
260
260
|
var isInitialValue = currentStart === start && currentEnd === end;
|
|
261
|
-
this.setQueryOptions(this.$props.componentId, customQueryOptions, false);
|
|
262
261
|
this.updateQuery({
|
|
263
262
|
componentId: this.$props.componentId,
|
|
264
263
|
query: query,
|
|
@@ -356,7 +356,6 @@ var MultiDropdownList = {
|
|
|
356
356
|
checkValueChange(props.componentId, finalValues, props.beforeValueChange, performUpdate);
|
|
357
357
|
},
|
|
358
358
|
updateDefaultQueryHandler: function updateDefaultQueryHandler(value, props) {
|
|
359
|
-
var defaultQueryOptions;
|
|
360
359
|
var query = MultiDropdownList.defaultQuery(value, props);
|
|
361
360
|
|
|
362
361
|
if (this.defaultQuery) {
|
|
@@ -365,14 +364,14 @@ var MultiDropdownList = {
|
|
|
365
364
|
|
|
366
365
|
if (defaultQueryObj) {
|
|
367
366
|
query = defaultQueryObj;
|
|
368
|
-
}
|
|
367
|
+
} // Update calculated default query in store
|
|
369
368
|
|
|
370
|
-
defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet); // Update calculated default query in store
|
|
371
369
|
|
|
372
370
|
updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
|
|
371
|
+
var defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet);
|
|
372
|
+
this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
|
|
373
373
|
}
|
|
374
374
|
|
|
375
|
-
this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
|
|
376
375
|
this.updateQuery({
|
|
377
376
|
componentId: this.internalComponent,
|
|
378
377
|
query: query,
|
|
@@ -383,16 +382,15 @@ var MultiDropdownList = {
|
|
|
383
382
|
updateQueryHandler: function updateQueryHandler(value, props) {
|
|
384
383
|
var customQuery = props.customQuery;
|
|
385
384
|
var query = MultiDropdownList.defaultQuery(value, props);
|
|
386
|
-
var customQueryOptions;
|
|
387
385
|
|
|
388
386
|
if (customQuery) {
|
|
389
387
|
var customQueryCalc = customQuery(value, props);
|
|
390
388
|
query = extractQueryFromCustomQuery(customQueryCalc);
|
|
391
|
-
customQueryOptions = getOptionsForCustomQuery(customQueryCalc);
|
|
392
389
|
updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
|
|
390
|
+
var customQueryOptions = getOptionsForCustomQuery(customQueryCalc);
|
|
391
|
+
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
393
392
|
}
|
|
394
393
|
|
|
395
|
-
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
396
394
|
this.updateQuery({
|
|
397
395
|
componentId: props.componentId,
|
|
398
396
|
query: query,
|
package/dist/es/MultiList.js
CHANGED
|
@@ -340,7 +340,6 @@ var MultiList = {
|
|
|
340
340
|
checkValueChange(props.componentId, finalValues, props.beforeValueChange, performUpdate);
|
|
341
341
|
},
|
|
342
342
|
updateDefaultQueryHandler: function updateDefaultQueryHandler(value, props) {
|
|
343
|
-
var defaultQueryOptions;
|
|
344
343
|
var query = MultiList.defaultQuery(value, props);
|
|
345
344
|
|
|
346
345
|
if (this.defaultQuery) {
|
|
@@ -349,14 +348,14 @@ var MultiList = {
|
|
|
349
348
|
|
|
350
349
|
if (defaultQueryObj) {
|
|
351
350
|
query = defaultQueryObj;
|
|
352
|
-
}
|
|
351
|
+
} // Update calculated default query in store
|
|
353
352
|
|
|
354
|
-
defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet); // Update calculated default query in store
|
|
355
353
|
|
|
356
354
|
updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
|
|
355
|
+
var defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet);
|
|
356
|
+
this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
|
|
357
357
|
}
|
|
358
358
|
|
|
359
|
-
this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
|
|
360
359
|
this.updateQuery({
|
|
361
360
|
componentId: this.internalComponent,
|
|
362
361
|
query: query,
|
|
@@ -367,16 +366,15 @@ var MultiList = {
|
|
|
367
366
|
updateQueryHandler: function updateQueryHandler(value, props) {
|
|
368
367
|
var customQuery = props.customQuery;
|
|
369
368
|
var query = MultiList.defaultQuery(value, props);
|
|
370
|
-
var customQueryOptions;
|
|
371
369
|
|
|
372
370
|
if (customQuery) {
|
|
373
371
|
var customQueryCalc = customQuery(value, props);
|
|
374
372
|
query = extractQueryFromCustomQuery(customQueryCalc);
|
|
375
|
-
customQueryOptions = getOptionsForCustomQuery(customQueryCalc);
|
|
376
373
|
updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
|
|
374
|
+
var customQueryOptions = getOptionsForCustomQuery(customQueryCalc);
|
|
375
|
+
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
377
376
|
}
|
|
378
377
|
|
|
379
|
-
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
380
378
|
this.updateQuery({
|
|
381
379
|
componentId: props.componentId,
|
|
382
380
|
query: query,
|
package/dist/es/MultiRange.js
CHANGED
|
@@ -131,17 +131,16 @@ var MultiRange = {
|
|
|
131
131
|
updateQueryHandler: function updateQueryHandler(value, props) {
|
|
132
132
|
var customQuery = props.customQuery;
|
|
133
133
|
var query = MultiRange.defaultQuery(value, props);
|
|
134
|
-
var customQueryOptions;
|
|
135
134
|
|
|
136
135
|
if (customQuery) {
|
|
137
136
|
var _ref = customQuery(value, props) || {};
|
|
138
137
|
|
|
139
138
|
query = _ref.query;
|
|
140
|
-
customQueryOptions = getOptionsFromQuery(customQuery(value, props));
|
|
139
|
+
var customQueryOptions = getOptionsFromQuery(customQuery(value, props));
|
|
141
140
|
updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.currentValue);
|
|
141
|
+
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
142
142
|
}
|
|
143
143
|
|
|
144
|
-
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
145
144
|
this.updateQuery({
|
|
146
145
|
componentId: props.componentId,
|
|
147
146
|
query: query,
|
package/dist/es/RangeSlider.js
CHANGED
|
@@ -108,14 +108,14 @@ var RangeSlider = {
|
|
|
108
108
|
updateQueryHandler: function updateQueryHandler(value, props) {
|
|
109
109
|
var customQuery = props.customQuery;
|
|
110
110
|
var query = RangeSlider.defaultQuery(value, props);
|
|
111
|
-
var customQueryOptions;
|
|
112
111
|
|
|
113
112
|
if (customQuery) {
|
|
114
113
|
var _ref = customQuery(value, props) || {};
|
|
115
114
|
|
|
116
115
|
query = _ref.query;
|
|
117
|
-
customQueryOptions = getOptionsFromQuery(customQuery(value, props));
|
|
116
|
+
var customQueryOptions = getOptionsFromQuery(customQuery(value, props));
|
|
118
117
|
updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.currentValue);
|
|
118
|
+
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
119
119
|
}
|
|
120
120
|
|
|
121
121
|
var showFilter = props.showFilter,
|
|
@@ -126,7 +126,6 @@ var RangeSlider = {
|
|
|
126
126
|
currentEnd = value[1]; // check if the slider is at its initial position
|
|
127
127
|
|
|
128
128
|
var isInitialValue = currentStart === start && currentEnd === end;
|
|
129
|
-
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
130
129
|
this.updateQuery({
|
|
131
130
|
componentId: props.componentId,
|
|
132
131
|
query: query,
|
|
@@ -96,10 +96,16 @@ var ReactiveComponent = {
|
|
|
96
96
|
|
|
97
97
|
var customQueryCalc = _extends({}, options, {
|
|
98
98
|
query: queryToBeSet
|
|
99
|
-
});
|
|
99
|
+
});
|
|
100
|
+
|
|
101
|
+
var rsAPIQuery = customQueryCalc; // handle stored queries
|
|
102
|
+
|
|
103
|
+
if (queryToBeSet && queryToBeSet.id) {
|
|
104
|
+
rsAPIQuery = queryToBeSet;
|
|
105
|
+
} // Update customQuery field for RS API
|
|
100
106
|
|
|
101
107
|
|
|
102
|
-
_this.setCustomQuery(props.componentId,
|
|
108
|
+
_this.setCustomQuery(props.componentId, rsAPIQuery);
|
|
103
109
|
|
|
104
110
|
if (options) {
|
|
105
111
|
_this.setQueryOptions(props.componentId, _extends({}, _this.getAggsQuery(), options), false);
|
|
@@ -281,7 +281,6 @@ var SingleDropdownList = {
|
|
|
281
281
|
}
|
|
282
282
|
},
|
|
283
283
|
updateDefaultQueryHandler: function updateDefaultQueryHandler(value, props) {
|
|
284
|
-
var defaultQueryOptions;
|
|
285
284
|
var query = SingleDropdownList.defaultQuery(value, props);
|
|
286
285
|
|
|
287
286
|
if (this.defaultQuery) {
|
|
@@ -290,14 +289,14 @@ var SingleDropdownList = {
|
|
|
290
289
|
|
|
291
290
|
if (defaultQueryObj) {
|
|
292
291
|
query = defaultQueryObj;
|
|
293
|
-
}
|
|
292
|
+
} // Update calculated default query in store
|
|
294
293
|
|
|
295
|
-
defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet); // Update calculated default query in store
|
|
296
294
|
|
|
297
295
|
updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
|
|
296
|
+
var defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet);
|
|
297
|
+
this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
|
|
298
298
|
}
|
|
299
299
|
|
|
300
|
-
this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
|
|
301
300
|
this.updateQuery({
|
|
302
301
|
componentId: this.internalComponent,
|
|
303
302
|
query: query,
|
|
@@ -308,16 +307,15 @@ var SingleDropdownList = {
|
|
|
308
307
|
updateQueryHandler: function updateQueryHandler(value, props) {
|
|
309
308
|
var customQuery = props.customQuery;
|
|
310
309
|
var query = SingleDropdownList.defaultQuery(value, props);
|
|
311
|
-
var customQueryOptions;
|
|
312
310
|
|
|
313
311
|
if (customQuery) {
|
|
314
312
|
var customQueryCalc = customQuery(value, props);
|
|
315
313
|
query = extractQueryFromCustomQuery(customQueryCalc);
|
|
316
|
-
customQueryOptions = getOptionsForCustomQuery(customQueryCalc);
|
|
317
314
|
updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
|
|
315
|
+
var customQueryOptions = getOptionsForCustomQuery(customQueryCalc);
|
|
316
|
+
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
318
317
|
}
|
|
319
318
|
|
|
320
|
-
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
321
319
|
this.updateQuery({
|
|
322
320
|
componentId: props.componentId,
|
|
323
321
|
query: query,
|
package/dist/es/SingleList.js
CHANGED
|
@@ -263,7 +263,6 @@ var SingleList = {
|
|
|
263
263
|
checkValueChange(props.componentId, value, props.beforeValueChange, performUpdate);
|
|
264
264
|
},
|
|
265
265
|
updateDefaultQueryHandler: function updateDefaultQueryHandler(value, props) {
|
|
266
|
-
var defaultQueryOptions;
|
|
267
266
|
var query = SingleList.defaultQuery(value, props);
|
|
268
267
|
|
|
269
268
|
if (this.defaultQuery) {
|
|
@@ -272,14 +271,14 @@ var SingleList = {
|
|
|
272
271
|
|
|
273
272
|
if (defaultQueryObj) {
|
|
274
273
|
query = defaultQueryObj;
|
|
275
|
-
}
|
|
274
|
+
} // Update calculated default query in store
|
|
276
275
|
|
|
277
|
-
defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet); // Update calculated default query in store
|
|
278
276
|
|
|
279
277
|
updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
|
|
278
|
+
var defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet);
|
|
279
|
+
this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
|
|
280
280
|
}
|
|
281
281
|
|
|
282
|
-
this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
|
|
283
282
|
this.updateQuery({
|
|
284
283
|
componentId: this.internalComponent,
|
|
285
284
|
query: query,
|
|
@@ -290,16 +289,15 @@ var SingleList = {
|
|
|
290
289
|
updateQueryHandler: function updateQueryHandler(value, props) {
|
|
291
290
|
var customQuery = props.customQuery;
|
|
292
291
|
var query = SingleList.defaultQuery(value, props);
|
|
293
|
-
var customQueryOptions;
|
|
294
292
|
|
|
295
293
|
if (customQuery) {
|
|
296
294
|
var customQueryCalc = customQuery(value, props);
|
|
297
295
|
query = extractQueryFromCustomQuery(customQueryCalc);
|
|
298
|
-
customQueryOptions = getOptionsForCustomQuery(customQueryCalc);
|
|
296
|
+
var customQueryOptions = getOptionsForCustomQuery(customQueryCalc);
|
|
299
297
|
updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
|
|
298
|
+
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
300
299
|
}
|
|
301
300
|
|
|
302
|
-
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
303
301
|
this.updateQuery({
|
|
304
302
|
componentId: props.componentId,
|
|
305
303
|
query: query,
|
package/dist/es/SingleRange.js
CHANGED
|
@@ -150,17 +150,16 @@ var SingleRange = {
|
|
|
150
150
|
updateQueryHandler: function updateQueryHandler(value, props) {
|
|
151
151
|
var customQuery = props.customQuery;
|
|
152
152
|
var query = SingleRange.defaultQuery(value, props);
|
|
153
|
-
var customQueryOptions;
|
|
154
153
|
|
|
155
154
|
if (customQuery) {
|
|
156
155
|
var _ref = customQuery(value, props) || {};
|
|
157
156
|
|
|
158
157
|
query = _ref.query;
|
|
159
|
-
customQueryOptions = getOptionsFromQuery(customQuery(value, props));
|
|
158
|
+
var customQueryOptions = getOptionsFromQuery(customQuery(value, props));
|
|
160
159
|
updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.currentValue);
|
|
160
|
+
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
161
161
|
}
|
|
162
162
|
|
|
163
|
-
this.setQueryOptions(props.componentId, customQueryOptions, false);
|
|
164
163
|
this.updateQuery({
|
|
165
164
|
componentId: props.componentId,
|
|
166
165
|
query: query,
|