Commit 8610332

author

Alberto Iannaccone

authored

Fix board selector synchronization (#1214)

* prevent deselecting a board from the board selctor * orrectly update board selector when baord config changes

1 parent 1f7c2eb commit 8610332Copy full SHA for 8610332

File tree

3 files changed

+26

-13

lines changed

arduino-ide-extension/src/browser
- boards
  - boards-service-provider.ts
  - boards-toolbar-item.tsx
- contributions
  - open-boards-config.ts

3 files changed

+26

-13

lines changed

`‎arduino-ide-extension/src/browser/boards/boards-service-provider.ts‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -516,6 +516,7 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {`
`516`	`516`	`for (let i = 0; !hasChanged && i < availableBoards.length; i++) {`
`517`	`517`	`const [left, right] = [availableBoards[i], currentAvailableBoards[i]];`
`518`	`518`	`hasChanged =`
	`519`	`+ left.fqbn !== right.fqbn \|\|`
`519`	`520`	`!!AvailableBoard.compare(left, right) \|\|`
`520`	`521`	`left.selected !== right.selected;`
`521`	`522`	`}`

`‎arduino-ide-extension/src/browser/boards/boards-toolbar-item.tsx‎`

Lines changed: 24 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import {`
`10`	`10`	`} from './boards-service-provider';`
`11`	`11`	`import { nls } from '@theia/core/lib/common';`
`12`	`12`	`import classNames from 'classnames';`
	`13`	`+import { BoardsConfig } from './boards-config';`
`13`	`14`
`14`	`15`	`export interface BoardsDropDownListCoords {`
`15`	`16`	`readonly top: number;`
`@@ -199,18 +200,17 @@ export class BoardsToolBarItem extends React.Component<`
`199`	`200`
`200`	`201`	`override render(): React.ReactNode {`
`201`	`202`	`const { coords, availableBoards } = this.state;`
`202`		`- const selectedBoard = availableBoards.find(({ selected }) => selected);`
	`203`	`+ const { selectedBoard, selectedPort } =`
	`204`	`+ this.props.boardsServiceProvider.boardsConfig;`
`203`	`205`
`204`	`206`	`const boardLabel =`
`205`	`207`	`selectedBoard?.name \|\|`
`206`	`208`	`nls.localize('arduino/board/selectBoard', 'Select Board');`
`207`		`- const selectedPortLabel = portLabel(selectedBoard?.port?.address);`
	`209`	`+ const selectedPortLabel = portLabel(selectedPort?.address);`
`208`	`210`
`209`		`- const isConnected = Boolean(`
`210`		`- selectedBoard && AvailableBoard.hasPort(selectedBoard)`
`211`		`- );`
	`211`	`+ const isConnected = Boolean(selectedBoard && selectedPort);`
`212`	`212`	`const protocolIcon = isConnected`
`213`		`- ? iconNameFromProtocol(selectedBoard?.port?.protocol \|\| '')`
	`213`	`+ ? iconNameFromProtocol(selectedPort?.protocol \|\| '')`
`214`	`214`	`: null;`
`215`	`215`	`const protocolIconClassNames = classNames(`
`216`	`216`	`'arduino-boards-toolbar-item--protocol',`
`@@ -244,11 +244,13 @@ export class BoardsToolBarItem extends React.Component<`
`244`	`244`	`.map((board) => ({`
`245`	`245`	`...board,`
`246`	`246`	`onClick: () => {`
`247`		`- if (board.state === AvailableBoard.State.incomplete) {`
	`247`	`+ if (!board.fqbn) {`
	`248`	`+ const previousBoardConfig =`
	`249`	`+ this.props.boardsServiceProvider.boardsConfig;`
`248`	`250`	`this.props.boardsServiceProvider.boardsConfig = {`
`249`	`251`	`selectedPort: board.port,`
`250`	`252`	`};`
`251`		`- this.openDialog();`
	`253`	`+ this.openDialog(previousBoardConfig);`
`252`	`254`	`} else {`
`253`	`255`	`this.props.boardsServiceProvider.boardsConfig = {`
`254`	`256`	`selectedBoard: board,`
`@@ -264,10 +266,20 @@ export class BoardsToolBarItem extends React.Component<`
`264`	`266`	`);`
`265`	`267`	`}`
`266`	`268`
`267`		`- protected openDialog = (): void => {`
`268`		`- this.props.commands.executeCommand(`
`269`		`- OpenBoardsConfig.Commands.OPEN_DIALOG.id`
`270`		`- );`
	`269`	`+ protected openDialog = async (`
	`270`	`+ previousBoardConfig?: BoardsConfig.Config`
	`271`	`+ ): Promise<void> => {`
	`272`	`+ const selectedBoardConfig =`
	`273`	`+ await this.props.commands.executeCommand<BoardsConfig.Config>(`
	`274`	`+ OpenBoardsConfig.Commands.OPEN_DIALOG.id`
	`275`	`+ );`
	`276`	`+ if (`
	`277`	`+ previousBoardConfig &&`
	`278`	`+ (!selectedBoardConfig?.selectedPort \|\|`
	`279`	`+ !selectedBoardConfig?.selectedBoard)`
	`280`	`+ ) {`
	`281`	`+ this.props.boardsServiceProvider.boardsConfig = previousBoardConfig;`
	`282`	`+ }`
`271`	`283`	`};`
`272`	`284`	`}`
`273`	`285`	`export namespace BoardsToolBarItem {`

`‎arduino-ide-extension/src/browser/contributions/open-boards-config.ts‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ export class OpenBoardsConfig extends Contribution {`
`17`	`17`	`execute: async (query?: string \| undefined) => {`
`18`	`18`	`const boardsConfig = await this.boardsConfigDialog.open(query);`
`19`	`19`	`if (boardsConfig) {`
`20`		`- this.boardsServiceProvider.boardsConfig = boardsConfig;`
	`20`	`+ return(this.boardsServiceProvider.boardsConfig = boardsConfig);`
`21`	`21`	`}`
`22`	`22`	`},`
`23`	`23`	`});`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 8610332

File tree

3 files changed

3 files changed

`‎arduino-ide-extension/src/browser/boards/boards-service-provider.ts‎`

`‎arduino-ide-extension/src/browser/boards/boards-toolbar-item.tsx‎`

`‎arduino-ide-extension/src/browser/contributions/open-boards-config.ts‎`

0 commit comments