fix: pulled up code

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

Author: Akos Kitta

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

@@ -346,6 +346,7 @@ import { DebugConfigurationWidget } from '@theia/debug/lib/browser/view/debug-co
 import { ConfigServiceClient } from './config/config-service-client';
 import { ValidateSketch } from './contributions/validate-sketch';
 import { RenameCloudSketch } from './contributions/rename-cloud-sketch';
+import { CreateFeatures } from './create/create-features';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
   // Commands and toolbar items
@@ -893,6 +894,8 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   );
   bind(CreateApi).toSelf().inSingletonScope();
   bind(SketchCache).toSelf().inSingletonScope();
+  bind(CreateFeatures).toSelf().inSingletonScope();
+  bind(FrontendApplicationContribution).toService(CreateFeatures);
 
   bind(ShareSketchDialog).toSelf().inSingletonScope();
   bind(AuthenticationClientService).toSelf().inSingletonScope();

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

@@ -63,8 +63,6 @@ import { MessageType } from '@theia/core/lib/common/message-service-protocol';
 import { WorkspaceService } from '../theia/workspace/workspace-service';
 import { MainMenuManager } from '../../common/main-menu-manager';
 import { ConfigServiceClient } from '../config/config-service-client';
-import { LocalCacheFsProvider } from '../local-cache/local-cache-fs-provider';
-import { CreateApi } from '../create/create-api';
 
 export {
   Command,
@@ -200,18 +198,6 @@ export abstract class SketchContribution extends Contribution {
   }
 }
 
