windmill-components 1.444.2 → 1.447.5

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

@@ -1,5 +1,4 @@
 import { SvelteComponent } from "svelte";
-import { type TriggerKind } from '../triggers';
 import { type CaptureTriggerKind } from '../../gen';
 declare const __propDef: {
     props: {
@@ -7,28 +6,27 @@ declare const __propDef: {
         hasPreprocessor?: boolean | undefined;
         canHavePreprocessor?: boolean | undefined;
         isFlow?: boolean | undefined;
-        captureType?: CaptureTriggerKind | 'all';
+        captureType?: CaptureTriggerKind | undefined;
         headless?: boolean | undefined;
         addButton?: boolean | undefined;
-        hideCapturesWhenEmpty?: boolean | undefined;
         canEdit?: boolean | undefined;
-        maxHeight?: number | undefined;
-        refreshCaptures?: (() => Promise<void>) | undefined;
+        fullHeight?: boolean | undefined;
+        loadCaptures?: ((refresh?: boolean) => Promise<void>) | undefined;
     };
     events: {
-        openTriggers: CustomEvent<{
-            kind: TriggerKind;
-            config: Record<string, any>;
-        }>;
+        openTriggers: CustomEvent<any>;
         applyArgs: CustomEvent<{
             kind: 'main' | 'preprocessor';
             args: Record<string, any> | undefined;
         }>;
         addPreprocessor: CustomEvent<null>;
         updateSchema: CustomEvent<{
-            schema: any;
+            payloadData: any;
             redirect: boolean;
+            args?: boolean | undefined;
         }>;
+        select: CustomEvent<any>;
+        testWithArgs: CustomEvent<any>;
     } & {
         [evt: string]: CustomEvent<any>;
     };
@@ -38,6 +36,6 @@ export type CaptureTableProps = typeof __propDef.props;
 export type CaptureTableEvents = typeof __propDef.events;
 export type CaptureTableSlots = typeof __propDef.slots;
 export default class CaptureTable extends SvelteComponent<CaptureTableProps, CaptureTableEvents, CaptureTableSlots> {
-    get refreshCaptures(): () => Promise<void>;
+    get loadCaptures(): (refresh?: boolean) => Promise<void>;
 }
 export {};

package/package/components/triggers/CaptureWrapper.svelte

@@ -10,6 +10,7 @@ import WebhooksConfigSection from './WebhooksConfigSection.svelte';
 import EmailTriggerConfigSection from '../details/EmailTriggerConfigSection.svelte';
 import KafkaTriggersConfigSection from './KafkaTriggersConfigSection.svelte';
 import CaptureTable from './CaptureTable.svelte';
+import NatsTriggersConfigSection from './NatsTriggersConfigSection.svelte';
 export let isFlow;
 export let path;
 export let hasPreprocessor;
@@ -69,33 +70,21 @@ async function capture() {
             });
             await getCaptureConfigs();
         }
-        captureTable?.refreshCaptures();
         i++;
         await sleep(1000);
+        captureTable?.loadCaptures(true);
     }
 }
