From 2538ac65242746adab70b91d2cc1d1298cd6b5d8 Mon Sep 17 00:00:00 2001 From: Simon Knott Date: Wed, 20 Nov 2024 15:26:07 +0100 Subject: [PATCH] apply feedback --- packages/trace-viewer/src/sw/main.ts | 5 +---- packages/trace-viewer/src/ui/uiModeView.tsx | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/trace-viewer/src/sw/main.ts b/packages/trace-viewer/src/sw/main.ts index 03f5e71106..cda3ba8cad 100644 --- a/packages/trace-viewer/src/sw/main.ts +++ b/packages/trace-viewer/src/sw/main.ts @@ -44,10 +44,7 @@ async function loadTrace(traceUrl: string, traceFileName: string | null, client: let data = clientIdToTraceUrls.get(clientId); if (!data) { const clientURL = new URL(client?.url ?? self.registration.scope); - let traceViewerServerBaseUrl = new URL('../', clientURL); - if (clientURL.searchParams.has('server')) - traceViewerServerBaseUrl = new URL(clientURL.searchParams.get('server')!, traceViewerServerBaseUrl); - + const traceViewerServerBaseUrl = new URL(clientURL.searchParams.get('server') ?? '../', clientURL); data = { limit, traceUrls: new Set(), traceViewerServer: new TraceViewerServer(traceViewerServerBaseUrl) }; clientIdToTraceUrls.set(clientId, data); } diff --git a/packages/trace-viewer/src/ui/uiModeView.tsx b/packages/trace-viewer/src/ui/uiModeView.tsx index 568effef5b..aa15e5a0a5 100644 --- a/packages/trace-viewer/src/ui/uiModeView.tsx +++ b/packages/trace-viewer/src/ui/uiModeView.tsx @@ -47,9 +47,7 @@ const xtermDataSource: XtermDataSource = { }; const searchParams = new URLSearchParams(window.location.search); -let testServerBaseUrl = new URL('../', window.location.href); -if (searchParams.has('server')) - testServerBaseUrl = new URL(searchParams.get('server')!, testServerBaseUrl); +const testServerBaseUrl = new URL(searchParams.get('server') ?? '../', window.location.href); const wsURL = new URL(searchParams.get('ws')!, testServerBaseUrl); wsURL.protocol = (wsURL.protocol === 'https:' ? 'wss:' : 'ws:'); const queryParams = {