windmill-components 1.642.0 → 1.655.0

package/package/components/workspaceSettings/DucklakeSettings.svelte

@@ -30,144 +30,102 @@ export function convertDucklakeSettingsToBackend(settings) {
 }
 </script>
 
-<script>
-	import { Plus, SettingsIcon } from 'lucide-svelte'
-
-	import Button from '../common/button/Button.svelte'
-	import SettingsFooter from './SettingsFooter.svelte'
-
-	import Description from '../Description.svelte'
-	import { random_adj } from '../random_positive_adjetive'
-	import { DataTable, Cell, Row } from '../table'
-	import Head from '../table/Head.svelte'
-	import CloseButton from '../common/CloseButton.svelte'
-	import Select from '../select/Select.svelte'
-	import ResourcePicker from '../ResourcePicker.svelte'
-	import { usePromise } from '../../svelte5Utils.svelte'
-	import { SettingService, WorkspaceService } from '../../gen'
-	import type { GetSettingsResponse } from '../../gen'
-
-	import { globalDbManagerDrawer, workspaceStore } from '../../stores'
-	import { sendUserToast } from '../../toast'
-	import ExploreAssetButton from '../ExploreAssetButton.svelte'
-	import Tooltip from '../Tooltip.svelte'
-	import ConfirmationModal from '../common/confirmationModal/ConfirmationModal.svelte'
-	import { createAsyncConfirmationModal } from '../common/confirmationModal/asyncConfirmationModal.svelte'
-	import { clone } from '../../utils'
-	import Alert from '../common/alert/Alert.svelte'
-	import { deepEqual } from 'fast-equals'
-	import Popover from '../meltComponents/Popover.svelte'
-	import TextInput from '../text_input/TextInput.svelte'
-	import { slide } from 'svelte/transition'
-	import { isCustomInstanceDbEnabled } from './utils.svelte'
-	import { resource } from 'runed'
-	import CustomInstanceDbSelect from './CustomInstanceDbSelect.svelte'
-	import Label from '../Label.svelte'
-
-	const DEFAULT_DUCKLAKE_CATALOG_NAME = 'ducklake_catalog'
-
-	type Props = {
-		ducklakeSettings: DucklakeSettingsType
-		ducklakeSavedSettings: DucklakeSettingsType
-		onSave?: () => void
-		onDiscard?: () => void
-	}
-	let {
-		ducklakeSettings = $bindable(),
-		ducklakeSavedSettings = $bindable(),
-		onSave: onSaveProp = undefined,
-		onDiscard = undefined
-	}: Props = $props()
-
-	function onNewDucklake() {
-		const name = ducklakeSettings.ducklakes.some((d) => d.name === 'main')
-			? `${random_adj()}_ducklake`
-			: 'main'
-		ducklakeSettings.ducklakes.push({
-			name,
-			catalog: {
-				resource_type: $isCustomInstanceDbEnabled ? 'instance' : 'postgresql',
-				resource_path: $isCustomInstanceDbEnabled ? DEFAULT_DUCKLAKE_CATALOG_NAME : undefined
-			},
-			storage: {
-				storage: undefined,
-				path: ''
-			}
-		})
-	}
-
-	function removeDucklake(index: number) {
-		ducklakeSettings.ducklakes.splice(index, 1)
-	}
-
-	const ducklakeIsDirty: Record<string, boolean> = $derived(
-		Object.fromEntries(
-			ducklakeSettings.ducklakes.map((d) => {
-				const saved = ducklakeSavedSettings.ducklakes.find((saved) => saved.name === d.name)
-				return [d.name, !deepEqual(saved, d)] as const
-			})
-		)
-	)
-
-	let hasUnsavedChanges = $derived(
-		ducklakeSavedSettings.ducklakes.length !== ducklakeSettings.ducklakes.length ||
-			!Object.values(ducklakeIsDirty).every((v) => v === false)
-	)
-
-	const customInstanceDbs = resource([], SettingService.listCustomInstanceDbs)
-
-	async function onSave() {
-		try {
-			if (
-				$isCustomInstanceDbEnabled &&
-				ducklakeSettings.ducklakes.some(
-					(d) =>
-						d.catalog.resource_type === 'instance' &&
-						!customInstanceDbs.current?.[d.catalog.resource_path ?? '']?.success
-				)
-			) {
-				let confirm = await confirmationModal.ask({
-					title: 'Some instance databases are not setup',
-					children: 'Are you sure you want to save without setting them up ?',
-					confirmationText: 'Save anyway'
-				})
-				if (!confirm) return
-			}
-			const settings = convertDucklakeSettingsToBackend(ducklakeSettings)
-			await WorkspaceService.editDucklakeConfig({
-				workspace: $workspaceStore!,
-				requestBody: { settings }
-			})
-			ducklakeSavedSettings = clone(ducklakeSettings)
-			sendUserToast('Ducklake settings saved successfully')
-			onSaveProp?.()
-		} catch (e) {
-			sendUserToast(e, true)
-			console.error('Error saving ducklake settings', e)
-			throw e
-		}
-	}
-
-	let secondaryStorageNames = usePromise(
-		() => SettingService.getSecondaryStorageNames({ workspace: $workspaceStore! }),
-		{ loadInit: false }
-	)
-	$effect(() => {
-		$workspaceStore
-		secondaryStorageNames.refresh()
-	})
-
-	let tableHeadNames = ['Name', 'Catalog', 'Workspace storage', '', ''] as const
-
-	let tableHeadTooltips: Partial<Record<(typeof tableHeadNames)[number], string | undefined>> = {
-		Name: "Ducklakes are referenced in DuckDB scripts with the <code class='px-1 py-0.5 border rounded-md'>ATTACH 'ducklake://name' AS dl;</code> syntax",
-		Catalog: 'Ducklake needs an SQL database to store metadata about the data',
-		'Workspace storage':
-			'Where the data is actually stored, in parquet format. You need to configure a workspace storage first'
-	}
-
-	let dbManagerDrawer = $derived(globalDbManagerDrawer.val)
-	let confirmationModal = createAsyncConfirmationModal()
+<script lang="ts">import { Plus, SettingsIcon } from 'lucide-svelte';
+import Button from '../common/button/Button.svelte';
+import SettingsFooter from './SettingsFooter.svelte';
+import Description from '../Description.svelte';
+import { random_adj } from '../random_positive_adjetive';
+import { DataTable, Cell, Row } from '../table';
+import Head from '../table/Head.svelte';
+import CloseButton from '../common/CloseButton.svelte';
+import Select from '../select/Select.svelte';
+import ResourcePicker from '../ResourcePicker.svelte';
+import { usePromise } from '../../svelte5Utils.svelte';
+import { SettingService, WorkspaceService } from '../../gen';
+import { workspaceStore } from '../../stores';
+import { sendUserToast } from '../../toast';
+import ExploreAssetButton from '../ExploreAssetButton.svelte';
+import Tooltip from '../Tooltip.svelte';
+import ConfirmationModal from '../common/confirmationModal/ConfirmationModal.svelte';
+import { createAsyncConfirmationModal } from '../common/confirmationModal/asyncConfirmationModal.svelte';
+import { clone } from '../../utils';
+import Alert from '../common/alert/Alert.svelte';
+import { deepEqual } from 'fast-equals';
+import Popover from '../meltComponents/Popover.svelte';
+import TextInput from '../text_input/TextInput.svelte';
+import { slide } from 'svelte/transition';
+import { isCustomInstanceDbEnabled } from './utils.svelte';
+import { resource } from 'runed';
+import CustomInstanceDbSelect from './CustomInstanceDbSelect.svelte';
+import Label from '../Label.svelte';
+const DEFAULT_DUCKLAKE_CATALOG_NAME = 'ducklake_catalog';
+let { ducklakeSettings = $bindable(), ducklakeSavedSettings = $bindable(), onSave: onSaveProp = undefined, onDiscard = undefined } = $props();
+function onNewDucklake() {
+    const name = ducklakeSettings.ducklakes.some((d) => d.name === 'main')
+        ? `${random_adj()}_ducklake`
+        : 'main';
+    ducklakeSettings.ducklakes.push({
+        name,
+        catalog: {
+            resource_type: $isCustomInstanceDbEnabled ? 'instance' : 'postgresql',
+            resource_path: $isCustomInstanceDbEnabled ? DEFAULT_DUCKLAKE_CATALOG_NAME : undefined
+        },
+        storage: {
+            storage: undefined,
+            path: ''
+        }
+    });
+}
+function removeDucklake(index) {
+    ducklakeSettings.ducklakes.splice(index, 1);
+}
+const ducklakeIsDirty = $derived(Object.fromEntries(ducklakeSettings.ducklakes.map((d) => {
+    const saved = ducklakeSavedSettings.ducklakes.find((saved) => saved.name === d.name);
+    return [d.name, !deepEqual(saved, d)];
+})));
+let hasUnsavedChanges = $derived(ducklakeSavedSettings.ducklakes.length !== ducklakeSettings.ducklakes.length ||
+    !Object.values(ducklakeIsDirty).every((v) => v === false));
+const customInstanceDbs = resource([], SettingService.listCustomInstanceDbs);
+async function onSave() {
+    try {
+        if ($isCustomInstanceDbEnabled &&
+            ducklakeSettings.ducklakes.some((d) => d.catalog.resource_type === 'instance' &&
+                !customInstanceDbs.current?.[d.catalog.resource_path ?? '']?.success)) {
+            let confirm = await confirmationModal.ask({
+                title: 'Some instance databases are not setup',
+                children: 'Are you sure you want to save without setting them up ?',
+                confirmationText: 'Save anyway'
+            });
+            if (!confirm)
+                return;
+        }
+        const settings = convertDucklakeSettingsToBackend(ducklakeSettings);
+        await WorkspaceService.editDucklakeConfig({
+            workspace: $workspaceStore,
+            requestBody: { settings }
+        });
+        ducklakeSavedSettings = clone(ducklakeSettings);
+        sendUserToast('Ducklake settings saved successfully');
+        onSaveProp?.();
+    }
+    catch (e) {
+        sendUserToast(e, true);
+        console.error('Error saving ducklake settings', e);
+        throw e;
+    }
+}
+let secondaryStorageNames = usePromise(() => SettingService.getSecondaryStorageNames({ workspace: $workspaceStore }), { loadInit: false });
+$effect(() => {
+    $workspaceStore;
+    secondaryStorageNames.refresh();
+});
+let tableHeadNames = ['Name', 'Catalog', 'Workspace storage', '', ''];
+let tableHeadTooltips = {
+    Name: "Ducklakes are referenced in DuckDB scripts with the <code class='px-1 py-0.5 border rounded-md'>ATTACH 'ducklake://name' AS dl;</code> syntax",
+    Catalog: 'Ducklake needs an SQL database to store metadata about the data',
+    'Workspace storage': 'Where the data is actually stored, in parquet format. You need to configure a workspace storage first'
+};
+let confirmationModal = createAsyncConfirmationModal();
 </script>
 
 <div class="flex flex-col gap-4 mb-8 mt-20">
