Update gitpod-protocol

Author: mustard-mh

components/gitpod-protocol/go/gitpod-service.go

@@ -2058,6 +2058,7 @@ type IDESettings struct {
 	UseDesktopIde     bool   `json:"useDesktopIde,omitempty"`
 	DefaultDesktopIde string `json:"defaultDesktopIde,omitempty"`
 	UseLatestVersion  bool   `json:"useLatestVersion"`
+	PreferToolbox     bool   `json:"preferToolbox"`
 }
 
 // EmailNotificationSettings is the EmailNotificationSettings message type

components/gitpod-protocol/src/protocol.ts

@@ -171,6 +171,7 @@ export type IDESettings = {
     settingVersion?: string;
     defaultIde?: string;
     useLatestVersion?: boolean;
+    preferToolbox?: boolean;
     // DEPRECATED: Use defaultIde after `settingVersion: 2.0`, no more specialify desktop or browser.
     useDesktopIde?: boolean;
     // DEPRECATED: Same with useDesktopIde.

components/gitpod-protocol/src/workspace-instance.ts

@@ -269,6 +269,7 @@ export namespace WorkspaceInstanceRepoStatus {
 export interface ConfigurationIdeConfig {
     useLatest?: boolean;
     ide?: string;
+    preferToolbox?: boolean;
 }
 
 export interface IdeSetup {

components/public-api/typescript-common/fixtures/toUser_1.golden

@@ -27,7 +27,8 @@
         },
         "editorSettings": {
             "name": "code",
-            "version": "latest"
+            "version": "latest",
+            "preferToolbox": true
         },
         "dotfileRepo": "https://github.com/gitpod-samples/demo-dotfiles-with-gitpod",
         "workspaceClass": "XXXL",
@@ -58,7 +59,8 @@
                 "workspaceClass": "XXXL",
                 "editorSettings": {
                     "name": "code",
-                    "version": "stable"
+                    "version": "stable",
+                    "preferToolbox": false
                 },
                 "region": ""
             }

components/public-api/typescript-common/fixtures/toUser_1.json

@@ -50,7 +50,8 @@
     "ideSettings": {
       "settingVersion": "2.0",
       "defaultIde": "code",
-      "useLatestVersion": true
+      "useLatestVersion": true,
+      "preferToolbox": true
     },
     "workspaceAutostartOptions": [
       {

components/public-api/typescript-common/fixtures/toWorkspace2_1.golden

@@ -56,7 +56,8 @@
             "logUrl": "",
             "editor": {
                 "name": "code",
-                "version": "latest"
+                "version": "latest",
+                "preferToolbox": false
             }
         },
         "status": {

components/public-api/typescript-common/fixtures/toWorkspace2_2.golden

@@ -51,7 +51,8 @@
             "logUrl": "",
             "editor": {
                 "name": "code",
-                "version": "stable"
+                "version": "stable",
+                "preferToolbox": false
             }
         },
         "status": {

components/public-api/typescript-common/fixtures/toWorkspace2_3.golden

@@ -49,7 +49,8 @@
             "logUrl": "",
             "editor": {
                 "name": "code",
-                "version": "stable"
+                "version": "stable",
+                "preferToolbox": false
             }
         },
         "status": {

components/public-api/typescript-common/fixtures/toWorkspace3_adminPage_1.golden

@@ -62,7 +62,8 @@
             "logUrl": "",
             "editor": {
                 "name": "code",
-                "version": "stable"
+                "version": "stable",
+                "preferToolbox": false
             }
         },
         "status": {

components/public-api/typescript-common/fixtures/toWorkspaceSession_1.golden

@@ -51,7 +51,8 @@
                 "logUrl": "",
                 "editor": {
                     "name": "code",
-                    "version": "stable"
+                    "version": "stable",
+                    "preferToolbox": false
                 }
             },
             "status": {