Removes workspaces code

Author: d13

package.json

@@ -67,7 +67,7 @@
 		"onWebviewPanel:gitlens.welcome",
 		"onWebviewPanel:gitlens.settings",
 		"onWebviewPanel:gitlens.graph",
-		"onWebviewPanel:gitlens.workspaces",
+		"onWebviewPanel:gitlens.focus",
 		"onCommand:gitlens.plus.learn",
 		"onCommand:gitlens.plus.loginOrSignUp",
 		"onCommand:gitlens.plus.logout",
@@ -76,7 +76,7 @@
 		"onCommand:gitlens.plus.purchase",
 		"onCommand:gitlens.getStarted",
 		"onCommand:gitlens.showGraphPage",
-		"onCommand:gitlens.showWorkspacesPage",
+		"onCommand:gitlens.showFocusPage",
 		"onCommand:gitlens.showSettingsPage",
 		"onCommand:gitlens.showSettingsPage#views",
 		"onCommand:gitlens.showSettingsPage#autolinks",
@@ -4487,7 +4487,7 @@
 				"icon": "$(gitlens-graph)"
 			},
 			{
-				"command": "gitlens.showWorkspacesPage",
+				"command": "gitlens.showFocusPage",
 				"title": "Show Focus View",
 				"category": "GitLens+",
 				"icon": "$(layers)"
@@ -6864,7 +6864,7 @@
 				"icon": "$(copy)"
 			},
 			{
-				"command": "gitlens.workspaces.refresh",
+				"command": "gitlens.focus.refresh",
 				"title": "Refresh",
 				"category": "GitLens",
 				"icon": "$(refresh)"
@@ -7424,7 +7424,7 @@
 					"when": "false"
 				},
 				{
-					"command": "gitlens.showWorkspacesPage",
+					"command": "gitlens.showFocusPage",
 					"when": "gitlens:enabled"
 				},
 				{
@@ -9036,7 +9036,7 @@
 					"when": "false"
 				},
 				{
-					"command": "gitlens.workspaces.refresh",
+					"command": "gitlens.focus.refresh",
 					"when": "false"
 				},
 				{
@@ -9470,8 +9470,8 @@
 					"group": "navigation@-98"
 				},
 				{
-					"command": "gitlens.workspaces.refresh",
-					"when": "gitlens:workspaces:focused",
+					"command": "gitlens.focus.refresh",
+					"when": "gitlens:focus:focused",
 					"group": "navigation@-98"
 				}
 			],

src/constants.ts

