diff --git a/src/webviews/apps/plus/graph/GraphWrapper.tsx b/src/webviews/apps/plus/graph/GraphWrapper.tsx index b9b25c881bdc0..489369f8a9c8f 100644 --- a/src/webviews/apps/plus/graph/GraphWrapper.tsx +++ b/src/webviews/apps/plus/graph/GraphWrapper.tsx @@ -1344,6 +1344,7 @@ export function GraphWrapper({ continueCommand="gitlens.graph.continuePausedOperation" abortCommand="gitlens.graph.abortPausedOperation" openEditorCommand="gitlens.graph.openRebaseEditor" + webviewId="gitlens.views.graph" > )} diff --git a/src/webviews/apps/plus/shared/components/merge-rebase-status.ts b/src/webviews/apps/plus/shared/components/merge-rebase-status.ts index 60a2708f7d685..8cf7243c62d42 100644 --- a/src/webviews/apps/plus/shared/components/merge-rebase-status.ts +++ b/src/webviews/apps/plus/shared/components/merge-rebase-status.ts @@ -5,6 +5,7 @@ import type { Commands } from '../../../../../constants.commands'; import type { GitPausedOperationStatus } from '../../../../../git/models/pausedOperationStatus'; import { pausedOperationStatusStringsByType } from '../../../../../git/utils/pausedOperationStatus.utils'; import { createCommandLink } from '../../../../../system/commands'; +import { createWebviewCommandLink } from '../../../../../system/webview'; import { getReferenceLabel } from '../../../shared/git-utils'; import '../../../shared/components/actions/action-item'; import '../../../shared/components/actions/action-nav'; @@ -74,20 +75,35 @@ export class GlMergeConflictWarning extends LitElement { @property() openEditorCommand = 'gitlens.home.openRebaseEditor'; + @property({ type: String }) + webviewId?: Parameters[1]; + + private createWebviewCommandLink(command: string, props: T) { + if (this.webviewId) { + return createWebviewCommandLink( + command as Parameters[0], + this.webviewId, + '', + props, + ); + } + return createCommandLink(command as Commands, props); + } + private get onSkipUrl() { - return createCommandLink(this.skipCommand as Commands, this.pausedOpStatus); + return this.createWebviewCommandLink(this.skipCommand, this.pausedOpStatus); } private get onContinueUrl() { - return createCommandLink(this.continueCommand as Commands, this.pausedOpStatus); + return this.createWebviewCommandLink(this.continueCommand, this.pausedOpStatus); } private get onAbortUrl() { - return createCommandLink(this.abortCommand as Commands, this.pausedOpStatus); + return this.createWebviewCommandLink(this.abortCommand, this.pausedOpStatus); } private get onOpenEditorUrl() { - return createCommandLink(this.openEditorCommand as Commands, this.pausedOpStatus); + return this.createWebviewCommandLink(this.openEditorCommand, this.pausedOpStatus); } override render() { diff --git a/src/webviews/plus/graph/graphWebview.ts b/src/webviews/plus/graph/graphWebview.ts index 8b5d944173054..7b835daff6b91 100644 --- a/src/webviews/plus/graph/graphWebview.ts +++ b/src/webviews/plus/graph/graphWebview.ts @@ -692,11 +692,10 @@ export class GraphWebviewProvider implements WebviewProvider