diff --git a/CHANGELOG.md b/CHANGELOG.md index d9ecba7256050..e91625b90176b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -82,6 +82,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Fixes intermittent issue with greater reliability of webview requests - Fixes an issue with autolink enrichment for issues - Fixes issues with incorrect aggregate contributor stats +- Fixes [#3841](https://github.com/gitkraken/vscode-gitlens/issues/3841) - Inspect & Graph Details: issue autolinks rendering when autolinks enabled is false ## [16.1.1] - 2024-12-20 diff --git a/src/webviews/apps/commitDetails/components/gl-commit-details.ts b/src/webviews/apps/commitDetails/components/gl-commit-details.ts index 3f0ce17eba954..56c31f30d800f 100644 --- a/src/webviews/apps/commitDetails/components/gl-commit-details.ts +++ b/src/webviews/apps/commitDetails/components/gl-commit-details.ts @@ -203,7 +203,7 @@ export class GlCommitDetails extends GlDetailsBase { } private renderAutoLinks() { - if (this.isUncommitted) return undefined; + if (this.isUncommitted || !this.state?.autolinksEnabled) return undefined; const deduped = new Map< string, diff --git a/src/webviews/commitDetails/commitDetailsWebview.ts b/src/webviews/commitDetails/commitDetailsWebview.ts index 463890944b942..7925c1129fea7 100644 --- a/src/webviews/commitDetails/commitDetailsWebview.ts +++ b/src/webviews/commitDetails/commitDetailsWebview.ts @@ -1241,7 +1241,13 @@ export class CommitDetailsWebviewProvider preferences: current.preferences, includeRichContent: current.richStateLoaded, autolinkedIssues: current.autolinkedIssues?.map(serializeIssueOrPullRequest), - pullRequest: current.pullRequest != null ? serializePullRequest(current.pullRequest) : undefined, + autolinksEnabled: configuration.get('views.commitDetails.autolinks.enabled') ?? false, + pullRequest: + configuration.get('views.commitDetails.autolinks.enabled') && + configuration.get('views.commitDetails.pullRequests.enabled') && + current.pullRequest != null + ? serializePullRequest(current.pullRequest) + : undefined, wip: serializeWipContext(wip), orgSettings: current.orgSettings, inReview: current.inReview, @@ -1426,6 +1432,7 @@ export class CommitDetailsWebviewProvider configuration.get('views.commitDetails.autolinks.enhanced') ? pauseOnCancelOrTimeoutMapTuplePromise(commit.getEnrichedAutolinks(remote)) : undefined, + configuration.get('views.commitDetails.autolinks.enabled') && configuration.get('views.commitDetails.pullRequests.enabled') ? commit.getAssociatedPullRequest(remote) : undefined, diff --git a/src/webviews/commitDetails/protocol.ts b/src/webviews/commitDetails/protocol.ts index da67d19617ff5..e11962ef0bbdc 100644 --- a/src/webviews/commitDetails/protocol.ts +++ b/src/webviews/commitDetails/protocol.ts @@ -103,6 +103,7 @@ export interface State extends WebviewState { commit?: CommitDetails; autolinkedIssues?: IssueOrPullRequest[]; + autolinksEnabled: boolean; pullRequest?: PullRequestShape; wip?: Wip; inReview?: boolean;