@@ -17966,13 +17966,15 @@ var FilterButton = /*#__PURE__*/function (_React$Component) {
17966
17966
}(React.Component);
17967
17967
17968
17968
exports.FilterButton = FilterButton;
17969
+ FilterButton.propTypes = {
17970
+ filters: React.PropTypes.object.isRequired,
17971
+ onClick: React.PropTypes.func.isRequired,
17972
+ title: React.PropTypes.string.isRequired
17973
+ };
17969
17974
FilterButton.contextTypes = {
17970
17975
filterBarActor: React.PropTypes.object,
17971
17976
filterBarStore: React.PropTypes.object
17972
17977
};
17973
- FilterButton.propTypes = {
17974
- disabledFilters: React.PropTypes.object.isRequired
17975
- };
17976
17978
17977
17979
},{"../FilterList/FilterListOption.react":459}],444:[function(require,module,exports){
17978
17980
"use strict";
@@ -18058,6 +18060,16 @@ var FilterDisplay = /*#__PURE__*/function (_React$Component) {
18058
18060
value: function onChange() {
18059
18061
this.setState(this.getStateFromStores());
18060
18062
}
18063
+ }, {
18064
+ key: "onFilterRemove",
18065
+ value: function onFilterRemove(groupKey, inputKey) {
18066
+ this.context.filterBarActor.clearActiveFilter(groupKey, inputKey);
18067
+ }
18068
+ }, {
18069
+ key: "onButtonClick",
18070
+ value: function onButtonClick(filterUid, groupKey) {
18071
+ this.context.filterBarStore.addGroupFilter(filterUid, groupKey);
18072
+ }
18061
18073
}, {
18062
18074
key: "getStateFromStores",
18063
18075
value: function getStateFromStores() {
@@ -18078,7 +18090,7 @@ var FilterDisplay = /*#__PURE__*/function (_React$Component) {
18078
18090
}, {
18079
18091
key: "addGroup",
18080
18092
value: function addGroup(filterUid) {
18081
- this.context.filterBarStore.addGroupFilter(-1, filterUid);
18093
+ this.context.filterBarStore.addGroupFilter(filterUid);
18082
18094
}
18083
18095
}, {
18084
18096
key: "render",
@@ -18098,7 +18110,9 @@ var FilterDisplay = /*#__PURE__*/function (_React$Component) {
18098
18110
filters.push( /*#__PURE__*/React.createElement(_FilterGroup.FilterGroup, {
18099
18111
key: idx,
18100
18112
groupKey: idx,
18101
- filters: groupFilters
18113
+ filters: groupFilters,
18114
+ onFilterRemove: this.onFilterRemove.bind(this),
18115
+ onButtonClick: this.onButtonClick.bind(this)
18102
18116
}));
18103
18117
});
18104
18118
@@ -18220,7 +18234,12 @@ var FilterGroup = /*#__PURE__*/function (_React$Component) {
18220
18234
}, {
18221
18235
key: "onButtonClick",
18222
18236
value: function onButtonClick(filterUid) {
18223
- this.context.filterBarStore.addGroupFilter(this.props.groupKey, filterUid);
18237
+ this.props.onButtonClick(filterUid, this.props.groupKey);
18238
+ }
18239
+ }, {
18240
+ key: "onFilterRemove",
18241
+ value: function onFilterRemove(groupKey, inputKey) {
18242
+ this.props.onFilterRemove(groupKey, inputKey);
18224
18243
}
18225
18244
}, {
18226
18245
key: "render",
@@ -18245,6 +18264,7 @@ var FilterGroup = /*#__PURE__*/function (_React$Component) {
18245
18264
padding: '10px'
18246
18265
}
18247
18266
}, /*#__PURE__*/React.createElement(_FilterInput.FilterInput, {
18267
+ onFilterRemove: this.onFilterRemove.bind(this),
18248
18268
groupKey: groupKey,
18249
18269
inputKey: idx,
18250
18270
filterUid: filter.uid,
@@ -18284,6 +18304,11 @@ var FilterGroup = /*#__PURE__*/function (_React$Component) {
18284
18304
}(React.Component);
18285
18305
18286
18306
exports.FilterGroup = FilterGroup;
18307
+ FilterGroup.propTypes = {
18308
+ groupKey: React.PropTypes.string.isRequired,
18309
+ filters: React.PropTypes.array.isRequired,
18310
+ onFilterRemove: React.PropTypes.func.isRequired
18311
+ };
18287
18312
FilterGroup.contextTypes = {
18288
18313
filterBarActor: React.PropTypes.object,
18289
18314
filterBarStore: React.PropTypes.object
@@ -18338,7 +18363,7 @@ var FilterInput = /*#__PURE__*/function (_React$Component) {
18338
18363
var _this$props = this.props,
18339
18364
groupKey = _this$props.groupKey,
18340
18365
inputKey = _this$props.inputKey;
18341
- this.context.filterBarActor.disableFilter (groupKey, inputKey);
18366
+ this.props.onFilterRemove (groupKey, inputKey);
18342
18367
}
18343
18368
}, {
18344
18369
key: "objectProperties",
@@ -18381,7 +18406,10 @@ FilterInput.propTypes = {
18381
18406
filterUid: React.PropTypes.string.isRequired,
18382
18407
label: React.PropTypes.string.isRequired,
18383
18408
type: React.PropTypes.string.isRequired,
18384
- value: React.PropTypes.node.isRequired
18409
+ value: React.PropTypes.node.isRequired,
18410
+ groupKey: React.PropTypes.string.isRequired,
18411
+ inputKey: React.PropTypes.string.isRequired,
18412
+ onFilterRemove: React.PropTypes.func.isRequired
18385
18413
};
18386
18414
FilterInput.contextTypes = {
18387
18415
filterBarActor: React.PropTypes.object.isRequired,
@@ -22418,13 +22446,10 @@ var FilterBarStore = /*#__PURE__*/function () {
22418
22446
}
22419
22447
}, {
22420
22448
key: "disableFilter",
22421
- value: function disableFilter(groupKey, inputKey) {
22422
- this.activeFilters[groupKey].splice(inputKey, 1);
22423
-
22424
- if (this.activeFilters[groupKey].length === 0) {
22425
- this.activeFilters.splice(groupKey, 1);
22426
- }
22427
-
22449
+ value: function disableFilter(filterUid) {
22450
+ this.filters[filterUid].enabled = false;
22451
+ this.filters[filterUid].value = "";
22452
+ this.deactivateQuickFiltersBasedOnRemovedFilter(filterUid, this.activeQuickFilters());
22428
22453
this.emitChange();
22429
22454
}
22430
22455
}, {
@@ -22455,20 +22480,30 @@ var FilterBarStore = /*#__PURE__*/function () {
22455
22480
});
22456
22481
});
22457
22482
}
22483
+ }, {
22484
+ key: "clearActiveFilter",
22485
+ value: function clearActiveFilter(groupKey, inputKey) {
22486
+ this.activeFilters[groupKey].splice(inputKey, 1);
22487
+
22488
+ if (this.activeFilters[groupKey].length === 0) {
22489
+ this.activeFilters.splice(groupKey, 1);
22490
+ }
22491
+
22492
+ this.emitChange();
22493
+ }
22458
22494
}, {
22459
22495
key: "updateFilter",
22460
22496
value: function updateFilter(groupKey, inputKey, value) {
22461
- //this.deactivateQuickFiltersBasedOnFilterValue(filterUid, propValue, this.activeQuickFilters());
22462
22497
this.activeFilters[groupKey][inputKey].value = value;
22463
22498
}
22464
22499
}, {
22465
22500
key: "addGroupFilter",
22466
- value: function addGroupFilter(groupKey, filterUid ) {
22501
+ value: function addGroupFilter(filterUid, groupKey ) {
22467
22502
var filter = this.filters[filterUid];
22468
22503
filter.filterUid = filterUid;
22469
22504
filter.uid = filterUid;
22470
22505
22471
- if (groupKey < 0 ) {
22506
+ if (groupKey == undefined ) {
22472
22507
this.activeFilters.push([filter]);
22473
22508
} else {
22474
22509
this.activeFilters[groupKey].push(filter);
0 commit comments