fix: context key match when pulling/pushing

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

Author: Akos Kitta

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

@@ -1,3 +1,4 @@
+import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
 import {
   ContextMenuRenderer,
   RenderContextMenuOptions,
@@ -60,6 +61,8 @@ export class CloudSketchbookContribution extends CloudSketchContribution {
   private readonly configServiceClient: ConfigServiceClient;
   @inject(ApplicationConnectionStatusContribution)
   private readonly connectionStatus: ApplicationConnectionStatusContribution;
+  @inject(ContextKeyService)
+  private readonly contextKeyService: ContextKeyService;
 
   private readonly onDidChangeToolbarEmitter = new Emitter<void>();
   private readonly toDisposeBeforeNewContextMenu = new DisposableCollection();
@@ -79,6 +82,17 @@ export class CloudSketchbookContribution extends CloudSketchContribution {
       }),
       this.createFeatures.onDidChangeSession(() => this.fireToolbarChange()),
       this.createFeatures.onDidChangeEnabled(() => this.fireToolbarChange()),
+      this.contextKeyService.onDidChange((event) => {
+        if (
+          event.affects({
+            has(candidate: string) {
+              return candidate === 'cloudSketchState';
+            },
+          })
+        ) {
+          this.fireToolbarChange();
+        }
+      }),
     ]);
   }
 
@@ -101,13 +115,15 @@ export class CloudSketchbookContribution extends CloudSketchContribution {
       tooltip: CloudSketchbookCommands.PULL_SKETCH__TOOLBAR.label,
       priority: -2,
       onDidChange: this.onDidChangeToolbar,
+      when: 'cloudSketchState != pulling && cloudSketchState != pushing',
     });
     registry.registerItem({
       id: CloudSketchbookCommands.PUSH_SKETCH__TOOLBAR.id,
       command: CloudSketchbookCommands.PUSH_SKETCH__TOOLBAR.id,
       tooltip: CloudSketchbookCommands.PUSH_SKETCH__TOOLBAR.label,
       priority: -1,
       onDidChange: this.onDidChangeToolbar,
+      when: 'cloudSketchState != pulling && cloudSketchState != pushing',
     });
   }
 

arduino-ide-extension/src/browser/widgets/cloud-sketchbook/cloud-sketchbook-tree.ts

@@ -37,6 +37,10 @@ import {
   pullingSketch,
   pushingSketch,
 } from '../../contributions/cloud-contribution';
+import {
+  ContextKey,
+  ContextKeyService,
+} from '@theia/core/lib/browser/context-key-service';
 
 const MESSAGE_TIMEOUT = 5 * 1000;
 const deepmerge = require('deepmerge').default;
@@ -63,10 +67,19 @@ export class CloudSketchbookTree extends SketchbookTree {
   @inject(ApplicationConnectionStatusContribution)
   private readonly connectionStatus: ApplicationConnectionStatusContribution;
 
+  @inject(ContextKeyService)
+  private readonly contextKeyService: ContextKeyService;
+
+  private cloudSketchState: ContextKey<string> | undefined;
+
   protected override init(): void {
     this.toDispose.push(
       this.connectionStatus.onOfflineStatusDidChange(() => this.refresh())
     );
+    this.cloudSketchState = this.contextKeyService.createKey<string>(
+      'cloudSketchState',
+      undefined
+    );
     super.init();
   }
 
@@ -343,18 +356,23 @@ export class CloudSketchbookTree extends SketchbookTree {
     task: (node: CloudSketchbookTree.CloudSketchDirNode) => MaybePromise<T>,
     noProgress = false
   ): Promise<T> {
-    const result = await (noProgress
-      ? task(node)
-      : ExecuteWithProgress.withProgress(
-          this.taskMessage(state, node.uri.path.name),
-          this.messageService,
-          async (progress) => {
-            progress.report({ work: { done: 0, total: NaN } });
-            return task(node);
-          }
-        ));
-    await this.refresh(node);
-    return result;
+    this.cloudSketchState?.set(state);
+    try {
+      const result = await (noProgress
+        ? task(node)
+        : ExecuteWithProgress.withProgress(
+            this.taskMessage(state, node.uri.path.name),
+            this.messageService,
+            async (progress) => {
+              progress.report({ work: { done: 0, total: NaN } });
+              return task(node);
+            }
+          ));
+      await this.refresh(node);
+      return result;
+    } finally {
+      this.cloudSketchState?.set(undefined);
+    }
   }
 
   private taskMessage(