Fixes #3954 command links for the graph

Author: d13

src/webviews/apps/plus/graph/GraphWrapper.tsx

@@ -1344,6 +1344,10 @@ export function GraphWrapper({
 								continueCommand="gitlens.graph.continuePausedOperation"
 								abortCommand="gitlens.graph.abortPausedOperation"
 								openEditorCommand="gitlens.graph.openRebaseEditor"
+								webviewCommandContext={{
+									webview: state.webviewId,
+									webviewInstance: state.webviewInstanceId,
+								}}
 							></GlMergeConflictWarning>
 						</div>
 					)}

src/webviews/apps/plus/shared/components/merge-rebase-status.ts

@@ -74,20 +74,35 @@ export class GlMergeConflictWarning extends LitElement {
 	@property()
 	openEditorCommand = 'gitlens.home.openRebaseEditor';
 
+	@property({ type: Object })
+	webviewCommandContext?: { webview: string; webviewInstance: string | undefined };
+
 	private get onSkipUrl() {
-		return createCommandLink(this.skipCommand as Commands, this.pausedOpStatus);
+		return this.createCommandLink(this.skipCommand as Commands, this.pausedOpStatus);
 	}
 
 	private get onContinueUrl() {
-		return createCommandLink(this.continueCommand as Commands, this.pausedOpStatus);
+		return this.createCommandLink(this.continueCommand as Commands, this.pausedOpStatus);
 	}
 
 	private get onAbortUrl() {
-		return createCommandLink(this.abortCommand as Commands, this.pausedOpStatus);
+		return this.createCommandLink(this.abortCommand as Commands, this.pausedOpStatus);
 	}
 
 	private get onOpenEditorUrl() {
-		return createCommandLink(this.openEditorCommand as Commands, this.pausedOpStatus);
+		return this.createCommandLink(this.openEditorCommand as Commands, this.pausedOpStatus);
+	}
+
+	private createCommandLink(command: string, args?: any) {
+		if (this.webviewCommandContext != null) {
+			if (args == null) {
+				args = this.webviewCommandContext;
+			} else {
+				args = { ...args, ...this.webviewCommandContext };
+			}
+		}
+
+		return createCommandLink(command as Commands, args);
 	}
 
 	override render() {

src/webviews/plus/graph/graphWebview.ts

@@ -692,11 +692,10 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 			this.host.registerWebviewCommand('gitlens.graph.generateCommitMessage', this.generateCommitMessage),
 
 			this.host.registerWebviewCommand('gitlens.graph.compareSelectedCommits.multi', this.compareSelectedCommits),
-			// TODO@d13: convert to this.host.registerWebviewCommand
-			registerCommand('gitlens.graph.abortPausedOperation', this.abortPausedOperation, this),
-			registerCommand('gitlens.graph.continuePausedOperation', this.continuePausedOperation, this),
-			registerCommand('gitlens.graph.openRebaseEditor', this.openRebaseEditor, this),
-			registerCommand('gitlens.graph.skipPausedOperation', this.skipPausedOperation, this),
+			this.host.registerWebviewCommand('gitlens.graph.abortPausedOperation', this.abortPausedOperation),
+			this.host.registerWebviewCommand('gitlens.graph.continuePausedOperation', this.continuePausedOperation),
+			this.host.registerWebviewCommand('gitlens.graph.openRebaseEditor', this.openRebaseEditor),
+			this.host.registerWebviewCommand('gitlens.graph.skipPausedOperation', this.skipPausedOperation),
 		);
 
 		return commands;