fix active sketchbook behavior in sidebar

Author: Alberto Iannaccone

Diff for: arduino-ide-extension/src/browser/local-cache/local-cache-fs-provider.ts

@@ -16,6 +16,10 @@ import {
 import { AuthenticationClientService } from '../auth/authentication-client-service';
 import { AuthenticationSession } from '../../common/protocol/authentication-service';
 import { ConfigService } from '../../common/protocol';
+import {
+  ARDUINO_CLOUD_FOLDER,
+  REMOTE_SKETCHBOOK_FOLDER,
+} from '../utils/constants';
 
 export namespace LocalCacheUri {
   export const scheme = 'arduino-local-cache';
@@ -91,7 +95,7 @@ export class LocalCacheFsProvider
   protected async init(fileService: FileService): Promise<void> {
     const config = await this.configService.getConfiguration();
     this._localCacheRoot = new URI(config.dataDirUri);
-    for (const segment of ['RemoteSketchbook', 'ArduinoCloud']) {
+    for (const segment of [REMOTE_SKETCHBOOK_FOLDER, ARDUINO_CLOUD_FOLDER]) {
       this._localCacheRoot = this._localCacheRoot.resolve(segment);
       await fileService.createFolder(this._localCacheRoot);
     }

Diff for: arduino-ide-extension/src/browser/utils/constants.ts

@@ -0,0 +1,2 @@
+export const REMOTE_SKETCHBOOK_FOLDER = 'RemoteSketchbook';
+export const ARDUINO_CLOUD_FOLDER = 'ArduinoCloud';

Diff for: arduino-ide-extension/src/browser/widgets/cloud-sketchbook/cloud-sketchbook-composite-widget.tsx

@@ -58,6 +58,20 @@ export class CloudSketchbookCompositeWidget extends BaseWidget {
     );
   }
 
+  protected onActivateRequest(msg: Message): void {
+    super.onActivateRequest(msg);
+    this.cloudSketchbookTreeWidget.activate();
+
+    /* 
+      Sending a resize message is needed because otherwise the cloudSketchbookTreeWidget
+      would render empty
+    */
+    MessageLoop.sendMessage(
+      this.cloudSketchbookTreeWidget,
+      Widget.ResizeMessage.UnknownSize
+    );
+  }
+
   protected onResize(message: Widget.ResizeMessage): void {
     super.onResize(message);
     MessageLoop.sendMessage(

Diff for: arduino-ide-extension/src/browser/widgets/cloud-sketchbook/cloud-sketchbook-widget.ts

@@ -2,6 +2,11 @@ import { inject, injectable, postConstruct } from 'inversify';
 import { CloudSketchbookCompositeWidget } from './cloud-sketchbook-composite-widget';
 import { SketchbookWidget } from '../sketchbook/sketchbook-widget';
 import { ArduinoPreferences } from '../../arduino-preferences';
+import { Message } from '@theia/core/shared/@phosphor/messaging';
+import { SketchesServiceClientImpl } from '../../../common/protocol/sketches-service-client-impl';
+import { SketchControl } from '../../contributions/sketch-control';
+import { LocalCacheFsProvider } from '../../local-cache/local-cache-fs-provider';
+import { REMOTE_SKETCHBOOK_FOLDER } from '../../utils/constants';
 
 @injectable()
 export class CloudSketchbookWidget extends SketchbookWidget {
@@ -11,6 +16,15 @@ export class CloudSketchbookWidget extends SketchbookWidget {
   @inject(ArduinoPreferences)
   protected readonly arduinoPreferences: ArduinoPreferences;
 
+  @inject(SketchControl)
+  protected readonly sketchControl: SketchControl;
+
+  @inject(SketchesServiceClientImpl)
+  protected readonly sketchesServiceClient: SketchesServiceClientImpl;
+
+  @inject(LocalCacheFsProvider)
+  protected readonly localCacheFsProvider: LocalCacheFsProvider;
+
   @postConstruct()
   protected init(): void {
     super.init();
@@ -25,33 +39,41 @@ export class CloudSketchbookWidget extends SketchbookWidget {
     return widget;
   }
 
-  checkCloudEnabled() {
-    if (this.arduinoPreferences['arduino.cloud.enabled']) {
-      this.sketchbookTreesContainer.activateWidget(this.widget);
-    } else {
-      this.sketchbookTreesContainer.activateWidget(
-        this.localSketchbookTreeWidget
-      );
-    }
-    this.setDocumentMode();
+  protected onAfterShow(msg: Message): void {
+    this.checkCloudEnabled();
+    super.onAfterShow(msg);
   }
 
-  setDocumentMode() {
+  async checkCloudEnabled(): Promise<void> {
+    const currentSketch = await this.sketchesServiceClient.currentSketch();
+    const isCloudSketch =
+      currentSketch && currentSketch.uri.includes(REMOTE_SKETCHBOOK_FOLDER);
+
     if (this.arduinoPreferences['arduino.cloud.enabled']) {
       this.sketchbookTreesContainer.mode = 'multiple-document';
+      if (isCloudSketch) {
+        this.sketchbookTreesContainer.activateWidget(this.widget);
+      }
     } else {
       this.sketchbookTreesContainer.mode = 'single-document';
     }
+
+    if (!isCloudSketch || !this.arduinoPreferences['arduino.cloud.enabled']) {
+      this.sketchbookTreesContainer.activateWidget(
+        this.localSketchbookTreeWidget
+      );
+    }
   }
 
   protected onAfterAttach(msg: any) {
     this.sketchbookTreesContainer.addWidget(this.widget);
-    this.setDocumentMode();
+    this.sketchbookTreesContainer.mode = 'single-document';
     this.arduinoPreferences.onPreferenceChanged((event) => {
       if (event.preferenceName === 'arduino.cloud.enabled') {
         this.checkCloudEnabled();
       }
     });
+    this.checkCloudEnabled();
     super.onAfterAttach(msg);
   }
 }