fix: update boards in tools menu after app start

Author: Akos Kitta

arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts

@@ -102,7 +102,7 @@ import {
   FrontendConnectionStatusService as TheiaFrontendConnectionStatusService,
   ApplicationConnectionStatusContribution as TheiaApplicationConnectionStatusContribution,
 } from '@theia/core/lib/browser/connection-status-service';
-import { BoardsDataMenuUpdater } from './boards/boards-data-menu-updater';
+import { BoardsDataMenuUpdater } from './contributions/boards-data-menu-updater';
 import { BoardsDataStore } from './boards/boards-data-store';
 import { ILogger } from '@theia/core/lib/common/logger';
 import { bindContributionProvider } from '@theia/core/lib/common/contribution-provider';
@@ -452,9 +452,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(BoardListDumper).toSelf().inSingletonScope();
 
   // To be able to track, and update the menu based on the core settings (aka. board details) of the currently selected board.
-  bind(FrontendApplicationContribution)
-    .to(BoardsDataMenuUpdater)
-    .inSingletonScope();
   bind(BoardsDataStore).toSelf().inSingletonScope();
   bind(FrontendApplicationContribution).toService(BoardsDataStore);
   // Logger for the Arduino daemon
@@ -755,6 +752,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   Contribution.configure(bind, CloudSketchbookContribution);
   Contribution.configure(bind, CreateCloudCopy);
   Contribution.configure(bind, UpdateArduinoState);
+  Contribution.configure(bind, BoardsDataMenuUpdater);
 
   bindContributionProvider(bind, StartupTaskProvider);
   bind(StartupTaskProvider).toService(BoardsServiceProvider); // to reuse the boards config in another window

arduino-ide-extension/src/browser/boards/boards-data-menu-updater.ts renamed to arduino-ide-extension/src/browser/contributions/boards-data-menu-updater.ts

@@ -1,58 +1,44 @@
-import PQueue from 'p-queue';
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { CommandRegistry } from '@theia/core/lib/common/command';
-import { MenuModelRegistry } from '@theia/core/lib/common/menu';
 import {
   Disposable,
   DisposableCollection,
 } from '@theia/core/lib/common/disposable';
-import { BoardsServiceProvider } from './boards-service-provider';
+import { nls } from '@theia/core/lib/common/nls';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import PQueue from 'p-queue';
 import {
   BoardIdentifier,
   ConfigOption,
   isBoardIdentifierChangeEvent,
   Programmer,
 } from '../../common/protocol';
-import { FrontendApplicationContribution } from '@theia/core/lib/browser';
-import { BoardsDataStore } from './boards-data-store';
-import { MainMenuManager } from '../../common/main-menu-manager';
+import { BoardsDataStore } from '../boards/boards-data-store';
+import { BoardsServiceProvider } from '../boards/boards-service-provider';
 import { ArduinoMenus, unregisterSubmenu } from '../menu/arduino-menus';
-import { nls } from '@theia/core/lib/common';
-import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
+import {
+  CommandRegistry,
+  Contribution,
+  MenuModelRegistry,
+} from './contribution';
 
 @injectable()
-export class BoardsDataMenuUpdater implements FrontendApplicationContribution {
+export class BoardsDataMenuUpdater extends Contribution {
   @inject(CommandRegistry)
-  protected readonly commandRegistry: CommandRegistry;
-
+  private readonly commandRegistry: CommandRegistry;
   @inject(MenuModelRegistry)
-  protected readonly menuRegistry: MenuModelRegistry;
-
-  @inject(MainMenuManager)
-  protected readonly mainMenuManager: MainMenuManager;
-
+  private readonly menuRegistry: MenuModelRegistry;
   @inject(BoardsDataStore)
-  protected readonly boardsDataStore: BoardsDataStore;
-
+  private readonly boardsDataStore: BoardsDataStore;
   @inject(BoardsServiceProvider)
-  protected readonly boardsServiceProvider: BoardsServiceProvider;
-
-  @inject(FrontendApplicationStateService)
-  private readonly appStateService: FrontendApplicationStateService;
+  private readonly boardsServiceProvider: BoardsServiceProvider;
 
-  protected readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
-  protected readonly toDisposeOnBoardChange = new DisposableCollection();
+  private readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
+  private readonly toDisposeOnBoardChange = new DisposableCollection();
 
-  async onStart(): Promise<void> {
-    this.appStateService
-      .reachedState('ready')
-      .then(() =>
-        this.updateMenuActions(
-          this.boardsServiceProvider.boardsConfig.selectedBoard
-        )
-      );
+  override onStart(): void {
     this.boardsDataStore.onChanged(() =>
-      this.updateMenuActions(this.boardsServiceProvider.boardsConfig.selectedBoard)
+      this.updateMenuActions(
+        this.boardsServiceProvider.boardsConfig.selectedBoard
+      )
     );
     this.boardsServiceProvider.onBoardsConfigDidChange((event) => {
       if (isBoardIdentifierChangeEvent(event)) {
@@ -61,12 +47,20 @@ export class BoardsDataMenuUpdater implements FrontendApplicationContribution {
     });
   }
 
-  protected async updateMenuActions(
+  override onReady(): void {
+    this.boardsServiceProvider.ready.then(() =>
+      this.updateMenuActions(
+        this.boardsServiceProvider.boardsConfig.selectedBoard
+      )
+    );
+  }
+
+  private async updateMenuActions(
     selectedBoard: BoardIdentifier | undefined
   ): Promise<void> {
     return this.queue.add(async () => {
       this.toDisposeOnBoardChange.dispose();
-      this.mainMenuManager.update();
+      this.menuManager.update();
       if (selectedBoard) {
         const { fqbn } = selectedBoard;
         if (fqbn) {
@@ -177,7 +171,7 @@ export class BoardsDataMenuUpdater implements FrontendApplicationContribution {
               ]);
             }
           }
-          this.mainMenuManager.update();
+          this.menuManager.update();
         }
       }
     });