fix IDE updater commands

Author: Alberto Iannaccone

arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx

@@ -68,7 +68,6 @@ import { ArduinoPreferences } from './arduino-preferences';
 import { SketchesServiceClientImpl } from '../common/protocol/sketches-service-client-impl';
 import { SaveAsSketch } from './contributions/save-as-sketch';
 import { SketchbookWidgetContribution } from './widgets/sketchbook/sketchbook-widget-contribution';
-import { IDEUpdaterCommands } from './ide-updater/ide-updater-commands';
 import { IDEUpdaterDialog } from './dialogs/ide-updater/ide-updater-dialog';
 import { IDEUpdater } from '../common/protocol/ide-updater';
 
@@ -160,8 +159,8 @@ export class ArduinoFrontendContribution
   @inject(LocalStorageService)
   protected readonly localStorageService: LocalStorageService;
 
-  @inject(IDEUpdaterCommands)
-  protected readonly updater: IDEUpdaterCommands;
+  @inject(IDEUpdater)
+  protected readonly updater: IDEUpdater;
 
   @inject(IDEUpdaterDialog)
   protected readonly updaterDialog: IDEUpdaterDialog;
@@ -283,14 +282,21 @@ export class ArduinoFrontendContribution
       this.arduinoPreferences.get('arduino.ide.updateChannel'),
       this.arduinoPreferences.get('arduino.ide.updateBaseUrl')
     );
-    this.updater.checkForUpdates(true).then(async (updateInfo) => {
-      if (!updateInfo) return;
-      const versionToSkip = await this.localStorageService.getData<string>(
-        SKIP_IDE_VERSION
-      );
-      if (versionToSkip === updateInfo.version) return;
-      this.updaterDialog.open(updateInfo);
-    });
+    this.updater
+      .checkForUpdates(true)
+      .then(async (updateInfo) => {
+        if (!updateInfo) return;
+        const versionToSkip = await this.localStorageService.getData<string>(
+          SKIP_IDE_VERSION
+        );
+        if (versionToSkip === updateInfo.version) return;
+        this.updaterDialog.open(updateInfo);
+      })
+      .catch((e) => {
+        this.messageService.error(
+          `Error while checking for Arduino IDE updates. ${e}`
+        );
+      });
 
     const start = async ({ selectedBoard }: BoardsConfig.Config) => {
       if (selectedBoard) {

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

@@ -13,6 +13,7 @@ import {
   KeybindingRegistry,
 } from './contribution';
 import { nls } from '@theia/core/lib/common';
+import { IDEUpdaterCommands } from '../ide-updater/ide-updater-commands';
 
 @injectable()
 export class Help extends Contribution {
@@ -115,6 +116,10 @@ export class Help extends Contribution {
       commandId: Help.Commands.VISIT_ARDUINO.id,
       order: '6',
     });
+    registry.registerMenuAction(ArduinoMenus.HELP__FIND_GROUP, {
+      commandId: IDEUpdaterCommands.CHECK_FOR_UPDATES.id,
+      order: '7',
+    });
   }
 
   registerKeybindings(registry: KeybindingRegistry): void {

arduino-ide-extension/src/browser/dialogs/ide-updater/ide-updater-dialog.tsx

@@ -7,8 +7,9 @@ import { Message } from '@phosphor/messaging';
 import { ReactWidget } from '@theia/core/lib/browser/widgets/react-widget';
 import { nls } from '@theia/core';
 import { IDEUpdaterComponent } from './ide-updater-component';
-import { IDEUpdaterCommands } from '../../ide-updater/ide-updater-commands';
+
 import {
+  IDEUpdater,
   IDEUpdaterClient,
   ProgressInfo,
   UpdateInfo,
@@ -27,8 +28,8 @@ export class IDEUpdaterDialogWidget extends ReactWidget {
   downloadStarted: boolean;
   onClose: () => void;
 
-  @inject(IDEUpdaterCommands)
-  protected readonly updater: IDEUpdaterCommands;
+  @inject(IDEUpdater)
+  protected readonly updater: IDEUpdater;
 
   @inject(IDEUpdaterClient)
   protected readonly updaterClient: IDEUpdaterClient;

arduino-ide-extension/src/browser/ide-updater/ide-updater-commands.ts

@@ -6,45 +6,41 @@ import {
 } from '@theia/core';
 import { injectable, inject } from 'inversify';
 import { IDEUpdater, UpdateInfo } from '../../common/protocol/ide-updater';
+import { IDEUpdaterDialog } from '../dialogs/ide-updater/ide-updater-dialog';
 
 @injectable()
 export class IDEUpdaterCommands implements CommandContribution {
   constructor(
     @inject(IDEUpdater)
     private readonly updater: IDEUpdater,
     @inject(MessageService)
-    protected readonly messageService: MessageService
+    protected readonly messageService: MessageService,
+    @inject(IDEUpdaterDialog)
+    protected readonly updaterDialog: IDEUpdaterDialog
   ) {}
 
   registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(IDEUpdaterCommands.CHECK_FOR_UPDATES, {
       execute: this.checkForUpdates.bind(this),
     });
-    registry.registerCommand(IDEUpdaterCommands.DOWNLOAD_UPDATE, {
-      execute: this.downloadUpdate.bind(this),
-    });
-    registry.registerCommand(IDEUpdaterCommands.STOP_DOWNLOAD, {
-      execute: this.stopDownload.bind(this),
-    });
-    registry.registerCommand(IDEUpdaterCommands.INSTALL_UPDATE, {
-      execute: this.quitAndInstall.bind(this),
-    });
   }
 
   async checkForUpdates(initialCheck?: boolean): Promise<UpdateInfo | void> {
-    return await this.updater.checkForUpdates(initialCheck);
-  }
-
-  async downloadUpdate(): Promise<void> {
-    await this.updater.downloadUpdate();
-  }
-
-  async stopDownload(): Promise<void> {
-    await this.updater.stopDownload();
-  }
-
-  quitAndInstall(): void {
-    this.updater.quitAndInstall();
+    try {
+      const updateInfo = await this.updater.checkForUpdates(initialCheck);
+      if (!!updateInfo) {
+        this.updaterDialog.open(updateInfo);
+      } else {
+        this.messageService.info(
+          `There are no recent updates available the Arduino IDE`
+        );
+      }
+      return updateInfo;
+    } catch (e) {
+      this.messageService.error(
+        `Error while checking for Arduino IDE updates. ${e}`
+      );
+    }
   }
 }
 export namespace IDEUpdaterCommands {
@@ -53,19 +49,4 @@ export namespace IDEUpdaterCommands {
     category: 'Arduino',
     label: 'Check for Arduino IDE updates',
   };
-  export const DOWNLOAD_UPDATE: Command = {
-    id: 'arduino-ide-download-update',
-    category: 'Arduino',
-    label: 'Download Arduino IDE updates',
-  };
-  export const STOP_DOWNLOAD: Command = {
-    id: 'arduino-ide-stop-download',
-    category: 'Arduino',
-    label: 'Stop download of Arduino IDE updates',
-  };
-  export const INSTALL_UPDATE: Command = {
-    id: 'arduino-ide-install-update',
-    category: 'Arduino',
-    label: 'Install Arduino IDE updates',
-  };
 }