fixed copy

Author: fstasi

Diff for: arduino-ide-extension/src/browser/contributions/upload-firmware.ts

@@ -42,7 +42,7 @@ export namespace UploadFirmware {
   export namespace Commands {
     export const OPEN: Command = {
       id: 'arduino-upload-firmware-open',
-      label: 'Connectivity Firmware Updater',
+      label: 'WiFi101 /  WiFiNINA Firmware Updater',
       category: 'Arduino',
     };
   }

Diff for: arduino-ide-extension/src/browser/dialogs/certificate-uploader/certificate-uploader-component.tsx

@@ -50,6 +50,19 @@ export const CertificateUploaderComponent = ({
     }
   };
 
+  const onBoardSelect = React.useCallback(
+    (board: AvailableBoard) => {
+      const newFqbn = (board && board.fqbn) || null;
+      const prevFqbn = (selectedBoard && selectedBoard.fqbn) || null;
+
+      if (newFqbn !== prevFqbn) {
+        setInstallFeedback(null);
+        setSelectedBoard(board);
+      }
+    },
+    [selectedBoard]
+  );
+
   return (
     <>
       <div className="dialogSection">
@@ -77,12 +90,7 @@ export const CertificateUploaderComponent = ({
             <SelectBoardComponent
               availableBoards={availableBoards}
               updatableFqbns={updatableFqbns}
-              onBoardSelect={(board) => {
-                if (board) {
-                  setInstallFeedback(null);
-                  setSelectedBoard(board);
-                }
-              }}
+              onBoardSelect={onBoardSelect}
               selectedBoard={selectedBoard}
             />
           </div>

Diff for: arduino-ide-extension/src/browser/dialogs/certificate-uploader/select-board-components.tsx

@@ -35,7 +35,7 @@ export const SelectBoardComponent = ({
     let placeholderTxt = 'Select a board...';
     let selBoard = -1;
     const updatableBoards = availableBoards.filter(
-      (board) => board.fqbn && updatableFqbns.includes(board.fqbn)
+      (board) => board.port && board.fqbn && updatableFqbns.includes(board.fqbn)
     );
     const boardsList: BoardOption[] = updatableBoards.map((board, i) => {
       if (board.selected) {
@@ -48,14 +48,20 @@ export const SelectBoardComponent = ({
     });
 
     if (boardsList.length === 0) {
-      placeholderTxt = 'No board connected to serial port';
+      placeholderTxt = 'No supported board connected';
     }
 
     setSelectBoardPlaceholder(placeholderTxt);
     setSelectOptions(boardsList);
 
-    selectOption(boardsList[selBoard]);
-  }, [availableBoards, onBoardSelect, selectOption, updatableFqbns]);
+    if (selectedBoard) {
+      selBoard = boardsList
+        .map((boardOpt) => boardOpt.value)
+        .indexOf(selectedBoard.fqbn || '');
+    }
+
+    selectOption(boardsList[selBoard] || null);
+  }, [availableBoards, selectOption, updatableFqbns, selectedBoard]);
 
   return (
     <ArduinoSelect

Diff for: arduino-ide-extension/src/browser/dialogs/firmware-uploader/firmware-uploader-component.tsx

@@ -80,7 +80,21 @@ export const FirmwareUploaderComponent = ({
 
     setInstallFeedback((installStatus && 'ok') || 'fail');
     setInstallingFw(false);
-  }, [firmwareUploader, selectedBoard, selectedFirmware]);
+  }, [firmwareUploader, selectedBoard, selectedFirmware, availableFirmwares]);
+
+  const onBoardSelect = React.useCallback(
+    (board: AvailableBoard) => {
+      const newFqbn = (board && board.fqbn) || null;
+      const prevFqbn = (selectedBoard && selectedBoard.fqbn) || null;
+
+      if (newFqbn !== prevFqbn) {
+        setInstallFeedback(null);
+        setAvailableFirmwares([]);
+        setSelectedBoard(board);
+      }
+    },
+    [selectedBoard]
+  );
 
   return (
     <>
@@ -93,14 +107,7 @@ export const FirmwareUploaderComponent = ({
             <SelectBoardComponent
               availableBoards={availableBoards}
               updatableFqbns={updatableFqbns}
-              onBoardSelect={(board) => {
-                if (board) {
-                  // clear previously available firmwares for the board
-                  setInstallFeedback(null);
-                  setAvailableFirmwares([]);
-                  setSelectedBoard(board);
-                }
-              }}
+              onBoardSelect={onBoardSelect}
               selectedBoard={selectedBoard}
             />
           </div>

Diff for: arduino-ide-extension/src/browser/dialogs/firmware-uploader/firmware-uploader-dialog.tsx

@@ -10,6 +10,7 @@ import {
 } from '../../boards/boards-service-provider';
 import { ArduinoFirmwareUploader } from '../../../common/protocol/arduino-firmware-uploader';
 import { FirmwareUploaderComponent } from './firmware-uploader-component';
+import { UploadFirmware } from '../../contributions/upload-firmware';
 
 @injectable()
 export class UploadFirmwareDialogWidget extends ReactWidget {
@@ -64,7 +65,7 @@ export class UploadFirmwareDialog extends AbstractDialog<void> {
     @inject(UploadFirmwareDialogProps)
     protected readonly props: UploadFirmwareDialogProps
   ) {
-    super({ title: 'Wireless Module Firmware Updater' });
+    super({ title: UploadFirmware.Commands.OPEN.label || '' });
     this.contentNode.classList.add('firmware-uploader-dialog');
     this.acceptButton = undefined;
   }

Diff for: arduino-ide-extension/src/browser/menu/arduino-menus.ts

@@ -88,7 +88,7 @@ export namespace ArduinoMenus {
   export const TOOLS = [...MAIN_MENU_BAR, '4_tools'];
   // `Auto Format`, `Archive Sketch`, `Manage Libraries...`, `Serial Monitor`
   export const TOOLS__MAIN_GROUP = [...TOOLS, '0_main'];
-  // `Connectivity Firmware Updater`
+  // `WiFi101 /  WiFiNINA Firmware Updater`
   export const TOOLS__FIRMWARE_UPLOADER_GROUP = [
     ...TOOLS,
     '1_firmware_uploader',