ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-06-28 16:48:04 +02:00
Code Issues Releases Wiki Activity

Improve PropTypes for PieceListToolbarFilterWidget

Browse Source
This commit is contained in:
Tim Daubenschütz 2015-09-17 10:20:35 +02:00
parent 67e0b34640
commit ace465afad
3 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
View File

@ -17,7 +17,15 @@ let PieceListToolbar = React.createClass({
filterParams: React.PropTypes.arrayOf(
React.PropTypes.shape({
label: React.PropTypes.string,
items: React.PropTypes.array
items: React.PropTypes.arrayOf(
React.PropTypes.oneOfType([
React.PropTypes.string,
React.PropTypes.shape({
key: React.PropTypes.string,
label: React.PropTypes.string
})
])
)
})
),
filterBy: React.PropTypes.object,

21
js/components/ascribe_piece_list_toolbar/piece_list_toolbar_filter_widget.js
View File

@ -3,23 +3,24 @@
import React from 'react';
import DropdownButton from 'react-bootstrap/lib/DropdownButton';
import MenuItem from 'react-bootstrap/lib/MenuItem';
import { getLangText } from '../../utils/lang_utils.js';
let PieceListToolbarFilterWidgetFilter = React.createClass({
propTypes: {
// An array of either strings (which represent acl enums) or objects of the form
//
// {
// key: <acl enum>,
// label: <a human readable string>
// }
//
filterParams: React.PropTypes.arrayOf(
React.PropTypes.shape({
label: React.PropTypes.string,
items: React.PropTypes.array
items: React.PropTypes.arrayOf(
React.PropTypes.oneOfType([
React.PropTypes.string,
React.PropTypes.shape({
key: React.PropTypes.string,
label: React.PropTypes.string
})
])
)
})
).isRequired,
filterBy: React.PropTypes.object,
@ -93,8 +94,6 @@ let PieceListToolbarFilterWidgetFilter = React.createClass({
<em>{label}:</em>
</li>
{items.map((param, j) => {
let label;
if(typeof param !== 'string') {
label = param.label;
param = param.key;

18
js/components/piece_list_filter_display.js
View File

@ -2,8 +2,6 @@
import React from 'react';
import { getLangText } from '../utils/lang_utils';
let PieceListFilterDisplay = React.createClass({
propTypes: {
@ -11,7 +9,15 @@ let PieceListFilterDisplay = React.createClass({
filterParams: React.PropTypes.arrayOf(
React.PropTypes.shape({
label: React.PropTypes.string,
items: React.PropTypes.array
items: React.PropTypes.arrayOf(
React.PropTypes.oneOfType([
React.PropTypes.string,
React.PropTypes.shape({
key: React.PropTypes.string,
label: React.PropTypes.string
})
])
)
})
)
},
@ -34,10 +40,10 @@ let PieceListFilterDisplay = React.createClass({
key: item,
label: item.split('acl_')[1].replace(/_/g, ' '),
value: filterBy[item] ? filterBy[item] : false
}
};
}
})
}
};
});
},
@ -55,7 +61,7 @@ let PieceListFilterDisplay = React.createClass({
.join(', ');
if(activeFilterWithLabel) {
return filterWithLabel.label + ': ' + activeFilterWithLabel
return filterWithLabel.label + ': ' + activeFilterWithLabel;
}
})
.filter((filterText) => !!filterText)