Update gitpod-protocol

mustard-mh · mustard-mh · commit aafc2b86b6ae · 2024-07-15T16:50:07.000+08:00
diff --git a/components/gitpod-protocol/go/gitpod-service.go b/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
diff --git a/components/gitpod-protocol/src/protocol.ts b/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.
diff --git a/components/gitpod-protocol/src/workspace-instance.ts b/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 {
diff --git a/components/public-api/typescript-common/fixtures/toUser_1.golden b/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": ""
             }
diff --git a/components/public-api/typescript-common/fixtures/toUser_1.json b/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": [
       {
diff --git a/components/public-api/typescript-common/fixtures/toWorkspace2_1.golden b/components/public-api/typescript-common/fixtures/toWorkspace2_1.golden
@@ -56,7 +56,8 @@
             "logUrl": "",
             "editor": {
                 "name": "code",
-                "version": "latest"
+                "version": "latest",
+                "preferToolbox": false
             }
         },
         "status": {
diff --git a/components/public-api/typescript-common/fixtures/toWorkspace2_2.golden b/components/public-api/typescript-common/fixtures/toWorkspace2_2.golden
@@ -51,7 +51,8 @@
             "logUrl": "",
             "editor": {
                 "name": "code",
-                "version": "stable"
+                "version": "stable",
+                "preferToolbox": false
             }
         },
         "status": {
diff --git a/components/public-api/typescript-common/fixtures/toWorkspace2_3.golden b/components/public-api/typescript-common/fixtures/toWorkspace2_3.golden
@@ -49,7 +49,8 @@
             "logUrl": "",
             "editor": {
                 "name": "code",
-                "version": "stable"
+                "version": "stable",
+                "preferToolbox": false
             }
         },
         "status": {
diff --git a/components/public-api/typescript-common/fixtures/toWorkspace3_adminPage_1.golden b/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": {
diff --git a/components/public-api/typescript-common/fixtures/toWorkspaceSession_1.golden b/components/public-api/typescript-common/fixtures/toWorkspaceSession_1.golden
@@ -51,7 +51,8 @@
                 "logUrl": "",
                 "editor": {
                     "name": "code",
-                    "version": "stable"
+                    "version": "stable",
+                    "preferToolbox": false
                 }
             },
             "status": {
diff --git a/components/public-api/typescript-common/fixtures/toWorkspaceSession_2.golden b/components/public-api/typescript-common/fixtures/toWorkspaceSession_2.golden
@@ -51,7 +51,8 @@
                 "logUrl": "",
                 "editor": {
                     "name": "code",
-                    "version": "stable"
+                    "version": "stable",
+                    "preferToolbox": false
                 }
             },
             "status": {
diff --git a/components/public-api/typescript-common/fixtures/toWorkspaceSession_3.golden b/components/public-api/typescript-common/fixtures/toWorkspaceSession_3.golden
@@ -51,7 +51,8 @@
                 "logUrl": "",
                 "editor": {
                     "name": "code",
-                    "version": "stable"
+                    "version": "stable",
+                    "preferToolbox": false
                 }
             },
             "status": {
diff --git a/components/public-api/typescript-common/fixtures/toWorkspaceSession_4.golden b/components/public-api/typescript-common/fixtures/toWorkspaceSession_4.golden
@@ -51,7 +51,8 @@
                 "logUrl": "",
                 "editor": {
                     "name": "code",
-                    "version": "stable"
+                    "version": "stable",
+                    "preferToolbox": false
                 }
             },
             "status": {
diff --git a/components/public-api/typescript-common/src/public-api-converter.ts b/components/public-api/typescript-common/src/public-api-converter.ts
@@ -449,6 +449,7 @@ export class PublicAPIConverter {
         const result = new EditorReference();
         result.name = ideConfig.ide;
         result.version = ideConfig.useLatest ? "latest" : "stable";
+        result.preferToolbox = ideConfig.preferToolbox ?? false
         return result;
     }
 
@@ -1542,6 +1543,7 @@ export class PublicAPIConverter {
         return new EditorReference({
             name: from.defaultIde,
             version: from.useLatestVersion ? "latest" : "stable",
+            preferToolbox: from.preferToolbox,
         });
     }
 
@@ -1552,6 +1554,7 @@ export class PublicAPIConverter {
         return {
             defaultIde: e.name,
             useLatestVersion: e.version === "latest",
+            preferToolbox: e.preferToolbox,
         };
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2058,6 +2058,7 @@ type IDESettings struct {`
`2058`	`2058`	UseDesktopIde bool `json:"useDesktopIde,omitempty"`
`2059`	`2059`	DefaultDesktopIde string `json:"defaultDesktopIde,omitempty"`
`2060`	`2060`	UseLatestVersion bool `json:"useLatestVersion"`
	`2061`	+ PreferToolbox bool `json:"preferToolbox"`
`2061`	`2062`	`}`
`2062`	`2063`
`2063`	`2064`	`// EmailNotificationSettings is the EmailNotificationSettings message type`
Original file line number	Diff line number	Diff line change
`@@ -269,6 +269,7 @@ export namespace WorkspaceInstanceRepoStatus {`
`269`	`269`	`export interface ConfigurationIdeConfig {`
`270`	`270`	`useLatest?: boolean;`
`271`	`271`	`ide?: string;`
	`272`	`+ preferToolbox?: boolean;`
`272`	`273`	`}`
`273`	`274`
`274`	`275`	`export interface IdeSetup {`
Original file line number	Diff line number	Diff line change
`@@ -449,6 +449,7 @@ export class PublicAPIConverter {`
`449`	`449`	`const result = new EditorReference();`
`450`	`450`	`result.name = ideConfig.ide;`
`451`	`451`	`result.version = ideConfig.useLatest ? "latest" : "stable";`
	`452`	`+ result.preferToolbox = ideConfig.preferToolbox ?? false`
`452`	`453`	`return result;`
`453`	`454`	`}`
`454`	`455`
`@@ -1542,6 +1543,7 @@ export class PublicAPIConverter {`
`1542`	`1543`	`return new EditorReference({`
`1543`	`1544`	`name: from.defaultIde,`
`1544`	`1545`	`version: from.useLatestVersion ? "latest" : "stable",`
	`1546`	`+ preferToolbox: from.preferToolbox,`
`1545`	`1547`	`});`
`1546`	`1548`	`}`
`1547`	`1549`
`@@ -1552,6 +1554,7 @@ export class PublicAPIConverter {`
`1552`	`1554`	`return {`
`1553`	`1555`	`defaultIde: e.name,`
`1554`	`1556`	`useLatestVersion: e.version === "latest",`
	`1557`	`+ preferToolbox: e.preferToolbox,`
`1555`	`1558`	`};`
`1556`	`1559`	`}`
`1557`	`1560`