luisgulo/focalboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

migrating filter component to use the Button component

Browse source
This commit is contained in:
Jesús Espino 2020-10-31 16:46:58 +01:00
parent 9a7c613022
commit 88a87d790a
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
webapp/src/components/filterComponent.tsx
View file

@ -13,6 +13,7 @@ import {Utils} from '../utils'
import MenuWrapper from '../widgets/menuWrapper'
import Menu from '../widgets/menu'
import Button from '../widgets/buttons/button'
import './filterComponent.scss'
@ -89,7 +90,7 @@ class FilterComponent extends React.Component<Props> {
key={key}
>
<MenuWrapper>
<div className='octo-button'>{propertyName}</div>
<Button>{propertyName}</Button>
<Menu>
{board.cardProperties.filter((o) => o.type === 'select').map((o) => (
<Menu.Text
@ -112,7 +113,7 @@ class FilterComponent extends React.Component<Props> {
</Menu>
</MenuWrapper>
<MenuWrapper>
<div className='octo-button'>{FilterClause.filterConditionDisplayString(filter.condition, intl)}</div>
<Button>{FilterClause.filterConditionDisplayString(filter.condition, intl)}</Button>
<Menu>
<Menu.Text
id='includes'
@ -140,36 +141,30 @@ class FilterComponent extends React.Component<Props> {
this.filterValue(filter, template)
}
<div className='octo-spacer'/>
<div
className='octo-button'
onClick={() => this.deleteClicked(filter)}
>
<Button onClick={() => this.deleteClicked(filter)}>
<FormattedMessage
id='FilterComponent.delete'
defaultMessage='Delete'
/>
</div>
</Button>
</div>)
})}
<br/>
<div
className='octo-button'
onClick={() => this.addFilterClicked()}
>
<Button onClick={() => this.addFilterClicked()}>
<FormattedMessage
id='FilterComponent.add-filter'
defaultMessage='+ Add Filter'
/>
</div>
</Button>
</div>
)
}
private filterValue(filter: FilterClause, template: IPropertyTemplate): JSX.Element {
const {boardTree} = this.props
const {board, activeView: view} = boardTree
const {activeView: view} = boardTree
if (filter.condition === 'includes' || filter.condition === 'notIncludes') {
let displayValue: string
@ -188,7 +183,7 @@ class FilterComponent extends React.Component<Props> {
return (
<MenuWrapper>
<div className='octo-button'>{displayValue}</div>
<Button>{displayValue}</Button>
<Menu>
{template.options.map((o) => (
<Menu.Switch