@@ -272,7 +230,6 @@ export function convertDucklakeSettingsToBackend(settings) {
 									bind:value={ducklake.catalog.resource_path}
 									{customInstanceDbs}
 									{confirmationModal}
-									{dbManagerDrawer}
 									tag="ducklake"
 								>
 									{#snippet wizardBottomHint()}
@@ -313,29 +270,33 @@ export function convertDucklakeSettingsToBackend(settings) {
 				<Cell class="w-12">
 					<div class="flex gap-2">
 						<Popover contentClasses="p-4" enableFlyTransition closeOnOtherPopoverOpen>
-							<svelte:fragment slot="trigger">
-								<div class="relative">
-									<Button variant="default" iconOnly size="sm" endIcon={{ icon: SettingsIcon }} />
-									{#if ducklake.extra_args}
-										<div
-											class="absolute -top-0.5 -right-0.5 w-2 h-2 bg-accent rounded-full border border-surface"
-										></div>
-									{/if}
-								</div>
-							</svelte:fragment>
-							<svelte:fragment slot="content">
-								<Label
-									label="Extra args"
-									tooltip="Additional arguments to pass in the ATTACH command. The argument list is substituted as-is. Separate them with commas."
-								>
-									<TextInput
-										bind:value={ducklake.extra_args}
-										class="min-w-96"
-										underlyingInputEl="textarea"
-										inputProps={{ placeholder: "METADATA_SCHEMA 'schema', ENCRYPTED true" }}
-									/>
-								</Label>
-							</svelte:fragment>
+							{#snippet trigger()}
+													
+									<div class="relative">
+										<Button variant="default" iconOnly size="sm" endIcon={{ icon: SettingsIcon }} />
+										{#if ducklake.extra_args}
+											<div
+												class="absolute -top-0.5 -right-0.5 w-2 h-2 bg-accent rounded-full border border-surface"
+											></div>
+										{/if}
+									</div>
+								
+													{/snippet}
+							{#snippet content()}
+													
+									<Label
+										label="Extra args"
+										tooltip="Additional arguments to pass in the ATTACH command. The argument list is substituted as-is. Separate them with commas."
+									>
+										<TextInput
+											bind:value={ducklake.extra_args}
+											class="min-w-96"
+											underlyingInputEl="textarea"
+											inputProps={{ placeholder: "METADATA_SCHEMA 'schema', ENCRYPTED true" }}
+										/>
+									</Label>
+								
+													{/snippet}
 						</Popover>
 						{#if ducklakeIsDirty[ducklake.name]}
 							<Popover
@@ -343,15 +304,18 @@ export function convertDucklakeSettingsToBackend(settings) {
 								contentClasses="p-2 text-sm text-secondary italic"
 								class="cursor-not-allowed"
 							>
-								<svelte:fragment slot="trigger">
-									<ExploreAssetButton asset={{ kind: 'ducklake', path: '' }} disabled />
-								</svelte:fragment>
-								<svelte:fragment slot="content">Please save settings first</svelte:fragment>
+								{#snippet trigger()}
+															
+										<ExploreAssetButton asset={{ kind: 'ducklake', path: '' }} disabled />
+									
+															{/snippet}
+								{#snippet content()}
+																Please save settings first
+															{/snippet}
 							</Popover>
 						{:else}
 							<ExploreAssetButton
 								asset={{ kind: 'ducklake', path: ducklake.name }}
-								{dbManagerDrawer}
 							/>
 						{/if}
 					</div>

package/package/components/workspaceSettings/GitSyncFilterSettings.svelte

@@ -30,7 +30,8 @@ const typeToggles = $derived({
     groups: effectiveIncludeTypes.includes('group'),
     triggers: effectiveIncludeTypes.includes('trigger'),
     settings: effectiveIncludeTypes.includes('settings'),
-    key: effectiveIncludeTypes.includes('key')
+    key: effectiveIncludeTypes.includes('key'),
+    workspaceDependencies: effectiveIncludeTypes.includes('workspacedependencies')
 });
 // Tab selection for filter kinds
 let filtersTab = $state('includes');
@@ -50,7 +51,8 @@ function updateIncludeType(key, value) {
         groups: 'group',
         triggers: 'trigger',
         settings: 'settings',
-        key: 'key'
+        key: 'key',
+        workspaceDependencies: 'workspacedependencies'
     };
     if (value) {
         newTypes.add(typeMap[key]);
@@ -262,6 +264,14 @@ function capitalize(str) {
 									options={{ right: 'Encryption key' }}
 								/>
 							</div>
+							<div class="flex items-center gap-2">
+								<Toggle
+									size="xs"
+									checked={typeToggles.workspaceDependencies}
+									on:change={(e) => updateIncludeType('workspaceDependencies', e.detail)}
+									options={{ right: 'Workspace dependencies' }}
+								/>
+							</div>
 						</div>
 					</div>
 				</div>

package/package/components/workspaceSettings/RulesetEditor.svelte

@@ -16,17 +16,21 @@ const isCreateMode = $derived(!rule);
 // Helper function to check if a rule is in the array
 const hasRule = (ruleKind) => rule?.rules?.includes(ruleKind) ?? false;
 // Editable state
-let name = $state(rule?.name ?? '');
+let name = $state(untrack(() => rule)?.name ?? '');
 let disableDirectDeployment = $state(hasRule('DisableDirectDeployment'));
 let disableFork = $state(hasRule('DisableWorkspaceForking'));
-let selectedGroups = $state(rule?.bypass_groups?.map((g) => g.replace('g/', '')) ?? []);
-let selectedUsers = $state(rule?.bypass_users?.map((u) => u.replace('u/', '')) ?? []);
+let selectedGroups = $state(untrack(() => rule)?.bypass_groups?.map((g) => g.replace('g/', '')) ?? []);
+let selectedUsers = $state(untrack(() => rule)?.bypass_users?.map((u) => u.replace('u/', '')) ?? []);
 // Initial state for unsaved changes tracking
-let initialName = $state(rule?.name ?? '');
+let initialName = $state(untrack(() => rule)?.name ?? '');
 let initialDisableDirectDeployment = $state(hasRule('DisableDirectDeployment'));
 let initialDisableFork = $state(hasRule('DisableWorkspaceForking'));
-let initialSelectedGroups = $state(rule?.bypass_groups ? rule.bypass_groups.map((g) => g.replace('g/', '')) : []);
-let initialSelectedUsers = $state(rule?.bypass_users ? rule.bypass_users.map((u) => u.replace('u/', '')) : []);
+let initialSelectedGroups = $state(untrack(() => rule)?.bypass_groups
+    ? untrack(() => rule).bypass_groups.map((g) => g.replace('g/', ''))
+    : []);
+let initialSelectedUsers = $state(untrack(() => rule)?.bypass_users
+    ? untrack(() => rule).bypass_users.map((u) => u.replace('u/', ''))
+    : []);
 // Available options
 let availableGroups = $state([]);
 let availableUsers = $state([]);
@@ -80,7 +84,8 @@ const hasUnsavedChanges = $derived(isCreateMode
         disableFork !== initialDisableFork ||
         JSON.stringify([...selectedGroups].sort()) !==
             JSON.stringify([...initialSelectedGroups].sort()) ||
-        JSON.stringify([...selectedUsers].sort()) !== JSON.stringify([...initialSelectedUsers].sort()));
+        JSON.stringify([...selectedUsers].sort()) !==
+            JSON.stringify([...initialSelectedUsers].sort()));
 const nameError = $derived.by(() => {
     if (!name.trim())
         return 'Name is required';
@@ -111,7 +116,7 @@ async function create() {
                 name,
                 rules: [
                     ...(disableDirectDeployment ? ['DisableDirectDeployment'] : []),
-                    ...(disableFork ? ['DisableWorkspaceForking'] : []),
+                    ...(disableFork ? ['DisableWorkspaceForking'] : [])
                 ],
                 bypass_groups: selectedGroups,
                 bypass_users: selectedUsers
@@ -135,7 +140,7 @@ async function save() {
             requestBody: {
                 rules: [
                     ...(disableDirectDeployment ? ['DisableDirectDeployment'] : []),
-                    ...(disableFork ? ['DisableWorkspaceForking'] : []),
+                    ...(disableFork ? ['DisableWorkspaceForking'] : [])
                 ],
                 bypass_groups: selectedGroups,
                 bypass_users: selectedUsers
@@ -195,7 +200,11 @@ async function save() {
 					{#each selectedGroups as group (group)}
 						<Badge color="blue" class="flex items-center gap-1">
 							{group}
-							<button type="button" onclick={() => removeGroup(group)} class="ml-1 hover:text-red-600">
+							<button
+								type="button"
+								onclick={() => removeGroup(group)}
+								class="ml-1 hover:text-red-600"
+							>
 								<X size={14} />
 							</button>
 						</Badge>
@@ -217,7 +226,11 @@ async function save() {
 					{#each selectedUsers as user (user)}
 						<Badge color="indigo" class="flex items-center gap-1">
 							{user}
-							<button type="button" onclick={() => removeUser(user)} class="ml-1 hover:text-red-600">
+							<button
+								type="button"
+								onclick={() => removeUser(user)}
+								class="ml-1 hover:text-red-600"
+							>
 								<X size={14} />
 							</button>
 						</Badge>
@@ -257,7 +270,6 @@ async function save() {
 				/>
 				<div class="text-xs text-secondary ml-6">Users cannot create forks of this workspace.</div>
 			</div>
-
 		</div>
 	</Section>
 

package/package/components/workspaceSettings/StorageSettings.svelte

@@ -71,6 +71,18 @@ function isPermissionsNonDefault(storage) {
 let hasUnsavedChanges = $derived.by(() => {
     return !deepEqual(s3ResourceSettings, s3ResourceSavedSettings);
 });
+let volumeStorageItems = $derived.by(() => {
+    const items = [{ value: '', label: 'Disabled' }];
+    if (!emptyString(s3ResourceSettings.resourcePath)) {
+        items.push({ value: 'primary', label: 'Primary storage' });
+    }
+    for (const [name, s] of s3ResourceSettings.secondaryStorage ?? []) {
+        if (!emptyString(s.resourcePath)) {
+            items.push({ value: name, label: name });
+        }
+    }
+    return items;
+});
 </script>
 
 <Portal name="workspace-settings">
@@ -129,6 +141,15 @@ let hasUnsavedChanges = $derived.by(() => {
 					<Cell>
 						<div class="flex gap-2">
 							<div class="relative">
+								{#if tableRow[1].resourceType === 'filesystem'}
+								<Select
+									items={[{ value: 'filesystem', label: 'Filesystem' }]}
+									value={'filesystem'}
+									disabled
+									id="storage-resource-type-select"
+									class="w-40"
+								/>
+							{:else}
 								<Select
 									items={[
 										{ value: 's3', label: 'S3' },
@@ -141,13 +162,22 @@ let hasUnsavedChanges = $derived.by(() => {
 									id="storage-resource-type-select"
 									class="w-40"
 								/>
+							{/if}
 							</div>
 							<div class="flex flex-1">
-								<ResourcePicker
-									class="flex-1"
-									bind:value={tableRow[1].resourcePath}
-									resourceType={tableRow[1].resourceType}
-								/>
+								{#if tableRow[1].resourceType === 'filesystem'}
+									<TextInput
+										class="flex-1"
+										value={tableRow[1].resourcePath ?? ''}
+										inputProps={{ disabled: true, placeholder: 'Filesystem path' }}
+									/>
+								{:else}
+									<ResourcePicker
+										class="flex-1"
+										bind:value={tableRow[1].resourcePath}
+										resourceType={tableRow[1].resourceType}
+									/>
+								{/if}
 							</div>
 						</div>
 					</Cell>
@@ -173,16 +203,20 @@ let hasUnsavedChanges = $derived.by(() => {
 									contentClasses="p-2 text-xs text-secondary"
 									class="cursor-not-allowed"
 								>
-									<svelte:fragment slot="trigger">
-										<ExploreAssetButton asset={{ kind: 's3object', path: '' }} disabled />
-									</svelte:fragment>
-									<svelte:fragment slot="content">
-										{#if emptyString(tableRow[1].resourcePath)}
-											Please select a storage resource
-										{:else if isDirty(tableRow[0])}
-											Please save your changes
-										{/if}
-									</svelte:fragment>
+									{#snippet trigger()}
+																	
+											<ExploreAssetButton asset={{ kind: 's3object', path: '' }} disabled />
+										
+																	{/snippet}
+									{#snippet content()}
+																	
+											{#if emptyString(tableRow[1].resourcePath)}
+												Please select a storage resource
+											{:else if isDirty(tableRow[0])}
+												Please save your changes
+											{/if}
+										
+																	{/snippet}
 								</Popover>
 							{:else}
 								<ExploreAssetButton
@@ -264,6 +298,25 @@ let hasUnsavedChanges = $derived.by(() => {
 		</tbody>
 	</DataTable>
 
+	<div class="mt-6 mb-2">
+		<SettingsPageHeader
+			title="Volume storage"
+			description="Select which storage volumes should use. If disabled, scripts with volumes will fail with an error."
+			link="https://www.windmill.dev/docs/core_concepts/persistent_storage/volumes"
+		/>
+		<div class="max-w-sm mt-2">
+			<Select
+				items={volumeStorageItems}
+				bind:value={
+					() => s3ResourceSettings.volumeStorage ?? '',
+					(v) => {
+						s3ResourceSettings.volumeStorage = v || undefined
+					}
+				}
+			/>
+		</div>
+	</div>
+
 	<SettingsFooter
 		class="mt-5 mb-5"
 		inline

package/package/components/workspaceSettings/WorkspaceIntegrations.svelte

@@ -12,7 +12,7 @@ import OAuthClientConfig from './OAuthClientConfig.svelte';
 import ConfirmationModal from '../common/confirmationModal/ConfirmationModal.svelte';
 import { createAsyncConfirmationModal } from '../common/confirmationModal/asyncConfirmationModal.svelte';
 import Path from '../Path.svelte';
-import { page } from '$app/stores';
+import { page } from '$app/state';
 import { goto } from '$app/navigation';
 const supportedServices = {
     nextcloud: {
@@ -32,6 +32,7 @@ const supportedServices = {
         displayName: 'Google',
         description: 'Connect to Google for Drive and Calendar triggers',
         icon: GoogleIcon,
+        docsUrl: 'https://www.windmill.dev/docs/core_concepts/native_triggers#google-triggers',
         requiresBaseUrl: false,
         clientIdPlaceholder: 'xxxx.apps.googleusercontent.com',
         clientSecretPlaceholder: 'Google Cloud Console client secret',
@@ -195,7 +196,7 @@ function handleOAuthCallback(workspace, serviceName, code, state) {
     // Pre-populate resource path from existing integration (for reconnect)
     const integration = getIntegrationByService(serviceName);
     resourcePath = integration?.resource_path ?? undefined;
-    const url = new URL($page.url);
+    const url = new URL(page.url);
     url.searchParams.delete('code');
     url.searchParams.delete('state');
     url.searchParams.delete('service');
@@ -230,13 +231,13 @@ async function finalizePendingCallback() {
     }
 }
 $effect(() => {
-    if ($page.url.searchParams.has('code') &&
-        $page.url.searchParams.has('state') &&
-        $page.url.searchParams.has('service') &&
+    if (page.url.searchParams.has('code') &&
+        page.url.searchParams.has('state') &&
+        page.url.searchParams.has('service') &&
         $workspaceStore) {
-        const service = $page.url.searchParams.get('service');
-        const code = $page.url.searchParams.get('code');
-        const state = $page.url.searchParams.get('state');
+        const service = page.url.searchParams.get('service');
+        const code = page.url.searchParams.get('code');
+        const state = page.url.searchParams.get('state');
         handleOAuthCallback($workspaceStore, service, code, state);
     }
 });
@@ -255,7 +256,7 @@ $effect(() => {
 	<SettingsPageHeader
 		title="Native Triggers"
 		description="Connect your workspace to external services for native triggers and enhanced functionality. These connections are shared across all workspace members and are required for native triggers to work."
-		link="https://www.windmill.dev/docs/integrations/native-triggers"
+		link="https://www.windmill.dev/docs/core_concepts/native_triggers"
 	/>
 
 	{#if pendingCallback}

package/package/gen/core/OpenAPI.js

@@ -21,7 +21,7 @@ export const OpenAPI = {
     PASSWORD: undefined,
     TOKEN: undefined,
     USERNAME: undefined,
-    VERSION: '1.639.0',
+    VERSION: '1.655.0',
     WITH_CREDENTIALS: false,
     interceptors: {
         request: new Interceptors(),