@@ -184,7 +184,7 @@ export const enum Commands {
 	PlusValidate = 'gitlens.plus.validate',
 	QuickOpenFileHistory = 'gitlens.quickOpenFileHistory',
 	RefreshGraph = 'gitlens.graph.refresh',
-	RefreshWorkspaces = 'gitlens.workspaces.refresh',
+	RefreshFocus = 'gitlens.focus.refresh',
 	RefreshHover = 'gitlens.refreshHover',
 	RefreshTimelinePage = 'gitlens.refreshTimelinePage',
 	ResetAvatarCache = 'gitlens.resetAvatarCache',
@@ -241,7 +241,7 @@ export const enum Commands {
 	ShowTimelineView = 'gitlens.showTimelineView',
 	ShowGraphPage = 'gitlens.showGraphPage',
 	ShowWelcomePage = 'gitlens.showWelcomePage',
-	ShowWorkspacesPage = 'gitlens.showWorkspacesPage',
+	ShowFocusPage = 'gitlens.showFocusPage',
 	StashApply = 'gitlens.stashApply',
 	StashSave = 'gitlens.stashSave',
 	StashSaveFiles = 'gitlens.stashSaveFiles',
@@ -285,7 +285,7 @@ export const enum ContextKeys {
 	DisabledToggleCodeLens = 'gitlens:disabledToggleCodeLens',
 	Disabled = 'gitlens:disabled',
 	Enabled = 'gitlens:enabled',
-	WorkspacesFocused = 'gitlens:workspaces:focused',
+	FocusFocused = 'gitlens:focus:focused',
 	HasConnectedRemotes = 'gitlens:hasConnectedRemotes',
 	HasRemotes = 'gitlens:hasRemotes',
 	HasRichRemotes = 'gitlens:hasRichRemotes',

src/container.ts

@@ -23,11 +23,10 @@ import { IntegrationAuthenticationService } from './plus/integrationAuthenticati
 import { SubscriptionAuthenticationProvider } from './plus/subscription/authenticationProvider';
 import { ServerConnection } from './plus/subscription/serverConnection';
 import { SubscriptionService } from './plus/subscription/subscriptionService';
+import { FocusWebview } from './plus/webviews/focus/focusWebview';
 import { GraphWebview } from './plus/webviews/graph/graphWebview';
 import { TimelineWebview } from './plus/webviews/timeline/timelineWebview';
 import { TimelineWebviewView } from './plus/webviews/timeline/timelineWebviewView';
-import { WorkspacesWebview } from './plus/webviews/workspaces/workspacesWebview';
-import { WorkspacesApi } from './plus/workspaces/workspaces';
 import { StatusBarController } from './statusbar/statusBarController';
 import type { Storage } from './storage';
 import { executeCommand } from './system/command';
@@ -176,7 +175,6 @@ export class Container {
 			(this._subscriptionAuthentication = new SubscriptionAuthenticationProvider(this, server)),
 		);
 		context.subscriptions.push((this._subscription = new SubscriptionService(this, previousVersion)));
-		context.subscriptions.push((this._workspaces = new WorkspacesApi(this, server)));
 
 		context.subscriptions.push((this._git = new GitProviderService(this)));
 		context.subscriptions.push(new GitFileSystemProvider(this));
@@ -203,7 +201,7 @@ export class Container {
 		context.subscriptions.push((this._welcomeWebview = new WelcomeWebview(this)));
 		context.subscriptions.push((this._rebaseEditor = new RebaseEditorProvider(this)));
 		context.subscriptions.push((this._graphWebview = new GraphWebview(this)));
-		context.subscriptions.push((this._workspacesWebview = new WorkspacesWebview(this)));
+		context.subscriptions.push((this._focusWebview = new FocusWebview(this)));
 
 		context.subscriptions.push(new ViewFileDecorationProvider());
 
@@ -532,11 +530,6 @@ export class Container {
 		return this._searchAndCompareView;
 	}
 
-	private _workspaces: WorkspacesApi;
-	get workspaces() {
-		return this._workspaces;
-	}
-
 	private _subscription: SubscriptionService;
 	get subscription() {
 		return this._subscription;
@@ -557,9 +550,9 @@ export class Container {
 		return this._graphWebview;
 	}
 
-	private _workspacesWebview: WorkspacesWebview;
-	get workspacesWebview() {
-		return this._workspacesWebview;
+	private _focusWebview: FocusWebview;
+	get focusWebview() {
+		return this._focusWebview;
 	}
 
 	private _stashesView: StashesView | undefined;

src/git/remotes/richRemoteProvider.ts

@@ -79,8 +79,7 @@ export abstract class RichRemoteProvider extends RemoteProvider {
 	}
 
 	protected _session: AuthenticationSession | null | undefined;
-	// TODO: exposing this is rough approach for workspaces
-	session() {
+	protected session() {
 		if (this._session === undefined) {
 			return this.ensureSession(false);
 		}

src/plus/webviews/workspaces/workspacesWebview.ts renamed to src/plus/webviews/focus/focusWebview.ts

@@ -31,7 +31,7 @@ interface RepoWithRichRemote {
 	isGitHub: boolean;
 }
 
-export class WorkspacesWebview extends WebviewBase<State> {
+export class FocusWebview extends WebviewBase<State> {
 	private _bootstrapping = true;
 	private _pullRequests: SearchedPullRequest[] = [];
 	private _issues: SearchedIssue[] = [];
@@ -42,32 +42,32 @@ export class WorkspacesWebview extends WebviewBase<State> {
 	constructor(container: Container) {
 		super(
 			container,
-			'gitlens.workspaces',
-			'workspaces.html',
+			'gitlens.focus',
+			'focus.html',
 			'images/gitlens-icon.png',
 			'Focus View',
-			`${ContextKeys.WebviewPrefix}workspaces`,
-			'workspacesWebview',
-			Commands.ShowWorkspacesPage,
+			`${ContextKeys.WebviewPrefix}focus`,
+			'focusWebview',
+			Commands.ShowFocusPage,
 		);
 
 		this.disposables.push(this.container.subscription.onDidChange(this.onSubscriptionChanged, this));
 		this.disposables.push(this.container.git.onDidChangeRepositories(() => void this.refresh(true)));
 	}
 
 	protected override registerCommands(): Disposable[] {
-		return [registerCommand(Commands.RefreshWorkspaces, () => this.refresh(true))];
+		return [registerCommand(Commands.RefreshFocus, () => this.refresh(true))];
 	}
 
 	protected override onFocusChanged(focused: boolean): void {
 		if (focused) {
 			// If we are becoming focused, delay it a bit to give the UI time to update
-			setTimeout(() => void setContext(ContextKeys.WorkspacesFocused, focused), 0);
+			setTimeout(() => void setContext(ContextKeys.FocusFocused, focused), 0);
 
 			return;
 		}
 
-		void setContext(ContextKeys.WorkspacesFocused, focused);
+		void setContext(ContextKeys.FocusFocused, focused);
 	}
 
 	private async onSubscriptionChanged(e: SubscriptionChangeEvent) {
@@ -86,17 +86,6 @@ export class WorkspacesWebview extends WebviewBase<State> {
 		});
 	}
 
-	private async getWorkspaces() {
-		try {
-			const rsp = await this.container.workspaces.getWorkspacesWithPullRequests();
-			console.log(rsp);
-		} catch (ex) {
-			console.log(ex);
-		}
-
-		return {};
-	}
-
 	private async getSubscription(subscription?: Subscription) {
 		const currentSubscription = subscription ?? (await this.container.subscription.getSubscription(true));
 		const isPlus = ![