From 5897f379a41e3f3b165b12a3fdfd5d54dd440ca3 Mon Sep 17 00:00:00 2001
From: Alberto Iannaccone <a.iannaccone@arduino.cc>
Date: Fri, 23 Jul 2021 10:01:21 +0200
Subject: [PATCH] fix url to open sketch in cloud editor (#452)

---
 .../cloud-sketchbook/cloud-sketchbook-contributions.ts       | 2 +-
 .../cloud-sketchbook/cloud-sketchbook-tree-widget.tsx        | 4 +++-
 .../browser/widgets/sketchbook/sketchbook-tree-widget.tsx    | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/arduino-ide-extension/src/browser/widgets/cloud-sketchbook/cloud-sketchbook-contributions.ts b/arduino-ide-extension/src/browser/widgets/cloud-sketchbook/cloud-sketchbook-contributions.ts
index aa1505c5..b573eb90 100644
--- a/arduino-ide-extension/src/browser/widgets/cloud-sketchbook/cloud-sketchbook-contributions.ts
+++ b/arduino-ide-extension/src/browser/widgets/cloud-sketchbook/cloud-sketchbook-contributions.ts
@@ -176,7 +176,7 @@ export class CloudSketchbookContribution extends Contribution {
     registry.registerCommand(CloudSketchbookCommands.OPEN_IN_CLOUD_EDITOR, {
       execute: (arg) => {
         this.windowService.openNewWindow(
-          `https://create.arduino.cc/editor/${arg.node.sketchId}`,
+          `https://create.arduino.cc/editor/${arg.username}/${arg.node.sketchId}`,
           { external: true }
         );
       },
diff --git a/arduino-ide-extension/src/browser/widgets/cloud-sketchbook/cloud-sketchbook-tree-widget.tsx b/arduino-ide-extension/src/browser/widgets/cloud-sketchbook/cloud-sketchbook-tree-widget.tsx
index fa4c63bf..c36183b0 100644
--- a/arduino-ide-extension/src/browser/widgets/cloud-sketchbook/cloud-sketchbook-tree-widget.tsx
+++ b/arduino-ide-extension/src/browser/widgets/cloud-sketchbook/cloud-sketchbook-tree-widget.tsx
@@ -94,7 +94,9 @@ export class CloudSketchbookTreeWidget extends SketchbookTreeWidget {
         this.currentSketchUri === node.uri.toString())
     ) {
       return Array.from(new Set(node.commands)).map((command) =>
-        this.renderInlineCommand(command.id, node)
+        this.renderInlineCommand(command.id, node, {
+          username: this.authenticationService.session?.account?.label,
+        })
       );
     }
     return undefined;
diff --git a/arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-tree-widget.tsx b/arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-tree-widget.tsx
index 7245b756..b866e884 100644
--- a/arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-tree-widget.tsx
+++ b/arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-tree-widget.tsx
@@ -125,11 +125,12 @@ export class SketchbookTreeWidget extends FileTreeWidget {
 
   protected renderInlineCommand(
     commandId: string,
-    node: SketchbookTree.SketchDirNode
+    node: SketchbookTree.SketchDirNode,
+    options?: any
   ): React.ReactNode {
     const command = this.commandRegistry.getCommand(commandId);
     const icon = command?.iconClass;
-    const args = { model: this.model, node: node };
+    const args = { model: this.model, node: node, ...options };
     if (
       command &&
       icon &&