Skip to content

Commit 27c78de

Browse files
author
Sergei Aksiutin
committed
[NEP-12629] WIP initial URL filters
1 parent d629f0f commit 27c78de

File tree

12 files changed

+243
-106
lines changed

12 files changed

+243
-106
lines changed

dist/react-filterbar.js

Lines changed: 53 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17966,13 +17966,15 @@ var FilterButton = /*#__PURE__*/function (_React$Component) {
1796617966
}(React.Component);
1796717967

1796817968
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+
};
1796917974
FilterButton.contextTypes = {
1797017975
filterBarActor: React.PropTypes.object,
1797117976
filterBarStore: React.PropTypes.object
1797217977
};
17973-
FilterButton.propTypes = {
17974-
disabledFilters: React.PropTypes.object.isRequired
17975-
};
1797617978

1797717979
},{"../FilterList/FilterListOption.react":459}],444:[function(require,module,exports){
1797817980
"use strict";
@@ -18058,6 +18060,16 @@ var FilterDisplay = /*#__PURE__*/function (_React$Component) {
1805818060
value: function onChange() {
1805918061
this.setState(this.getStateFromStores());
1806018062
}
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+
}
1806118073
}, {
1806218074
key: "getStateFromStores",
1806318075
value: function getStateFromStores() {
@@ -18078,7 +18090,7 @@ var FilterDisplay = /*#__PURE__*/function (_React$Component) {
1807818090
}, {
1807918091
key: "addGroup",
1808018092
value: function addGroup(filterUid) {
18081-
this.context.filterBarStore.addGroupFilter(-1, filterUid);
18093+
this.context.filterBarStore.addGroupFilter(filterUid);
1808218094
}
1808318095
}, {
1808418096
key: "render",
@@ -18098,7 +18110,9 @@ var FilterDisplay = /*#__PURE__*/function (_React$Component) {
1809818110
filters.push( /*#__PURE__*/React.createElement(_FilterGroup.FilterGroup, {
1809918111
key: idx,
1810018112
groupKey: idx,
18101-
filters: groupFilters
18113+
filters: groupFilters,
18114+
onFilterRemove: this.onFilterRemove.bind(this),
18115+
onButtonClick: this.onButtonClick.bind(this)
1810218116
}));
1810318117
});
1810418118

@@ -18220,7 +18234,12 @@ var FilterGroup = /*#__PURE__*/function (_React$Component) {
1822018234
}, {
1822118235
key: "onButtonClick",
1822218236
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);
1822418243
}
1822518244
}, {
1822618245
key: "render",
@@ -18245,6 +18264,7 @@ var FilterGroup = /*#__PURE__*/function (_React$Component) {
1824518264
padding: '10px'
1824618265
}
1824718266
}, /*#__PURE__*/React.createElement(_FilterInput.FilterInput, {
18267+
onFilterRemove: this.onFilterRemove.bind(this),
1824818268
groupKey: groupKey,
1824918269
inputKey: idx,
1825018270
filterUid: filter.uid,
@@ -18284,6 +18304,11 @@ var FilterGroup = /*#__PURE__*/function (_React$Component) {
1828418304
}(React.Component);
1828518305

1828618306
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+
};
1828718312
FilterGroup.contextTypes = {
1828818313
filterBarActor: React.PropTypes.object,
1828918314
filterBarStore: React.PropTypes.object
@@ -18338,7 +18363,7 @@ var FilterInput = /*#__PURE__*/function (_React$Component) {
1833818363
var _this$props = this.props,
1833918364
groupKey = _this$props.groupKey,
1834018365
inputKey = _this$props.inputKey;
18341-
this.context.filterBarActor.disableFilter(groupKey, inputKey);
18366+
this.props.onFilterRemove(groupKey, inputKey);
1834218367
}
1834318368
}, {
1834418369
key: "objectProperties",
@@ -18381,7 +18406,10 @@ FilterInput.propTypes = {
1838118406
filterUid: React.PropTypes.string.isRequired,
1838218407
label: React.PropTypes.string.isRequired,
1838318408
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
1838518413
};
1838618414
FilterInput.contextTypes = {
1838718415
filterBarActor: React.PropTypes.object.isRequired,
@@ -22418,13 +22446,10 @@ var FilterBarStore = /*#__PURE__*/function () {
2241822446
}
2241922447
}, {
2242022448
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());
2242822453
this.emitChange();
2242922454
}
2243022455
}, {
@@ -22455,20 +22480,30 @@ var FilterBarStore = /*#__PURE__*/function () {
2245522480
});
2245622481
});
2245722482
}
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+
}
2245822494
}, {
2245922495
key: "updateFilter",
2246022496
value: function updateFilter(groupKey, inputKey, value) {
22461-
//this.deactivateQuickFiltersBasedOnFilterValue(filterUid, propValue, this.activeQuickFilters());
2246222497
this.activeFilters[groupKey][inputKey].value = value;
2246322498
}
2246422499
}, {
2246522500
key: "addGroupFilter",
22466-
value: function addGroupFilter(groupKey, filterUid) {
22501+
value: function addGroupFilter(filterUid, groupKey) {
2246722502
var filter = this.filters[filterUid];
2246822503
filter.filterUid = filterUid;
2246922504
filter.uid = filterUid;
2247022505

22471-
if (groupKey < 0) {
22506+
if (groupKey == undefined) {
2247222507
this.activeFilters.push([filter]);
2247322508
} else {
2247422509
this.activeFilters[groupKey].push(filter);

dist/react-filterbar.min.js

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)