fix: board <select> update on board detach

When the previously selected board is not detected, unset the `<select>` option. Closes #2222 Signed-off-by: Akos Kitta <[email protected]>
arduino · Jan 15, 2024 · 0ca1a31 · 0ca1a31
1 parent d01f956
commit 0ca1a31
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/...ide-extension/src/browser/dialogs/certificate-uploader/certificate-uploader-component.tsx b/...ide-extension/src/browser/dialogs/certificate-uploader/certificate-uploader-component.tsx
@@ -69,6 +69,7 @@ export const CertificateUploaderComponent = ({
  const onItemSelect = React.useCallback(
  (item: BoardOptionValue | null) => {
  if (!item) {
+ setSelectedItem(null);
  return;
  }
  const board = item.board;

diff --git a/arduino-ide-extension/src/browser/dialogs/certificate-uploader/select-board-components.tsx b/arduino-ide-extension/src/browser/dialogs/certificate-uploader/select-board-components.tsx
@@ -1,8 +1,9 @@
 import { nls } from '@theia/core/lib/common';
 import React from '@theia/core/shared/react';
-import type {
- BoardList,
- BoardListItemWithBoard,
+import {
+ boardListItemEquals,
+ type BoardList,
+ type BoardListItemWithBoard,
 } from '../../../common/protocol/board-list';
 import { ArduinoSelect } from '../../widgets/arduino-select';
 
@@ -75,7 +76,9 @@ export const SelectBoardComponent = ({
  setSelectOptions(boardOptions);
 
  if (selectedItem) {
- selBoard = updatableBoards.indexOf(selectedItem);
+ selBoard = updatableBoards.findIndex((board) =>
+ boardListItemEquals(board, selectedItem)
+ );
  }
 
  selectOption(boardOptions[selBoard] || null);

diff --git a/arduino-ide-extension/src/browser/dialogs/firmware-uploader/firmware-uploader-component.tsx b/arduino-ide-extension/src/browser/dialogs/firmware-uploader/firmware-uploader-component.tsx
@@ -104,6 +104,7 @@ export const FirmwareUploaderComponent = ({
  const onItemSelect = React.useCallback(
  (item: BoardListItemWithBoard | null) => {
  if (!item) {
+ setSelectedItem(null);
  return;
  }
  const board = item.board;