Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

apply feedback

Browse source
This commit is contained in:
Simon Knott 2024-11-20 15:26:07 +01:00
parent 29b15dea57
commit 2538ac6524
No known key found for this signature in database
GPG key ID: 8CEDC00028084AEC
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packages/trace-viewer/src/sw/main.ts
View file

@ -44,10 +44,7 @@ async function loadTrace(traceUrl: string, traceFileName: string | null, client:
let data = clientIdToTraceUrls.get(clientId); let data = clientIdToTraceUrls.get(clientId);
if (!data) { if (!data) {
const clientURL = new URL(client?.url ?? self.registration.scope); const clientURL = new URL(client?.url ?? self.registration.scope);
let traceViewerServerBaseUrl = new URL('../', clientURL); const traceViewerServerBaseUrl = new URL(clientURL.searchParams.get('server') ?? '../', clientURL);
if (clientURL.searchParams.has('server'))
traceViewerServerBaseUrl = new URL(clientURL.searchParams.get('server')!, traceViewerServerBaseUrl);
data = { limit, traceUrls: new Set(), traceViewerServer: new TraceViewerServer(traceViewerServerBaseUrl) }; data = { limit, traceUrls: new Set(), traceViewerServer: new TraceViewerServer(traceViewerServerBaseUrl) };
clientIdToTraceUrls.set(clientId, data); clientIdToTraceUrls.set(clientId, data);
} }

4
packages/trace-viewer/src/ui/uiModeView.tsx
View file

@ -47,9 +47,7 @@ const xtermDataSource: XtermDataSource = {
}; };
const searchParams = new URLSearchParams(window.location.search); const searchParams = new URLSearchParams(window.location.search);
let testServerBaseUrl = new URL('../', window.location.href); const testServerBaseUrl = new URL(searchParams.get('server') ?? '../', window.location.href);
if (searchParams.has('server'))
testServerBaseUrl = new URL(searchParams.get('server')!, testServerBaseUrl);
const wsURL = new URL(searchParams.get('ws')!, testServerBaseUrl); const wsURL = new URL(searchParams.get('ws')!, testServerBaseUrl);
wsURL.protocol = (wsURL.protocol === 'https:' ? 'wss:' : 'ws:'); wsURL.protocol = (wsURL.protocol === 'https:' ? 'wss:' : 'ws:');
const queryParams = { const queryParams = {