Revert "Update AI settings strings" This reverts commit 4856b19c0c6fb6d11f2799d22a0d595f2c0f6895. Reason for revert: This broke some unit tests that verified these strings. Please rebase and reland with test fixes. Original change's description: > Update AI settings strings > > Update strings in AI innovation settings, Patching agent, AI annotations disclaimer > > Fixed: 431741846 > Change-Id: Ic32bd71671484454792fc12d60d28324a00d318c > Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6858995 > Commit-Queue: Natallia Harshunova <nharshunova@chromium.org> > Reviewed-by: Alina Varkki <alinavarkki@chromium.org> No-Presubmit: true No-Tree-Checks: true No-Try: true Change-Id: Ie1e4c29e64e6c336f3421ac69ca194b7b7116f55 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6862817 Auto-Submit: Eric Leese <leese@chromium.org> Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
diff --git a/config/gni/devtools_grd_files.gni b/config/gni/devtools_grd_files.gni index 88953fc..fec38b8 100644 --- a/config/gni/devtools_grd_files.gni +++ b/config/gni/devtools_grd_files.gni
@@ -198,7 +198,6 @@ "front_end/Images/keyboard-full.svg", "front_end/Images/keyboard-pen.svg", "front_end/Images/keyboard.svg", - "front_end/Images/label-auto.svg", "front_end/Images/label.svg", "front_end/Images/large-arrow-right-filled.svg", "front_end/Images/layers-filled.svg",
diff --git a/config/gni/devtools_image_files.gni b/config/gni/devtools_image_files.gni index c97ceaf..9b82581 100644 --- a/config/gni/devtools_image_files.gni +++ b/config/gni/devtools_image_files.gni
@@ -200,7 +200,6 @@ "keyboard-full.svg", "keyboard-pen.svg", "keyboard.svg", - "label-auto.svg", "label.svg", "large-arrow-right-filled.svg", "layers-filled.svg",
diff --git a/front_end/Images/src/label-auto.svg b/front_end/Images/src/label-auto.svg deleted file mode 100644 index e62c396..0000000 --- a/front_end/Images/src/label-auto.svg +++ /dev/null
@@ -1,3 +0,0 @@ -<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg"> -<path d="M3.5 16C3.08333 16 2.72917 15.8542 2.4375 15.5625C2.14583 15.2708 2 14.9167 2 14.5V9.5C2.23611 9.5 2.47222 9.5 2.70833 9.5C2.95833 9.5 3.22222 9.5 3.5 9.5V14.5H12.25L15.625 10L12.25 5.5H9.52083C9.52083 5.25 9.52083 5 9.52083 4.75C9.52083 4.5 9.52083 4.25 9.52083 4H12.25C12.4861 4 12.7083 4.05556 12.9167 4.16667C13.125 4.26389 13.3056 4.40972 13.4583 4.60417L17.5 10L13.4583 15.3958C13.3056 15.5903 13.125 15.7431 12.9167 15.8542C12.7083 15.9514 12.4861 16 12.25 16H3.5ZM4.5 8C4.48611 8 4.43056 7.95833 4.33333 7.875C4.13889 7.08333 3.75 6.40278 3.16667 5.83333C2.59722 5.25 1.91667 4.86111 1.125 4.66667C1.09722 4.65278 1.05556 4.59722 1 4.5C1 4.47222 1.04167 4.41667 1.125 4.33333C1.91667 4.13889 2.59722 3.75694 3.16667 3.1875C3.75 2.60417 4.13889 1.91667 4.33333 1.125C4.34722 1.09722 4.40278 1.05556 4.5 1C4.52778 1 4.58333 1.04167 4.66667 1.125C4.875 1.91667 5.26389 2.59722 5.83333 3.16667C6.40278 3.73611 7.08333 4.125 7.875 4.33333C7.90278 4.33333 7.94445 4.38889 8 4.5C8 4.51389 7.95833 4.56944 7.875 4.66667C7.08333 4.86111 6.39583 5.25 5.8125 5.83333C5.24306 6.40278 4.86111 7.08333 4.66667 7.875C4.66667 7.90278 4.61111 7.94444 4.5 8Z" fill="black"/> -</svg>
diff --git a/front_end/panels/ai_assistance/PatchWidget.ts b/front_end/panels/ai_assistance/PatchWidget.ts index e150694..59db51b 100644 --- a/front_end/panels/ai_assistance/PatchWidget.ts +++ b/front_end/panels/ai_assistance/PatchWidget.ts
@@ -83,11 +83,11 @@ * @description The footer disclaimer that links to more information * about the AI feature. Same text as in ChatView. */ - learnMore: 'Learn more', + learnMore: 'Learn about AI in DevTools', /** * @description Header text for the AI-powered code suggestions disclaimer dialog. */ - freDisclaimerHeader: 'Apply changes directly to your project’s source code', + freDisclaimerHeader: 'Get AI-powered code suggestions for your workspace', /** * @description First disclaimer item text for the fre dialog. */ @@ -95,13 +95,12 @@ /** * @description Second disclaimer item text for the fre dialog. */ - freDisclaimerTextPrivacy: - 'To generate code suggestions, source code from the selected folder is sent to Google. This data may be seen by human reviewers to improve this feature.', + freDisclaimerTextPrivacy: 'Source code from the selected folder is sent to Google to generate code suggestions', /** * @description Second disclaimer item text for the fre dialog when enterprise logging is off. */ freDisclaimerTextPrivacyNoLogging: - 'To generate code suggestions, source code from the selected folder is sent to Google. This data will not be used to improve Google’s AI models. Your organization may change these settings at any time.', + 'Source code from the selected folder is sent to Google to generate code suggestions. This data will not be used to improve Google’s AI models.', /** * @description Third disclaimer item text for the fre dialog. */
diff --git a/front_end/panels/ai_assistance/SelectWorkspaceDialog.test.ts b/front_end/panels/ai_assistance/SelectWorkspaceDialog.test.ts index aedc081..4bd936d 100644 --- a/front_end/panels/ai_assistance/SelectWorkspaceDialog.test.ts +++ b/front_end/panels/ai_assistance/SelectWorkspaceDialog.test.ts
@@ -2,13 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import * as i18n from '../../core/i18n/i18n.js'; -import * as Root from '../../core/root/root.js'; import * as Persistence from '../../models/persistence/persistence.js'; import * as Workspace from '../../models/workspace/workspace.js'; import {createTestFilesystem, setupAutomaticFileSystem} from '../../testing/AiAssistanceHelpers.js'; import {assertScreenshot, renderElementIntoDOM, setColorScheme} from '../../testing/DOMHelpers.js'; -import {describeWithEnvironment, updateHostConfig} from '../../testing/EnvironmentHelpers.js'; +import {describeWithEnvironment} from '../../testing/EnvironmentHelpers.js'; import {createViewFunctionStub, type ViewFunctionStub} from '../../testing/ViewFunctionHelpers.js'; import * as UI from '../../ui/legacy/legacy.js'; @@ -56,12 +54,6 @@ } describe('screenshots', () => { - beforeEach(() => { - updateHostConfig({ - aidaAvailability: {enterprisePolicyValue: Root.Runtime.GenAiEnterprisePolicyValue.ALLOW_WITHOUT_LOGGING}, - }); - }); - function renderViewForScreenshots() { const noop = () => {}; const target = document.createElement('div'); @@ -82,8 +74,6 @@ } ], selectedIndex: 0, - selectProjectRootText: i18n.i18n.lockedString( - 'Source code from the selected folder is sent to Google. This data will not be used to improve Google’s AI models. Your organization may change these settings at any time.'), showAutomaticWorkspaceNudge: false, onProjectSelected: noop, onSelectButtonClick: noop,
diff --git a/front_end/panels/ai_assistance/SelectWorkspaceDialog.ts b/front_end/panels/ai_assistance/SelectWorkspaceDialog.ts index e8aae51..6b776f8 100644 --- a/front_end/panels/ai_assistance/SelectWorkspaceDialog.ts +++ b/front_end/panels/ai_assistance/SelectWorkspaceDialog.ts
@@ -8,7 +8,6 @@ import * as Host from '../../core/host/host.js'; import * as i18n from '../../core/i18n/i18n.js'; import type * as Platform from '../../core/platform/platform.js'; -import * as Root from '../../core/root/root.js'; import * as Persistence from '../../models/persistence/persistence.js'; import * as Workspace from '../../models/workspace/workspace.js'; import * as Buttons from '../../ui/components/buttons/buttons.js'; @@ -46,12 +45,7 @@ * @description Explanation for selecting the correct workspace folder. */ selectProjectRoot: - 'Source code from the selected folder is sent to Google. This data may be seen by human reviewers to improve this feature.', - /** - * @description Explanation for selecting the correct workspace folder when enterprise logging is off. - */ - selectProjectRootNoLogging: - 'Source code from the selected folder is sent to Google. This data will not be used to improve Google’s AI models. Your organization may change these settings at any time.', + 'To save patches directly to your project, select the project root folder containing the source files of the inspected page. Relevant code snippets will be sent to Google to generate code suggestions.', } as const; const lockedString = i18n.i18n.lockedString; @@ -66,7 +60,6 @@ interface ViewInput { folders: Folder[]; selectedIndex: number; - selectProjectRootText: Platform.UIString.LocalizedString; showAutomaticWorkspaceNudge: boolean; onProjectSelected: (index: number) => void; onSelectButtonClick: () => void; @@ -84,7 +77,7 @@ <style>${selectWorkspaceDialogStyles}</style> <h2 class="dialog-header">${lockedString(UIStringsNotTranslate.selectFolder)}</h2> <div class="main-content"> - <div class="select-project-root">${input.selectProjectRootText}</div> + <div class="select-project-root">${lockedString(UIStringsNotTranslate.selectProjectRoot)}</div> ${input.showAutomaticWorkspaceNudge ? html` <!-- Hardcoding, because there is no 'getFormatLocalizedString' equivalent for 'lockedString' --> <div> @@ -231,14 +224,9 @@ } override performUpdate(): void { - const noLogging = Root.Runtime.hostConfig.aidaAvailability?.enterprisePolicyValue === - Root.Runtime.GenAiEnterprisePolicyValue.ALLOW_WITHOUT_LOGGING; - const viewInput = { folders: this.#folders, selectedIndex: this.#selectedIndex, - selectProjectRootText: noLogging ? lockedString(UIStringsNotTranslate.selectProjectRootNoLogging) : - lockedString(UIStringsNotTranslate.selectProjectRoot), showAutomaticWorkspaceNudge: this.#automaticFileSystemManager.automaticFileSystem === null && this.#automaticFileSystemManager.availability === 'available', onProjectSelected: (index: number) => {
diff --git a/front_end/panels/settings/AISettingsTab.ts b/front_end/panels/settings/AISettingsTab.ts index 585179e..12d4cf0 100644 --- a/front_end/panels/settings/AISettingsTab.ts +++ b/front_end/panels/settings/AISettingsTab.ts
@@ -62,11 +62,7 @@ /** * @description Text describing the 'Auto Annotations' feature */ - aIAnnotationsFeatureDescription: 'Automatically generate titles for performance trace annotations', - /** - * @description Text explaining AI feature helps annotate a performance trace with auto-generated labels - */ - helpAnnotatePerformance: 'Helps you annotate your performance trace with auto-generated labels', + getAIAnnotationsSuggestions: 'Get AI suggestions for performance panel annotations', /** * @description Label for a button to expand an accordion */ @@ -91,12 +87,12 @@ * @description Explainer for which data is being sent by the console insights feature */ consoleInsightsSendsData: - 'To generate explanations, the console message, associated stack trace, related source code, and the associated network headers are sent to Google. This data may be seen by human reviewers to improve this feature.', + 'The console message, associated stack trace, related source code, and the associated network headers are sent to Google to generate explanations. This data may be seen by human reviewers to improve this feature.', /** * @description Explainer for which data is being sent by the console insights feature */ consoleInsightsSendsDataNoLogging: - 'To generate explanations, the console message, associated stack trace, related source code, and the associated network headers are sent to Google. This data will not be used to improve Google’s AI models. Your organization may change these settings at any time.', + 'The console message, associated stack trace, related source code, and the associated network headers are sent to Google to generate explanations. This data will not be used to improve Google’s AI models.', /** * @description Reference to the terms of service and privacy notice * @example {Google Terms of Service} PH1 @@ -153,22 +149,22 @@ * @description Explainer for which data is being sent by the AI assistance feature */ freestylerSendsData: - 'To generate explanations, any user query and data the inspected page can access via Web APIs, network requests, files, and performance traces are sent to Google. This data may be seen by human reviewers to improve this feature. Don’t use on pages with personal or sensitive information.', + 'Any user query and data the inspected page can access via Web APIs, network requests, files, and performance traces are sent to Google to generate explanations. This data may be seen by human reviewers to improve this feature. Don’t use on pages with personal or sensitive information.', /** * @description Explainer for which data is being sent by the AI assistance feature */ freestylerSendsDataNoLogging: - 'To generate explanations, any user query and data the inspected page can access via Web APIs, network requests, files, and performance traces are sent to Google. This data will not be used to improve Google’s AI models. Your organization may change these settings at any time.', + 'Any user query and data the inspected page can access via Web APIs, network requests, files, and performance traces are sent to Google to generate explanations. This data will not be used to improve Google’s AI models.', /** * @description Explainer for which data is being sent by the AI generated annotations feature */ generatedAiAnnotationsSendData: - 'To generate annotation suggestions, your performance trace is sent to Google. This data may be seen by human reviewers to improve this feature.', + 'Your performance trace is sent to Google to generate an explanation. This data will be used to improve Google’s AI models.', /** * @description Explainer for which data is being sent by the AI assistance feature */ generatedAiAnnotationsSendDataNoLogging: - 'To generate annotation suggestions, your performance trace is sent to Google. This data will not be used to improve Google’s AI models. Your organization may change these settings at any time.', + 'Your performance trace is sent to Google to generate an explanation. This data will not be used to improve Google’s AI models.', /** * @description Description of the 'Code suggestions' feature */ @@ -178,12 +174,12 @@ * @description Explainer for which data is being sent for the 'Code suggestions' feature */ codeSuggestionsSendData: - 'To generate annotation suggestions, your performance trace is sent to Google. This data may be seen by human reviewers to improve this feature.', + 'To generate code suggestions, your console input, the history of your current console session, the currently inspected CSS, and the contents of the currently open file are shared with Google. This data may be seen by human reviewers to improve this feature.', /** * @description Explainer for which data is being sent for the 'Code suggestions' feature when logging is not enabled */ codeSuggestionsSendDataNoLogging: - 'To generate annotation suggestions, your performance trace is sent to Google. This data will not be used to improve Google’s AI models. Your organization may change these settings at any time.', + 'To generate code suggestions, your console input, the history of your current console session, the currently inspected CSS, and the contents of the currently open file are shared with Google. This data will not be used to improve Google’s AI models.', /** * @description Label for a link to the terms of service */ @@ -343,10 +339,10 @@ const aiAnnotationsData: AiSettingParams = { settingName: i18n.i18n.lockedString('Auto annotations'), iconName: 'pen-spark', - settingDescription: i18nString(UIStrings.aIAnnotationsFeatureDescription), + settingDescription: i18nString(UIStrings.getAIAnnotationsSuggestions), enableSettingText: i18nString(UIStrings.enableAiSuggestedAnnotations), settingItems: [ - {iconName: 'label-auto', text: i18nString(UIStrings.helpAnnotatePerformance)}, + {iconName: 'pen-spark', text: i18nString(UIStrings.getAIAnnotationsSuggestions)}, ], toConsiderSettingItems: [{ iconName: 'google',
diff --git a/front_end/panels/timeline/overlays/components/EntryLabelOverlay.ts b/front_end/panels/timeline/overlays/components/EntryLabelOverlay.ts index 335cc44..335d7c6 100644 --- a/front_end/panels/timeline/overlays/components/EntryLabelOverlay.ts +++ b/front_end/panels/timeline/overlays/components/EntryLabelOverlay.ts
@@ -98,13 +98,7 @@ /** * @description Second disclaimer item text for the fre dialog - trace data is sent to Google. */ - freDisclaimerPrivacyDataSentToGoogle: - 'To generate annotation suggestions, your performance trace is sent to Google. This data may be seen by human reviewers to improve this feature.', - /** - * @description Second disclaimer item text for the fre dialog - trace data is sent to Google. - */ - freDisclaimerPrivacyDataSentToGoogleNoLogging: - 'To generate annotation suggestions, your performance trace is sent to Google. This data will not be used to improve Google’s AI models. Your organization may change these settings at any time.', + freDisclaimerPrivacyDataSentToGoogle: 'Performance trace is sent to Google to generate annotation suggestions', /** * @description Third disclaimer item text part for the fre dialog part - you can control this setting from the settings panel (because 'settings panel' part of the string is a link, it is attached separately). */ @@ -116,7 +110,7 @@ /** * @description Text for the 'learn more' button displayed in fre. */ - learnMoreButton: 'Learn more', + learnMoreButton: 'Learn more about auto annotations', } as const; const enum AIButtonState { @@ -188,7 +182,7 @@ #label: string; #shouldDrawBelowEntry: boolean; #richTooltip: Lit.Directives.Ref<HTMLElement> = Directives.createRef(); - #noLogging: boolean; + /** * Required to generate a label with AI. */ @@ -238,8 +232,6 @@ this.#entryHighlightWrapper = this.#labelPartsWrapper?.querySelector<HTMLElement>('.entry-highlight-wrapper') ?? null; this.#label = label; - this.#noLogging = Root.Runtime.hostConfig.aidaAvailability?.enterprisePolicyValue === - Root.Runtime.GenAiEnterprisePolicyValue.ALLOW_WITHOUT_LOGGING; this.#drawLabel(label); // If the label is not empty, it was loaded from the trace file. // In that case, do not auto-focus it as if the user were creating it for the first time @@ -578,8 +570,7 @@ }, { iconName: 'google', - content: this.#noLogging ? lockedString(UIStringsNotTranslate.freDisclaimerPrivacyDataSentToGoogleNoLogging) : - lockedString(UIStringsNotTranslate.freDisclaimerPrivacyDataSentToGoogle), + content: lockedString(UIStringsNotTranslate.freDisclaimerPrivacyDataSentToGoogle), }, { iconName: 'gear', @@ -679,6 +670,9 @@ } #renderAiButton(): Lit.LitTemplate { + const noLogging = Root.Runtime.hostConfig.aidaAvailability?.enterprisePolicyValue === + Root.Runtime.GenAiEnterprisePolicyValue.ALLOW_WITHOUT_LOGGING; + if (this.#currAIButtonState === AIButtonState.GENERATION_FAILED) { // Only show the error message on the first component render render after the failure. // clang-format off @@ -721,7 +715,7 @@ .variant=${Buttons.Button.Variant.ICON} ></devtools-button> ${this.#renderAITooltip({ - textContent: this.#noLogging ? lockedString(UIStringsNotTranslate.generateLabelSecurityDisclaimerLogginOff) : lockedString(UIStringsNotTranslate.generateLabelSecurityDisclaimer), + textContent: noLogging ? lockedString(UIStringsNotTranslate.generateLabelSecurityDisclaimerLogginOff) : lockedString(UIStringsNotTranslate.generateLabelSecurityDisclaimer), includeSettingsButton: true, })} </span>
diff --git a/test/goldens/linux/ai_assistance/select-workspace-dialog-dark-default.png b/test/goldens/linux/ai_assistance/select-workspace-dialog-dark-default.png index 3ac4c3f..08ef808 100644 --- a/test/goldens/linux/ai_assistance/select-workspace-dialog-dark-default.png +++ b/test/goldens/linux/ai_assistance/select-workspace-dialog-dark-default.png Binary files differ
diff --git a/test/goldens/linux/ai_assistance/select-workspace-dialog-light-default.png b/test/goldens/linux/ai_assistance/select-workspace-dialog-light-default.png index 2db63c4..7c6378f 100644 --- a/test/goldens/linux/ai_assistance/select-workspace-dialog-light-default.png +++ b/test/goldens/linux/ai_assistance/select-workspace-dialog-light-default.png Binary files differ