-@injectable()
-export abstract class CloudSketchContribution extends SketchContribution {
-  @inject(CreateApi)
-  protected readonly createApi: CreateApi;
-  @inject(LocalCacheFsProvider)
-  protected readonly localCacheFsProvider: LocalCacheFsProvider;
-
-  protected cloudUri(sketch: Sketch): URI | undefined {
-    return this.localCacheFsProvider.from(new URI(sketch.uri));
-  }
-}
-
 @injectable()
 export abstract class CoreServiceContribution extends SketchContribution {
   @inject(BoardsDataStore)

arduino-ide-extension/src/browser/contributions/create-contribution.ts

@@ -0,0 +1,53 @@
+import URI from '@theia/core/lib/common/uri';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { Sketch } from '../../common/protocol';
+import { CreateApi } from '../create/create-api';
+import { CreateFeatures } from '../create/create-features';
+import { LocalCacheFsProvider } from '../local-cache/local-cache-fs-provider';
+import { CloudSketchbookTreeModel } from '../widgets/cloud-sketchbook/cloud-sketchbook-tree-model';
+import { CloudSketchbookTreeWidget } from '../widgets/cloud-sketchbook/cloud-sketchbook-tree-widget';
+import { SketchbookWidget } from '../widgets/sketchbook/sketchbook-widget';
+import { SketchbookWidgetContribution } from '../widgets/sketchbook/sketchbook-widget-contribution';
+import { SketchContribution } from './contribution';
+
+@injectable()
+export abstract class CloudSketchContribution extends SketchContribution {
+  @inject(LocalCacheFsProvider)
+  private readonly localCacheFsProvider: LocalCacheFsProvider;
+  @inject(SketchbookWidgetContribution)
+  private readonly widgetContribution: SketchbookWidgetContribution;
+  @inject(CreateApi)
+  protected readonly createApi: CreateApi;
+  @inject(CreateFeatures)
+  protected readonly createFeatures: CreateFeatures;
+
+  protected cloudUri(sketch: Sketch): URI | undefined {
+    return this.localCacheFsProvider.from(new URI(sketch.uri));
+  }
+
+  protected async treeModel(): Promise<CloudSketchbookTreeModel | undefined> {
+    const { enabled, session } = this.createFeatures;
+    if (enabled && session) {
+      const widget = await this.widgetContribution.widget;
+      const treeModel = this.treeModelFrom(widget);
+      if (treeModel) {
+        return treeModel;
+      }
+    }
+    return undefined;
+  }
+
+  treeModelFrom(
+    widget: SketchbookWidget
+  ): CloudSketchbookTreeModel | undefined {
+    for (const treeWidget of widget.getTreeWidgets()) {
+      if (treeWidget instanceof CloudSketchbookTreeWidget) {
+        const model = treeWidget.model;
+        if (model instanceof CloudSketchbookTreeModel) {
+          return model;
+        }
+      }
+    }
+    return undefined;
+  }
+}

arduino-ide-extension/src/browser/contributions/delete-sketch.ts

@@ -11,11 +11,8 @@ import { inject, injectable } from '@theia/core/shared/inversify';
 import { SketchesError } from '../../common/protocol';
 import { Sketch } from '../contributions/contribution';
 import { isNotFound } from '../create/typings';
-import {
-  Command,
-  CommandRegistry,
-  CloudSketchContribution,
-} from './contribution';
+import { Command, CommandRegistry } from './contribution';
+import { CloudSketchContribution } from './create-contribution';
 
 export interface DeleteSketchParams {
   /**

arduino-ide-extension/src/browser/contributions/new-cloud-sketch.ts

@@ -14,65 +14,29 @@ import {
   ProgressUpdate,
 } from '@theia/core/lib/common/message-service-protocol';
 import { nls } from '@theia/core/lib/common/nls';
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { injectable } from '@theia/core/shared/inversify';
 import { WorkspaceInputDialogProps } from '@theia/workspace/lib/browser/workspace-input-dialog';
 import { v4 } from 'uuid';
-import type { AuthenticationSession } from '../../node/auth/types';
-import { AuthenticationClientService } from '../auth/authentication-client-service';
-import { CreateApi } from '../create/create-api';
 import { CreateUri } from '../create/create-uri';
 import { Create, isConflict, isNotFound } from '../create/typings';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import { WorkspaceInputDialog } from '../theia/workspace/workspace-input-dialog';
 import { CloudSketchbookTree } from '../widgets/cloud-sketchbook/cloud-sketchbook-tree';
 import { CloudSketchbookTreeModel } from '../widgets/cloud-sketchbook/cloud-sketchbook-tree-model';
-import { CloudSketchbookTreeWidget } from '../widgets/cloud-sketchbook/cloud-sketchbook-tree-widget';
 import { SketchbookCommands } from '../widgets/sketchbook/sketchbook-commands';
-import { SketchbookWidget } from '../widgets/sketchbook/sketchbook-widget';
-import { SketchbookWidgetContribution } from '../widgets/sketchbook/sketchbook-widget-contribution';
-import {
-  Command,
-  CommandRegistry,
-  Contribution,
-  Sketch,
-  URI,
-} from './contribution';
+import { Command, CommandRegistry, Sketch, URI } from './contribution';
+import { CloudSketchContribution } from './create-contribution';
 
 @injectable()
-export class NewCloudSketch extends Contribution {
-  @inject(CreateApi)
-  private readonly createApi: CreateApi;
-  @inject(SketchbookWidgetContribution)
-  private readonly widgetContribution: SketchbookWidgetContribution;
-  @inject(AuthenticationClientService)
-  private readonly authenticationService: AuthenticationClientService;
-
+export class NewCloudSketch extends CloudSketchContribution {
   private readonly toDispose = new DisposableCollection();
-  private _session: AuthenticationSession | undefined;
-  private _enabled: boolean;
 
   override onReady(): void {
     this.toDispose.pushAll([
-      this.authenticationService.onSessionDidChange((session) => {
-        const oldSession = this._session;
-        this._session = session;
-        if (!!oldSession !== !!this._session) {
-          this.menuManager.update();
-        }
-      }),
-      this.preferences.onPreferenceChanged(({ preferenceName, newValue }) => {
-        if (preferenceName === 'arduino.cloud.enabled') {
-          const oldEnabled = this._enabled;
-          this._enabled = Boolean(newValue);
-          if (this._enabled !== oldEnabled) {
-            this.menuManager.update();
-          }
-        }
-      }),
+      this.createFeatures.onDidChangeEnabled(() => this.menuManager.update()),
+      this.createFeatures.onDidChangeSession(() => this.menuManager.update()),
     ]);
-    this._enabled = this.preferences['arduino.cloud.enabled'];
-    this._session = this.authenticationService.session;
-    if (this._session) {
+    if (this.createFeatures.session) {
       this.menuManager.update();
     }
   }
@@ -84,8 +48,8 @@ export class NewCloudSketch extends Contribution {
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(NewCloudSketch.Commands.NEW_CLOUD_SKETCH, {
       execute: () => this.createNewSketch(),
-      isEnabled: () => !!this._session,
-      isVisible: () => this._enabled,
+      isEnabled: () => Boolean(this.createFeatures.session),
+      isVisible: () => this.createFeatures.enabled,
     });
   }
 
@@ -107,8 +71,7 @@ export class NewCloudSketch extends Contribution {
   private async createNewSketch(
     initialValue?: string | undefined
   ): Promise<unknown> {
-    const widget = await this.widgetContribution.widget;
-    const treeModel = this.treeModelFrom(widget);
+    const treeModel = await this.treeModel();
     if (!treeModel) {
       return undefined;
     }
@@ -202,20 +165,6 @@ export class NewCloudSketch extends Contribution {
     );
   }
 
-  private treeModelFrom(
-    widget: SketchbookWidget
-  ): CloudSketchbookTreeModel | undefined {
-    for (const treeWidget of widget.getTreeWidgets()) {
-      if (treeWidget instanceof CloudSketchbookTreeWidget) {
-        const model = treeWidget.model;
-        if (model instanceof CloudSketchbookTreeModel) {
-          return model;
-        }
-      }
-    }
-    return undefined;
-  }
-
   private async openWizard(
     rootNode: CompositeTreeNode,
     treeModel: CloudSketchbookTreeModel,

arduino-ide-extension/src/browser/contributions/rename-cloud-sketch.ts

@@ -1,27 +1,21 @@
 import { injectable } from '@theia/core/shared/inversify';
-import {
-  Command,
-  CommandRegistry,
-  Sketch,
-  SketchContribution,
-  URI,
-} from './contribution';
+import { Command, CommandRegistry, Sketch, URI } from './contribution';
+import { CloudSketchContribution } from './create-contribution';
 
 export interface RenameCloudSketchParams {
   readonly cloudUri: URI;
   readonly sketch: Sketch;
 }
 
 @injectable()
-export class RenameCloudSketch extends SketchContribution {
+export class RenameCloudSketch extends CloudSketchContribution {
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(RenameCloudSketch.Commands.RENAME_CLOUD_SKETCH, {
-      execute: (params: RenameCloudSketchParams) =>
-        this.renameCloudSketch(params),
+      execute: (params: RenameCloudSketchParams) => this.rename(params),
     });
   }
 
-  private async renameCloudSketch(
+  private async rename(
     params: RenameCloudSketchParams
   ): Promise<URI | undefined> {
     return undefined;

arduino-ide-extension/src/browser/contributions/save-as-sketch.ts

@@ -4,13 +4,13 @@ import * as dateFormat from 'dateformat';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import {
   Sketch,
-  CloudSketchContribution,
   URI,
   Command,
   CommandRegistry,
   MenuModelRegistry,
   KeybindingRegistry,
 } from './contribution';
+import { CloudSketchContribution } from "./create-contribution";
 import { nls } from '@theia/core/lib/common';
 import { ApplicationShell, NavigatableWidget, Saveable } from '@theia/core/lib/browser';
 import { WindowService } from '@theia/core/lib/browser/window/window-service';

arduino-ide-extension/src/browser/create/create-features.ts

@@ -0,0 +1,69 @@
+import { FrontendApplicationContribution } from '@theia/core/lib/browser';
+import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import { Emitter, Event } from '@theia/core/lib/common/event';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { AuthenticationSession } from '../../node/auth/types';
+import { ArduinoPreferences } from '../arduino-preferences';
+import { AuthenticationClientService } from '../auth/authentication-client-service';
+
+@injectable()
+export class CreateFeatures implements FrontendApplicationContribution {
+  @inject(ArduinoPreferences)
+  private readonly preferences: ArduinoPreferences;
+  @inject(AuthenticationClientService)
+  private readonly authenticationService: AuthenticationClientService;
+
+  private readonly onDidChangeSessionEmitter = new Emitter<
+    AuthenticationSession | undefined
+  >();
+  private readonly onDidChangeEnabledEmitter = new Emitter<boolean>();
+  private readonly toDispose = new DisposableCollection(
+    this.onDidChangeSessionEmitter,
+    this.onDidChangeEnabledEmitter
+  );
+  private _enabled: boolean;
+  private _session: AuthenticationSession | undefined;
+
+  onStart(): void {
+    this.toDispose.pushAll([
+      this.authenticationService.onSessionDidChange((session) => {
+        const oldSession = this._session;
+        this._session = session;
+        if (!!oldSession !== !!this._session) {
+          this.onDidChangeSessionEmitter.fire(this._session);
+        }
+      }),
+      this.preferences.onPreferenceChanged(({ preferenceName, newValue }) => {
+        if (preferenceName === 'arduino.cloud.enabled') {
+          const oldEnabled = this._enabled;
+          this._enabled = Boolean(newValue);
+          if (this._enabled !== oldEnabled) {
+            this.onDidChangeEnabledEmitter.fire(this._enabled);
+          }
+        }
+      }),
+    ]);
+    this._enabled = this.preferences['arduino.cloud.enabled'];
+    this._session = this.authenticationService.session;
+  }
+
+  onStop(): void {
+    this.toDispose.dispose();
+  }
+
+  get onDidChangeSession(): Event<AuthenticationSession | undefined> {
+    return this.onDidChangeSessionEmitter.event;
+  }
+
+  get onDidChangeEnabled(): Event<boolean> {
+    return this.onDidChangeEnabledEmitter.event;
+  }
+
+  get enabled(): boolean {
+    return this._enabled;
+  }
+
+  get session(): AuthenticationSession | undefined {
+    return this._session;
+  }
+}