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

Moving header dots by menu into the new menu system

Browse source
This commit is contained in:
Jesús Espino 2020-10-24 08:43:53 +02:00
parent 083052f9be
commit 3859ad30b1
2 changed files with 93 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
webapp/src/components/boardComponent.tsx
View file

@ -10,10 +10,10 @@ import {BlockIcons} from '../blockIcons'
import {IPropertyOption, IPropertyTemplate} from '../blocks/board'
import {Card, MutableCard} from '../blocks/card'
import {BoardTree, BoardTreeGroup} from '../viewModel/boardTree'
import {CsvExporter} from '../csvExporter'
import {CardFilter} from '../cardFilter'
import ViewMenu from '../components/viewMenu'
import {Constants} from '../constants'
import {Menu as OldMenu} from '../menu'
import mutator from '../mutator'
import {Utils} from '../utils'
import Menu from '../widgets/menu'
@ -312,12 +312,36 @@ class BoardComponent extends React.Component<Props, State> {
}}
>Search</div>
}
<div
className='octo-button'
onClick={(e) => {
this.optionsClicked(e)
}}
><div className='imageOptions'/></div>
<MenuWrapper>
<div className='imageOptions'/>
<Menu>
<Menu.Text
id='exportCsv'
name='Export to CSV'
onClick={() => CsvExporter.exportTableCsv(boardTree)}
/>
<Menu.Text
id='exportBoardArchive'
name='Export board archive'
onClick={() => Archiver.exportBoardTree(boardTree)}
/>
<Menu.Text
id='testAdd100Cards'
name='TEST: Add 100 cards'
onClick={() => this.testAddCards(100)}
/>
<Menu.Text
id='testAdd1000Cards'
name='TEST: Add 1,000 cards'
onClick={() => this.testAddCards(1000)}
/>
<Menu.Text
id='testRandomizeIcons'
name='TEST: Randomize icons'
onClick={() => this.testRandomizeIcons()}
/>
</Menu>
</MenuWrapper>
<div
className='octo-button filled'
onClick={() => {
@ -624,39 +648,6 @@ class BoardComponent extends React.Component<Props, State> {
this.props.showFilter(e.target as HTMLElement)
}
private async optionsClicked(e: React.MouseEvent) {
const {boardTree} = this.props
OldMenu.shared.options = [
{id: 'exportBoardArchive', name: 'Export board archive'},
{id: 'testAdd100Cards', name: 'TEST: Add 100 cards'},
{id: 'testAdd1000Cards', name: 'TEST: Add 1,000 cards'},
{id: 'testRandomizeIcons', name: 'TEST: Randomize icons'},
]
OldMenu.shared.onMenuClicked = async (id: string) => {
switch (id) {
case 'exportBoardArchive': {
Archiver.exportBoardTree(boardTree)
break
}
case 'testAdd100Cards': {
this.testAddCards(100)
break
}
case 'testAdd1000Cards': {
this.testAddCards(1000)
break
}
case 'testRandomizeIcons': {
this.testRandomizeIcons()
break
}
}
}
OldMenu.shared.showAtElement(e.target as HTMLElement)
}
private async testAddCards(count: number) {
const {boardTree} = this.props
const {board, activeView} = boardTree

89
webapp/src/components/tableComponent.tsx
View file

@ -11,6 +11,7 @@ import {Card, MutableCard} from '../blocks/card'
import {BoardTree} from '../viewModel/boardTree'
import ViewMenu from '../components/viewMenu'
import {CsvExporter} from '../csvExporter'
import {CardFilter} from '../cardFilter'
import {Menu as OldMenu} from '../menu'
import mutator from '../mutator'
import {Utils} from '../utils'
@ -291,10 +292,36 @@ class TableComponent extends React.Component<Props, State> {
defaultMessage='Search'
/>
</div>}
<div
className='octo-button'
onClick={(e) => this.optionsClicked(e)}
><div className='imageOptions'/></div>
<MenuWrapper>
<div className='imageOptions'/>
<Menu>
<Menu.Text
id='exportCsv'
name='Export to CSV'
onClick={() => CsvExporter.exportTableCsv(boardTree)}
/>
<Menu.Text
id='exportBoardArchive'
name='Export board archive'
onClick={() => Archiver.exportBoardTree(boardTree)}
/>
<Menu.Text
id='testAdd100Cards'
name='TEST: Add 100 cards'
onClick={() => this.testAddCards(100)}
/>
<Menu.Text
id='testAdd1000Cards'
name='TEST: Add 1,000 cards'
onClick={() => this.testAddCards(1000)}
/>
<Menu.Text
id='testRandomizeIcons'
name='TEST: Randomize icons'
onClick={() => this.testRandomizeIcons()}
/>
</Menu>
</MenuWrapper>
<div
className='octo-button filled'
onClick={() => {
@ -434,29 +461,6 @@ class TableComponent extends React.Component<Props, State> {
this.props.showFilter(e.target as HTMLElement)
}
private async optionsClicked(e: React.MouseEvent) {
const {boardTree} = this.props
OldMenu.shared.options = [
{id: 'exportCsv', name: 'Export to CSV'},
{id: 'exportBoardArchive', name: 'Export board archive'},
]
OldMenu.shared.onMenuClicked = async (id: string) => {
switch (id) {
case 'exportCsv': {
CsvExporter.exportTableCsv(boardTree)
break
}
case 'exportBoardArchive': {
Archiver.exportBoardTree(boardTree)
break
}
}
}
OldMenu.shared.showAtElement(e.target as HTMLElement)
}
private async headerClicked(e: React.MouseEvent<HTMLDivElement>, templateId: string) {
const {boardTree} = this.props
const {board} = boardTree
@ -589,6 +593,37 @@ class TableComponent extends React.Component<Props, State> {
private searchChanged(text?: string) {
this.props.setSearchText(text)
}
private async testAddCards(count: number) {
const {boardTree} = this.props
const {board, activeView} = boardTree
const startCount = boardTree?.cards?.length
let optionIndex = 0
for (let i = 0; i < count; i++) {
const card = new MutableCard()
card.parentId = boardTree.board.id
card.properties = CardFilter.propertiesThatMeetFilterGroup(activeView.filter, board.cardProperties)
if (boardTree.groupByProperty && boardTree.groupByProperty.options.length > 0) {
// Cycle through options
const option = boardTree.groupByProperty.options[optionIndex]
optionIndex = (optionIndex + 1) % boardTree.groupByProperty.options.length
card.properties[boardTree.groupByProperty.id] = option.id
card.title = `Test Card ${startCount + i + 1}`
card.icon = BlockIcons.shared.randomIcon()
}
await mutator.insertBlock(card, 'test add card')
}
}
private async testRandomizeIcons() {
const {boardTree} = this.props
for (const card of boardTree.cards) {
mutator.changeIcon(card, BlockIcons.shared.randomIcon(), 'randomize icon')
}
}
}
export {TableComponent}