Skip to content

Commit 7bb46ec

Browse files
authored
chat - welcome updates (microsoft#234329)
1 parent eeec4c3 commit 7bb46ec

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "code-oss-dev",
33
"version": "1.96.0",
4-
"distro": "f656a837bb4aa14329dbe98d58c178615e959ae1",
4+
"distro": "7d14bf7e9a283e1c9ca8b18ccb0c13274a3757cf",
55
"author": {
66
"name": "Microsoft Corporation"
77
},

src/vs/base/common/product.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@ export interface IDefaultChatAgent {
310310
readonly chatWelcomeTitle: string;
311311
readonly documentationUrl: string;
312312
readonly privacyStatementUrl: string;
313+
readonly collectionDocumentationUrl: string;
313314
readonly providerId: string;
314315
readonly providerName: string;
315316
readonly providerScopes: string[];

src/vs/workbench/contrib/chat/browser/chatSetup.contribution.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
77
import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
88
import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
9-
import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
9+
import { ITelemetryService, TelemetryLevel } from '../../../../platform/telemetry/common/telemetry.js';
1010
import { AuthenticationSession, IAuthenticationService } from '../../../services/authentication/common/authentication.js';
1111
import { IProductService } from '../../../../platform/product/common/productService.js';
1212
import { IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
@@ -47,6 +47,7 @@ const defaultChat = {
4747
chatWelcomeTitle: product.defaultChatAgent?.chatWelcomeTitle ?? '',
4848
documentationUrl: product.defaultChatAgent?.documentationUrl ?? '',
4949
privacyStatementUrl: product.defaultChatAgent?.privacyStatementUrl ?? '',
50+
collectionDocumentationUrl: product.defaultChatAgent?.collectionDocumentationUrl ?? '',
5051
providerId: product.defaultChatAgent?.providerId ?? '',
5152
providerName: product.defaultChatAgent?.providerName ?? '',
5253
providerScopes: product.defaultChatAgent?.providerScopes ?? [],
@@ -102,7 +103,7 @@ class ChatSetupContribution extends Disposable implements IWorkbenchContribution
102103
@IProductService private readonly productService: IProductService,
103104
@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
104105
@IExtensionService private readonly extensionService: IExtensionService,
105-
@IInstantiationService private readonly instantiationService: IInstantiationService
106+
@IInstantiationService private readonly instantiationService: IInstantiationService,
106107
) {
107108
super();
108109

@@ -119,8 +120,10 @@ class ChatSetupContribution extends Disposable implements IWorkbenchContribution
119120
}
120121

121122
private registerChatWelcome(): void {
122-
const header = localize('setupPreamble1', "{0} is your AI pair programmer that helps you write code faster and smarter.", defaultChat.name);
123-
const footer = localize('setupPreamble2', "By proceeding you agree to the [Privacy Statement]({0}).", defaultChat.privacyStatementUrl);
123+
const header = localize('setupPreamble1', "{0} is your AI pair programmer.", defaultChat.name);
124+
const footer = this.telemetryService.telemetryLevel !== TelemetryLevel.NONE ?
125+
localize({ key: 'setupPreambleWithOptOut', comment: ['{Locked="]({0})"}'] }, "{0} may use your code snippets for product improvements. Read our [privacy statement]({1}) and learn how to [opt out]({2}).", defaultChat.name, defaultChat.privacyStatementUrl, defaultChat.collectionDocumentationUrl) :
126+
localize({ key: 'setupPreambleWithoutOptOut', comment: ['{Locked="]({0})"}'] }, "By proceeding you agree to our [privacy statement]({0}).", defaultChat.privacyStatementUrl);
124127

125128
// Setup: Triggered (signed-out)
126129
Registry.as<IChatViewsWelcomeContributionRegistry>(ChatViewsWelcomeExtensions.ChatViewsWelcomeRegistry).register({

src/vs/workbench/contrib/chat/browser/media/chatViewWelcome.css

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,13 @@ div.chat-welcome-view {
6262
& > .chat-welcome-view-progress {
6363
display: flex;
6464
gap: 6px;
65-
color: var(--vscode-descriptionForeground);
6665
text-align: center;
6766
max-width: 350px;
6867
padding: 0 20px;
6968
margin-top: 20px;
7069
}
7170

7271
& > .chat-welcome-view-message {
73-
color: var(--vscode-descriptionForeground);
7472
text-align: center;
7573
max-width: 350px;
7674
padding: 0 20px;
@@ -88,7 +86,6 @@ div.chat-welcome-view {
8886
}
8987

9088
& > .chat-welcome-view-tips {
91-
color: var(--vscode-descriptionForeground);
9289
max-width: 250px;
9390
margin-top: 10px;
9491

0 commit comments

Comments
 (0)