From 7eff6490a474270d3c298532c352ab7b81867566 Mon Sep 17 00:00:00 2001 From: Matthieu Huin Date: Wed, 5 May 2021 00:27:40 +0200 Subject: Web UI: add checkbox, selects to filter toolbar Support three new filter types: checkbox, select and ternary select. The ternary select tool is meant to support fields that can be set to True, False, or ignored. Use this feature to allow filtering builds by held status (i.e. show builds that triggered a autohold only) or by voting status (i.e. show only voting jobs). Selects let a user choose among predefined values. Use a select to help a user choose a result value when searching builds and buildsets. Build page: add a thumbtack icon next to a build's status badge if that build triggered an autohold. Change-Id: I40b06c83ed069e0756c7f8b00430d36a36230bfa --- web/src/containers/FilterToolbar.jsx | 96 +++++++++++++++++++++++++++++++++--- 1 file changed, 88 insertions(+), 8 deletions(-) (limited to 'web/src/containers/FilterToolbar.jsx') diff --git a/web/src/containers/FilterToolbar.jsx b/web/src/containers/FilterToolbar.jsx index dcb7c4c43..23a652cb3 100644 --- a/web/src/containers/FilterToolbar.jsx +++ b/web/src/containers/FilterToolbar.jsx @@ -32,6 +32,11 @@ import { } from '@patternfly/react-core' import { FilterIcon, SearchIcon } from '@patternfly/react-icons' +import { FilterSelect } from './filters/Select' +import { FilterTernarySelect } from './filters/TernarySelect' +import { FilterCheckbox } from './filters/Checkbox' + + function FilterToolbar(props) { const [isCategoryDropdownOpen, setIsCategoryDropdownOpen] = useState(false) const [currentCategory, setCurrentCategory] = useState( @@ -89,9 +94,16 @@ function FilterToolbar(props) { // filter to be updated/removed. let newFilters = {} if (type) { - newFilters = { - ...filters, - [category.key]: filters[category.key].filter((s) => s !== id), + if (category.type === 'ternary') { + newFilters = { + ...filters, + [category.key]: [], + } + } else { + newFilters = { + ...filters, + [category.key]: filters[category.key].filter((s) => s !== id), + } } } else { // Delete the values for each filter category @@ -122,7 +134,12 @@ function FilterToolbar(props) { } isOpen={isCategoryDropdownOpen} - dropdownItems={filterCategories.map((category) => ( + dropdownItems={filterCategories.filter( + (category) => (category.type === 'search' || + category.type === 'select' || + category.type === 'ternary' || + category.type === 'checkbox') + ).map((category) => ( {category.title} ))} style={{ width: '100%' }} @@ -131,7 +148,8 @@ function FilterToolbar(props) { ) } - function renderFilterInput(category) { + function renderFilterInput(category, filters) { + const { onFilterChange } = props if (category.type === 'search') { return ( @@ -154,6 +172,37 @@ function FilterToolbar(props) { ) + } else if (category.type === 'select') { + return ( + + + + ) + } else if (category.type === 'ternary') { + return ( + + + + ) + } else if (category.type === 'checkbox') { + return ( + +
+ +
+ ) } } @@ -165,12 +214,12 @@ function FilterToolbar(props) { {filterCategories.map((category) => ( handleDelete(type, id, category)} categoryName={category.title} showToolbarItem={currentCategory === category.title} > - {renderFilterInput(category)} + {renderFilterInput(category, filters)} ))} @@ -203,14 +252,45 @@ FilterToolbar.propTypes = { filterCategories: PropTypes.array.isRequired, } +function getChipsFromFilters(filters, category) { + if (category.type === 'ternary') { + switch ([...filters[category.key]].pop()) { + case 1: + case '1': + return ['True',] + case 0: + case '0': + return ['False',] + default: + return [] + } + } else { + return filters[category.key] + } +} + function getFiltersFromUrl(location, filterCategories) { const urlParams = new URLSearchParams(location.search) const filters = filterCategories.reduce((filterDict, item) => { // Initialize each filter category with an empty list filterDict[item.key] = [] + // And update the list with each matching element from the URL query urlParams.getAll(item.key).forEach((param) => { - filterDict[item.key].push(param) + if (item.type === 'checkbox') { + switch (param) { + case '1': + filterDict[item.key].push(1) + break + case '0': + filterDict[item.key].push(0) + break + default: + break + } + } else { + filterDict[item.key].push(param) + } }) return filterDict }, {}) -- cgit v1.2.1