Skip to content

Commit

Permalink
[NEP-12629] WIP initial URL filters
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergei Aksiutin committed Feb 1, 2022
1 parent d629f0f commit 27c78de
Show file tree
Hide file tree
Showing 12 changed files with 243 additions and 106 deletions.
71 changes: 53 additions & 18 deletions dist/react-filterbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -17966,13 +17966,15 @@ var FilterButton = /*#__PURE__*/function (_React$Component) {
}(React.Component);

exports.FilterButton = FilterButton;
FilterButton.propTypes = {
filters: React.PropTypes.object.isRequired,
onClick: React.PropTypes.func.isRequired,
title: React.PropTypes.string.isRequired
};
FilterButton.contextTypes = {
filterBarActor: React.PropTypes.object,
filterBarStore: React.PropTypes.object
};
FilterButton.propTypes = {
disabledFilters: React.PropTypes.object.isRequired
};

},{"../FilterList/FilterListOption.react":459}],444:[function(require,module,exports){
"use strict";
Expand Down Expand Up @@ -18058,6 +18060,16 @@ var FilterDisplay = /*#__PURE__*/function (_React$Component) {
value: function onChange() {
this.setState(this.getStateFromStores());
}
}, {
key: "onFilterRemove",
value: function onFilterRemove(groupKey, inputKey) {
this.context.filterBarActor.clearActiveFilter(groupKey, inputKey);
}
}, {
key: "onButtonClick",
value: function onButtonClick(filterUid, groupKey) {
this.context.filterBarStore.addGroupFilter(filterUid, groupKey);
}
}, {
key: "getStateFromStores",
value: function getStateFromStores() {
Expand All @@ -18078,7 +18090,7 @@ var FilterDisplay = /*#__PURE__*/function (_React$Component) {
}, {
key: "addGroup",
value: function addGroup(filterUid) {
this.context.filterBarStore.addGroupFilter(-1, filterUid);
this.context.filterBarStore.addGroupFilter(filterUid);
}
}, {
key: "render",
Expand All @@ -18098,7 +18110,9 @@ var FilterDisplay = /*#__PURE__*/function (_React$Component) {
filters.push( /*#__PURE__*/React.createElement(_FilterGroup.FilterGroup, {
key: idx,
groupKey: idx,
filters: groupFilters
filters: groupFilters,
onFilterRemove: this.onFilterRemove.bind(this),
onButtonClick: this.onButtonClick.bind(this)
}));
});

Expand Down Expand Up @@ -18220,7 +18234,12 @@ var FilterGroup = /*#__PURE__*/function (_React$Component) {
}, {
key: "onButtonClick",
value: function onButtonClick(filterUid) {
this.context.filterBarStore.addGroupFilter(this.props.groupKey, filterUid);
this.props.onButtonClick(filterUid, this.props.groupKey);
}
}, {
key: "onFilterRemove",
value: function onFilterRemove(groupKey, inputKey) {
this.props.onFilterRemove(groupKey, inputKey);
}
}, {
key: "render",
Expand All @@ -18245,6 +18264,7 @@ var FilterGroup = /*#__PURE__*/function (_React$Component) {
padding: '10px'
}
}, /*#__PURE__*/React.createElement(_FilterInput.FilterInput, {
onFilterRemove: this.onFilterRemove.bind(this),
groupKey: groupKey,
inputKey: idx,
filterUid: filter.uid,
Expand Down Expand Up @@ -18284,6 +18304,11 @@ var FilterGroup = /*#__PURE__*/function (_React$Component) {
}(React.Component);

exports.FilterGroup = FilterGroup;
FilterGroup.propTypes = {
groupKey: React.PropTypes.string.isRequired,
filters: React.PropTypes.array.isRequired,
onFilterRemove: React.PropTypes.func.isRequired
};
FilterGroup.contextTypes = {
filterBarActor: React.PropTypes.object,
filterBarStore: React.PropTypes.object
Expand Down Expand Up @@ -18338,7 +18363,7 @@ var FilterInput = /*#__PURE__*/function (_React$Component) {
var _this$props = this.props,
groupKey = _this$props.groupKey,
inputKey = _this$props.inputKey;
this.context.filterBarActor.disableFilter(groupKey, inputKey);
this.props.onFilterRemove(groupKey, inputKey);
}
}, {
key: "objectProperties",
Expand Down Expand Up @@ -18381,7 +18406,10 @@ FilterInput.propTypes = {
filterUid: React.PropTypes.string.isRequired,
label: React.PropTypes.string.isRequired,
type: React.PropTypes.string.isRequired,
value: React.PropTypes.node.isRequired
value: React.PropTypes.node.isRequired,
groupKey: React.PropTypes.string.isRequired,
inputKey: React.PropTypes.string.isRequired,
onFilterRemove: React.PropTypes.func.isRequired
};
FilterInput.contextTypes = {
filterBarActor: React.PropTypes.object.isRequired,
Expand Down Expand Up @@ -22418,13 +22446,10 @@ var FilterBarStore = /*#__PURE__*/function () {
}
}, {
key: "disableFilter",
value: function disableFilter(groupKey, inputKey) {
this.activeFilters[groupKey].splice(inputKey, 1);

if (this.activeFilters[groupKey].length === 0) {
this.activeFilters.splice(groupKey, 1);
}

value: function disableFilter(filterUid) {
this.filters[filterUid].enabled = false;
this.filters[filterUid].value = "";
this.deactivateQuickFiltersBasedOnRemovedFilter(filterUid, this.activeQuickFilters());
this.emitChange();
}
}, {
Expand Down Expand Up @@ -22455,20 +22480,30 @@ var FilterBarStore = /*#__PURE__*/function () {
});
});
}
}, {
key: "clearActiveFilter",
value: function clearActiveFilter(groupKey, inputKey) {
this.activeFilters[groupKey].splice(inputKey, 1);

if (this.activeFilters[groupKey].length === 0) {
this.activeFilters.splice(groupKey, 1);
}

this.emitChange();
}
}, {
key: "updateFilter",
value: function updateFilter(groupKey, inputKey, value) {
//this.deactivateQuickFiltersBasedOnFilterValue(filterUid, propValue, this.activeQuickFilters());
this.activeFilters[groupKey][inputKey].value = value;
}
}, {
key: "addGroupFilter",
value: function addGroupFilter(groupKey, filterUid) {
value: function addGroupFilter(filterUid, groupKey) {
var filter = this.filters[filterUid];
filter.filterUid = filterUid;
filter.uid = filterUid;

if (groupKey < 0) {
if (groupKey == undefined) {
this.activeFilters.push([filter]);
} else {
this.activeFilters[groupKey].push(filter);
Expand Down
30 changes: 15 additions & 15 deletions dist/react-filterbar.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit 27c78de

Please sign in to comment.