Adds Open in "View" command to branch cards

Author: eamodio

docs/telemetry-events.md

@@ -54,6 +54,7 @@ type InternalHomeWebviewCommands =
 	| 'gitlens.home.switchToBranch'
 	| 'gitlens.home.fetch'
 	| 'gitlens.home.openInGraph'
+	| 'gitlens.openInView.branch:home'
 	| 'gitlens.home.createBranch'
 	| 'gitlens.home.mergeIntoCurrent'
 	| 'gitlens.home.rebaseCurrentOnto'

src/constants.commands.ts

@@ -475,7 +475,7 @@ export abstract class GlBranchCardBase extends GlElement {
 	}
 
 	get isWorktree(): boolean {
-		return this.branch.worktree != null;
+		return this.branch.worktree != null && !this.branch.worktree.isDefault;
 	}
 
 	get cardIndicator(): GlCard['indicator'] {
@@ -951,7 +951,7 @@ export class GlBranchCard extends GlBranchCardBase {
 	protected getCollapsedActions(): TemplateResult[] {
 		const actions = [];
 
-		if (this.branch.worktree) {
+		if (this.isWorktree) {
 			actions.push(
 				html`<action-item
 					label="Open Worktree"
@@ -974,6 +974,22 @@ export class GlBranchCard extends GlBranchCardBase {
 			);
 		}
 
+		actions.push(
+			html`<action-item
+				label="Open in Commit Graph"
+				icon="gl-graph"
+				href=${createCommandLink('gitlens.home.openInGraph', {
+					...this.branchRef,
+					type: 'branch',
+				} satisfies OpenInGraphParams)}
+			></action-item>`,
+			html`<action-item
+				label=${this.isWorktree ? 'Open in Worktrees View' : 'Open in Branches View'}
+				icon="arrow-right"
+				href=${this.createCommandLink('gitlens.openInView.branch:home')}
+			></action-item>`,
+		);
+
 		return actions;
 	}
 
@@ -982,7 +998,7 @@ export class GlBranchCard extends GlBranchCardBase {
 
 		const aiEnabled = this._homeState.orgSettings.ai && this._homeState.aiEnabled;
 
-		if (this.branch.worktree) {
+		if (this.isWorktree) {
 			actions.push(
 				html`<action-item
 					label="Open Worktree"
@@ -1070,6 +1086,11 @@ export class GlBranchCard extends GlBranchCardBase {
 					type: 'branch',
 				} satisfies OpenInGraphParams)}
 			></action-item>`,
+			html`<action-item
+				label=${this.isWorktree ? 'Open in Worktrees View' : 'Open in Branches View'}
+				icon="arrow-right"
+				href=${this.createCommandLink('gitlens.openInView.branch:home')}
+			></action-item>`,
 		);
 
 		return actions;

src/webviews/apps/plus/home/components/branch-card.ts

@@ -20,9 +20,11 @@ import {
 import type { HomeTelemetryContext, Source } from '../../constants.telemetry';
 import type { Container } from '../../container';
 import { executeGitCommand } from '../../git/actions';
+import { revealBranch } from '../../git/actions/branch';
 import { openComparisonChanges } from '../../git/actions/commit';
 import { abortPausedOperation, continuePausedOperation, skipPausedOperation } from '../../git/actions/pausedOperation';
 import * as RepoActions from '../../git/actions/repository';
+import { revealWorktree } from '../../git/actions/worktree';
 import type { BranchContributionsOverview } from '../../git/gitProvider';
 import type { GitBranch } from '../../git/models/branch';
 import type { GitFileChangeShape } from '../../git/models/fileChange';
@@ -363,6 +365,7 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 			registerCommand('gitlens.home.openInGraph', this.openInGraph, this),
 			registerCommand('gitlens.visualizeHistory.repo:home', this.openInTimeline, this),
 			registerCommand('gitlens.visualizeHistory.branch:home', this.openInTimeline, this),
+			registerCommand('gitlens.openInView.branch:home', this.openInView, this),
 			registerCommand('gitlens.home.createBranch', this.createBranch, this),
 			registerCommand('gitlens.home.mergeIntoCurrent', this.mergeIntoCurrent, this),
 			registerCommand('gitlens.home.rebaseCurrentOnto', this.rebaseCurrentOnto, this),
@@ -527,6 +530,22 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 		}
 	}
 
+	@log<HomeWebviewProvider['openInView']>({
+		args: { 0: p => `repoPath=${p?.repoPath}, branchId=${p?.branchId}` },
+	})
+	private async openInView(params: BranchRef) {
+		const { repo, branch } = await this.getRepoInfoFromRef(params);
+		if (repo == null || branch == null) return;
+
+		// Show in the Worktrees or Branches view depending
+		const worktree = await branch.getWorktree();
+		if (worktree != null && !worktree.isDefault) {
+			await revealWorktree(worktree, { select: true, focus: true, expand: true });
+		} else {
+			await revealBranch(branch, { select: true, focus: true, expand: true });
+		}
+	}
+
 	@log()
 	private createBranch() {
 		this.container.telemetry.sendEvent('home/createBranch');