From 4c8c90e7fbde8ae3c58ff7d709a05d2ac943e2ad Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Wed, 8 Jan 2025 23:01:47 +0100 Subject: [PATCH] nits --- frontend/package.json | 2 +- .../triggers/RouteEditorConfigSection.svelte | 4 ++-- .../components/triggers/WebhooksConfigSection.svelte | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index dd4a8d862f..82a304771e 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "windmill-components", - "version": "1.444.0", + "version": "1.444.2", "scripts": { "dev": "vite dev", "build": "vite build", diff --git a/frontend/src/lib/components/triggers/RouteEditorConfigSection.svelte b/frontend/src/lib/components/triggers/RouteEditorConfigSection.svelte index 1ebc2da408..7526dac043 100644 --- a/frontend/src/lib/components/triggers/RouteEditorConfigSection.svelte +++ b/frontend/src/lib/components/triggers/RouteEditorConfigSection.svelte @@ -9,7 +9,7 @@ import CopyableCodeBlock from '$lib/components/details/CopyableCodeBlock.svelte' import { bash } from 'svelte-highlight/languages' import { HttpTriggerService } from '$lib/gen' - import { page } from '$app/stores' + // import { page } from '$app/stores' import { isCloudHosted } from '$lib/cloud' import { base } from '$lib/base' import type { CaptureInfo } from './CaptureSection.svelte' @@ -59,7 +59,7 @@ } function getHttpRoute(route_path: string | undefined) { - return `${$page.url.origin}${base}/api/r/${ + return `${location.origin}${base}/api/r/${ isCloudHosted() ? $workspaceStore + '/' : '' }${route_path}` } diff --git a/frontend/src/lib/components/triggers/WebhooksConfigSection.svelte b/frontend/src/lib/components/triggers/WebhooksConfigSection.svelte index da67569709..2a50f729b4 100644 --- a/frontend/src/lib/components/triggers/WebhooksConfigSection.svelte +++ b/frontend/src/lib/components/triggers/WebhooksConfigSection.svelte @@ -15,7 +15,7 @@ import { typescript } from 'svelte-highlight/languages' import ClipboardPanel from '../details/ClipboardPanel.svelte' import { copyToClipboard } from '$lib/utils' - import { page } from '$app/stores' + // import { page } from '$app/stores' import { base } from '$lib/base' import TriggerTokens from './TriggerTokens.svelte' import { workspaceStore, userStore } from '$lib/stores' @@ -54,7 +54,7 @@ $: webhooks = isFlow ? computeFlowWebhooks(path) : computeScriptWebhooks(hash, path) function computeScriptWebhooks(hash: string | undefined, path: string) { - let webhookBase = `${$page.url.origin}${base}/api/w/${$workspaceStore}/jobs` + let webhookBase = `${location.origin}${base}/api/w/${$workspaceStore}/jobs` return { async: { hash: `${webhookBase}/run/h/${hash}`, @@ -69,7 +69,7 @@ } function computeFlowWebhooks(path: string) { - let webhooksBase = `${$page.url.origin}${base}/api/w/${$workspaceStore}/jobs` + let webhooksBase = `${location.origin}${base}/api/w/${$workspaceStore}/jobs` let urlAsync = `${webhooksBase}/run/f/${path}` let urlSync = `${webhooksBase}/run_wait_result/f/${path}` @@ -158,7 +158,7 @@ function waitForJobCompletion(UUID) { return new Promise(async (resolve, reject) => { try { const endpoint = \`${ - $page.url.origin + location.origin }/api/w/${$workspaceStore}/jobs_u/completed/get_result_maybe/\${UUID}\`; const checkResponse = await fetch(endpoint, { method: 'GET', @@ -186,7 +186,7 @@ function waitForJobCompletion(UUID) { return `${mainFunction}\n\n${triggerJobFunction}\n\n${waitForJobCompletionFunction}` } - let captureUrl = `${$page.url.origin}/api/w/${$workspaceStore}/capture_u/webhook/${ + let captureUrl = `${location.origin}/api/w/${$workspaceStore}/capture_u/webhook/${ isFlow ? 'flow' : 'script' }/${path}` @@ -211,7 +211,7 @@ ${ webhookType === 'sync' ? 'echo -E $RESULT | jq' : ` -URL="${$page.url.origin}/api/w/${$workspaceStore}/jobs_u/completed/get_result_maybe/$UUID" +URL="${location.origin}/api/w/${$workspaceStore}/jobs_u/completed/get_result_maybe/$UUID" while true; do curl -s -H "Authorization: Bearer $TOKEN" $URL -o res.json COMPLETED=$(cat res.json | jq .completed)