windmill-components 1.504.6 → 1.511.0

package/package/components/triggers/TriggersEditor.svelte

@@ -13,6 +13,8 @@ import Button from '../common/button/Button.svelte';
 import TriggersWrapperV2 from './TriggersWrapper.svelte';
 import { triggerTypeToCaptureKind, CLOUD_DISABLED_TRIGGER_TYPES } from './utils';
 import { isCloudHosted } from '../../cloud';
+import { ScheduleService, WebsocketTriggerService, PostgresTriggerService, KafkaTriggerService, NatsTriggerService, MqttTriggerService, HttpTriggerService, GcpTriggerService, SqsTriggerService } from '../../gen';
+import { sendUserToast } from '../../toast';
 let { noEditor, newItem = false, currentPath, fakeInitialPath = '', hash = undefined, args = {}, initialPath, isFlow, canHavePreprocessor = false, hasPreprocessor = false, isDeployed = false, schema = undefined, noCapture = false, isEditor = true, onDeployTrigger } = $props();
 let config = $state({});
 let width = $state(0);
@@ -30,10 +32,50 @@ onDestroy(() => {
 function onSelect(triggerIndex) {
     triggersState.selectedTriggerIndex = triggerIndex;
 }
-function deleteDraftTrigger(triggerIndex) {
+let deletingTrigger = $state(undefined);
+async function deleteDeployedTrigger(triggerIndex) {
+    const { type: triggerType, path: triggerPath } = triggersState.triggers[triggerIndex];
+    if (!triggerPath) {
+        return;
+    }
+    const deleteHandlers = {
+        schedule: () => ScheduleService.deleteSchedule,
+        websocket: () => WebsocketTriggerService.deleteWebsocketTrigger,
+        postgres: () => PostgresTriggerService.deletePostgresTrigger,
+        kafka: () => KafkaTriggerService.deleteKafkaTrigger,
+        nats: () => NatsTriggerService.deleteNatsTrigger,
+        gcp: () => GcpTriggerService.deleteGcpTrigger,
+        sqs: () => SqsTriggerService.deleteSqsTrigger,
+        mqtt: () => MqttTriggerService.deleteMqttTrigger,
+        http: () => HttpTriggerService.deleteHttpTrigger
+    };
+    const deleteHandler = deleteHandlers[triggerType];
+    if (deleteHandler && deletingTrigger !== triggerIndex) {
+        deletingTrigger = triggerIndex;
+        try {
+            await deleteHandler()({
+                workspace: $workspaceStore ?? '',
+                path: triggerPath ?? ''
+            });
+            sendUserToast(`Successfully deleted ${triggerType} trigger: ${triggerPath}`);
+        }
+        catch (error) {
+            sendUserToast(error.body || error.message, true);
+        }
+        finally {
+            deletingTrigger = undefined;
+        }
+    }
+}
+async function deleteTrigger(triggerIndex) {
     if (triggerIndex === undefined) {
         return;
     }
+    // If the trigger is deployed, delete the trigger from the db
+    if (!triggersState.triggers[triggerIndex].isDraft &&
+        triggersState.triggers[triggerIndex].path) {
+        await deleteDeployedTrigger(triggerIndex);
+    }
     triggersState.deleteTrigger(triggersCount, triggerIndex);
     triggersState.selectedTriggerIndex = triggersState.triggers.length - 1;
 }
@@ -110,7 +152,7 @@ const cloudDisabled = $derived(CLOUD_DISABLED_TRIGGER_TYPES.includes(triggersSta
 								triggers={triggersState.triggers}
 								{isEditor}
 								onAddDraftTrigger={handleAddTrigger}
-								onDeleteDraft={deleteDraftTrigger}
+								onDeleteDraft={deleteTrigger}
 								onReset={handleResetDraft}
 								webhookToken={$triggersCount?.webhook_count}
 								emailToken={$triggersCount?.email_count}
@@ -170,7 +212,7 @@ const cloudDisabled = $derived(CLOUD_DISABLED_TRIGGER_TYPES.includes(triggersSta
 										{schema}
 										{isEditor}
 										onDelete={() => {
-											deleteDraftTrigger(triggersState.selectedTriggerIndex)
+											deleteTrigger(triggersState.selectedTriggerIndex)
 										}}
 										onUpdate={(path) => {
 											handleUpdate(triggersState.selectedTriggerIndex, path)

package/package/components/triggers/TriggersWrapper.svelte

@@ -34,13 +34,13 @@ let { selectedTrigger, isFlow = false, initialPath, fakeInitialPath, currentPath
 		{hash}
 		token=""
 		{args}
-		scopes={isFlow ? [`run:flow/${currentPath}`] : [`run:script/${currentPath}`]}
+		scopes={isFlow ? [`jobs:run:flows:${currentPath}`] : [`jobs:run:scripts:${currentPath}`]}
 		{newItem}
 	/>
 {:else if selectedTrigger.type === 'email'}
 	<EmailTriggerPanel
 		token=""
-		scopes={isFlow ? [`run:flow/${currentPath}`] : [`run:script/${currentPath}`]}
+		scopes={isFlow ? [`jobs:run:flows:${currentPath}`] : [`jobs:run:scripts:${currentPath}`]}
 		path={initialPath || fakeInitialPath}
 		{isFlow}
 		on:email-domain

package/package/components/triggers/gcp/GcpTriggerEditorInner.svelte

@@ -14,8 +14,11 @@ import GcpTriggerEditorConfigSection from './GcpTriggerEditorConfigSection.svelt
 import { untrack } from 'svelte';
 import TriggerEditorToolbar from '../TriggerEditorToolbar.svelte';
 import { saveGcpTriggerFromCfg } from './utils';
-import { handleConfigChange } from '../utils';
+import { getHandlerType, handleConfigChange } from '../utils';
 import { base } from '../../../base';
+import Tabs from '../../common/tabs/Tabs.svelte';
+import Tab from '../../common/tabs/Tab.svelte';
+import TriggerRetriesAndErrorHandler from '../TriggerRetriesAndErrorHandler.svelte';
 let drawer = $state(undefined);
 let is_flow = $state(false);
 let initialPath = $state('');
@@ -40,6 +43,11 @@ let subscription_mode = $state('create_update');
 let initialConfig = undefined;
 let deploymentLoading = $state(false);
 let base_endpoint = $derived(`${window.location.origin}${base}`);
+let optionTabSelected = $state('error_handler');
+let errorHandlerSelected = $state('slack');
+let error_handler_path = $state();
+let error_handler_args = $state({});
+let retry = $state();
 let { useDrawer = true, description = undefined, hideTarget = false, hideTooltips = false, isEditor = false, allowDraft = false, trigger = undefined, isDeployed = false, customLabel = undefined, onConfigChange = undefined, onCaptureConfigChange = undefined, onUpdate = undefined, onDelete = undefined, onReset = undefined, cloudDisabled = false } = $props();
 const gcpConfig = $derived.by(getGcpConfig);
 const saveDisabled = $derived(pathError != '' || emptyString(script_path) || !isValid || !can_write);
@@ -84,6 +92,10 @@ export async function openNew(nis_flow, fixedScriptPath_, defaultValues) {
         edit = false;
         dirtyPath = false;
         enabled = defaultValues?.enabled ?? false;
+        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 {
         drawerLoading = false;
@@ -120,6 +132,10 @@ async function loadTriggerConfig(cfg) {
     enabled = cfg?.enabled;
     topic_id = cfg?.topic_id ?? '';
     can_write = canWrite(cfg?.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 updateTrigger() {
     deploymentLoading = true;
@@ -146,7 +162,10 @@ function getGcpConfig() {
         path,
         script_path,
         enabled,
-        is_flow
+        is_flow,
+        error_handler_path,
+        error_handler_args,
+        retry
     };
 }
 function getGcpCaptureConfig() {
@@ -201,14 +220,14 @@ $effect(() => {
 	</Drawer>
 {:else}
 	<Section label={!customLabel ? 'GCP Pub/Sub trigger' : ''} headerClass="grow min-w-0 h-[30px]">
-		<svelte:fragment slot="header">
+		{#snippet header()}
 			{#if customLabel}
 				{@render customLabel()}
 			{/if}
-		</svelte:fragment>
-		<svelte:fragment slot="action">
+		{/snippet}
+		{#snippet action()}
 			{@render actionsButtons()}
-		</svelte:fragment>
+		{/snippet}
 		{@render config()}
 	</Section>
 {/if}
@@ -317,6 +336,28 @@ $effect(() => {
 				headless={true}
 				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/gcp/utils.js

@@ -3,6 +3,13 @@ import { sendUserToast } from '../../../toast';
 import { get } from 'svelte/store';
 export async function saveGcpTriggerFromCfg(initialPath, cfg, edit, workspace, usedTriggerKinds) {
     try {
+        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 = {
             gcp_resource_path: cfg.gcp_resource_path,
             subscription_mode: cfg.subscription_mode,
@@ -14,7 +21,8 @@ export async function saveGcpTriggerFromCfg(initialPath, cfg, edit, workspace, u
             path: cfg.path,
             script_path: cfg.script_path,
             enabled: cfg.enabled,
-            is_flow: cfg.is_flow
+            is_flow: cfg.is_flow,
+            ...errorHandlerAndRetries
         };
         if (edit) {
             await GcpTriggerService.updateGcpTrigger({

package/package/components/triggers/http/OpenAPISpecGenerator.svelte

@@ -168,6 +168,7 @@ export function openDrawer() {
 						token = e.detail
 					}}
 					newTokenLabel={`openapi-${$userStore?.username ?? 'superadmin'}-${generateRandomString(4)}`}
+					scopes={['openapi:write']}
 				/>
 			</div>
 
@@ -180,7 +181,7 @@ export function openDrawer() {
 			</Label>
 
 			<Label label="Example cURL">
-				<svelte:fragment slot="header">
+				{#snippet header()}
 					<Tooltip>
 						Use this cURL command to call the OpenAPI generation endpoint.
 
@@ -196,7 +197,7 @@ export function openDrawer() {
 
 						<br />
 					</Tooltip>
-				</svelte:fragment>
+				{/snippet}
 				<CopyableCodeBlock
 					code={`token=${emptyString(token) ? '' : token}; \\
 curl -X POST "${window.location.origin}${base}/api/w/${$workspaceStore!}/openapi/generate" \\

package/package/components/triggers/http/RouteEditorConfigSection.svelte

@@ -10,19 +10,10 @@ import { getHttpRoute } from './utils';
 import { isCloudHosted } from '../../../cloud';
 import Toggle from '../../Toggle.svelte';
 import TestingBadge from '../testingBadge.svelte';
-export let initialTriggerPath = undefined;
-export let dirtyRoutePath = false;
-export let route_path;
-export let http_method;
-export let can_write = false;
-export let static_asset_config = undefined;
-export let headless = false;
-export let workspaced_route = false;
-export let isValid = false;
-export let isDraftOnly = true;
-export let showTestingBadge = false;
+import { untrack } from 'svelte';
+let { initialTriggerPath = undefined, dirtyRoutePath = $bindable(false), route_path = $bindable(), http_method = $bindable(), can_write = false, static_asset_config = $bindable(undefined), headless = false, workspaced_route = $bindable(false), isValid = $bindable(false), isDraftOnly = true, showTestingBadge = false } = $props();
 let validateTimeout = undefined;
-let routeError = '';
+let routeError = $state('');
 async function validateRoute(routePath, method, workspaced_route) {
     if (validateTimeout) {
         clearTimeout(validateTimeout);
@@ -51,22 +42,34 @@ async function routeExists(route_path, method, workspaced_route) {
         }
     });
 }
-$: validateRoute(route_path, http_method, workspaced_route);
-$: isValid = routeError === '';
-$: fullRoute = getHttpRoute('r', route_path, workspaced_route, $workspaceStore ?? '');
-$: !http_method && (http_method = 'post');
-$: route_path === undefined && (route_path = '');
-$: userIsAdmin = $userStore?.is_admin || $userStore?.is_super_admin;
-$: userCanEditConfig = userIsAdmin || isDraftOnly; // User can edit config if they are admin or if the trigger is a draft which will not be saved
+$effect.pre(() => {
+    ;
+    [route_path, http_method, workspaced_route];
+    untrack(() => {
+        validateRoute(route_path, http_method, workspaced_route);
+    });
+});
+$effect.pre(() => {
+    isValid = routeError === '';
+});
+let fullRoute = $derived(getHttpRoute('r', route_path, workspaced_route, $workspaceStore ?? ''));
+$effect.pre(() => {
+    !http_method && (http_method = 'post');
+});
+$effect.pre(() => {
+    route_path === undefined && (route_path = '');
+});
+let userIsAdmin = $derived($userStore?.is_admin || $userStore?.is_super_admin);
+let userCanEditConfig = $derived(userIsAdmin || isDraftOnly); // User can edit config if they are admin or if the trigger is a draft which will not be saved
 </script>
 
 <div>
 	<Section label="HTTP" {headless}>
-		<svelte:fragment slot="header">
+		{#snippet header()}
 			{#if showTestingBadge}
 				<TestingBadge />
 			{/if}
-		</svelte:fragment>
+		{/snippet}
 		{#if !userCanEditConfig && isDraftOnly}
 			<Alert type="info" title="Admin only" collapsible size="xs">
 				Route endpoints can only be edited by workspace admins
@@ -83,7 +86,7 @@ $: userCanEditConfig = userIsAdmin || isDraftOnly; // User can edit config if th
 						</div>
 						<div class="text-2xs text-tertiary"> ':myparam' for path params </div>
 					</div>
-					<!-- svelte-ignore a11y-autofocus -->
+					<!-- svelte-ignore a11y_autofocus -->
 					<input
 						type="text"
 						autocomplete="off"
@@ -92,7 +95,7 @@ $: userCanEditConfig = userIsAdmin || isDraftOnly; // User can edit config if th
 						class={routeError === ''
 							? ''
 							: 'border border-red-700 bg-red-100 border-opacity-30 focus:border-red-700 focus:border-opacity-30 focus-visible:ring-red-700 focus-visible:ring-opacity-25 focus-visible:border-red-700'}
-						on:input={() => {
+						oninput={() => {
 							dirtyRoutePath = true
 						}}
 					/>

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

@@ -1,21 +1,8 @@
-interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> = any, Events extends Record<string, any> = any, Slots extends Record<string, any> = any, Exports = {}, Bindings = string> {
-    new (options: import('svelte').ComponentConstructorOptions<Props>): import('svelte').SvelteComponent<Props, Events, Slots> & {
-        $$bindings?: Bindings;
-    } & Exports;
-    (internal: unknown, props: Props & {
-        $$events?: Events;
-        $$slots?: Slots;
-    }): Exports & {
-        $set?: any;
-        $on?: any;
-    };
-    z_$$bindings?: Bindings;
-}
-declare const RouteEditorConfigSection: $$__sveltets_2_IsomorphicComponent<{
+interface Props {
     initialTriggerPath?: string | undefined;
     dirtyRoutePath?: boolean;
     route_path: string | undefined;
-    http_method: "get" | "post" | "put" | "patch" | "delete" | undefined;
+    http_method: 'get' | 'post' | 'put' | 'patch' | 'delete' | undefined;
     can_write?: boolean;
     static_asset_config?: {
         s3: string;
@@ -27,8 +14,7 @@ declare const RouteEditorConfigSection: $$__sveltets_2_IsomorphicComponent<{
     isValid?: boolean;
     isDraftOnly?: boolean;
     showTestingBadge?: boolean;
-}, {
-    [evt: string]: CustomEvent<any>;
-}, {}, {}, string>;
-type RouteEditorConfigSection = InstanceType<typeof RouteEditorConfigSection>;
+}
+declare const RouteEditorConfigSection: import("svelte").Component<Props, {}, "route_path" | "http_method" | "workspaced_route" | "static_asset_config" | "isValid" | "dirtyRoutePath">;
+type RouteEditorConfigSection = ReturnType<typeof RouteEditorConfigSection>;
 export default RouteEditorConfigSection;