Remove duplicate commands

Fixes https://linear.app/gitpod/issue/EXP-431

Author: jeanp413

gitpod-remote/package.json

@@ -39,11 +39,6 @@
   "segmentKey": "YErmvd89wPsrCuGcVnF2XAl846W9WIGl",
   "contributes": {
     "commands": [
-      {
-        "command": "gitpod.stop.ws",
-        "title": "%stopWorkspace%",
-        "enablement": "gitpod.inWorkspace == true && gitpod.workspaceOwned == true"
-      },
       {
         "command": "gitpod.open.settings",
         "title": "%openSettings%",
@@ -54,11 +49,6 @@
         "title": "%openAccessControl%",
         "enablement": "gitpod.inWorkspace == true"
       },
-      {
-        "command": "gitpod.open.context",
-        "title": "%openContext%",
-        "enablement": "gitpod.inWorkspace == true"
-      },
       {
         "command": "gitpod.open.dashboard",
         "title": "%openDashboard%",
@@ -114,11 +104,6 @@
         "title": "%stopSharingWorkspace%",
         "enablement": "gitpod.inWorkspace == true && gitpod.workspaceOwned == true && gitpod.workspaceShared == true"
       },
-      {
-        "command": "gitpod.openInBrowser",
-        "title": "%openInBrowser%",
-        "enablement": "gitpod.inWorkspace == true && gitpod.UIKind == 'desktop'"
-      },
       {
         "command": "gitpod.ports.openBrowser",
         "title": "%openBrowser%",
@@ -192,11 +177,6 @@
     ],
     "menus": {
       "statusBar/remoteIndicator": [
-        {
-          "command": "gitpod.stop.ws",
-          "group": "remote_00_gitpod_navigation@10",
-          "when": "gitpod.inWorkspace == true && gitpod.workspaceOwned == true"
-        },
         {
           "command": "gitpod.open.settings",
           "group": "remote_00_gitpod_navigation@20",
@@ -207,11 +187,6 @@
           "group": "remote_00_gitpod_navigation@30",
           "when": "gitpod.inWorkspace == true"
         },
-        {
-          "command": "gitpod.open.context",
-          "group": "remote_00_gitpod_navigation@40",
-          "when": "gitpod.inWorkspace == true"
-        },
         {
           "command": "gitpod.open.dashboard",
           "group": "remote_00_gitpod_navigation@50",
@@ -261,11 +236,6 @@
           "command": "gitpod.stopSharingWorkspace",
           "group": "remote_00_gitpod_navigation@130",
           "when": "gitpod.inWorkspace == true && gitpod.workspaceOwned == true && gitpod.workspaceShared == true"
-        },
-        {
-          "command": "gitpod.openInBrowser",
-          "group": "remote_00_gitpod_navigation@1000",
-          "when": "gitpod.inWorkspace == true && gitpod.UIKind == 'desktop'"
         }
       ],
       "editor/context": [

gitpod-remote/src/extension.ts

@@ -80,15 +80,6 @@ function registerCLI(context: GitpodExtensionContext): void {
 }
 
 function registerCommands(context: GitpodExtensionContext) {
-	context.subscriptions.push(vscode.commands.registerCommand('gitpod.openInBrowser', () => {
-		context.telemetryService.sendTelemetryEvent('vscode_execute_command_gitpod_change_vscode_type', {
-			...context.getWorkspaceTelemetryProperties(),
-			targetUiKind: 'web'
-		});
-		const url = context.info.workspaceUrl;
-		return vscode.env.openExternal(vscode.Uri.parse(url));
-	}));
-
 	// For collecting logs, will be called by gitpod-desktop extension;
 	context.subscriptions.push(vscode.commands.registerCommand('__gitpod.getGitpodRemoteLogsUri', () => {
 		return context.logUri;

gitpod-shared/src/features.ts

@@ -148,14 +148,6 @@ export async function registerWorkspaceCommands(context: GitpodExtensionContext)
 		});
 		return vscode.env.openExternal(vscode.Uri.parse(url));
 	}));
-	context.subscriptions.push(vscode.commands.registerCommand('gitpod.open.context', () => {
-		const url = context.workspaceContextUrl.toString();
-		context.telemetryService.sendTelemetryEvent('vscode_execute_command_gitpod_open_link', {
-			...context.getWorkspaceTelemetryProperties(),
-			url
-		});
-		return vscode.env.openExternal(vscode.Uri.parse(url));
-	}));
 	context.subscriptions.push(vscode.commands.registerCommand('gitpod.open.documentation', () => {
 		const url = 'https://www.gitpod.io/docs';
 		context.telemetryService.sendTelemetryEvent('vscode_execute_command_gitpod_open_link', {
@@ -193,13 +185,6 @@ export async function registerWorkspaceCommands(context: GitpodExtensionContext)
 	if (!workspaceOwned) {
 		return;
 	}
-	context.subscriptions.push(vscode.commands.registerCommand('gitpod.stop.ws', () => {
-		context.telemetryService.sendTelemetryEvent('vscode_execute_command_gitpod_workspace', {
-			...context.getWorkspaceTelemetryProperties(),
-			action: 'stop'
-		});
-		return context.gitpod.server.stopWorkspace(context.info.workspaceId);
-	}));
 	context.subscriptions.push(vscode.commands.registerCommand('gitpod.upgradeSubscription', () => {
 		const url = new GitpodHostUrl(context.info.gitpodHost).asBilling().toString();
 		context.telemetryService.sendTelemetryEvent('vscode_execute_command_gitpod_open_link', {

gitpod-web/src/extension.ts

@@ -455,6 +455,24 @@ function registerCommands(context: GitpodExtensionContext) {
 		});
 		return openDesktop('vscode-insiders');
 	}));
+	context.subscriptions.push(vscode.commands.registerCommand('gitpod.open.context', () => {
+		const url = context.workspaceContextUrl.toString();
+		context.telemetryService.sendTelemetryEvent('vscode_execute_command_gitpod_open_link', {
+			...context.getWorkspaceTelemetryProperties(),
+			url
+		});
+		return vscode.env.openExternal(vscode.Uri.parse(url));
+	}));
+
+	if (context.workspaceOwned) {
+		context.subscriptions.push(vscode.commands.registerCommand('gitpod.stop.ws', () => {
+			context.telemetryService.sendTelemetryEvent('vscode_execute_command_gitpod_workspace', {
+				...context.getWorkspaceTelemetryProperties(),
+				action: 'stop'
+			});
+			return context.gitpod.server.stopWorkspace(context.info.workspaceId);
+		}));
+	}
 }
 
 async function registerDesktop(): Promise<void> {