ashatora/editor
1
0
Fork 0
mirror of https://github.com/maputnik/editor.git synced 2026-01-08 06:20:00 +00:00
Code Issues Projects Releases Wiki Activity

Notice for not supported nested filter

Browse Source
This commit is contained in:
Lukas Martinelli
2016-12-31 11:08:14 +01:00
parent 03796c963b
commit e7709dae15
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/filter/FilterEditor.jsx
View File

@@ -11,6 +11,18 @@ const otherFilterOps = Object
.keys(GlSpec.filter_operator.values) .keys(GlSpec.filter_operator.values)
.filter(op => combiningFilterOps.indexOf(op) < 0) .filter(op => combiningFilterOps.indexOf(op) < 0)
function hasCombiningFilter(filter) {
return combiningFilterOps.indexOf(filter[0]) >= 0
}
function hasNestedCombiningFilter(filter) {
if(hasCombiningFilter(filter)) {
const combinedFilters = filter.slice(1)
return filter.slice(1).map(f => hasCombiningFilter(f)).filter(f => f == true).length > 0
}
return false
}
class CombiningOperatorSelect extends React.Component { class CombiningOperatorSelect extends React.Component {
static propTypes = { static propTypes = {
value: React.PropTypes.string.isRequired, value: React.PropTypes.string.isRequired,
@@ -165,6 +177,11 @@ export default class CombiningFilterEditor extends React.Component {
/> />
}) })
//TODO: Implement support for nested filter
if(hasNestedCombiningFilter(filter)) {
return null
}
return <div style={{ return <div style={{
padding: margins[2], padding: margins[2],
paddingRight: 0, paddingRight: 0,