windmill-components 1.613.1 → 1.613.3

package/package/components/FlowRestartButton.svelte

@@ -4,8 +4,7 @@ import { Play, RefreshCw } from 'lucide-svelte';
 import { FlowService, JobService } from '../gen';
 import { workspaceStore } from '../stores';
 import { emptyString, sendUserToast } from '../utils';
-import { goto } from '../navigation';
-let { jobId, selectedJobStep, selectedJobStepType, restartBranchNames = [], flowPath = undefined, disabled = false, enterpriseOnly = false, variant = 'default', unifiedSize = 'md', onRestart } = $props();
+let { jobId, selectedJobStep, selectedJobStepType, restartBranchNames = [], flowPath = undefined, disabled = false, enterpriseOnly = false, variant = 'default', unifiedSize = 'md', onRestart, onRestartComplete } = $props();
 let branchOrIterationN = $state(0);
 let selectedVersionMode = $state('run');
 let customFlowVersion = $state(undefined);
@@ -21,7 +20,14 @@ async function restartFlow(stepId, branchOrIterationN, flowVersion) {
             flow_version: flowVersion
         }
     });
-    await goto('/run/' + run + '?workspace=' + $workspaceStore);
+    if (onRestartComplete) {
+        onRestartComplete(run);
+    }
+    else {
+        // Lazy load navigation for SvelteKit contexts
+        const { goto } = await import('../navigation');
+        await goto('/run/' + run + '?workspace=' + $workspaceStore);
+    }
 }
 async function loadFlowVersions() {
     if (!flowPath || loadingVersions)

package/package/components/FlowRestartButton.svelte.d.ts

@@ -8,7 +8,10 @@ interface Props {
     enterpriseOnly?: boolean;
     variant?: 'default' | 'accent';
     unifiedSize?: 'xs' | 'sm' | 'md' | 'lg';
+    /** Called when flow is restarted. If not provided, will navigate to the new run using goto (requires SvelteKit) */
     onRestart?: (stepId: string, branchOrIterationN: number, flowVersion?: number) => void;
+    /** Called when flow restart completes with the new job ID. Used for navigation in non-SvelteKit contexts */
+    onRestartComplete?: (newJobId: string) => void;
 }
 declare const FlowRestartButton: import("svelte").Component<Props, {}, "">;
 type FlowRestartButton = ReturnType<typeof FlowRestartButton>;

package/package/components/RunsPage.svelte

@@ -30,7 +30,8 @@ import ToggleButtonGroup from './common/toggleButton-v2/ToggleButtonGroup.svelte
 import ToggleButton from './common/toggleButton-v2/ToggleButton.svelte';
 import Select from './select/Select.svelte';
 import AnimatedPane from './splitPanes/AnimatedPane.svelte';
-import { useSearchParams, StaleWhileLoading } from '../svelte5Utils.svelte';
+import { useSearchParams } from '../svelte5UtilsKit.svelte';
+import { StaleWhileLoading } from '../svelte5Utils.svelte';
 let { initialPath } = $props();
 let filters = useSearchParams(runsFiltersSchema);
 // Initialize path filter from route param if provided and not already set via query params

package/package/components/sidebar/OperatorMenu.svelte

@@ -4,7 +4,7 @@ import MultiplayerMenu from './MultiplayerMenu.svelte';
 import { clearWorkspaceFromStorage, enterpriseLicense, superadmin, userWorkspaces, workspaceStore, tutorialsToDo, skippedAll } from '../../stores';
 import { twMerge } from 'tailwind-merge';
 import { USER_SETTINGS_HASH } from './settings';
-import { logout } from '../../logout';
+import { logout } from '../../logoutKit';
 import DarkModeObserver from '../DarkModeObserver.svelte';
 import BarsStaggered from '../icons/BarsStaggered.svelte';
 import { Menu, Menubar, MenuItem } from '../meltComponents';

package/package/components/sidebar/UserMenu.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">import { goto } from '../../navigation';
-import { logout } from '../../logout';
+import { logout } from '../../logoutKit';
 import { userStore, usageStore, workspaceUsageStore, isPremiumStore, workspaceStore } from '../../stores';
 import { USER_SETTINGS_HASH } from './settings';
 import { isCloudHosted } from '../../cloud';

package/package/components/workspaceSettings/CreateWorkspace.svelte

@@ -3,7 +3,7 @@ import { goto } from '../../navigation';
 import { base } from '../../base';
 import { JobService, ResourceService, SettingService, UserService, VariableService, WorkspaceService } from '../../gen';
 import { validateUsername } from '../../utils';
-import { logoutWithRedirect } from '../../logout';
+import { logoutWithRedirect } from '../../logoutKit';
 import { page } from '$app/stores';
 import { usersWorkspaceStore, workspaceStore } from '../../stores';
 import CenteredModal from '../CenteredModal.svelte';

package/package/logout.d.ts

@@ -1,3 +1 @@
-export declare function logoutWithRedirect(rd?: string): Promise<void>;
-export declare function logout(): Promise<void>;
 export declare function clearUser(): Promise<void>;

package/package/logout.js

@@ -1,28 +1,7 @@
-import { goto } from './navigation';
 import { UserService } from './gen';
 import { clearStores } from './storeUtils';
-import { sendUserToast } from './toast';
-export async function logoutWithRedirect(rd) {
-    console.log('logoutWithRedirect', rd);
-    await clearUser();
-    const splitted = rd?.split('?')[0];
-    if (rd && rd != '/' && splitted != '/user/login' && splitted != '/user/logout') {
-        const error = document.cookie.includes('token')
-            ? `error=${encodeURIComponent('You have been logged out because your session has expired.')}&`
-            : '';
-        console.log('login redirect with error', error, rd);
-        goto(`/user/login?${error}${rd ? 'rd=' + encodeURIComponent(rd) : ''}`, { replaceState: true });
-    }
-    else {
-        console.log('login redirect vanilla');
-        goto('/user/login', { replaceState: true });
-    }
-}
-export async function logout() {
-    await clearUser();
-    goto(`/user/login`);
-    sendUserToast('you have been logged out');
-}
+// Note: logout and logoutWithRedirect have been moved to logoutKit.ts
+// as they depend on SvelteKit navigation
 export async function clearUser() {
     try {
         clearStores();

package/package/logoutKit.d.ts

@@ -0,0 +1,2 @@
+export declare function logoutWithRedirect(rd?: string): Promise<void>;
+export declare function logout(): Promise<void>;

package/package/logoutKit.js

@@ -0,0 +1,26 @@
+// SvelteKit-specific logout utilities
+// These functions depend on $lib/navigation which requires SvelteKit
+import { goto } from './navigation';
+import { clearUser } from './logout';
+import { sendUserToast } from './toast';
+export async function logoutWithRedirect(rd) {
+    console.log('logoutWithRedirect', rd);
+    await clearUser();
+    const splitted = rd?.split('?')[0];
+    if (rd && rd != '/' && splitted != '/user/login' && splitted != '/user/logout') {
+        const error = document.cookie.includes('token')
+            ? `error=${encodeURIComponent('You have been logged out because your session has expired.')}&`
+            : '';
+        console.log('login redirect with error', error, rd);
+        goto(`/user/login?${error}${rd ? 'rd=' + encodeURIComponent(rd) : ''}`, { replaceState: true });
+    }
+    else {
+        console.log('login redirect vanilla');
+        goto('/user/login', { replaceState: true });
+    }
+}
+export async function logout() {
+    await clearUser();
+    goto(`/user/login`);
+    sendUserToast('you have been logged out');
+}

package/package/navigation.d.ts

@@ -1,2 +1,2 @@
-export declare function goto(path: any, options?: {}): any;
+export declare function goto(path: string, options?: {}): any;
 export declare function setQuery(url: URL, key: string, value: string | undefined, currentHash?: string | undefined): Promise<void>;

package/package/svelte5Utils.svelte.d.ts

@@ -1,6 +1,4 @@
-import { type StateStore } from './utils';
-import * as runed from 'runed/kit';
-import type z from 'zod';
+import type { StateStore } from './utils';
 export declare function withProps<Component, Props>(component: Component, props: Props): {
     component: Component;
     props: Props;
@@ -71,7 +69,6 @@ export declare class ChangeOnDeepInequality<T> {
     constructor(compute: () => T);
     get value(): T;
 }
-export declare function useSearchParams<S extends z.ZodType>(schema: S, options?: runed.SearchParamsOptions): runed.ReturnUseSearchParams<S>;
 export declare class StaleWhileLoading<T> {
     private _current;
     private _currentTimeout;

package/package/svelte5Utils.svelte.js

@@ -1,9 +1,7 @@
 // https://github.com/sveltejs/svelte/issues/14600
 import { untrack } from 'svelte';
 import { deepEqual } from 'fast-equals';
-import {} from './utils';
 import { resource, watch } from 'runed';
-import * as runed from 'runed/kit';
 export function withProps(component, props) {
     const ret = $state({
         component,
@@ -148,33 +146,6 @@ export class ChangeOnDeepInequality {
         return this._cached;
     }
 }
-// The original from runed has a weird behavior with dedup reads causing duplicate effect runs
-// (Every field has to be derived to avoid it : https://runed.dev/docs/utilities/use-search-params)
-export function useSearchParams(schema, options) {
-    let params = runed.useSearchParams(schema, options);
-    let keys = Object.keys(schema.shape ?? {});
-    let obj = { ...params };
-    for (const key of keys) {
-        // Somehow using $derived does not trigger reactivity sometimes ...
-        // (e.g: filters.arg in RunsPage.svelte updates in the URL but does not trigger reactivity)
-        let derivedVal = $state(params[key]);
-        Object.defineProperty(obj, key, {
-            get: () => {
-                if (typeof derivedVal === 'string')
-                    return decodeURIComponent(derivedVal);
-                return derivedVal;
-            },
-            set: (v) => {
-                const val = typeof v === 'string' ? encodeURIComponent(v) : v;
-                params[key] = val;
-                derivedVal = val;
-            },
-            enumerable: true,
-            configurable: true
-        });
-    }
-    return obj;
-}
 // Prevents flickering when data is unloaded (undefined) then reloaded quickly
 // But still becomes undefined if data is not reloaded within the timeout
 // so the user has feedback that the data is not available anymore.

package/package/svelte5UtilsKit.svelte.d.ts

@@ -0,0 +1,3 @@
+import * as runed from 'runed/kit';
+import type z from 'zod';
+export declare function useSearchParams<S extends z.ZodType>(schema: S, options?: runed.SearchParamsOptions): runed.ReturnUseSearchParams<S>;

package/package/svelte5UtilsKit.svelte.js

@@ -0,0 +1,30 @@
+// SvelteKit-specific utilities
+// This file should only be imported in SvelteKit apps as it depends on $app/environment
+import * as runed from 'runed/kit';
+// The original from runed has a weird behavior with dedup reads causing duplicate effect runs
+// (Every field has to be derived to avoid it : https://runed.dev/docs/utilities/use-search-params)
+export function useSearchParams(schema, options) {
+    let params = runed.useSearchParams(schema, options);
+    let keys = Object.keys(schema.shape ?? {});
+    let obj = { ...params };
+    for (const key of keys) {
+        // Somehow using $derived does not trigger reactivity sometimes ...
+        // (e.g: filters.arg in RunsPage.svelte updates in the URL but does not trigger reactivity)
+        let derivedVal = $state(params[key]);
+        Object.defineProperty(obj, key, {
+            get: () => {
+                if (typeof derivedVal === 'string')
+                    return decodeURIComponent(derivedVal);
+                return derivedVal;
+            },
+            set: (v) => {
+                const val = typeof v === 'string' ? encodeURIComponent(v) : v;
+                params[key] = val;
+                derivedVal = val;
+            },
+            enumerable: true,
+            configurable: true
+        });
+    }
+    return obj;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.613.1",
+	"version": "1.613.3",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",