wip

Author: fstasi

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

@@ -367,16 +367,15 @@ export class ArduinoFrontendContribution
       }
       const { clangdUri, cliUri, lsUri, fwuploaderUri } =
         await this.executableService.list();
-      const [clangdPath, cliPath, lsPath, cliConfigPath, fwuploaderPath] =
-        await Promise.all([
-          this.fileService.fsPath(new URI(clangdUri)),
-          this.fileService.fsPath(new URI(cliUri)),
-          this.fileService.fsPath(new URI(lsUri)),
-          this.fileService.fsPath(
-            new URI(await this.configService.getCliConfigFileUri())
-          ),
-          this.fileService.fsPath(new URI(fwuploaderUri)),
-        ]);
+      const [clangdPath, cliPath, lsPath, cliConfigPath] = await Promise.all([
+        this.fileService.fsPath(new URI(clangdUri)),
+        this.fileService.fsPath(new URI(cliUri)),
+        this.fileService.fsPath(new URI(lsUri)),
+        this.fileService.fsPath(
+          new URI(await this.configService.getCliConfigFileUri())
+        ),
+        this.fileService.fsPath(new URI(fwuploaderUri)),
+      ]);
       this.languageServerFqbn = await Promise.race([
         new Promise<undefined>((_, reject) =>
           setTimeout(

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

@@ -242,7 +242,13 @@ import {
   UploadFirmwareDialog,
   UploadFirmwareDialogProps,
   UploadFirmwareDialogWidget,
-} from './dialogs/upload-firmware-dialog';
+} from './dialogs/firmware-uploader/upload-firmware-dialog';
+import {
+  UploadCertificateDialog,
+  UploadCertificateDialogProps,
+  UploadCertificateDialogWidget,
+} from './dialogs/certificate-uploader/upload-certificate-dialog';
+import { UploadCertificate } from './contributions/upload-certificate';
 
 const ElementQueries = require('css-element-queries/src/ElementQueries');
 
@@ -578,6 +584,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   Contribution.configure(bind, Debug);
   Contribution.configure(bind, Sketchbook);
   Contribution.configure(bind, UploadFirmware);
+  Contribution.configure(bind, UploadCertificate);
   Contribution.configure(bind, BoardSelection);
   Contribution.configure(bind, OpenRecentSketch);
   Contribution.configure(bind, Help);
@@ -726,4 +733,9 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(UploadFirmwareDialogProps).toConstantValue({
     title: 'UploadFirmware',
   });
+  bind(UploadCertificateDialogWidget).toSelf().inSingletonScope();
+  bind(UploadCertificateDialog).toSelf().inSingletonScope();
+  bind(UploadCertificateDialogProps).toConstantValue({
+    title: 'UploadCertificate',
+  });
 });

arduino-ide-extension/src/browser/contributions/upload-certificate.ts

@@ -0,0 +1,49 @@
+import { inject, injectable } from 'inversify';
+import {
+  Command,
+  MenuModelRegistry,
+  CommandRegistry,
+  Contribution,
+} from './contribution';
+import { ArduinoMenus } from '../menu/arduino-menus';
+import { UploadCertificateDialog } from '../dialogs/certificate-uploader/upload-certificate-dialog';
+
+@injectable()
+export class UploadCertificate extends Contribution {
+  @inject(UploadCertificateDialog)
+  protected readonly dialog: UploadCertificateDialog;
+
+  protected dialogOpened = false;
+
+  registerCommands(registry: CommandRegistry): void {
+    registry.registerCommand(UploadCertificate.Commands.OPEN, {
+      execute: async () => {
+        try {
+          this.dialogOpened = true;
+          await this.dialog.open();
+        } finally {
+          this.dialogOpened = false;
+        }
+      },
+      isEnabled: () => !this.dialogOpened,
+    });
+  }
+
+  registerMenus(registry: MenuModelRegistry): void {
+    registry.registerMenuAction(ArduinoMenus.TOOLS__FIRMWARE_UPLOADER_GROUP, {
+      commandId: UploadCertificate.Commands.OPEN.id,
+      label: UploadCertificate.Commands.OPEN.label,
+      order: '1',
+    });
+  }
+}
+
+export namespace UploadCertificate {
+  export namespace Commands {
+    export const OPEN: Command = {
+      id: 'arduino-upload-certificate-open',
+      label: 'Upload SSL Root Certificates',
+      category: 'Arduino',
+    };
+  }
+}

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

@@ -6,7 +6,7 @@ import {
   Contribution,
 } from './contribution';
 import { ArduinoMenus } from '../menu/arduino-menus';
-import { UploadFirmwareDialog } from '../dialogs/upload-firmware-dialog';
+import { UploadFirmwareDialog } from '../dialogs/firmware-uploader/upload-firmware-dialog';
 
 @injectable()
 export class UploadFirmware extends Contribution {