windmill-components 1.687.0 → 1.695.1

package/package/templates/ci_test_bun.ts.template

@@ -1,10 +1,18 @@
 // test: script/u/user/script_to_test
 //
+// Wildcards: `*` matches one path segment, `**` matches any depth.
+//   // test: script/u/user/*
+//   // test: flow/u/team/**
+//
 // To test multiple items, list them on separate lines:
 // // test:
 // // script/u/user/script_a
 // // script/u/user/script_b
 // // flow/u/user/my_flow
+//
+// The triggering item is exposed as process.env.WM_TESTED_RUNNABLE
+// (e.g. "script/u/user/script_to_test"), useful for branching inside a
+// single test script that covers multiple targets.
 import * as wmill from "windmill-client";
 
 export async function main() {

package/package/templates/ci_test_python.py.template

@@ -1,10 +1,18 @@
 # test: script/u/user/script_to_test
 #
+# Wildcards: `*` matches one path segment, `**` matches any depth.
+#   # test: script/u/user/*
+#   # test: flow/u/team/**
+#
 # To test multiple items, list them on separate lines:
 # # test:
 # # script/u/user/script_a
 # # script/u/user/script_b
 # # flow/u/user/my_flow
+#
+# The triggering item is exposed as os.environ["WM_TESTED_RUNNABLE"]
+# (e.g. "script/u/user/script_to_test"), useful for branching inside a
+# single test script that covers multiple targets.
 import wmill
 
 

package/package/utils/forkConflict.d.ts

@@ -0,0 +1,26 @@
+/**
+ * The backend rejects "enable" requests on triggers/schedules in a fork when
+ * the parent workspace has the same path enabled. The error body is shaped as
+ *   `fork-conflict:<kind>:<parent_workspace_id>`
+ * so the UI can show a tailored confirm-to-proceed dialog and re-issue the
+ * call with `force: true` if the user agrees.
+ */
+export interface ForkConflict {
+    kind: string;
+    parentWorkspaceId: string;
+}
+export declare function detectForkConflict(e: unknown): ForkConflict | null;
+/**
+ * Catches a fork-conflict error from `fn(false)`, shows the confirmation
+ * dialog, and retries with `fn(true)` when the user accepts. Re-throws every
+ * other error.
+ *
+ * Returns `true` when the call committed (no conflict, or user confirmed and
+ * retry succeeded) and `false` when the user dismissed the modal. Callers
+ * should bail on `false` to skip success toasts and revert any optimistic UI
+ * state.
+ *
+ * `kindLabel` is shown to the user — pass a friendly name like "kafka trigger"
+ * or "schedule" so the dialog reads naturally.
+ */
+export declare function withForkConflictRetry(fn: (force: boolean) => Promise<unknown>, kindLabel: string): Promise<boolean>;

package/package/utils/forkConflict.js

@@ -0,0 +1,56 @@
+import { forkConflictModal } from '../stores';
+export function detectForkConflict(e) {
+    const body = e?.body;
+    const raw = typeof body === 'string'
+        ? body
+        : (body?.error?.message ?? body?.message ?? e?.message ?? '');
+    const m = String(raw).match(/fork-conflict:([^:]+):(.+)/);
+    if (!m)
+        return null;
+    return { kind: m[1], parentWorkspaceId: m[2].trim() };
+}
+/**
+ * Opens the global ForkConflictModal and awaits the user's choice. Resolves
+ * to true when the user clicks "Enable anyway", false when they cancel or
+ * dismiss. If a previous modal is still pending (e.g. user clicked toggles
+ * on two rows in quick succession), resolve the older promise to false so
+ * the prior caller doesn't hang.
+ */
+function askForkConflictConfirm(kind, kindLabel, parentWorkspaceId) {
+    return new Promise((resolve) => {
+        const previous = forkConflictModal.val;
+        previous?.resolve(false);
+        forkConflictModal.val = { kind, kindLabel, parentWorkspaceId, resolve };
+    });
+}
+/**
+ * Catches a fork-conflict error from `fn(false)`, shows the confirmation
+ * dialog, and retries with `fn(true)` when the user accepts. Re-throws every
+ * other error.
+ *
+ * Returns `true` when the call committed (no conflict, or user confirmed and
+ * retry succeeded) and `false` when the user dismissed the modal. Callers
+ * should bail on `false` to skip success toasts and revert any optimistic UI
+ * state.
+ *
+ * `kindLabel` is shown to the user — pass a friendly name like "kafka trigger"
+ * or "schedule" so the dialog reads naturally.
+ */
+export async function withForkConflictRetry(fn, kindLabel) {
+    try {
+        await fn(false);
+        return true;
+    }
+    catch (e) {
+        const conflict = detectForkConflict(e);
+        if (!conflict)
+            throw e;
+        const proceed = await askForkConflictConfirm(conflict.kind, kindLabel, conflict.parentWorkspaceId);
+        // User explicitly dismissed the modal — treat as a silent no-op so the
+        // caller's catch block doesn't pop a redundant error toast.
+        if (!proceed)
+            return false;
+        await fn(true);
+        return true;
+    }
+}

package/package/utils_deployable.d.ts

@@ -1,4 +1,4 @@
-import { GcpTriggerService, HttpTriggerService, KafkaTriggerService, MqttTriggerService, NatsTriggerService, PostgresTriggerService, ScheduleService, SqsTriggerService, WebsocketTriggerService, type GcpTriggerData, type WorkspaceDeployUISettings } from './gen';
+import { AzureTriggerService, EmailTriggerService, GcpTriggerService, HttpTriggerService, KafkaTriggerService, MqttTriggerService, NatsTriggerService, PostgresTriggerService, ScheduleService, SqsTriggerService, WebsocketTriggerService, type GcpTriggerData, type WorkspaceDeployUISettings } from './gen';
 import type { TriggerKind } from './components/triggers';
 type DeployUIType = 'script' | 'flow' | 'app' | 'resource' | 'variable' | 'secret' | 'trigger';
 export type Kind = 'script' | 'resource' | 'schedule' | 'variable' | 'flow' | 'app' | 'raw_app' | 'resource_type' | 'folder' | 'trigger';
@@ -22,26 +22,25 @@ export declare function getTriggersDeployData(kind: TriggerKind, path: string, w
         permissioned_as: string | undefined;
         preserve_permissioned_as: boolean;
         path: string;
-        script_path: string;
+        workspace_id: string;
+        error?: string | undefined;
         extra_perms: {
             [key: string]: (boolean);
         };
-        workspace_id: string;
         edited_by: string;
         edited_at: string;
+        script_path: string;
         is_flow: boolean;
-        mode: import("./gen").TriggerMode;
-        labels?: Array<(string)>;
         queue_url: string;
-        aws_auth_resource_type: import("./gen").AwsAuthResourceType;
         aws_resource_path: string;
-        message_attributes?: Array<(string)> | null;
-        server_id?: string;
-        last_server_ping?: string;
-        error?: string;
-        error_handler_path?: string;
-        error_handler_args?: import("./gen").ScriptArgs;
-        retry?: import("./gen").Retry;
+        aws_auth_resource_type: import("./gen").AwsAuthResourceType;
+        labels?: Array<(string)> | undefined;
+        retry?: import("./gen").Retry | undefined;
+        error_handler_path?: string | undefined;
+        error_handler_args?: import("./gen").ScriptArgs | undefined;
+        message_attributes?: (Array<(string)> | null) | undefined;
+        server_id?: string | undefined;
+        last_server_ping?: string | undefined;
     };
     createFn: typeof SqsTriggerService.createSqsTrigger;
     updateFn: typeof SqsTriggerService.updateSqsTrigger;
@@ -50,32 +49,31 @@ export declare function getTriggersDeployData(kind: TriggerKind, path: string, w
         permissioned_as: string | undefined;
         preserve_permissioned_as: boolean;
         path: string;
-        script_path: string;
+        workspace_id: string;
+        error?: string | undefined;
         extra_perms: {
             [key: string]: (boolean);
         };
-        workspace_id: string;
         edited_by: string;
         edited_at: string;
+        script_path: string;
         is_flow: boolean;
-        mode: import("./gen").TriggerMode;
-        labels?: Array<(string)>;
-        kafka_resource_path: string;
-        group_id: string;
-        topics: Array<(string)>;
         filters: Array<{
             key: string;
             value: unknown;
         }>;
-        filter_logic?: "and" | "or";
-        auto_offset_reset?: "latest" | "earliest";
-        auto_commit?: boolean;
-        server_id?: string;
-        last_server_ping?: string;
-        error?: string;
-        error_handler_path?: string;
-        error_handler_args?: import("./gen").ScriptArgs;
-        retry?: import("./gen").Retry;
+        kafka_resource_path: string;
+        group_id: string;
+        topics: Array<(string)>;
+        labels?: Array<(string)> | undefined;
+        retry?: import("./gen").Retry | undefined;
+        error_handler_path?: string | undefined;
+        error_handler_args?: import("./gen").ScriptArgs | undefined;
+        filter_logic?: "and" | "or" | undefined;
+        auto_offset_reset?: "latest" | "earliest" | undefined;
+        auto_commit?: boolean | undefined;
+        server_id?: string | undefined;
+        last_server_ping?: string | undefined;
     };
     createFn: typeof KafkaTriggerService.createKafkaTrigger;
     updateFn: typeof KafkaTriggerService.updateKafkaTrigger;
@@ -84,28 +82,27 @@ export declare function getTriggersDeployData(kind: TriggerKind, path: string, w
         permissioned_as: string | undefined;
         preserve_permissioned_as: boolean;
         path: string;
-        script_path: string;
+        client_id?: string | null | undefined;
+        workspace_id: string;
+        error?: string | undefined;
         extra_perms: {
             [key: string]: (boolean);
         };
-        workspace_id: string;
         edited_by: string;
         edited_at: string;
+        script_path: string;
         is_flow: boolean;
-        mode: import("./gen").TriggerMode;
-        labels?: Array<(string)>;
-        mqtt_resource_path: string;
         subscribe_topics: Array<import("./gen").MqttSubscribeTopic>;
-        v3_config?: import("./gen").MqttV3Config | null;
-        v5_config?: import("./gen").MqttV5Config | null;
-        client_id?: string | null;
-        client_version?: import("./gen").MqttClientVersion | null;
-        server_id?: string;
-        last_server_ping?: string;
-        error?: string;
-        error_handler_path?: string;
-        error_handler_args?: import("./gen").ScriptArgs;
-        retry?: import("./gen").Retry;
+        mqtt_resource_path: string;
+        labels?: Array<(string)> | undefined;
+        retry?: import("./gen").Retry | undefined;
+        error_handler_path?: string | undefined;
+        error_handler_args?: import("./gen").ScriptArgs | undefined;
+        client_version?: (import("./gen").MqttClientVersion | null) | undefined;
+        v3_config?: (import("./gen").MqttV3Config | null) | undefined;
+        v5_config?: (import("./gen").MqttV5Config | null) | undefined;
+        server_id?: string | undefined;
+        last_server_ping?: string | undefined;
     };
     createFn: typeof MqttTriggerService.createMqttTrigger;
     updateFn: typeof MqttTriggerService.updateMqttTrigger;
@@ -114,27 +111,26 @@ export declare function getTriggersDeployData(kind: TriggerKind, path: string, w
         permissioned_as: string | undefined;
         preserve_permissioned_as: boolean;
         path: string;
-        script_path: string;
+        workspace_id: string;
+        error?: string | undefined;
         extra_perms: {
             [key: string]: (boolean);
         };
-        workspace_id: string;
         edited_by: string;
         edited_at: string;
+        script_path: string;
         is_flow: boolean;
-        mode: import("./gen").TriggerMode;
-        labels?: Array<(string)>;
         nats_resource_path: string;
         use_jetstream: boolean;
-        stream_name?: string | null;
-        consumer_name?: string | null;
         subjects: Array<(string)>;
-        server_id?: string;
-        last_server_ping?: string;
-        error?: string;
-        error_handler_path?: string;
-        error_handler_args?: import("./gen").ScriptArgs;
-        retry?: import("./gen").Retry;
+        labels?: Array<(string)> | undefined;
+        retry?: import("./gen").Retry | undefined;
+        error_handler_path?: string | undefined;
+        error_handler_args?: import("./gen").ScriptArgs | undefined;
+        stream_name?: string | null | undefined;
+        consumer_name?: string | null | undefined;
+        server_id?: string | undefined;
+        last_server_ping?: string | undefined;
     };
     createFn: typeof NatsTriggerService.createNatsTrigger;
     updateFn: typeof NatsTriggerService.updateNatsTrigger;
@@ -147,25 +143,24 @@ export declare function getTriggersDeployData(kind: TriggerKind, path: string, w
         permissioned_as: string | undefined;
         preserve_permissioned_as: boolean;
         path: string;
-        script_path: string;
+        workspace_id: string;
+        error?: string | undefined;
         extra_perms: {
             [key: string]: (boolean);
         };
-        workspace_id: string;
         edited_by: string;
         edited_at: string;
+        script_path: string;
         is_flow: boolean;
-        mode: import("./gen").TriggerMode;
-        labels?: Array<(string)>;
         postgres_resource_path: string;
-        publication_name: string;
-        server_id?: string;
         replication_slot_name: string;
-        error?: string;
-        last_server_ping?: string;
-        error_handler_path?: string;
-        error_handler_args?: import("./gen").ScriptArgs;
-        retry?: import("./gen").Retry;
+        publication_name: string;
+        labels?: Array<(string)> | undefined;
+        retry?: import("./gen").Retry | undefined;
+        error_handler_path?: string | undefined;
+        error_handler_args?: import("./gen").ScriptArgs | undefined;
+        server_id?: string | undefined;
+        last_server_ping?: string | undefined;
     };
     createFn: typeof PostgresTriggerService.createPostgresTrigger;
     updateFn: typeof PostgresTriggerService.updatePostgresTrigger;
@@ -174,33 +169,32 @@ export declare function getTriggersDeployData(kind: TriggerKind, path: string, w
         permissioned_as: string | undefined;
         preserve_permissioned_as: boolean;
         path: string;
-        script_path: string;
+        workspace_id: string;
+        error?: string | undefined;
         extra_perms: {
             [key: string]: (boolean);
         };
-        workspace_id: string;
         edited_by: string;
         edited_at: string;
+        script_path: string;
         is_flow: boolean;
-        mode: import("./gen").TriggerMode;
-        labels?: Array<(string)>;
         url: string;
-        server_id?: string;
-        last_server_ping?: string;
-        error?: string;
         filters: Array<{
             key: string;
             value: unknown;
         }>;
-        filter_logic?: "and" | "or";
-        initial_messages?: Array<import("./gen").WebsocketTriggerInitialMessage> | null;
-        url_runnable_args?: import("./gen").ScriptArgs | null;
         can_return_message: boolean;
         can_return_error_result: boolean;
-        heartbeat?: import("./gen").WebsocketHeartbeat | null;
-        error_handler_path?: string;
-        error_handler_args?: import("./gen").ScriptArgs;
-        retry?: import("./gen").Retry;
+        labels?: Array<(string)> | undefined;
+        retry?: import("./gen").Retry | undefined;
+        error_handler_path?: string | undefined;
+        error_handler_args?: import("./gen").ScriptArgs | undefined;
+        filter_logic?: "and" | "or" | undefined;
+        initial_messages?: (Array<import("./gen").WebsocketTriggerInitialMessage> | null) | undefined;
+        url_runnable_args?: (import("./gen").ScriptArgs | null) | undefined;
+        heartbeat?: (import("./gen").WebsocketHeartbeat | null) | undefined;
+        server_id?: string | undefined;
+        last_server_ping?: string | undefined;
     };
     createFn: typeof WebsocketTriggerService.createWebsocketTrigger;
     updateFn: typeof WebsocketTriggerService.updateWebsocketTrigger;
@@ -208,36 +202,35 @@ export declare function getTriggersDeployData(kind: TriggerKind, path: string, w
     data: {
         permissioned_as: string | undefined;
         preserve_permissioned_as: boolean;
+        summary?: string | null | undefined;
         path: string;
-        script_path: string;
+        workspace_id: string;
+        description?: string | null | undefined;
         extra_perms: {
             [key: string]: (boolean);
         };
-        workspace_id: string;
         edited_by: string;
         edited_at: string;
+        script_path: string;
         is_flow: boolean;
-        mode: import("./gen").TriggerMode;
-        labels?: Array<(string)>;
         route_path: string;
-        static_asset_config?: {
-            s3: string;
-            storage?: string;
-            filename?: string;
-        } | null;
-        http_method: import("./gen").HttpMethod;
-        authentication_resource_path?: string | null;
-        summary?: string | null;
-        description?: string | null;
         request_type: import("./gen").HttpRequestType;
         authentication_method: import("./gen").AuthenticationMethod;
+        http_method: import("./gen").HttpMethod;
         is_static_website: boolean;
         workspaced_route: boolean;
         wrap_body: boolean;
         raw_string: boolean;
-        error_handler_path?: string;
-        error_handler_args?: import("./gen").ScriptArgs;
-        retry?: import("./gen").Retry;
+        labels?: Array<(string)> | undefined;
+        retry?: import("./gen").Retry | undefined;
+        static_asset_config?: {
+            s3: string;
+            storage?: string;
+            filename?: string;
+        } | null | undefined;
+        authentication_resource_path?: string | null | undefined;
+        error_handler_path?: string | undefined;
+        error_handler_args?: import("./gen").ScriptArgs | undefined;
     };
     createFn: typeof HttpTriggerService.createHttpTrigger;
     updateFn: typeof HttpTriggerService.updateHttpTrigger;
@@ -246,38 +239,88 @@ export declare function getTriggersDeployData(kind: TriggerKind, path: string, w
         permissioned_as: string | undefined;
         preserve_permissioned_as: boolean;
         path: string;
+        workspace_id: string;
+        error?: string | undefined;
+        extra_perms: {
+            [key: string]: (boolean);
+        };
         edited_by: string;
         edited_at: string;
-        schedule: string;
-        timezone: string;
-        enabled: boolean;
         script_path: string;
         is_flow: boolean;
-        args?: import("./gen").ScriptArgs | null;
+        azure_mode: import("./gen").AzureMode;
+        scope_resource_id: string;
+        subscription_name: string;
+        azure_resource_path: string;
+        topic_name?: string | null | undefined;
+        labels?: Array<(string)> | undefined;
+        retry?: import("./gen").Retry | undefined;
+        error_handler_path?: string | undefined;
+        error_handler_args?: import("./gen").ScriptArgs | undefined;
+        event_type_filters?: (Array<(string)> | null) | undefined;
+        server_id?: string | undefined;
+        last_server_ping?: string | undefined;
+    };
+    createFn: typeof AzureTriggerService.createAzureTrigger;
+    updateFn: typeof AzureTriggerService.updateAzureTrigger;
+} | {
+    data: {
+        permissioned_as: string | undefined;
+        preserve_permissioned_as: boolean;
+        path: string;
+        workspace_id: string;
+        extra_perms: {
+            [key: string]: (boolean);
+        };
+        edited_by: string;
+        edited_at: string;
+        script_path: string;
+        is_flow: boolean;
+        local_part: string;
+        labels?: Array<(string)> | undefined;
+        retry?: import("./gen").Retry | undefined;
+        error_handler_path?: string | undefined;
+        error_handler_args?: import("./gen").ScriptArgs | undefined;
+        workspaced_local_part?: boolean | undefined;
+    };
+    createFn: typeof EmailTriggerService.createEmailTrigger;
+    updateFn: typeof EmailTriggerService.updateEmailTrigger;
+} | {
+    data: {
+        permissioned_as: string | undefined;
+        preserve_permissioned_as: boolean;
+        summary?: string | null | undefined;
+        path: string;
+        error?: string | null | undefined;
+        description?: string | null | undefined;
+        schedule: string;
         extra_perms: {
             [key: string]: (boolean);
         };
+        args?: (import("./gen").ScriptArgs | null) | undefined;
         email: string;
-        error?: string | null;
-        on_failure?: string | null;
-        on_failure_times?: number | null;
-        on_failure_exact?: boolean | null;
-        on_failure_extra_args?: import("./gen").ScriptArgs | null;
-        on_recovery?: string | null;
-        on_recovery_times?: number | null;
-        on_recovery_extra_args?: import("./gen").ScriptArgs | null;
-        on_success?: string | null;
-        on_success_extra_args?: import("./gen").ScriptArgs | null;
-        ws_error_handler_muted?: boolean;
-        retry?: import("./gen").Retry | null;
-        summary?: string | null;
-        description?: string | null;
-        no_flow_overlap?: boolean;
-        tag?: string | null;
-        paused_until?: string | null;
-        cron_version?: string | null;
-        dynamic_skip?: string | null;
-        labels?: Array<(string)>;
+        tag?: string | null | undefined;
+        edited_by: string;
+        edited_at: string;
+        script_path: string;
+        timezone: string;
+        is_flow: boolean;
+        labels?: Array<(string)> | undefined;
+        on_failure?: string | null | undefined;
+        on_failure_times?: number | null | undefined;
+        on_failure_exact?: boolean | null | undefined;
+        on_failure_extra_args?: (import("./gen").ScriptArgs | null) | undefined;
+        on_recovery?: string | null | undefined;
+        on_recovery_times?: number | null | undefined;
+        on_recovery_extra_args?: (import("./gen").ScriptArgs | null) | undefined;
+        on_success?: string | null | undefined;
+        on_success_extra_args?: (import("./gen").ScriptArgs | null) | undefined;
+        ws_error_handler_muted?: boolean | undefined;
+        retry?: (import("./gen").Retry | null) | undefined;
+        no_flow_overlap?: boolean | undefined;
+        paused_until?: string | null | undefined;
+        cron_version?: string | null | undefined;
+        dynamic_skip?: string | null | undefined;
     };
     createFn: typeof ScheduleService.createSchedule;
     updateFn: typeof ScheduleService.updateSchedule;