Skip to content

Commit 902b7ad

Browse files
jalonthomasDevtools-frontend LUCI CQ
authored andcommitted
Fix Impact Report Known Context Values to suppress errors
When the "Allowed by exception" filter chip is displayed, an "Unknown VE Context" error is emitted. 1. Change filter bar to use jslogContext instead of name for visual logging. 2. Use kebab-case in the Impact Report's jslogContext values, and modify Known Context Values accordingly. 3. Change the impression values for the network helper filter-bar items to align with the new jslogContext values Bug: 396112906 Change-Id: Ia10d5836450f2122f4948f3351c6050a07254ab2 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6190047 Reviewed-by: Danil Somsikov <[email protected]> Reviewed-by: Kim-Anh Tran <[email protected]> Commit-Queue: Jalon Thomas <[email protected]>
1 parent 1d5d955 commit 902b7ad

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

front_end/panels/security/CookieReportView.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -352,15 +352,15 @@ export class CookieReportView extends UI.Widget.VBox {
352352
name: UIStrings.blocked,
353353
label: () => i18nString(UIStrings.blocked),
354354
title: UIStrings.blocked,
355-
jslogContext: UIStrings.blocked,
355+
jslogContext: 'blocked',
356356
});
357357
}
358358
if (this.#cookieRows.values().some(n => n.status === IssuesManager.CookieIssue.CookieStatus.ALLOWED)) {
359359
filterItems.push({
360360
name: UIStrings.allowed,
361361
label: () => i18nString(UIStrings.allowed),
362362
title: UIStrings.allowed,
363-
jslogContext: UIStrings.allowed,
363+
jslogContext: 'allowed',
364364
});
365365
}
366366
if (this.#cookieRows.values().some(
@@ -370,7 +370,7 @@ export class CookieReportView extends UI.Widget.VBox {
370370
name: UIStrings.allowedByException,
371371
label: () => i18nString(UIStrings.allowedByException),
372372
title: UIStrings.allowedByException,
373-
jslogContext: UIStrings.allowedByException,
373+
jslogContext: 'allowed-by-exception',
374374
});
375375
}
376376

front_end/ui/legacy/FilterBar.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -341,12 +341,12 @@ export class NamedBitSetFilterUI extends Common.ObjectWrapper.ObjectWrapper<Filt
341341
this.typeFilterElementTypeNames = new WeakMap();
342342
this.allowedTypes = new Set();
343343
this.typeFilterElements = [];
344-
this.addBit(NamedBitSetFilterUI.ALL_TYPES, i18nString(UIStrings.allStrings));
344+
this.addBit(NamedBitSetFilterUI.ALL_TYPES, i18nString(UIStrings.allStrings), NamedBitSetFilterUI.ALL_TYPES);
345345
this.typeFilterElements[0].tabIndex = 0;
346346
this.filtersElement.createChild('div', 'filter-bitset-filter-divider');
347347

348348
for (let i = 0; i < items.length; ++i) {
349-
this.addBit(items[i].name, items[i].label(), items[i].title);
349+
this.addBit(items[i].name, items[i].label(), items[i].jslogContext, items[i].title);
350350
}
351351

352352
if (setting) {
@@ -400,7 +400,7 @@ export class NamedBitSetFilterUI extends Common.ObjectWrapper.ObjectWrapper<Filt
400400
this.dispatchEventToListeners(FilterUIEvents.FILTER_CHANGED);
401401
}
402402

403-
private addBit(name: string, label: string, title?: string): void {
403+
private addBit(name: string, label: string, jslogContext: string, title?: string): void {
404404
const typeFilterElement = this.filtersElement.createChild('span', name);
405405
typeFilterElement.tabIndex = -1;
406406
this.typeFilterElementTypeNames.set(typeFilterElement, name);
@@ -411,7 +411,7 @@ export class NamedBitSetFilterUI extends Common.ObjectWrapper.ObjectWrapper<Filt
411411
}
412412
typeFilterElement.addEventListener('click', this.onTypeFilterClicked.bind(this), false);
413413
typeFilterElement.addEventListener('keydown', this.onTypeFilterKeydown.bind(this), false);
414-
typeFilterElement.setAttribute('jslog', `${VisualLogging.item(name).track({click: true})}`);
414+
typeFilterElement.setAttribute('jslog', `${VisualLogging.item(jslogContext).track({click: true})}`);
415415
this.typeFilterElements.push(typeFilterElement);
416416
}
417417

front_end/ui/visual_logging/KnownContextValues.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,15 +211,11 @@ export const knownContextValues = new Set([
211211
'75%',
212212
'8',
213213
'9',
214-
'Allowed By Exception',
215-
'Allowed',
216-
'AllowedByException',
217214
'ArrowDown',
218215
'ArrowLeft',
219216
'ArrowRight',
220217
'ArrowUp',
221218
'Backspace',
222-
'Blocked',
223219
'CSS',
224220
'CoLoR',
225221
'Delete',
@@ -359,6 +355,8 @@ export const knownContextValues = new Set([
359355
'allow-pasting',
360356
'allow-scroll-past-eof',
361357
'allow-scroll-past-eof-false',
358+
'allowed',
359+
'allowed-by-exception',
362360
'alpha',
363361
'alt-!',
364362
'alt-:',
@@ -548,6 +546,7 @@ export const knownContextValues = new Set([
548546
'block-request-domain',
549547
'block-request-url',
550548
'block-size',
549+
'blocked',
551550
'blocked-by-response-details',
552551
'blocking',
553552
'blur',
@@ -3740,6 +3739,7 @@ export const knownContextValues = new Set([
37403739
'waiting',
37413740
'waiting-entry-inspect',
37423741
'warning',
3742+
'wasm',
37433743
'wasm-auto-stepping',
37443744
'wasm-auto-stepping-false',
37453745
'watch-test-expression',

test/e2e/helpers/network-helpers.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -186,17 +186,17 @@ export function veImpressionForNetworkPanel(options?: {newFilterBar?: boolean})
186186
'Section', 'filter-bitset',
187187
[
188188
veImpression('Item', 'all'),
189-
veImpression('Item', 'FetchandXHR'),
190-
veImpression('Item', 'Document'),
191-
veImpression('Item', 'CSS'),
192-
veImpression('Item', 'JavaScript'),
193-
veImpression('Item', 'Font'),
194-
veImpression('Item', 'Image'),
195-
veImpression('Item', 'Media'),
196-
veImpression('Item', 'Manifest'),
197-
veImpression('Item', 'WebSocket'),
198-
veImpression('Item', 'WebAssembly'),
199-
veImpression('Item', 'Other'),
189+
veImpression('Item', 'xhr'),
190+
veImpression('Item', 'document'),
191+
veImpression('Item', 'stylesheet'),
192+
veImpression('Item', 'script'),
193+
veImpression('Item', 'font'),
194+
veImpression('Item', 'image'),
195+
veImpression('Item', 'media'),
196+
veImpression('Item', 'manifest'),
197+
veImpression('Item', 'web-socket'),
198+
veImpression('Item', 'wasm'),
199+
veImpression('Item', 'other'),
200200
]),
201201
veImpression('TextField', 'filter'),
202202
veImpression('Toggle', 'invert-filter'),

0 commit comments

Comments
 (0)