windmill-components 1.687.0 → 1.695.1

package/package/components/triggers/nats/NatsTriggerEditorInner.svelte

@@ -7,6 +7,7 @@ import ScriptPicker from '../../ScriptPicker.svelte';
 import { NatsTriggerService } from '../../../gen';
 import { usedTriggerKinds, userStore, workspaceStore } from '../../../stores';
 import { canWrite, capitalize, emptyString, sendUserToast } from '../../../utils';
+import { withForkConflictRetry } from '../../../utils/forkConflict';
 import Section from '../../Section.svelte';
 import { Loader2 } from 'lucide-svelte';
 import Label from '../../Label.svelte';
@@ -213,13 +214,18 @@ function useDefaultValues() {
         defaultValues.servers.some((broker) => broker.trim() !== ''));
 }
 async function handleToggleMode(newMode) {
+    const previousMode = mode;
     mode = newMode;
     if (!trigger?.draftConfig) {
-        await NatsTriggerService.setNatsTriggerMode({
+        const ok = await withForkConflictRetry((force) => NatsTriggerService.setNatsTriggerMode({
             path: initialPath,
             workspace: $workspaceStore ?? '',
-            requestBody: { mode: newMode }
-        });
+            requestBody: { mode: newMode, force }
+        }), 'NATS trigger');
+        if (!ok) {
+            mode = previousMode;
+            return;
+        }
         sendUserToast(`${capitalize(newMode)} NATS trigger ${initialPath}`);
         onUpdate?.(initialPath);
     }

package/package/components/triggers/postgres/PostgresTriggerEditorInner.svelte

@@ -7,6 +7,7 @@ import ScriptPicker from '../../ScriptPicker.svelte';
 import { PostgresTriggerService } from '../../../gen';
 import { usedTriggerKinds, userStore, workspaceStore } from '../../../stores';
 import { canWrite, emptyString, emptyStringTrimmed, sendUserToast } from '../../../utils';
+import { withForkConflictRetry } from '../../../utils/forkConflict';
 import Section from '../../Section.svelte';
 import { Loader2 } from 'lucide-svelte';
 import Label from '../../Label.svelte';
@@ -362,13 +363,18 @@ const getTemplateScript = async () => {
     }
 };
 async function handleToggleMode(newMode) {
+    const previousMode = mode;
     mode = newMode;
     if (!trigger?.draftConfig) {
-        await PostgresTriggerService.setPostgresTriggerMode({
+        const ok = await withForkConflictRetry((force) => PostgresTriggerService.setPostgresTriggerMode({
             path: initialPath,
             workspace: $workspaceStore ?? '',
-            requestBody: { mode: newMode }
-        });
+            requestBody: { mode: newMode, force }
+        }), 'postgres trigger');
+        if (!ok) {
+            mode = previousMode;
+            return;
+        }
         sendUserToast(`${capitalize(newMode)} postgres trigger ${initialPath}`);
         onUpdate?.(initialPath);
     }

package/package/components/triggers/schedules/ScheduleEditorInner.svelte

@@ -26,6 +26,7 @@ import Label from '../../Label.svelte';
 import WorkerTagPicker from '../../WorkerTagPicker.svelte';
 import { runScheduleNow } from '../scheduled/utils';
 import { handleConfigChange } from '../utils';
+import { withForkConflictRetry } from '../../../utils/forkConflict';
 import TextInput from '../../text_input/TextInput.svelte';
 import { twMerge } from 'tailwind-merge';
 import PermissionedAsLine from '../PermissionedAsLine.svelte';
@@ -575,13 +576,18 @@ function getScheduleCfg() {
     };
 }
 async function handleToggleEnabled(nEnabled) {
+    const previousEnabled = enabled;
     enabled = nEnabled;
     if (!trigger?.draftConfig) {
-        await ScheduleService.setScheduleEnabled({
+        const ok = await withForkConflictRetry((force) => ScheduleService.setScheduleEnabled({
             path: initialPath,
             workspace: $workspaceStore ?? '',
-            requestBody: { enabled: nEnabled }
-        });
+            requestBody: { enabled: nEnabled, force }
+        }), 'schedule');
+        if (!ok) {
+            enabled = previousEnabled;
+            return;
+        }
         sendUserToast(`${nEnabled ? 'enabled' : 'disabled'} schedule ${initialPath}`);
         onUpdate?.(initialPath);
     }

package/package/components/triggers/sqs/SqsTriggerEditorInner.svelte

@@ -4,6 +4,7 @@ import DrawerContent from '../../common/drawer/DrawerContent.svelte';
 import Path from '../../Path.svelte';
 import { usedTriggerKinds, userStore, workspaceStore } from '../../../stores';
 import { canWrite, capitalize, emptyString, sendUserToast } from '../../../utils';
+import { withForkConflictRetry } from '../../../utils/forkConflict';
 import { Loader2 } from 'lucide-svelte';
 import Label from '../../Label.svelte';
 import { SqsTriggerService } from '../../../gen';
@@ -186,13 +187,18 @@ function getSaveCfg() {
     };
 }
 async function handleToggleMode(newMode) {
+    const previousMode = mode;
     mode = newMode;
     if (!trigger?.draftConfig) {
-        await SqsTriggerService.setSqsTriggerMode({
+        const ok = await withForkConflictRetry((force) => SqsTriggerService.setSqsTriggerMode({
             path: initialPath,
             workspace: $workspaceStore ?? '',
-            requestBody: { mode: newMode }
-        });
+            requestBody: { mode: newMode, force }
+        }), 'SQS trigger');
+        if (!ok) {
+            mode = previousMode;
+            return;
+        }
         sendUserToast(`${capitalize(newMode)} SQS trigger ${initialPath}`);
         onUpdate?.(initialPath);
     }

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

@@ -26,6 +26,7 @@ export declare class Triggers {
     fetchMqttTriggers(triggersCountStore: Writable<TriggersCount | undefined>, workspaceId: string | undefined, path: string, isFlow: boolean, user?: UserExt | undefined): Promise<void>;
     fetchSqsTriggers(triggersCountStore: Writable<TriggersCount | undefined>, workspaceId: string | undefined, path: string, isFlow: boolean, user?: UserExt | undefined): Promise<void>;
     fetchGcpTriggers(triggersCountStore: Writable<TriggersCount | undefined>, workspaceId: string | undefined, path: string, isFlow: boolean, user?: UserExt | undefined): Promise<void>;
+    fetchAzureTriggers(triggersCountStore: Writable<TriggersCount | undefined>, workspaceId: string | undefined, path: string, isFlow: boolean, user?: UserExt | undefined): Promise<void>;
     fetchHttpTriggers(triggersCountStore: Writable<TriggersCount | undefined>, workspaceId: string | undefined, path: string, isFlow: boolean, user?: UserExt | undefined): Promise<void>;
     fetchEmailTriggers(triggersCountStore: Writable<TriggersCount | undefined>, workspaceId: string | undefined, path: string, isFlow: boolean, user?: UserExt | undefined): Promise<void>;
     fetchNativeTriggers(triggersCountStore: Writable<TriggersCount | undefined>, serviceName: NativeServiceName, workspaceId: string | undefined, path: string, isFlow: boolean, user?: UserExt | undefined): Promise<void>;

package/package/components/triggers/triggers.svelte.js

@@ -1,4 +1,4 @@
-import { KafkaTriggerService, MqttTriggerService, NatsTriggerService, PostgresTriggerService, ScheduleService, SqsTriggerService, WebsocketTriggerService, NativeTriggerService, HttpTriggerService, GcpTriggerService, EmailTriggerService } from '../../gen';
+import { KafkaTriggerService, MqttTriggerService, NatsTriggerService, PostgresTriggerService, ScheduleService, SqsTriggerService, WebsocketTriggerService, NativeTriggerService, HttpTriggerService, GcpTriggerService, AzureTriggerService, EmailTriggerService } from '../../gen';
 import { enterpriseLicense } from '../../stores';
 import { getLightConfig, sortTriggers, updateTriggersCount } from './utils';
 import { get } from 'svelte/store';
@@ -298,6 +298,27 @@ export class Triggers {
             console.error('Failed to fetch GCP Pub/Sub triggers:', error);
         }
     }
+    async fetchAzureTriggers(triggersCountStore, workspaceId, path, isFlow, user = undefined) {
+        if (!workspaceId)
+            return;
+        try {
+            const azureTriggers = await AzureTriggerService.listAzureTriggers({
+                workspace: workspaceId,
+                path,
+                isFlow
+            });
+            const azureCount = this.updateTriggers(azureTriggers, 'azure', user);
+            triggersCountStore.update((triggersCount) => {
+                return {
+                    ...(triggersCount ?? {}),
+                    azure_count: azureCount
+                };
+            });
+        }
+        catch (error) {
+            console.error('Failed to fetch Azure triggers:', error);
+        }
+    }
     async fetchHttpTriggers(triggersCountStore, workspaceId, path, isFlow, user = undefined) {
         if (!workspaceId)
             return;
@@ -389,6 +410,7 @@ export class Triggers {
                     this.fetchKafkaTriggers(triggersCountStore, workspaceId, path, isFlow, user),
                     this.fetchSqsTriggers(triggersCountStore, workspaceId, path, isFlow, user),
                     this.fetchGcpTriggers(triggersCountStore, workspaceId, path, isFlow, user),
+                    this.fetchAzureTriggers(triggersCountStore, workspaceId, path, isFlow, user),
                     this.fetchEmailTriggers(triggersCountStore, workspaceId, path, isFlow, user),
                     this.fetchNatsTriggers(triggersCountStore, workspaceId, path, isFlow, user)
                 ]

package/package/components/triggers/utils.js

@@ -4,6 +4,7 @@ import NatsIcon from '../icons/NatsIcon.svelte';
 import MqttIcon from '../icons/MqttIcon.svelte';
 import AwsIcon from '../icons/AwsIcon.svelte';
 import GoogleCloudIcon from '../icons/GoogleCloudIcon.svelte';
+import AzureIcon from '../icons/AzureIcon.svelte';
 import SchedulePollIcon from '../icons/SchedulePollIcon.svelte';
 import { saveScheduleFromCfg } from '../flows/scheduleUtils';
 import { saveHttpRouteFromCfg } from './http/utils';
@@ -14,6 +15,7 @@ import { saveSqsTriggerFromCfg } from './sqs/utils';
 import { saveNatsTriggerFromCfg } from './nats/utils';
 import { saveMqttTriggerFromCfg } from './mqtt/utils';
 import { saveGcpTriggerFromCfg } from './gcp/utils';
+import { saveAzureTriggerFromCfg } from './azure/utils';
 import { emptyString } from '../../utils';
 import { saveEmailTriggerFromCfg } from './email/utils';
 import NextcloudIcon from '../icons/NextcloudIcon.svelte';
@@ -26,6 +28,7 @@ export const CLOUD_DISABLED_TRIGGER_TYPES = [
     'sqs',
     'mqtt',
     'gcp',
+    'azure',
     'websocket',
     'postgres'
 ];
@@ -42,6 +45,7 @@ export const jobTriggerKinds = [
     'postgres',
     'schedule',
     'gcp',
+    'azure',
     'google',
     'github'
 ];
@@ -59,6 +63,7 @@ export const triggerIconMap = {
     mqtt: MqttIcon,
     sqs: AwsIcon,
     gcp: GoogleCloudIcon,
+    azure: AzureIcon,
     primary_schedule: Calendar,
     poll: SchedulePollIcon,
     cli: Terminal,
@@ -76,6 +81,7 @@ export const triggerDisplayNamesMap = {
     mqtt: 'MQTT',
     sqs: 'SQS',
     gcp: 'GCP Pub/Sub',
+    azure: 'Azure Event Grid',
     email: 'Email',
     poll: 'Scheduled Poll',
     webhook: 'Webhook',
@@ -104,6 +110,7 @@ export function triggerTypeToCaptureKind(triggerType) {
         'mqtt',
         'sqs',
         'gcp',
+        'azure',
         'cli'
     ];
     if (capturableTriggerTypes.includes(triggerType)) {
@@ -125,6 +132,7 @@ export function updateTriggersCount(triggersCountStore, type, action, primaryCfg
         mqtt: 'mqtt_count',
         sqs: 'sqs_count',
         gcp: 'gcp_count',
+        azure: 'azure_count',
         email: 'email_count',
         poll: undefined,
         cli: undefined,
@@ -194,6 +202,8 @@ export function triggerKindToTriggerType(kind) {
             return 'sqs';
         case 'gcp':
             return 'gcp';
+        case 'azure':
+            return 'azure';
         case 'scheduledPoll':
             return 'poll';
         default:
@@ -233,6 +243,7 @@ export async function deployTriggers(triggersToDeploy, workspaceId, isAdmin, use
         mqtt: (trigger) => saveMqttTriggerFromCfg(trigger.path ?? trigger.draftConfig?.path ?? '', trigger.draftConfig ?? {}, !trigger.isDraft, workspaceId, usedTriggerKinds),
         sqs: (trigger) => saveSqsTriggerFromCfg(trigger.path ?? trigger.draftConfig?.path ?? '', trigger.draftConfig ?? {}, !trigger.isDraft, workspaceId, usedTriggerKinds),
         gcp: (trigger) => saveGcpTriggerFromCfg(trigger.path ?? trigger.draftConfig?.path ?? '', trigger.draftConfig ?? {}, !trigger.isDraft, workspaceId, usedTriggerKinds),
+        azure: (trigger) => saveAzureTriggerFromCfg(trigger.path ?? trigger.draftConfig?.path ?? '', trigger.draftConfig ?? {}, !trigger.isDraft, workspaceId, usedTriggerKinds),
         email: (trigger) => saveEmailTriggerFromCfg(trigger.path ?? trigger.draftConfig?.path ?? '', trigger.draftConfig ?? {}, !trigger.isDraft, workspaceId, isAdmin, usedTriggerKinds),
         poll: undefined,
         cli: undefined,
@@ -316,6 +327,14 @@ export function getLightConfig(triggerType, trigger) {
     else if (triggerType === 'gcp') {
         return { gcp_resource_path: trigger.gcp_resource_path, topic: trigger.topic };
     }
+    else if (triggerType === 'azure') {
+        return {
+            azure_resource_path: trigger.azure_resource_path,
+            azure_mode: trigger.azure_mode,
+            scope_resource_id: trigger.scope_resource_id,
+            topic_name: trigger.topic_name
+        };
+    }
     else if (triggerType === 'email') {
         return { local_part: trigger.local_part };
     }
@@ -435,6 +454,7 @@ export function sortTriggers(triggers) {
         'mqtt',
         'sqs',
         'gcp',
+        'azure',
         'email',
         'nextcloud',
         'google',

package/package/components/triggers/websocket/WebsocketTriggerEditorInner.svelte

@@ -8,6 +8,7 @@ import ScriptPicker from '../../ScriptPicker.svelte';
 import { FlowService, ScriptService, WebsocketTriggerService } from '../../../gen';
 import { usedTriggerKinds, userStore, workspaceStore } from '../../../stores';
 import { canWrite, emptySchema, emptyString, sendUserToast } from '../../../utils';
+import { withForkConflictRetry } from '../../../utils/forkConflict';
 import Section from '../../Section.svelte';
 import { Loader2, X, Plus } from 'lucide-svelte';
 import Label from '../../Label.svelte';
@@ -282,13 +283,18 @@ function getCaptureConfig() {
     };
 }
 async function handleToggleMode(newMode) {
+    const previousMode = mode;
     mode = newMode;
     if (!trigger?.draftConfig) {
-        await WebsocketTriggerService.setWebsocketTriggerMode({
+        const ok = await withForkConflictRetry((force) => WebsocketTriggerService.setWebsocketTriggerMode({
             path: initialPath,
             workspace: $workspaceStore ?? '',
-            requestBody: { mode: newMode }
-        });
+            requestBody: { mode: newMode, force }
+        }), 'websocket trigger');
+        if (!ok) {
+            mode = previousMode;
+            return;
+        }
         sendUserToast(`${capitalize(newMode)} websocket trigger ${initialPath}`);
         onUpdate?.(initialPath);
     }

package/package/components/triggers.d.ts

@@ -16,5 +16,5 @@ export type TriggerContext = {
     triggersState: Triggers;
 };
 export declare function setScheduledPollSchedule(triggersState: Triggers, triggersCount: Writable<TriggersCount | undefined>): void;
-export type TriggerKind = 'webhooks' | 'emails' | 'default_emails' | 'schedules' | 'cli' | 'routes' | 'websockets' | 'scheduledPoll' | 'kafka' | 'nats' | 'postgres' | 'mqtt' | 'sqs' | 'gcp' | 'nextcloud' | 'google' | 'github';
+export type TriggerKind = 'webhooks' | 'emails' | 'default_emails' | 'schedules' | 'cli' | 'routes' | 'websockets' | 'scheduledPoll' | 'kafka' | 'nats' | 'postgres' | 'mqtt' | 'sqs' | 'gcp' | 'azure' | 'nextcloud' | 'google' | 'github';
 export declare function captureTriggerKindToTriggerKind(kind: CaptureTriggerKind): TriggerKind;

package/package/components/useNestedRestartState.svelte.d.ts

@@ -0,0 +1,56 @@
+import type { FlowModule, Job } from '../gen';
+import type { GraphModuleState } from './graph';
+export type NestedRestartStep = {
+    step_id: string;
+    branch_or_iteration_n?: number;
+};
+/**
+ * Reactive state shared by the run page and the editor's flow preview to drive
+ * the "restart flow at step" UI. Given the currently selected step, the
+ * completed flow job, the graph's per-module display state, and any expanded
+ * subflow definitions, derives:
+ *
+ *   - `selectedJobStepIsTopLevel` — whether the selected step appears in the
+ *     parent flow's top-level `flow_status.modules`
+ *   - `selectedJobStepType` — `single` / `forloop` / `branchall`, used by the
+ *     popup to decide which controls to render for the OUTER container
+ *   - `restartBranchNames` — for top-level BranchAll steps, the labels for the
+ *     branch picker
+ *   - `nestedRestartTopStepId` / `nestedRestartTopBranchOrIterationN` /
+ *     `nestedRestartPath` — the API request shape when restarting at a nested
+ *     step (single source of truth for both call sites)
+ *   - `nestedRestartSupported` — gate for showing the button when the selected
+ *     step is nested (subflow expansion or BranchOne / sequential ForLoop)
+ *   - `topLevelLoopIteration` — when the selected step IS a top-level ForLoop,
+ *     the iteration the user is currently viewing (pre-fills the popup input)
+ *   - `iterationCounts` — map of step id → number of recorded iterations,
+ *     so the popup can render an iteration `<select>` matching the graph's tabs
+ *     instead of a free-form number input
+ *
+ * Inputs are passed as getters so the composable stays reactive in either
+ * caller's signal graph.
+ */
+export declare function useNestedRestartState(opts: {
+    selectedJobStep: () => string | undefined;
+    job: () => Job | undefined;
+    graphModuleStates: () => Record<string, GraphModuleState>;
+    /** Subflow definitions cached when the user expands a subflow in the graph,
+     * keyed by the graph node id (i.e. the prefixed `subflow:...:<step_id>` for
+     * nested subflows). Lets us walk inside subflows when building the nested
+     * restart path. */
+    expandedSubflows?: () => Record<string, {
+        modules: FlowModule[];
+    }>;
+}): {
+    readonly selectedJobStepIsTopLevel: boolean | undefined;
+    readonly selectedJobStepType: "branchall" | "forloop" | "single";
+    readonly restartBranchNames: [number, string][];
+    readonly nestedRestartTopStepId: string | undefined;
+    readonly nestedRestartTopBranchOrIterationN: number | undefined;
+    readonly nestedRestartPath: NestedRestartStep[] | undefined;
+    readonly nestedRestartSupported: boolean;
+    readonly topLevelLoopIteration: number | undefined;
+    readonly topLevelRestartable: boolean;
+    readonly iterationCounts: Record<string, number>;
+    readonly nestedPathIterationCounts: Record<string, number>;
+};