windmill-components 1.613.2 → 1.613.4

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,7 @@ async function restartFlow(stepId, branchOrIterationN, flowVersion) {
             flow_version: flowVersion
         }
     });
-    await goto('/run/' + run + '?workspace=' + $workspaceStore);
+    onRestartComplete?.(run);
 }
 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/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.json

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