Keeps the expression when popping out a debug visualizer view.

This commit is contained in:
Henning Dieterichs
2020-02-12 15:12:35 +01:00
parent d4c6e942d0
commit 1e851fe0f0
3 changed files with 15 additions and 5 deletions

View File

@@ -72,12 +72,18 @@ export class ConnectionHandler {
openInBrowser: async ({}) => {
throwIfNotAuthenticated();
const url = server.getIndexUrl({
expression: this.watcher
? this.watcher.expression
: undefined,
});
let opened = false;
if (config.useChromeKioskMode()) {
opened = await launchChrome(server.indexUrl);
opened = await launchChrome(url);
}
if (!opened) {
open(server.indexUrl);
open(url);
}
},
setPreferredDataExtractor: async ({ dataExtractorId }) => {

View File

@@ -28,9 +28,13 @@ export class Server {
});
}
public get indexUrl(): string {
public getIndexUrl(args: { expression?: string } = {}): string {
const port = process.env.USE_DEV_UI ? 8080 : this.port;
return `http://localhost:${port}/index.html?serverPort=${this.port}&serverSecret=${this.secret}`;
const expr =
args.expression !== undefined
? `&expression=${encodeURIComponent(args.expression)}`
: "";
return `http://localhost:${port}/index.html?serverPort=${this.port}&serverSecret=${this.secret}${expr}`;
}
public get mainBundleUrl(): string {

View File

@@ -89,7 +89,7 @@ export function getHtml(server: Server) {
</script>
${
isDev
? `<iframe sandbox="allow-top-navigation allow-scripts allow-same-origin allow-popups allow-pointer-lock allow-forms" src="${server.indexUrl}"></iframe>`
? `<iframe sandbox="allow-top-navigation allow-scripts allow-same-origin allow-popups allow-pointer-lock allow-forms" src="${server.getIndexUrl()}"></iframe>`
: `<script type="text/javascript" src="${server.mainBundleUrl}"></script>`
}
</body>