windmill-components 1.623.1 → 1.642.0

package/package/components/FlowRestartButton.svelte

@@ -4,13 +4,15 @@ 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, flowVersionId = undefined, disabled = false, enterpriseOnly = false, variant = 'default', unifiedSize = 'md', onRestart, onRestartComplete } = $props();
+// Sentinel value meaning "use the same version as the original run" (backend receives undefined)
+const RUN_VERSION_SENTINEL = -1;
 let branchOrIterationN = $state(0);
-let selectedVersionMode = $state('run');
-let customFlowVersion = $state(undefined);
+let selectedFlowVersion = $state(RUN_VERSION_SENTINEL);
 let flowVersions = $state([]);
 let loadingVersions = $state(false);
+let versionsLoaded = $state(false);
+let runVersionInList = $state(false);
 async function restartFlow(stepId, branchOrIterationN, flowVersion) {
     let run = await JobService.restartFlowAtStep({
         workspace: $workspaceStore,
@@ -21,10 +23,10 @@ async function restartFlow(stepId, branchOrIterationN, flowVersion) {
             flow_version: flowVersion
         }
     });
-    await goto('/run/' + run + '?workspace=' + $workspaceStore);
+    onRestartComplete?.(run);
 }
 async function loadFlowVersions() {
-    if (!flowPath || loadingVersions)
+    if (!flowPath || loadingVersions || versionsLoaded)
         return;
     loadingVersions = true;
     try {
@@ -32,9 +34,13 @@ async function loadFlowVersions() {
             workspace: $workspaceStore,
             path: flowPath
         });
-        if (flowVersions.length > 0 && customFlowVersion === undefined) {
-            customFlowVersion = flowVersions[0].id;
+        if (flowVersions.length > 0) {
+            const match = flowVersionId ? flowVersions.find((v) => v.id === flowVersionId) : undefined;
+            runVersionInList = match !== undefined;
+            selectedFlowVersion =
+                match?.id ?? (flowVersionId ? RUN_VERSION_SENTINEL : flowVersions[0].id);
         }
+        versionsLoaded = true;
     }
     catch (e) {
         sendUserToast('Failed to load flow versions', true);
@@ -44,13 +50,11 @@ async function loadFlowVersions() {
     }
 }
 function getFlowVersionForRestart() {
-    if (selectedVersionMode === 'run') {
-        return undefined; // use run version
-    }
-    else if (selectedVersionMode === 'custom') {
-        return customFlowVersion;
-    }
-    return undefined;
+    return selectedFlowVersion === RUN_VERSION_SENTINEL ? undefined : selectedFlowVersion;
+}
+function formatVersionLabel(version) {
+    const name = emptyString(version.deployment_msg) ? `v${version.id}` : version.deployment_msg;
+    return `${name} - ${new Date(version.created_at).toLocaleString()}`;
 }
 function handleRestart() {
     if (onRestart) {
@@ -66,37 +70,28 @@ function handleRestart() {
 {#snippet flowVersionSelector()}
 	<label>
 		<div class="pb-1 text-xs font-semibold text-emphasis">Flow version</div>
-		<div class="flex flex-col gap-2">
-			<select
-				bind:value={selectedVersionMode}
-				class="grow"
-				onchange={() => {
-					if (selectedVersionMode === 'custom' && flowVersions.length === 0) {
-						loadFlowVersions()
-					}
-				}}
-			>
-				<option value="run">Run version</option>
-				<option value="custom">Specific version</option>
-			</select>
-
-			{#if selectedVersionMode === 'custom'}
-				{#if loadingVersions}
-					<div class="text-xs text-secondary">Loading versions...</div>
-				{:else if flowVersions.length > 0}
-					<select bind:value={customFlowVersion} class="grow text-xs">
-						{#each flowVersions as version}
-							<option value={version.id}>
-								{#if emptyString(version.deployment_msg)}Version {version.id}{:else}{version.deployment_msg}{/if}
-								- {new Date(version.created_at).toLocaleString()}
-							</option>
-						{/each}
-					</select>
-				{:else}
-					<div class="text-xs text-tertiary">No versions available</div>
+		{#if loadingVersions}
+			<div class="text-xs text-secondary">Loading versions...</div>
+		{:else if flowVersions.length > 0}
+			<select bind:value={selectedFlowVersion} class="w-full text-xs">
+				{#if flowVersionId && !runVersionInList}
+					<option value={RUN_VERSION_SENTINEL}>Same as run (v{flowVersionId})</option>
 				{/if}
-			{/if}
-		</div>
+				{#each flowVersions as version, i (version.id)}
+					{@const isLatest = i === 0}
+					{@const isSameAsRun = flowVersionId !== undefined && version.id === flowVersionId}
+					<option value={version.id}>
+						{formatVersionLabel(version)}{isSameAsRun
+							? ' (Same as run)'
+							: isLatest
+								? ' (Latest)'
+								: ''}
+					</option>
+				{/each}
+			</select>
+		{:else}
+			<div class="text-xs text-tertiary">No versions available</div>
+		{/if}
 	</label>
 {/snippet}
 {#snippet singleRestartButton()}
@@ -130,12 +125,13 @@ function handleRestart() {
 		<Popover
 			floatingConfig={{ strategy: 'absolute', placement: 'bottom-start' }}
 			disablePopup={!flowPath}
+			on:openChange={(e) => { if (e.detail) loadFlowVersions() }}
 		>
 			{#snippet trigger()}
 				{@render singleRestartButton()}
 			{/snippet}
 			{#snippet content()}
-				<div class="flex flex-col gap-4 text-primary p-4 min-w-64">
+				<div class="flex flex-col gap-4 text-primary p-4 w-80">
 					{@render flowVersionSelector()}
 
 					<Button variant="accent" onClick={handleRestart}>Restart</Button>
@@ -144,7 +140,10 @@ function handleRestart() {
 		</Popover>
 	{/if}
 {:else}
-	<Popover floatingConfig={{ strategy: 'absolute', placement: 'bottom-start' }}>
+	<Popover
+		floatingConfig={{ strategy: 'absolute', placement: 'bottom-start' }}
+		on:openChange={(e) => { if (e.detail) loadFlowVersions() }}
+	>
 		{#snippet trigger()}
 			<Button
 				title={`Re-start this flow from step ${selectedJobStep} (included).${enterpriseOnly ? ' This is a feature only available in enterprise edition.' : ''}`}
@@ -164,7 +163,7 @@ function handleRestart() {
 			</Button>
 		{/snippet}
 		{#snippet content()}
-			<div class="flex flex-col gap-4 text-primary p-4 min-w-64">
+			<div class="flex flex-col gap-4 text-primary p-4 w-80">
 				<label>
 					<div class="pb-1 text-xs font-semibold text-emphasis"
 						>{selectedJobStepType == 'forloop' ? 'From iteration #' : 'From branch'}</div
@@ -174,7 +173,7 @@ function handleRestart() {
 							<input type="number" min="0" bind:value={branchOrIterationN} class="!w-32 grow" />
 						{:else}
 							<select bind:value={branchOrIterationN} class="!w-32 grow">
-								{#each restartBranchNames as [branchIdx, branchName]}
+								{#each restartBranchNames as [branchIdx, branchName] (branchIdx)}
 									<option value={branchIdx}>{branchName}</option>
 								{/each}
 							</select>

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

@@ -4,11 +4,16 @@ interface Props {
     selectedJobStepType: 'single' | 'forloop' | 'branchall';
     restartBranchNames?: [number, string][];
     flowPath?: string;
+    /** The flow version ID used in this run (from job.script_hash) */
+    flowVersionId?: number;
     disabled?: boolean;
     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/FlowStatusViewer.svelte

@@ -2,7 +2,7 @@
 import { setContext, untrack } from 'svelte';
 import { isOwner as loadIsOwner } from '../utils';
 import { userStore, workspaceStore } from '../stores';
-let { jobId, initialJob = undefined, workspaceId = undefined, flowState = $bindable({}), selectedJobStep = $bindable(undefined), hideFlowResult = false, hideTimeline = false, hideDownloadInGraph = false, hideNodeDefinition = false, hideJobId = false, hideDownloadLogs = false, rightColumnSelect = $bindable('timeline'), isOwner = $bindable(false), wideResults = false, localModuleStates = $bindable({}), localDurationStatuses = $bindable({}), job = $bindable(undefined), render = true, suspendStatus = $bindable({ val: {} }), customUi, onStart, onJobsLoaded, onDone } = $props();
+let { jobId, initialJob = undefined, workspaceId = undefined, flowState = $bindable({}), selectedJobStep = $bindable(undefined), hideTimeline = false, hideDownloadInGraph = false, hideNodeDefinition = false, hideJobId = false, hideDownloadLogs = false, rightColumnSelect = $bindable('timeline'), isOwner = $bindable(false), wideResults = false, localModuleStates = $bindable({}), localDurationStatuses = $bindable({}), job = $bindable(undefined), render = true, suspendStatus = $bindable({ val: {} }), customUi, onStart, onJobsLoaded, onDone, showLogsWithResult = false } = $props();
 let lastJobId = jobId;
 let retryStatus = $state({ val: {} });
 let globalRefreshes = $state({});
@@ -52,7 +52,6 @@ let toolCallIndicesToLoad = $state([]);
 
 {#key jobId}
 	<FlowStatusViewerInner
-		{hideFlowResult}
 		onJobsLoaded={({ job, force }) => {
 			if (job.script_path != lastScriptPath && job.script_path) {
 				lastScriptPath = job.script_path
@@ -70,7 +69,6 @@ let toolCallIndicesToLoad = $state([]);
 		{initialJob}
 		{jobId}
 		{workspaceId}
-		{isOwner}
 		{wideResults}
 		bind:rightColumnSelect
 		{render}
@@ -105,5 +103,6 @@ let toolCallIndicesToLoad = $state([]);
 				}
 			}
 		}}
+		{showLogsWithResult}
 	/>
 {/key}

package/package/components/FlowStatusViewer.svelte.d.ts

@@ -36,6 +36,7 @@ interface Props {
     onDone?: ({ job }: {
         job: CompletedJob;
     }) => void;
+    showLogsWithResult?: boolean;
 }
 declare const FlowStatusViewer: import("svelte").Component<Props, {}, "job" | "isOwner" | "suspendStatus" | "localModuleStates" | "localDurationStatuses" | "flowState" | "rightColumnSelect" | "selectedJobStep">;
 type FlowStatusViewer = ReturnType<typeof FlowStatusViewer>;