Skip to content

fix(trace-viewer): provide hints on how to open trace statically #10450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pavelfeldman merged 1 commit into from
Nov 20, 2021
Merged

fix(trace-viewer): provide hints on how to open trace statically #10450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions packages/playwright-core/src/web/traceViewer/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,17 @@ import '../common.css';

(async () => {
applyTheme();
navigator.serviceWorker.register('sw.bundle.js');
if (!navigator.serviceWorker.controller) {
await new Promise<void>(f => {
navigator.serviceWorker.oncontrollerchange = () => f();
});
if (window.location.protocol !== 'file:') {
navigator.serviceWorker.register('sw.bundle.js');
if (!navigator.serviceWorker.controller) {
await new Promise<void>(f => {
navigator.serviceWorker.oncontrollerchange = () => f();
});
}

// Keep SW running.
setInterval(function() { fetch('ping'); }, 10000);
}
// Keep SW running.
setInterval(function() { fetch('ping'); }, 10000);

ReactDOM.render(<Workbench/>, document.querySelector('#root'));
})();
6 changes: 3 additions & 3 deletions packages/playwright-core/src/web/traceViewer/ui/workbench.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
display: flex;
align-items: center;
justify-content: center;
box-shadow: var(--box-shadow);
flex: auto;
flex-direction: column;
background-color: #fffb;
background-color: white;
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 100;
line-height: 24px;
}

.drop-target .title {
Expand All @@ -52,7 +52,7 @@
.drop-target button {
color: rgb(255, 255, 255);
background-color: rgb(0, 122, 204);
padding: 6px 4px;
padding: 8px 12px;
border: none;
margin: 30px 0;
cursor: pointer;
Expand Down
19 changes: 17 additions & 2 deletions packages/playwright-core/src/web/traceViewer/ui/workbench.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ export const Workbench: React.FunctionComponent<{
const [selectedPropertiesTab, setSelectedPropertiesTab] = React.useState<string>('logs');
const [progress, setProgress] = React.useState<{ done: number, total: number }>({ done: 0, total: 0 });
const [dragOver, setDragOver] = React.useState<boolean>(false);
const [processingErrorMessage, setProcessingErrorMessage] = React.useState<string|null>(null);
const [processingErrorMessage, setProcessingErrorMessage] = React.useState<string | null>(null);
const [fileForLocalModeError, setFileForLocalModeError] = React.useState<string | null>(null);

const processTraceFile = (file: File) => {
const blobTraceURL = URL.createObjectURL(file);
Expand Down Expand Up @@ -73,6 +74,12 @@ export const Workbench: React.FunctionComponent<{

React.useEffect(() => {
const newTraceURL = new URL(window.location.href).searchParams.get('trace');
// Don't accept file:// URLs - this means we re opened locally.
if (newTraceURL?.startsWith('file:')) {
setFileForLocalModeError(newTraceURL);
return;
}

// Don't re-use blob file URLs on page load (results in Fetch error)
if (newTraceURL && !newTraceURL.startsWith('blob:'))
setTraceURL(newTraceURL);
Expand Down Expand Up @@ -185,7 +192,15 @@ export const Workbench: React.FunctionComponent<{
{!!progress.total && <div className='progress'>
<div className='inner-progress' style={{ width: (100 * progress.done / progress.total) + '%' }}></div>
</div>}
{!dragOver && (!traceURL || processingErrorMessage) && <div className='drop-target'>
{fileForLocalModeError && <div className='drop-target'>
<div>Trace Viewer uses Service Workers to show traces. To view trace:</div>
<div style={{ paddingTop: 20 }}>
<div>1. Click <a href={fileForLocalModeError}>here</a> to put your trace into the download shelf</div>
<div>2. Go to <a href='https://trace.playwright.dev'>trace.playwright.dev</a></div>
<div>3. Drop the trace from the download shelf into the page</div>
</div>
</div>}
{!dragOver && !fileForLocalModeError && (!traceURL || processingErrorMessage) && <div className='drop-target'>
<div className='processing-error'>{processingErrorMessage}</div>
<div className='title'>Drop Playwright Trace to load</div>
<div>or</div>
Expand Down