windmill-components 1.504.6 → 1.510.1

package/package/components/triggers/http/RouteEditorInner.svelte

@@ -30,9 +30,12 @@ import { HubFlow } from '../../../hub';
 import RouteBodyTransformerOption from './RouteBodyTransformerOption.svelte';
 import TestingBadge from '../testingBadge.svelte';
 import TriggerEditorToolbar from '../TriggerEditorToolbar.svelte';
-import { handleConfigChange } from '../utils';
+import { getHandlerType, handleConfigChange } from '../utils';
 import autosize from '../../../autosize';
 import { untrack } from 'svelte';
+import Tabs from '../../common/tabs/Tabs.svelte';
+import Tab from '../../common/tabs/Tab.svelte';
+import TriggerRetriesAndErrorHandler from '../TriggerRetriesAndErrorHandler.svelte';
 let { useDrawer = true, hideTarget = false, description = undefined, isEditor = false, customLabel = undefined, allowDraft = false, isDeployed = false, onConfigChange = undefined, onCaptureConfigChange = undefined, onUpdate = undefined, onDelete = undefined, onReset = undefined, trigger = undefined, customSaveBehavior = undefined } = $props();
 // Form data state
 let initialPath = $state('');
@@ -66,6 +69,9 @@ let can_write = $state(true);
 let extraPerms = $state(undefined);
 let summary = $state();
 let routeDescription = $state();
+let error_handler_path = $state();
+let error_handler_args = $state({});
+let retry = $state();
 // Component references
 let s3FilePicker = $state(null);
 let s3Editor = $state(null);
@@ -74,6 +80,8 @@ let variableEditor = $state(null);
 let drawer = $state(null);
 let initialConfig = undefined;
 let deploymentLoading = $state(false);
+let optionTabSelected = $state('request_options');
+let errorHandlerSelected = $state('slack');
 const isAdmin = $derived($userStore?.is_admin || $userStore?.is_super_admin);
 const routeConfig = $derived.by(getRouteConfig);
 const captureConfig = $derived.by(isEditor ? getCaptureConfig : () => ({}));
