fix: simplify sketchbook menu enablement

Signed-off-by: Akos Kitta <[email protected]>

Author: Akos Kitta

arduino-ide-extension/src/browser/contributions/sketchbook.ts

@@ -1,9 +1,9 @@
 import { injectable } from '@theia/core/shared/inversify';
-import { Disposable } from '@theia/core/lib/common/disposable';
 import { CommandHandler } from '@theia/core/lib/common/command';
+import { MenuModelRegistry } from './contribution';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import { Examples } from './examples';
-import { SketchesError } from '../../common/protocol';
+import { SketchContainer, SketchesError } from '../../common/protocol';
 import { OpenSketch } from './open-sketch';
 import { nls } from '@theia/core/lib/common/nls';
 
@@ -19,39 +19,27 @@ export class Sketchbook extends Examples {
   }
 
   protected override update(): void {
-    this.toDispose.dispose();
-    this.menuRegistry.registerSubmenu(
+    this.sketchService.getSketches({}).then((container) => {
+      this.register(container);
+      this.menuManager.update();
+    });
+  }
+
+  override registerMenus(registry: MenuModelRegistry): void {
+    registry.registerSubmenu(
       ArduinoMenus.FILE__SKETCHBOOK_SUBMENU,
       nls.localize('arduino/sketch/sketchbook', 'Sketchbook'),
       { order: '3' }
     );
-    this.toDispose.push(
-      Disposable.create(() =>
-        this.menuRegistry.unregisterMenuNode(
-          ArduinoMenus.FILE__SKETCHBOOK_SUBMENU[
-            ArduinoMenus.FILE__SKETCHBOOK_SUBMENU.length - 1
-          ]
-          // It's not possible to unregister submenu in Theia https://github.com/eclipse-theia/theia/issues/7300
-          // This workaround relies on how Theia calculates menu ID from the menu path.
-        )
-      )
+  }
+
+  private register(container: SketchContainer): void {
+    this.toDispose.dispose();
+    this.registerRecursively(
+      [...container.children, ...container.sketches],
+      ArduinoMenus.FILE__SKETCHBOOK_SUBMENU,
+      this.toDispose
     );
-    const sketchDirUri = this.configService.tryGetSketchDirUri();
-    const messages = this.configService.tryGetMessages();
-    if (!sketchDirUri || messages?.length) {
-      this.menuManager.update();
-      return;
-    }
-    this.sketchService
-      .getSketches({ uri: sketchDirUri?.toString() })
-      .then((container) => {
-        this.registerRecursively(
-          [...container.children, ...container.sketches],
-          ArduinoMenus.FILE__SKETCHBOOK_SUBMENU,
-          this.toDispose
-        );
-        this.menuManager.update();
-      });
   }
 
   protected override createHandler(uri: string): CommandHandler {

arduino-ide-extension/src/common/protocol/sketches-service-client-impl.ts

@@ -10,8 +10,8 @@ import {
   DisposableCollection,
 } from '@theia/core/lib/common/disposable';
 import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
-import { ConfigServiceClient } from '../../browser/config/config-service-client';
 import { Sketch, SketchesService } from '.';
+import { ConfigServiceClient } from '../../browser/config/config-service-client';
 import { SketchContainer, SketchesError, SketchRef } from './sketches-service';
 import {
   ARDUINO_CLOUD_FOLDER,