Disable Sketch > Configure and Upload menu if board doesn't support user fields

Author: silvanocerza

Diff for: arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx

@@ -497,7 +497,7 @@ export class ArduinoFrontendContribution
         'arduino/debug/optimizeForDebugging',
         'Optimize for Debugging'
       ),
-      order: '4',
+      order: '5',
     });
   }
 

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

@@ -1,7 +1,7 @@
 import { inject, injectable, postConstruct } from 'inversify';
 import { Emitter } from '@theia/core/lib/common/event';
 import { BoardUserField, CoreService } from '../../common/protocol';
-import { ArduinoMenus } from '../menu/arduino-menus';
+import { ArduinoMenus, PlaceholderMenuNode } from '../menu/arduino-menus';
 import { ArduinoToolbar } from '../toolbar/arduino-toolbar';
 import { BoardsDataStore } from '../boards/boards-data-store';
 import { MonitorConnection } from '../monitor/monitor-connection';
@@ -16,12 +16,16 @@ import {
 } from './contribution';
 import { UserFieldsDialog } from '../dialogs/user-fields/user-fields-dialog';
 import { nls } from '@theia/core/lib/browser/nls';
+import { DisposableCollection } from '@theia/core';
 
 @injectable()
 export class UploadSketch extends SketchContribution {
   @inject(CoreService)
   protected readonly coreService: CoreService;
 
+  @inject(MenuModelRegistry)
+  protected readonly menuRegistry: MenuModelRegistry;
+
   @inject(MonitorConnection)
   protected readonly monitorConnection: MonitorConnection;
 
@@ -42,11 +46,14 @@ export class UploadSketch extends SketchContribution {
   protected uploadInProgress = false;
   protected boardRequiresUserFields = false;
 
+  protected readonly menuActionsDisposables = new DisposableCollection();
+
   @postConstruct()
   protected init(): void {
     this.boardsServiceClientImpl.onBoardsConfigChanged(async () => {
       const userFields = await this.boardsServiceClientImpl.selectedBoardUserFields();
       this.boardRequiresUserFields = userFields.length > 0;
+      this.registerMenus(this.menuRegistry);
     })
   }
 
@@ -124,24 +131,43 @@ export class UploadSketch extends SketchContribution {
   }
 
   registerMenus(registry: MenuModelRegistry): void {
-    registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
-      commandId: UploadSketch.Commands.UPLOAD_SKETCH.id,
-      label: nls.localize('arduino/sketch/upload', 'Upload'),
-      order: '1',
-    });
-    registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
-      commandId: UploadSketch.Commands.UPLOAD_WITH_CONFIGURATION.id,
-      label: UploadSketch.Commands.UPLOAD_WITH_CONFIGURATION.label,
-      order: '2',
-    });
-    registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
-      commandId: UploadSketch.Commands.UPLOAD_SKETCH_USING_PROGRAMMER.id,
-      label: nls.localize(
-        'arduino/sketch/uploadUsingProgrammer',
-        'Upload Using Programmer'
-      ),
-      order: '3',
-    });
+    this.menuActionsDisposables.dispose();
+
+    this.menuActionsDisposables.push(
+      registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
+        commandId: UploadSketch.Commands.UPLOAD_SKETCH.id,
+        label: nls.localize('arduino/sketch/upload', 'Upload'),
+        order: '1',
+      })
+    );
+    if (this.boardRequiresUserFields) {
+      this.menuActionsDisposables.push(
+        registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
+          commandId: UploadSketch.Commands.UPLOAD_WITH_CONFIGURATION.id,
+          label: UploadSketch.Commands.UPLOAD_WITH_CONFIGURATION.label,
+          order: '2',
+        })
+      );
+    } else {
+      this.menuActionsDisposables.push(
+        registry.registerMenuNode(ArduinoMenus.SKETCH__MAIN_GROUP, new PlaceholderMenuNode(
+          ArduinoMenus.SKETCH__MAIN_GROUP,
+          // commandId: UploadSketch.Commands.UPLOAD_WITH_CONFIGURATION.id,
+          UploadSketch.Commands.UPLOAD_WITH_CONFIGURATION.label!,
+          { order: '2' }
+        ))
+      );
+    }
+    this.menuActionsDisposables.push(
+      registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
+        commandId: UploadSketch.Commands.UPLOAD_SKETCH_USING_PROGRAMMER.id,
+        label: nls.localize(
+          'arduino/sketch/uploadUsingProgrammer',
+          'Upload Using Programmer'
+        ),
+        order: '3',
+      })
+    );
   }
 
   registerKeybindings(registry: KeybindingRegistry): void {

Diff for: arduino-ide-extension/src/browser/contributions/verify-sketch.ts

@@ -62,7 +62,7 @@ export class VerifySketch extends SketchContribution {
         'arduino/sketch/exportBinary',
         'Export Compiled Binary'
       ),
-      order: '3',
+      order: '4',
     });
   }