@@ -182,6 +190,10 @@ export async function openNew(nis_flow, fixedScriptPath_, defaultValues) {
         wrap_body = defaultValues?.wrap_body ?? false;
         summary = defaultValues?.summary ?? '';
         routeDescription = defaultValues?.description ?? '';
+        error_handler_path = defaultValues?.error_handler_path ?? undefined;
+        error_handler_args = defaultValues?.error_handler_args ?? {};
+        retry = defaultValues?.retry ?? undefined;
+        errorHandlerSelected = getHandlerType(error_handler_path ?? '');
     }
     finally {
         clearTimeout(loader);
@@ -190,34 +202,38 @@ export async function openNew(nis_flow, fixedScriptPath_, defaultValues) {
     }
 }
 function loadTriggerConfig(cfg) {
-    script_path = cfg?.script_path;
-    initialScriptPath = cfg?.script_path;
-    is_flow = cfg?.is_flow;
-    path = cfg?.path;
-    route_path = cfg?.route_path;
+    script_path = cfg?.script_path ?? '';
+    initialScriptPath = cfg?.script_path ?? '';
+    is_flow = cfg?.is_flow ?? false;
+    path = cfg?.path ?? '';
+    route_path = cfg?.route_path ?? '';
     http_method = cfg?.http_method ?? 'post';
-    is_async = cfg?.is_async;
-    workspaced_route = cfg?.workspaced_route;
-    wrap_body = cfg?.wrap_body;
-    raw_string = cfg?.raw_string;
-    summary = cfg?.summary;
-    routeDescription = cfg?.description;
+    is_async = cfg?.is_async ?? false;
+    workspaced_route = cfg?.workspaced_route ?? false;
+    wrap_body = cfg?.wrap_body ?? false;
+    raw_string = cfg?.raw_string ?? false;
+    summary = cfg?.summary ?? '';
+    routeDescription = cfg?.description ?? '';
     authentication_resource_path = cfg?.authentication_resource_path ?? '';
     if (cfg?.authentication_method === 'custom_script') {
         authentication_method = 'signature';
         signature_options_type = 'custom_script';
     }
     else {
-        authentication_method = cfg?.authentication_method;
+        authentication_method = cfg?.authentication_method ?? 'none';
         signature_options_type = 'custom_signature';
     }
     if (!isCloudHosted()) {
         static_asset_config = cfg?.static_asset_config;
         s3FileUploadRawMode = !!cfg?.static_asset_config;
-        is_static_website = cfg?.is_static_website;
+        is_static_website = cfg?.is_static_website ?? false;
     }
-    extraPerms = cfg?.extra_perms;
-    can_write = canWrite(path, cfg?.extra_perms, $userStore);
+    extraPerms = cfg?.extra_perms ?? undefined;
+    can_write = canWrite(path, cfg?.extra_perms ?? {}, $userStore);
+    error_handler_path = cfg?.error_handler_path;
+    error_handler_args = cfg?.error_handler_args ?? {};
+    retry = cfg?.retry;
+    errorHandlerSelected = getHandlerType(error_handler_path ?? '');
 }
 async function loadTrigger(defaultConfig) {
     if (defaultConfig) {
@@ -271,7 +287,10 @@ function getRouteConfig() {
         is_static_website,
         extra_perms: extraPerms,
         summary,
-        description: routeDescription
+        description: routeDescription,
+        error_handler_path,
+        error_handler_args,
+        retry
     };
     return nCfg;
 }
@@ -413,7 +432,6 @@ $effect(() => {
 										disabled={!can_write}
 									/>
 								{/if}
-								{s3FileUploadRawMode}
 								{#if s3FileUploadRawMode}
 									{#if can_write}
 										<JsonEditor
@@ -515,175 +533,201 @@ $effect(() => {
 			{#if !is_static_website}
 				<Section label="Advanced" collapsable>
 					<div class="flex flex-col gap-4">
-						{#if !static_asset_config}
-							<div class="flex flex-row justify-between">
-								<Label label="Request type" class="w-full">
-									<svelte:fragment slot="action">
-										<ToggleButtonGroup
-											class="w-auto h-full"
-											selected={is_async ? 'async' : 'sync'}
-											on:selected={({ detail }) => {
-												is_async = detail === 'async'
-											}}
-											disabled={!can_write || !!static_asset_config}
-										>
-											{#snippet children({ item, disabled })}
-												<ToggleButton
-													label="Async"
-													value="async"
-													tooltip="The returning value is the uuid of the job assigned to execute the job."
-													{item}
-													{disabled}
-												/>
-												<ToggleButton
-													label="Sync"
-													value="sync"
-													tooltip="Triggers the execution, wait for the job to complete and return it as a response."
-													{item}
-													{disabled}
-												/>
-											{/snippet}
-										</ToggleButtonGroup>
-									</svelte:fragment>
-								</Label>
-							</div>
-						{/if}
-						<Label label="Authentication" class="w-full">
-							<svelte:fragment slot="action">
-								<ToggleButtonGroup
-									class="w-auto h-full"
-									bind:selected={authentication_method}
-									on:selected={(e) => {
-										if (e.detail === 'signature' && signature_options_type === 'custom_script') {
-											raw_string = true
-										}
-									}}
-									disabled={!can_write}
-								>
-									{#snippet children({ item, disabled })}
-										{#each authentication_options as option}
-											{#if option.value === 'signature'}
-												<Popover placement="top-end" usePointerDownOutside>
-													<svelte:fragment slot="trigger">
-														<ToggleButton
-															label={option.label}
-															value={option.value}
-															tooltip={option.tooltip}
-															{item}
-															{disabled}
-														/>
-													</svelte:fragment>
-													<svelte:fragment slot="content">
+						<div class="min-h-96">
+							<Tabs bind:selected={optionTabSelected}>
+								<Tab value="request_options">Request Options</Tab>
+								<Tab value="error_handler">Error Handler</Tab>
+								<Tab value="retries">Retries</Tab>
+							</Tabs>
+							<div class="mt-4">
+								{#if optionTabSelected === 'request_options'}
+									<div class="flex flex-col gap-4">
+										{#if !static_asset_config}
+											<div class="flex flex-row justify-between">
+												<Label label="Request type" class="w-full">
+													<svelte:fragment slot="action">
 														<ToggleButtonGroup
 															class="w-auto h-full"
-															bind:selected={signature_options_type}
-															on:selected={(e) => {
-																if (e.detail === 'custom_script') {
-																	if (!raw_string) {
-																		raw_string = true
-																	}
-																}
+															selected={is_async ? 'async' : 'sync'}
+															on:selected={({ detail }) => {
+																is_async = detail === 'async'
 															}}
-															disabled={!can_write}
+															disabled={!can_write || !!static_asset_config}
 														>
 															{#snippet children({ item, disabled })}
 																<ToggleButton
-																	label="Signature validation"
-																	value="custom_signature"
-																	tooltip="Use a predefined or custom signature-based authentication scheme"
+																	label="Async"
+																	value="async"
+																	tooltip="The returning value is the uuid of the job assigned to execute the job."
 																	{item}
 																	{disabled}
 																/>
 																<ToggleButton
-																	label="Custom script"
-																	value="custom_script"
-																	tooltip="Use your own script logic"
+																	label="Sync"
+																	value="sync"
+																	tooltip="Triggers the execution, wait for the job to complete and return it as a response."
 																	{item}
 																	{disabled}
 																/>
 															{/snippet}
 														</ToggleButtonGroup>
 													</svelte:fragment>
-												</Popover>
-											{:else}
-												<ToggleButton
-													label={option.label}
-													value={option.value}
-													tooltip={option.tooltip}
-													{item}
-													{disabled}
+												</Label>
+											</div>
+										{/if}
+										<Label label="Authentication" class="w-full">
+											<svelte:fragment slot="action">
+												<ToggleButtonGroup
+													class="w-auto h-full"
+													bind:selected={authentication_method}
+													on:selected={(e) => {
+														if (
+															e.detail === 'signature' &&
+															signature_options_type === 'custom_script'
+														) {
+															raw_string = true
+														}
+													}}
+													disabled={!can_write}
+												>
+													{#snippet children({ item, disabled })}
+														{#each authentication_options as option}
+															{#if option.value === 'signature'}
+																<Popover placement="top-end" usePointerDownOutside>
+																	<svelte:fragment slot="trigger">
+																		<ToggleButton
+																			label={option.label}
+																			value={option.value}
+																			tooltip={option.tooltip}
+																			{item}
+																			{disabled}
+																		/>
+																	</svelte:fragment>
+																	<svelte:fragment slot="content">
+																		<ToggleButtonGroup
+																			class="w-auto h-full"
+																			bind:selected={signature_options_type}
+																			on:selected={(e) => {
+																				if (e.detail === 'custom_script') {
+																					if (!raw_string) {
+																						raw_string = true
+																					}
+																				}
+																			}}
+																			disabled={!can_write}
+																		>
+																			{#snippet children({ item, disabled })}
+																				<ToggleButton
+																					label="Signature validation"
+																					value="custom_signature"
+																					tooltip="Use a predefined or custom signature-based authentication scheme"
+																					{item}
+																					{disabled}
+																				/>
+																				<ToggleButton
+																					label="Custom script"
+																					value="custom_script"
+																					tooltip="Use your own script logic"
+																					{item}
+																					{disabled}
+																				/>
+																			{/snippet}
+																		</ToggleButtonGroup>
+																	</svelte:fragment>
+																</Popover>
+															{:else}
+																<ToggleButton
+																	label={option.label}
+																	value={option.value}
+																	tooltip={option.tooltip}
+																	{item}
+																	{disabled}
+																/>
+															{/if}
+														{/each}
+													{/snippet}
+												</ToggleButtonGroup>
+											</svelte:fragment>
+										</Label>
+
+										{#each authentication_options as option}
+											{#if option.resource_type && authentication_method === option.value}
+												<ResourcePicker
+													bind:value={authentication_resource_path}
+													resourceType={option.resource_type}
+													disabled={!can_write}
 												/>
 											{/if}
 										{/each}
-									{/snippet}
-								</ToggleButtonGroup>
-							</svelte:fragment>
-						</Label>
 
-						{#each authentication_options as option}
-							{#if option.resource_type && authentication_method === option.value}
-								<ResourcePicker
-									bind:value={authentication_resource_path}
-									resourceType={option.resource_type}
-									disabled={!can_write}
-								/>
-							{/if}
-						{/each}
+										{#if authentication_method === 'signature'}
+											{#if signature_options_type === 'custom_signature'}
+												<ResourcePicker
+													bind:value={authentication_resource_path}
+													resourceType={'signature_auth'}
+													disabled={!can_write}
+												/>
+											{:else if signature_options_type === 'custom_script'}
+												<p class="text-xs mt-3 mb-1 text-tertiary">
+													Pick a secret variable or create one which will be used as a secret key
+													for your custom script/flow<Required required={true} /><br />
+												</p>
+												<div class="flex flex-row gap-2">
+													<div class="flex flex-row gap-2 w-full">
+														<input
+															type="text"
+															autocomplete="off"
+															bind:value={variable_path}
+															readonly
+															disabled={true}
+														/>
+														<Button
+															title="Add variable"
+															on:click={() => variablePicker?.openDrawer()}
+															size="xs"
+															color="dark"
+															disabled={!can_write}
+														>
+															Pick variable
+														</Button>
+													</div>
+													<Button
+														disabled={emptyString(variable_path) || !can_write}
+														color="dark"
+														size="xs"
+														href={itemKind === 'flow'
+															? `/flows/add?${SECRET_KEY_PATH}=${encodeURIComponent(variable_path)}&hub=${
+																	HubFlow.SIGNATURE_TEMPLATE
+																}`
+															: `/scripts/add?${SECRET_KEY_PATH}=${encodeURIComponent(
+																	variable_path
+																)}&hub=hub%2F${HUB_SCRIPT_ID}`}
+														target="_blank">Create from template</Button
+													>
+												</div>
+											{/if}
+										{/if}
 
-						{#if authentication_method === 'signature'}
-							{#if signature_options_type === 'custom_signature'}
-								<ResourcePicker
-									bind:value={authentication_resource_path}
-									resourceType={'signature_auth'}
-									disabled={!can_write}
-								/>
-							{:else if signature_options_type === 'custom_script'}
-								<p class="text-xs mt-3 mb-1 text-tertiary">
-									Pick a secret variable or create one which will be used as a secret key for your
-									custom script/flow<Required required={true} /><br />
-								</p>
-								<div class="flex flex-row gap-2">
-									<div class="flex flex-row gap-2 w-full">
-										<input
-											type="text"
-											autocomplete="off"
-											bind:value={variable_path}
-											readonly
-											disabled={true}
-										/>
-										<Button
-											title="Add variable"
-											on:click={() => variablePicker?.openDrawer()}
-											size="xs"
-											color="dark"
+										<RouteBodyTransformerOption
+											bind:raw_string
+											bind:wrap_body
 											disabled={!can_write}
-										>
-											Pick variable
-										</Button>
+											{testingBadge}
+										/>
 									</div>
-									<Button
-										disabled={emptyString(variable_path) || !can_write}
-										color="dark"
-										size="xs"
-										href={itemKind === 'flow'
-											? `/flows/add?${SECRET_KEY_PATH}=${encodeURIComponent(variable_path)}&hub=${
-													HubFlow.SIGNATURE_TEMPLATE
-												}`
-											: `/scripts/add?${SECRET_KEY_PATH}=${encodeURIComponent(
-													variable_path
-												)}&hub=hub%2F${HUB_SCRIPT_ID}`}
-										target="_blank">Create from template</Button
-									>
-								</div>
-							{/if}
-						{/if}
-
-						<RouteBodyTransformerOption
-							bind:raw_string
-							bind:wrap_body
-							disabled={!can_write}
-							{testingBadge}
-						/>
+								{:else}
+									<TriggerRetriesAndErrorHandler
+										{optionTabSelected}
+										{itemKind}
+										{can_write}
+										bind:errorHandlerSelected
+										bind:error_handler_path
+										bind:error_handler_args
+										bind:retry
+									/>
+								{/if}
+							</div>
+						</div>
 					</div>
 				</Section>
 			{/if}

package/package/components/triggers/http/RouteEditorInner.svelte.d.ts

@@ -1,3 +1,4 @@
+import { type HttpTrigger, type NewHttpTrigger } from '../../../gen';
 declare const RouteEditorInner: import("svelte").Component<{
     useDrawer?: boolean;
     hideTarget?: boolean;
@@ -14,8 +15,11 @@ declare const RouteEditorInner: import("svelte").Component<{
     trigger?: any;
     customSaveBehavior?: any;
 }, {
-    openEdit: (ePath: string, isFlow: boolean, defaultConfig?: Record<string, any>) => Promise<void>;
-    openNew: (nis_flow: boolean, fixedScriptPath_?: string, defaultValues?: Record<string, any>) => Promise<void>;
+    openEdit: (ePath: string, isFlow: boolean, defaultConfig?: Partial<NewHttpTrigger>) => Promise<void>;
+    openNew: (nis_flow: boolean, fixedScriptPath_?: string, defaultValues?: Partial<HttpTrigger> & {
+        s3FileUploadRawMode?: boolean;
+        signature_options_type?: "custom_script" | "custom_signature";
+    }) => Promise<void>;
 }, "">;
 type RouteEditorInner = ReturnType<typeof RouteEditorInner>;
 export default RouteEditorInner;

package/package/components/triggers/http/utils.js

@@ -25,7 +25,7 @@ export async function saveHttpRouteFromCfg(initialPath, routeCfg, edit, workspac
         is_flow: routeCfg.is_flow,
         is_async: routeCfg.is_async,
         authentication_method: routeCfg.authentication_method,
-        route_path: isAdmin || !edit ? routeCfg.route_path : undefined,
+        route_path: routeCfg.route_path,
         http_method: routeCfg.http_method,
         is_static_website: routeCfg.is_static_website,
         static_asset_config: routeCfg.static_asset_config,
@@ -34,14 +34,20 @@ export async function saveHttpRouteFromCfg(initialPath, routeCfg, edit, workspac
         wrap_body: routeCfg.wrap_body,
         raw_string: routeCfg.raw_string,
         description: routeCfg.description,
-        summary: routeCfg.summary
+        summary: routeCfg.summary,
+        error_handler_path: routeCfg.error_handler_path,
+        error_handler_args: routeCfg.error_handler_path ? routeCfg.error_handler_args : undefined,
+        retry: routeCfg.retry
     };
     try {
         if (edit) {
             await HttpTriggerService.updateHttpTrigger({
                 workspace: workspace,
                 path: initialPath,
-                requestBody: requestBody
+                requestBody: {
+                    ...requestBody,
+                    route_path: isAdmin || !edit ? routeCfg.route_path : undefined
+                }
             });
             sendUserToast(`Route ${routeCfg.path} updated`);
         }

package/package/components/triggers/kafka/KafkaTriggerEditorInner.svelte

@@ -14,7 +14,10 @@ import KafkaTriggersConfigSection from './KafkaTriggersConfigSection.svelte';
 import { untrack } from 'svelte';
 import TriggerEditorToolbar from '../TriggerEditorToolbar.svelte';
 import { saveKafkaTriggerFromCfg } from './utils';
-import { handleConfigChange } from '../utils';
+import { getHandlerType, handleConfigChange } from '../utils';
+import Tabs from '../../common/tabs/Tabs.svelte';
+import Tab from '../../common/tabs/Tab.svelte';
+import TriggerRetriesAndErrorHandler from '../TriggerRetriesAndErrorHandler.svelte';
 let { useDrawer = true, description = undefined, hideTarget = false, hideTooltips = false, isEditor = false, allowDraft = false, trigger = undefined, customLabel, isDeployed = false, cloudDisabled = false, onConfigChange = undefined, onCaptureConfigChange = undefined, onUpdate = undefined, onDelete = undefined, onReset = undefined } = $props();
 let drawer = $state();
 let is_flow = $state(false);
@@ -37,6 +40,11 @@ let kafkaCfgValid = $state(false);
 let kafkaResourcePath = $state('');
 let kafkaCfg = $state({});
 let deploymentLoading = $state(false);
+let optionTabSelected = $state('error_handler');
+let errorHandlerSelected = $state('slack');
+let error_handler_path = $state();
+let error_handler_args = $state({});
+let retry = $state();
 const isValid = $derived(!!kafkaResourcePath &&
     kafkaCfgValid &&
     kafkaCfg.topics &&
@@ -101,6 +109,10 @@ export async function openNew(nis_flow, fixedScriptPath_, nDefaultValues) {
         path = nDefaultValues?.path ?? '';
         initialPath = '';
         dirtyPath = false;
+        error_handler_path = nDefaultValues?.error_handler_path ?? undefined;
+        error_handler_args = nDefaultValues?.error_handler_args ?? {};
+        retry = nDefaultValues?.retry ?? undefined;
+        errorHandlerSelected = getHandlerType(error_handler_path ?? '');
     }
     finally {
         clearTimeout(loadingTimeout);
@@ -121,6 +133,10 @@ function loadTriggerConfig(cfg) {
     enabled = cfg?.enabled;
     extra_perms = cfg?.extra_perms;
     can_write = canWrite(path, cfg?.extra_perms, $userStore);
+    error_handler_path = cfg?.error_handler_path;
+    error_handler_args = cfg?.error_handler_args ?? {};
+    retry = cfg?.retry;
+    errorHandlerSelected = getHandlerType(error_handler_path ?? '');
 }
 async function loadTrigger(defaultConfig) {
     if (defaultConfig) {
@@ -144,7 +160,10 @@ function getSaveCfg() {
         group_id: kafkaCfg.group_id,
         topics: kafkaCfg.topics,
         enabled,
-        extra_perms: extra_perms
+        extra_perms: extra_perms,
+        error_handler_path,
+        error_handler_args,
+        retry
     };
 }
 async function updateTrigger() {
@@ -310,6 +329,28 @@ $effect(() => {
 				{can_write}
 				showTestingBadge={isEditor}
 			/>
+
+			<Section label="Advanced" collapsable>
+				<div class="flex flex-col gap-4">
+					<div class="min-h-96">
+						<Tabs bind:selected={optionTabSelected}>
+							<Tab value="error_handler">Error Handler</Tab>
+							<Tab value="retries">Retries</Tab>
+						</Tabs>
+						<div class="mt-4">
+							<TriggerRetriesAndErrorHandler
+								{optionTabSelected}
+								{itemKind}
+								{can_write}
+								bind:errorHandlerSelected
+								bind:error_handler_path
+								bind:error_handler_args
+								bind:retry
+							/>
+						</div>
+					</div>
+				</div>
+			</Section>
 		</div>
 	{/if}
 {/snippet}

package/package/components/triggers/kafka/utils.js

@@ -2,13 +2,21 @@ import { KafkaTriggerService } from '../../../gen';
 import { sendUserToast } from '../../../toast';
 import { get } from 'svelte/store';
 export async function saveKafkaTriggerFromCfg(initialPath, cfg, edit, workspace, usedTriggerKinds) {
+    const errorHandlerAndRetries = !cfg.is_flow
+        ? {
+            error_handler_path: cfg.error_handler_path,
+            error_handler_args: cfg.error_handler_path ? cfg.error_handler_args : undefined,
+            retry: cfg.retry
+        }
+        : {};
     const requestBody = {
         path: cfg.path,
         script_path: cfg.script_path,
         is_flow: cfg.is_flow,
         kafka_resource_path: cfg.kafka_resource_path,
         group_id: cfg.group_id,
-        topics: cfg.topics
+        topics: cfg.topics,
+        ...errorHandlerAndRetries
     };
     try {
         if (edit) {