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
fix(trace-viewer): Don't show 'Merge files' setting in trace viewer (#38021)
Chrise45b5732ab09
diff --git a/packages/trace-viewer/src/ui/defaultSettingsView.tsx b/packages/trace-viewer/src/ui/defaultSettingsView.tsxindex 547af5fdca..348b77b928 100644--- a/packages/trace-viewer/src/ui/defaultSettingsView.tsx+++ b/packages/trace-viewer/src/ui/defaultSettingsView.tsx@@ -15,14 +15,16 @@*/import * as React from 'react';-import { SettingsView } from './settingsView';+import { type Setting, SettingsView } from './settingsView';import { useDarkModeSetting } from '@web/theme';import { useSetting } from '@web/uiUtils';/*** A view of the collection of standard settings used between various applications*/-export const DefaultSettingsView: React.FC<{}> = () => {+export const DefaultSettingsView: React.FC<{+ location: 'ui-mode' | 'trace-viewer'+}> = ({ location }) => {const [shouldPopulateCanvasFromScreenshot,setShouldPopulateCanvasFromScreenshot,@@ -39,12 +41,12 @@ export const DefaultSettingsView: React.FC<{}> = () => {set: setDarkMode,name: 'Dark mode'},- {+ ...(location === 'ui-mode' ? [{type: 'check',value: mergeFiles,set: setMergeFiles,name: 'Merge files'- },+ } satisfies Setting] : []),{type: 'check',value: shouldPopulateCanvasFromScreenshot,diff --git a/packages/trace-viewer/src/ui/uiModeView.tsx b/packages/trace-viewer/src/ui/uiModeView.tsxindex 4399d2d13e..c81726e803 100644--- a/packages/trace-viewer/src/ui/uiModeView.tsx+++ b/packages/trace-viewer/src/ui/uiModeView.tsx@@ -520,7 +520,7 @@ export const UIModeView: React.FC<{}> = ({/><div className='section-title'>Settings</div></Toolbar>- {settingsVisible && <DefaultSettingsView />}+ {settingsVisible && <DefaultSettingsView location='ui-mode' />}</div>}/>diff --git a/packages/trace-viewer/src/ui/workbenchLoader.tsx b/packages/trace-viewer/src/ui/workbenchLoader.tsxindex 5b0efa0498..a777394512 100644--- a/packages/trace-viewer/src/ui/workbenchLoader.tsx+++ b/packages/trace-viewer/src/ui/workbenchLoader.tsx@@ -183,7 +183,7 @@ export const WorkbenchLoader: React.FunctionComponent<{{model.title && <div className='title'>{model.title}</div>}<div className='spacer'></div><DialogToolbarButton icon='settings-gear' title='Settings' dialogDataTestId='settings-toolbar-dialog'>- <DefaultSettingsView />+ <DefaultSettingsView location='trace-viewer' /></DialogToolbarButton></div><Workbench model={model} inert={showFileUploadDropArea} />