Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.
TypeScript automationchromechromiume2e-testingelectronend-to-end-testingfirefoxjavascriptplaywrighttesttest-automationtestingtesting-toolswebwebkit
chore(trace viewer): update actions list filter (#37554)
Dmitry Gozman81ecc95ce6ba
diff --git a/packages/trace-viewer/src/ui/metadataView.tsx b/packages/trace-viewer/src/ui/metadataView.tsxindex 9d2e1c207c..ac511a21e3 100644--- a/packages/trace-viewer/src/ui/metadataView.tsx+++ b/packages/trace-viewer/src/ui/metadataView.tsx@@ -27,7 +27,7 @@ export const MetadataView: React.FunctionComponent<{const wallTime = model.wallTime !== undefined ? new Date(model.wallTime).toLocaleString(undefined, { timeZoneName: 'short' }) : undefined;- return <div className='vbox' style={{ flexShrink: 0 }}>+ return <div style={{ flex: 'auto', display: 'block', overflow: 'hidden auto' }}><div className='call-section' style={{ paddingTop: 2 }}>Time</div>{!!wallTime && <div className='call-line'>start time:<span className='call-value datetime' title={wallTime}>{wallTime}</span></div>}<div className='call-line'>duration:<span className='call-value number' title={msToString(model.endTime - model.startTime)}>{msToString(model.endTime - model.startTime)}</span></div>diff --git a/packages/trace-viewer/src/ui/modelUtil.ts b/packages/trace-viewer/src/ui/modelUtil.tsindex cd5ed0a168..5f8c3da6e9 100644--- a/packages/trace-viewer/src/ui/modelUtil.ts+++ b/packages/trace-viewer/src/ui/modelUtil.ts@@ -84,6 +84,7 @@ export class MultiTraceModel {readonly testIdAttributeName: string | undefined;readonly sources: Map<string, SourceModel>;resources: ResourceSnapshot[];+ readonly actionCounters: Map<string, number>;constructor(contexts: ContextEntry[]) {@@ -116,6 +117,13 @@ export class MultiTraceModel {this.resources.sort((a1, a2) => a1._monotonicTime! - a2._monotonicTime!);this.errorDescriptors = this.hasStepData ? this._errorDescriptorsFromTestRunner() : this._errorDescriptorsFromActions();this.sources = collectSources(this.actions, this.errorDescriptors);++ this.actionCounters = new Map();+ for (const action of this.actions) {+ action.group = action.group ?? getActionGroup({ type: action.class, method: action.method });+ if (action.group)+ this.actionCounters.set(action.group, 1 + (this.actionCounters.get(action.group) || 0));+ }}failedAction() {@@ -125,10 +133,7 @@ export class MultiTraceModel {filteredActions(actionsFilter: ActionGroup[]) {const filter = new Set<string>(actionsFilter);- return this.actions.filter(action => {- const group = action.group ?? getActionGroup({ type: action.class, method: action.method });- return !group || filter.has(group);- });+ return this.actions.filter(action => !action.group || filter.has(action.group));}private _errorDescriptorsFromActions(): ErrorDescription[] {diff --git a/packages/trace-viewer/src/ui/settingsView.css b/packages/trace-viewer/src/ui/settingsView.cssindex 68d8a6a751..62bcc2a2a4 100644--- a/packages/trace-viewer/src/ui/settingsView.css+++ b/packages/trace-viewer/src/ui/settingsView.css@@ -50,3 +50,16 @@.settings-view .setting-select:not(:first-child) {margin-top: 4px;}++.settings-view .setting-counter {+ padding: 0 4px;+ background: var(--vscode-menu-separatorBackground);+ border-radius: 9px;+ height: 18px;+ margin-left: 4px;+ line-height: 18px;+ min-width: 18px;+ display: inline-flex;+ align-items: center;+ justify-content: center;+}diff --git a/packages/trace-viewer/src/ui/settingsView.tsx b/packages/trace-viewer/src/ui/settingsView.tsxindex cc50343817..12bb8f1788 100644--- a/packages/trace-viewer/src/ui/settingsView.tsx+++ b/packages/trace-viewer/src/ui/settingsView.tsx@@ -20,6 +20,7 @@ import './settingsView.css';export type Setting = {name: string;title?: string;+ count?: number;} & ({type: 'check',value: boolean;@@ -60,13 +61,13 @@ const renderSetting = (setting: Setting, labelId: string) => {checked={setting.value}onChange={() => setting.set(!setting.value)}/>- <label htmlFor={labelId}>{setting.name}</label>+ <label htmlFor={labelId}>{setting.name}{!!setting.count && <span className='setting-counter'>{setting.count}</span>}</label></>);case 'select':return (<>- <label htmlFor={labelId}>{setting.name}:</label>+ <label htmlFor={labelId}>{setting.name}:{!!setting.count && <span className='setting-counter'>{setting.count}</span>}</label><select id={labelId} value={setting.value} onChange={e => setting.set(e.target.value)}>{setting.options.map(option => (<option key={option.value} value={option.value}>diff --git a/packages/trace-viewer/src/ui/workbench.css b/packages/trace-viewer/src/ui/workbench.cssindex b3684c2b71..81080c68d7 100644--- a/packages/trace-viewer/src/ui/workbench.css+++ b/packages/trace-viewer/src/ui/workbench.css@@ -38,3 +38,18 @@align-items: center;color: var(--vscode-editorCodeLens-foreground);}++.workbench-actions-status-bar {+ padding: 2px;+ flex: none;+ display: flex;+ align-items: center;+ justify-content: flex-end;+ border-top: 1px solid var(--vscode-panel-border);+}++.workbench-actions-hidden-count {+ padding-right: 4px;+ user-select: none;+ color: var(--vscode-editorCodeLens-foreground);+}diff --git a/packages/trace-viewer/src/ui/workbench.tsx b/packages/trace-viewer/src/ui/workbench.tsxindex 0989e87deb..932434f40b 100644--- a/packages/trace-viewer/src/ui/workbench.tsx+++ b/packages/trace-viewer/src/ui/workbench.tsx@@ -82,6 +82,7 @@ export const Workbench: React.FunctionComponent<{}, []);const actions = React.useMemo(() => model?.filteredActions(actionsFilter), [model, actionsFilter]);+ const hiddenActionsCount = (model?.actions.length ?? 0) - (actions?.length ?? 0);const highlightedAction = React.useMemo(() => {return actions?.find(a => a.callId === highlightedCallId);@@ -317,6 +318,10 @@ export const Workbench: React.FunctionComponent<{revealConsole={() => selectPropertiesTab('console')}isLive={isLive}/>+ <div className='workbench-actions-status-bar'>+ {!!hiddenActionsCount && <span className='workbench-actions-hidden-count' title={hiddenActionsCount + ' actions hidden by filters'}>{hiddenActionsCount} hidden</span>}+ <ActionsFilterButton counters={model?.actionCounters} />+ </div></div>};const metadataTab: TabbedPaneTabModel = {@@ -360,7 +365,6 @@ export const Workbench: React.FunctionComponent<{tabs={[actionsTab, metadataTab]}selectedTab={selectedNavigatorTab}setSelectedTab={setSelectedNavigatorTab}- rightToolbar={[<ActionsFilterButton key='filter'/>]}/>}/>}@@ -383,9 +387,9 @@ export const Workbench: React.FunctionComponent<{</div>;};-const ActionsFilterButton: React.FC<{}> = () => {+const ActionsFilterButton: React.FC<{ counters?: Map<string, number> }> = ({ counters }) => {const [actionsFilter, setActionsFilter] = useSetting<ActionGroup[]>('actionsFilter', []);- return <DialogToolbarButton icon='filter' title='Filter actions'>+ return <DialogToolbarButton icon='filter' title='Filter actions' dialogDataTestId='actions-filter-dialog'><SettingsViewsettings={[{@@ -393,18 +397,21 @@ const ActionsFilterButton: React.FC<{}> = () => {value: actionsFilter.includes('getter'),set: value => setActionsFilter(value ? [...actionsFilter, 'getter'] : actionsFilter.filter(a => a !== 'getter')),name: 'Getters',+ count: counters?.get('getter'),},{type: 'check',value: actionsFilter.includes('route'),set: value => setActionsFilter(value ? [...actionsFilter, 'route'] : actionsFilter.filter(a => a !== 'route')),name: 'Network routes',+ count: counters?.get('route'),},{type: 'check',value: actionsFilter.includes('configuration'),set: value => setActionsFilter(value ? [...actionsFilter, 'configuration'] : actionsFilter.filter(a => a !== 'configuration')),name: 'Configuration',+ count: counters?.get('configuration'),},]}/>diff --git a/packages/web/src/components/dialog.tsx b/packages/web/src/components/dialog.tsxindex df40bde3fb..3a6e0b142a 100644--- a/packages/web/src/components/dialog.tsx+++ b/packages/web/src/components/dialog.tsx@@ -57,7 +57,7 @@ export const Dialog: React.FC<React.PropsWithChildren<DialogProps>> = ({top: bounds.bottom + (verticalOffset ?? 0),left: buildTopLeftCoord(bounds, width ?? 0),width,- zIndex: 100,+ zIndex: 110, // on top of split view resizer...externalStyle};}diff --git a/tests/library/trace-viewer.spec.ts b/tests/library/trace-viewer.spec.tsindex 064be8097f..eea630c49d 100644--- a/tests/library/trace-viewer.spec.ts+++ b/tests/library/trace-viewer.spec.ts@@ -1955,7 +1955,7 @@ test('should load trace from HTTP with progress indicator', async ({ showTraceViawait expect(traceViewer.actionTitles).toContainText([/Create page/]);});-test('should show all actions', async ({ runAndTrace, page }) => {+test('should filter actions', async ({ runAndTrace, page }) => {const traceViewer = await runAndTrace(async () => {await page.route('**/*', async route => {await route.fulfill({ contentType: 'text/html', body: '<input type=checkbox checked>' });@@ -1969,9 +1969,25 @@ test('should show all actions', async ({ runAndTrace, page }) => {/Navigate to/,/Expect "toBeChecked"/,]);+ await expect(traceViewer.page.getByText('3 hidden', { exact: true })).toBeVisible();++ await traceViewer.page.getByRole('button', { name: 'Filter actions' }).click();+ await expect(traceViewer.page.getByTestId('actions-filter-dialog')).toMatchAriaSnapshot(`+ - dialog:+ - checkbox "Getters 1"+ - checkbox "Network routes 2"+ - checkbox "Configuration"+ `);- await traceViewer.showAllActions();+ await traceViewer.page.locator('.setting').getByText('Getters').click();+ await expect(traceViewer.actionTitles).toHaveText([+ /Navigate to/,+ /Get attribute "checked"/,+ /Expect "toBeChecked"/,+ ]);+ await expect(traceViewer.page.getByText('2 hidden', { exact: true })).toBeVisible();+ await traceViewer.page.locator('.setting').getByText('Network routes').click();await expect(traceViewer.actionTitles).toHaveText([/Route requests/,/Navigate to/,