From 484ff70372002dfd3cefbf9271032716246c3358 Mon Sep 17 00:00:00 2001 From: Danil Somsikov Date: Tue, 23 Jul 2024 17:32:19 +0000 Subject: [PATCH] [ve] Add default jslog context value to the ToolbarFilter Bug: 348173254 Change-Id: Ifcc6bff32be9364954e15771e345dec6121ad050 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/5729987 Reviewed-by: Kim-Anh Tran Auto-Submit: Danil Somsikov Commit-Queue: Kim-Anh Tran --- .../panels/protocol_monitor/ProtocolMonitor.ts | 2 +- front_end/ui/legacy/Toolbar.ts | 2 +- test/e2e/helpers/application-helpers.ts | 13 +++++++------ test/e2e/helpers/console-helpers.ts | 6 +++--- test/e2e/helpers/network-helpers.ts | 4 ++-- test/e2e/helpers/visual-logging-helpers.ts | 2 +- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/front_end/panels/protocol_monitor/ProtocolMonitor.ts b/front_end/panels/protocol_monitor/ProtocolMonitor.ts index 43fd3f3d19..15acb6454f 100644 --- a/front_end/panels/protocol_monitor/ProtocolMonitor.ts +++ b/front_end/panels/protocol_monitor/ProtocolMonitor.ts @@ -372,7 +372,7 @@ export class ProtocolMonitorDataGrid extends Common.ObjectWrapper.eventMixin { const query = event.data as string; const filters = this.filterParser.parse(query); diff --git a/front_end/ui/legacy/Toolbar.ts b/front_end/ui/legacy/Toolbar.ts index 65dff36eb6..bfcbe533ff 100644 --- a/front_end/ui/legacy/Toolbar.ts +++ b/front_end/ui/legacy/Toolbar.ts @@ -864,7 +864,7 @@ export class ToolbarFilter extends ToolbarInput { const filterPlaceholder = filterBy ? filterBy : i18nString(UIStrings.filter); super( filterPlaceholder, filterPlaceholder, growFactor, shrinkFactor, tooltip, completions, dynamicCompletions, - jslogContext); + jslogContext || 'filter'); const filterIcon = IconButton.Icon.create('filter'); this.element.prepend(filterIcon); diff --git a/test/e2e/helpers/application-helpers.ts b/test/e2e/helpers/application-helpers.ts index 396997013e..662331e111 100644 --- a/test/e2e/helpers/application-helpers.ts +++ b/test/e2e/helpers/application-helpers.ts @@ -225,18 +225,19 @@ export async function getStorageItemsData(columns: string[], leastExpected: numb export async function filterStorageItems(filter: string) { const element = await $('.toolbar-input-prompt') as puppeteer.ElementHandle; await expectVeEvents( - [veImpressionsUnder('Panel: resources > Pane: cookies-data > Toolbar', [veImpression('TextField')])]); + [veImpressionsUnder('Panel: resources > Pane: cookies-data > Toolbar', [veImpression('TextField', 'filter')])]); await element.type(filter); await expectVeEvents([ - veChange('Panel: resources > Pane: cookies-data > Toolbar > TextField'), + veChange('Panel: resources > Pane: cookies-data > Toolbar > TextField: filter'), veImpressionsUnder( - 'Panel: resources > Pane: cookies-data > Toolbar > TextField', [veImpression('Action', 'clear')]), + 'Panel: resources > Pane: cookies-data > Toolbar > TextField: filter', [veImpression('Action', 'clear')]), ]); } export async function clearStorageItemsFilter() { await click('.toolbar-input .toolbar-input-clear-button'); - await expectVeEvents([veClick('Panel: resources > Pane: cookies-data > Toolbar > TextField > Action: clear')]); + await expectVeEvents( + [veClick('Panel: resources > Pane: cookies-data > Toolbar > TextField: filter > Action: clear')]); } export async function clearStorageItems() { @@ -396,7 +397,7 @@ function veImpressionForCookieTable() { veImpression('Action', 'storage-items-view.clear-all'), veImpression('Action', 'storage-items-view.delete-selected'), veImpression('Action', 'storage-items-view.refresh'), - veImpression('TextField'), + veImpression('TextField', 'filter'), veImpression('Toggle', 'only-show-cookies-with-issues'), ]), ]); @@ -416,7 +417,7 @@ function veImpressionForFrameDetails() { function veImpressionForStorageViewToolbar() { return veImpression('Toolbar', undefined, [ veImpression('Action', 'storage-items-view.refresh'), - veImpression('TextField'), + veImpression('TextField', 'filter'), veImpression('Action', 'storage-items-view.clear-all'), veImpression('Action', 'storage-items-view.delete-selected'), ]); diff --git a/test/e2e/helpers/console-helpers.ts b/test/e2e/helpers/console-helpers.ts index acf8121e97..01b8144436 100644 --- a/test/e2e/helpers/console-helpers.ts +++ b/test/e2e/helpers/console-helpers.ts @@ -68,7 +68,7 @@ export async function deleteConsoleMessagesFilter(frontend: puppeteer.Page) { deleteButton.click(); } }, main); - await expectVeEvents([veClick('Panel: console > Toolbar > TextField > Action: clear')]); + await expectVeEvents([veClick('Panel: console > Toolbar > TextField: filter > Action: clear')]); } export async function filterConsoleMessages(frontend: puppeteer.Page, filter: string) { @@ -81,7 +81,7 @@ export async function filterConsoleMessages(frontend: puppeteer.Page, filter: st await pasteText(filter); await frontend.keyboard.press('Tab'); if (filter.length) { - await expectVeEvents([veChange('Panel: console > Toolbar > TextField')]); + await expectVeEvents([veChange('Panel: console > Toolbar > TextField: filter')]); } } @@ -423,7 +423,7 @@ export function veImpressionForConsolePanel() { veImpression('Action', 'console.create-pin'), veImpression('DropDown', 'log-level'), veImpression('ToggleSubpane', 'console-settings'), - veImpression('TextField'), + veImpression('TextField', 'filter'), ]), veImpression('TextField', 'console-prompt'), ]); diff --git a/test/e2e/helpers/network-helpers.ts b/test/e2e/helpers/network-helpers.ts index f36b037d77..62a8675b2f 100644 --- a/test/e2e/helpers/network-helpers.ts +++ b/test/e2e/helpers/network-helpers.ts @@ -166,10 +166,10 @@ export function veImpressionForNetworkPanel(options?: {newFilterBar?: boolean}) veImpression('DropDown', 'request-types'), veImpression('DropDown', 'more-filters'), veImpression('Toggle', 'invert-filter'), - veImpression('TextField'), + veImpression('TextField', 'filter'), ] : [ - veImpression('TextField'), + veImpression('TextField', 'filter'), veImpression('Toggle', 'invert-filter'), veImpression('Toggle', 'hide-data-urls'), veImpression('Toggle', 'hide-extension-urls'), diff --git a/test/e2e/helpers/visual-logging-helpers.ts b/test/e2e/helpers/visual-logging-helpers.ts index 79a0180d12..4512bbea6d 100644 --- a/test/e2e/helpers/visual-logging-helpers.ts +++ b/test/e2e/helpers/visual-logging-helpers.ts @@ -177,7 +177,7 @@ export function veImpressionForElementsPanel(options?: {dockable?: boolean}) { veImpression('Action', 'elements.new-style-rule'), veImpression('DropDown', 'rendering-emulations'), veImpression('ToggleSubpane', 'computed-styles'), - veImpression('TextField'), + veImpression('TextField', 'filter'), ]), ]); }