+let ready = false;
 function setDefaultArgs(captureConfigs) {
     if (captureType in captureConfigs) {
         const triggerConfig = captureConfigs[captureType].trigger_config;
         args = isObject(triggerConfig) ? triggerConfig : {};
     }
-    else if (captureType === 'kafka') {
-        args = {
-            ...args,
-            brokers: [''],
-            topics: [''],
-            group_id: `windmill_consumer-${$workspaceStore}-${path.replaceAll('/', '__')}`
-        };
-    }
-    else if (captureType === 'http') {
-        args = {
-            route_path: '',
-            http_method: 'post'
-        };
-    }
     else {
         args = {};
     }
+    ready = true;
 }
 onDestroy(() => {
     captureActive = false;
@@ -115,14 +104,17 @@ export async function handleCapture() {
 }
 let config;
 $: config = captureConfigs[captureType];
-let cloudDisabled = (captureType === 'websocket' || captureType === 'kafka') && isCloudHosted();
+let cloudDisabled = (captureType === 'websocket' || captureType === 'kafka' || captureType === 'nats') &&
+    isCloudHosted();
 function updateConnectionInfo(config, captureActive) {
-    if ((captureType === 'websocket' || captureType === 'kafka') && config && captureActive) {
+    if ((captureType === 'websocket' || captureType === 'kafka' || captureType === 'nats') &&
+        config &&
+        captureActive) {
         const serverEnabled = getServerEnabled(config);
         const connected = serverEnabled && !config.error;
         const message = connected
-            ? `${capitalize(captureType)} is connected`
-            : `${capitalize(captureType)} is not connected${config.error ? ': ' + config.error : ''}`;
+            ? `Connected`
+            : `Not connected${config.error ? ': ' + config.error : ''}`;
         connectionInfo = {
             connected,
             message
@@ -145,93 +137,118 @@ $: captureInfo = {
 $: args && (captureActive = false);
 </script>
 
-<div class="flex flex-col gap-4 w-full">
-	{#if cloudDisabled}
-		<Alert title="Not compatible with multi-tenant cloud" type="warning" size="xs">
-			{capitalize(captureType)} triggers are disabled in the multi-tenant cloud.
-		</Alert>
-	{:else if captureType === 'websocket'}
-		<WebsocketEditorConfigSection
-			can_write={true}
-			headless={true}
-			bind:url={args.url}
-			bind:url_runnable_args={args.url_runnable_args}
-			{showCapture}
-			{captureInfo}
-			bind:captureTable
-			on:applyArgs
-			on:updateSchema
-			on:addPreprocessor
-			on:captureToggle={() => {
-				handleCapture()
-			}}
-		/>
-	{:else if captureType === 'webhook'}
-		<WebhooksConfigSection
-			{isFlow}
-			{path}
-			hash={data?.hash}
-			token={data?.token}
-			{args}
-			scopes={data?.scopes}
-			{showCapture}
-			{captureInfo}
-			bind:captureTable
-			on:applyArgs
-			on:updateSchema
-			on:addPreprocessor
-			on:captureToggle={() => {
-				handleCapture()
-			}}
-		/>
-	{:else if captureType === 'http'}
-		<RouteEditorConfigSection
-			{showCapture}
-			can_write={true}
-			bind:route_path={args.route_path}
-			bind:http_method={args.http_method}
-			headless
-			{captureInfo}
-			bind:captureTable
-			on:applyArgs
-			on:updateSchema
-			on:addPreprocessor
-			on:captureToggle={() => {
-				handleCapture()
-			}}
-		/>
-	{:else if captureType === 'email'}
-		<EmailTriggerConfigSection
-			hash={data?.hash}
-			token={data?.token}
-			{path}
-			{isFlow}
-			userSettings={data?.userSettings}
-			emailDomain={data?.emailDomain}
-			{showCapture}
-			{captureInfo}
-			bind:captureTable
-			on:applyArgs
-			on:updateSchema
-			on:addPreprocessor
-			on:captureToggle={() => {
-				handleCapture()
-			}}
-		/>
-	{:else if captureType === 'kafka'}
-		<KafkaTriggersConfigSection
-			headless={true}
-			bind:args
-			staticInputDisabled={false}
-			{showCapture}
-			{captureInfo}
-			bind:captureTable
-			on:applyArgs
-			on:updateSchema
-			on:addPreprocessor
-			on:captureToggle={() => {
-				handleCapture()
-			}}
-		/>
-	{/if}
-</div>
+{#key ready}
+	<div class="flex flex-col gap-4 w-full">
+		{#if cloudDisabled}
+			<Alert title="Not compatible with multi-tenant cloud" type="warning" size="xs">
+				{capitalize(captureType)} triggers are disabled in the multi-tenant cloud.
+			</Alert>
+		{:else if captureType === 'websocket'}
+			<WebsocketEditorConfigSection
+				can_write={true}
+				headless={true}
+				bind:url={args.url}
+				bind:url_runnable_args={args.url_runnable_args}
+				{showCapture}
+				{captureInfo}
+				bind:captureTable
+				on:applyArgs
+				on:updateSchema
+				on:addPreprocessor
+				on:captureToggle={() => {
+					handleCapture()
+				}}
+				on:testWithArgs
+			/>
+		{:else if captureType === 'webhook'}
+			<WebhooksConfigSection
+				{isFlow}
+				{path}
+				hash={data?.hash}
+				token={data?.token}
+				{args}
+				scopes={data?.scopes}
+				{showCapture}
+				{captureInfo}
+				bind:captureTable
+				on:applyArgs
+				on:updateSchema
+				on:addPreprocessor
+				on:captureToggle={() => {
+					handleCapture()
+				}}
+				on:testWithArgs
+			/>
+		{:else if captureType === 'http'}
+			<RouteEditorConfigSection
+				{isFlow}
+				{path}
+				{showCapture}
+				can_write={true}
+				bind:args
+				headless
+				{captureInfo}
+				bind:captureTable
+				on:applyArgs
+				on:updateSchema
+				on:addPreprocessor
+				on:captureToggle={() => {
+					handleCapture()
+				}}
+				on:testWithArgs
+			/>
+		{:else if captureType === 'email'}
+			<EmailTriggerConfigSection
+				hash={data?.hash}
+				token={data?.token}
+				{path}
+				{isFlow}
+				userSettings={data?.userSettings}
+				emailDomain={data?.emailDomain}
+				{showCapture}
+				{captureInfo}
+				bind:captureTable
+				on:applyArgs
+				on:updateSchema
+				on:addPreprocessor
+				on:captureToggle={() => {
+					handleCapture()
+				}}
+				on:testWithArgs
+			/>
+		{:else if captureType === 'kafka'}
+			<KafkaTriggersConfigSection
+				headless={true}
+				{path}
+				bind:args
+				staticInputDisabled={false}
+				{showCapture}
+				{captureInfo}
+				bind:captureTable
+				on:applyArgs
+				on:updateSchema
+				on:addPreprocessor
+				on:captureToggle={() => {
+					handleCapture()
+				}}
+				on:testWithArgs
+			/>
+		{:else if captureType === 'nats'}
+			<NatsTriggersConfigSection
+				headless={true}
+				bind:args
+				{path}
+				staticInputDisabled={false}
+				{showCapture}
+				{captureInfo}
+				bind:captureTable
+				on:applyArgs
+				on:updateSchema
+				on:addPreprocessor
+				on:captureToggle={() => {
+					handleCapture()
+				}}
+			/>
+		{/if}
+	</div>
+{/key}

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

@@ -1,4 +1,5 @@
 import { SvelteComponent } from "svelte";
+import { type CaptureTriggerKind } from '../../gen';
 import type { ConnectionInfo } from '../common/alert/ConnectionIndicator.svelte';
 import CaptureTable from './CaptureTable.svelte';
 declare const __propDef: {
@@ -7,7 +8,7 @@ declare const __propDef: {
         path: string;
         hasPreprocessor: boolean;
         canHavePreprocessor: boolean;
-        captureType?: any;
+        captureType?: CaptureTriggerKind | undefined;
         showCapture?: boolean | undefined;
         data?: any;
         connectionInfo?: ConnectionInfo | undefined;
@@ -20,6 +21,7 @@ declare const __propDef: {
         applyArgs: any;
         updateSchema: any;
         addPreprocessor: any;
+        testWithArgs: any;
     } & {
         [evt: string]: CustomEvent<any>;
     };

package/package/components/triggers/KafkaTriggerEditorInner.svelte

@@ -204,6 +204,7 @@ let isValid = false;
 				<KafkaTriggersConfigSection
 					bind:args
 					bind:isValid
+					{path}
 					defaultValues={useDefaultValues() ? defaultValues : undefined}
 				/>
 

package/package/components/triggers/KafkaTriggersConfigSection.svelte

@@ -7,6 +7,8 @@ import ToggleButtonGroup from '../common/toggleButton-v2/ToggleButtonGroup.svelt
 import SchemaForm from '../SchemaForm.svelte';
 import CaptureSection, {} from './CaptureSection.svelte';
 import CaptureTable from './CaptureTable.svelte';
+import { workspaceStore } from '../../stores';
+export let path;
 export let defaultValues = undefined;
 export let headless = false;
 export let args = {};
@@ -26,7 +28,8 @@ const connnectionSchema = {
                 type: 'string'
             },
             nullable: false,
-            title: 'Brokers'
+            title: 'Brokers',
+            default: ['']
         },
         security: {
             type: 'object',
@@ -115,12 +118,13 @@ const argsSchema = {
                 type: 'string'
             },
             nullable: false,
-            title: 'Topics'
+            title: 'Topics',
+            default: ['']
         },
         group_id: {
             type: 'string',
             title: 'Group ID',
-            pattern: '^[a-zA-Z0-9-_.]+$',
+            pattern: '^((\\$var:[\\w-\\/]+)|[a-zA-Z0-9-_.]+)$',
             customErrorMessage: 'Invalid group ID'
         }
     },
@@ -139,7 +143,14 @@ $: isValid =
         args.topics &&
         args.topics.length > 0 &&
         args.topics.every((b) => /^[a-zA-Z0-9-_.]+$/.test(b));
-$: args.kafka_resource_path && (selected = 'resource');
+$: usingResource = !!args.kafka_resource_path;
+$: usingResource && (selected = 'resource');
+function setGroupId() {
+    if (!args.group_id) {
+        args.group_id = `windmill_consumer-${$workspaceStore}-${path.replaceAll('/', '__')}`;
+    }
+}
+$: path && setGroupId();
 </script>
 
 <div>
@@ -152,6 +163,7 @@ $: args.kafka_resource_path && (selected = 'resource');
 			on:applyArgs
 			on:updateSchema
 			on:addPreprocessor
+			on:testWithArgs
 			bind:captureTable
 		/>
 	{/if}

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

@@ -3,6 +3,7 @@ import { type CaptureInfo } from './CaptureSection.svelte';
 import CaptureTable from './CaptureTable.svelte';
 declare const __propDef: {
     props: {
+        path: string;
         defaultValues?: Record<string, any> | undefined;
         headless?: boolean | undefined;
         args?: Record<string, any> | undefined;
@@ -19,10 +20,11 @@ declare const __propDef: {
             args: Record<string, any> | undefined;
         }>;
         updateSchema: CustomEvent<{
-            schema: any;
+            payloadData: Record<string, any>;
             redirect: boolean;
         }>;
         addPreprocessor: CustomEvent<null>;
+        testWithArgs: CustomEvent<any>;
     } & {
         [evt: string]: CustomEvent<any>;
     };

package/package/components/triggers/KafkaTriggersPanel.svelte

@@ -77,6 +77,8 @@ function saveTrigger(path, args) {
 			}}
 			on:applyArgs
 			on:addPreprocessor
+			on:updateSchema
+			on:testWithArgs
 			cloudDisabled={false}
 			triggerType="kafka"
 			{isFlow}

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

@@ -12,6 +12,8 @@ declare const __propDef: {
     events: {
         applyArgs: any;
         addPreprocessor: any;
+        updateSchema: any;
+        testWithArgs: any;
     } & {
         [evt: string]: CustomEvent<any>;
     };

package/package/components/triggers/NatsTriggerEditor.svelte

@@ -0,0 +1,19 @@
+<script>import { tick } from 'svelte';
+import NatsTriggerEditorInner from './NatsTriggerEditorInner.svelte';
+let open = false;
+export async function openEdit(ePath, isFlow) {
+    open = true;
+    await tick();
+    drawer?.openEdit(ePath, isFlow);
+}
+export async function openNew(is_flow, initial_script_path, defaultValues) {
+    open = true;
+    await tick();
+    drawer?.openNew(is_flow, initial_script_path, defaultValues);
+}
+let drawer;
+</script>
+
+{#if open}
+	<NatsTriggerEditorInner on:update bind:this={drawer} />
+{/if}

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

@@ -0,0 +1,21 @@
+import { SvelteComponent } from "svelte";
+declare const __propDef: {
+    props: {
+        openEdit?: ((ePath: string, isFlow: boolean) => Promise<void>) | undefined;
+        openNew?: ((is_flow: boolean, initial_script_path?: string, defaultValues?: Record<string, any>) => Promise<void>) | undefined;
+    };
+    events: {
+        update: CustomEvent<any>;
+    } & {
+        [evt: string]: CustomEvent<any>;
+    };
+    slots: {};
+};
+export type NatsTriggerEditorProps = typeof __propDef.props;
+export type NatsTriggerEditorEvents = typeof __propDef.events;
+export type NatsTriggerEditorSlots = typeof __propDef.slots;
+export default class NatsTriggerEditor extends SvelteComponent<NatsTriggerEditorProps, NatsTriggerEditorEvents, NatsTriggerEditorSlots> {
+    get openEdit(): (ePath: string, isFlow: boolean) => Promise<void>;
+    get openNew(): (is_flow: boolean, initial_script_path?: string | undefined, defaultValues?: Record<string, any> | undefined) => Promise<void>;
+}
+export {};