windmill-components 1.434.1 → 1.444.0

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

@@ -0,0 +1,35 @@
+import { SvelteComponent } from "svelte";
+import type { ConnectionInfo } from '../common/alert/ConnectionIndicator.svelte';
+import CaptureTable from './CaptureTable.svelte';
+declare const __propDef: {
+    props: {
+        isFlow: boolean;
+        path: string;
+        hasPreprocessor: boolean;
+        canHavePreprocessor: boolean;
+        captureType?: any;
+        showCapture?: boolean | undefined;
+        data?: any;
+        connectionInfo?: ConnectionInfo | undefined;
+        args?: Record<string, any> | undefined;
+        captureTable?: CaptureTable | undefined;
+        setConfig?: (() => Promise<void>) | undefined;
+        handleCapture?: (() => Promise<void>) | undefined;
+    };
+    events: {
+        applyArgs: any;
+        updateSchema: any;
+        addPreprocessor: any;
+    } & {
+        [evt: string]: CustomEvent<any>;
+    };
+    slots: {};
+};
+export type CaptureWrapperProps = typeof __propDef.props;
+export type CaptureWrapperEvents = typeof __propDef.events;
+export type CaptureWrapperSlots = typeof __propDef.slots;
+export default class CaptureWrapper extends SvelteComponent<CaptureWrapperProps, CaptureWrapperEvents, CaptureWrapperSlots> {
+    get setConfig(): () => Promise<void>;
+    get handleCapture(): () => Promise<void>;
+}
+export {};

package/package/components/triggers/KafkaTriggerEditor.svelte

@@ -6,10 +6,10 @@ export async function openEdit(ePath, isFlow) {
     await tick();
     drawer?.openEdit(ePath, isFlow);
 }
-export async function openNew(is_flow, initial_script_path) {
+export async function openNew(is_flow, initial_script_path, defaultValues) {
     open = true;
     await tick();
-    drawer?.openNew(is_flow, initial_script_path);
+    drawer?.openNew(is_flow, initial_script_path, defaultValues);
 }
 let drawer;
 </script>

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

@@ -2,7 +2,7 @@ import { SvelteComponent } from "svelte";
 declare const __propDef: {
     props: {
         openEdit?: ((ePath: string, isFlow: boolean) => Promise<void>) | undefined;
-        openNew?: ((is_flow: boolean, initial_script_path?: string) => Promise<void>) | undefined;
+        openNew?: ((is_flow: boolean, initial_script_path?: string, defaultValues?: Record<string, any>) => Promise<void>) | undefined;
     };
     events: {
         update: CustomEvent<any>;
@@ -16,6 +16,6 @@ export type KafkaTriggerEditorEvents = typeof __propDef.events;
 export type KafkaTriggerEditorSlots = typeof __propDef.slots;
 export default class KafkaTriggerEditor extends SvelteComponent<KafkaTriggerEditorProps, KafkaTriggerEditorEvents, KafkaTriggerEditorSlots> {
     get openEdit(): (ePath: string, isFlow: boolean) => Promise<void>;
-    get openNew(): (is_flow: boolean, initial_script_path?: string | undefined) => Promise<void>;
+    get openNew(): (is_flow: boolean, initial_script_path?: string | undefined, defaultValues?: Record<string, any> | undefined) => Promise<void>;
 }
 export {};

package/package/components/triggers/KafkaTriggerEditorInner.svelte

@@ -9,11 +9,10 @@ import { usedTriggerKinds, userStore, workspaceStore } from '../../stores';
 import { canWrite, emptyString, sendUserToast } from '../../utils';
 import { createEventDispatcher } from 'svelte';
 import Section from '../Section.svelte';
-import { Loader2, Save, X, Plus } from 'lucide-svelte';
+import { Loader2, Save } from 'lucide-svelte';
 import Label from '../Label.svelte';
 import Toggle from '../Toggle.svelte';
-import { fade } from 'svelte/transition';
-import ResourcePicker from '../ResourcePicker.svelte';
+import KafkaTriggersConfigSection from './KafkaTriggersConfigSection.svelte';
 let drawer;
 let is_flow = false;
 let initialPath = '';
@@ -24,14 +23,12 @@ let initialScriptPath = '';
 let fixedScriptPath = '';
 let path = '';
 let pathError = '';
-let kafka_resource_path = '';
-let group_id = '';
-let topics = [''];
-let dirtyGroupId = false;
 let enabled = false;
 let dirtyPath = false;
 let can_write = true;
 let drawerLoading = true;
+let defaultValues = undefined;
+let args = {};
 const dispatch = createEventDispatcher();
 $: is_flow = itemKind === 'flow';
 export async function openEdit(ePath, isFlow) {
@@ -42,7 +39,6 @@ export async function openEdit(ePath, isFlow) {
         itemKind = isFlow ? 'flow' : 'script';
         edit = true;
         dirtyPath = false;
-        dirtyGroupId = false;
         await loadTrigger();
     }
     catch (err) {
@@ -52,23 +48,23 @@ export async function openEdit(ePath, isFlow) {
         drawerLoading = false;
     }
 }
-export async function openNew(nis_flow, fixedScriptPath_) {
+export async function openNew(nis_flow, fixedScriptPath_, nDefaultValues) {
     drawerLoading = true;
     try {
         drawer?.openDrawer();
         is_flow = nis_flow;
         edit = false;
         itemKind = nis_flow ? 'flow' : 'script';
-        kafka_resource_path = '';
-        group_id = '';
-        topics = [''];
-        dirtyGroupId = false;
+        args.kafka_resource_path = nDefaultValues?.kafka_resource_path ?? '';
+        args.group_id = nDefaultValues?.group_id ?? '';
+        args.topics = nDefaultValues?.topics ?? [''];
         initialScriptPath = '';
         fixedScriptPath = fixedScriptPath_ ?? '';
         script_path = fixedScriptPath;
         path = '';
         initialPath = '';
         dirtyPath = false;
+        defaultValues = nDefaultValues;
     }
     finally {
         drawerLoading = false;
@@ -83,9 +79,9 @@ async function loadTrigger() {
     initialScriptPath = s.script_path;
     is_flow = s.is_flow;
     path = s.path;
-    kafka_resource_path = s.kafka_resource_path;
-    group_id = s.group_id;
-    topics = s.topics;
+    args.kafka_resource_path = s.kafka_resource_path;
+    args.group_id = s.group_id;
+    args.topics = s.topics;
     enabled = s.enabled;
     can_write = canWrite(s.path, s.extra_perms, $userStore);
 }
@@ -98,9 +94,9 @@ async function updateTrigger() {
                 path,
                 script_path,
                 is_flow,
-                kafka_resource_path,
-                group_id,
-                topics
+                kafka_resource_path: args.kafka_resource_path,
+                group_id: args.group_id,
+                topics: args.topics
             }
         });
         sendUserToast(`Kafka trigger ${path} updated`);
@@ -113,9 +109,9 @@ async function updateTrigger() {
                 script_path,
                 is_flow,
                 enabled: true,
-                kafka_resource_path,
-                group_id,
-                topics
+                kafka_resource_path: args.kafka_resource_path,
+                group_id: args.group_id,
+                topics: args.topics
             }
         });
         sendUserToast(`Kafka trigger ${path} created`);
@@ -126,11 +122,18 @@ async function updateTrigger() {
     dispatch('update');
     drawer.closeDrawer();
 }
-$: topicsError = topics.some((b) => /[^[a-zA-Z0-9-_.]/.test(b)) ? 'Invalid topics' : '';
-$: groupIdError = /[^a-zA-Z0-9-_.]/.test(group_id) ? 'Invalid group ID' : '';
-$: !dirtyGroupId &&
-    path &&
-    (group_id = `windmill_consumer-${$workspaceStore}-${path.replaceAll('/', '__')}`);
+function useDefaultValues() {
+    if (args.kafka_resource_path && args.kafka_resource_path != '') {
+        return false;
+    }
+    if (!defaultValues) {
+        return false;
+    }
+    return (defaultValues.brokers &&
+        defaultValues.brokers.length > 0 &&
+        defaultValues.brokers.some((broker) => broker.trim() !== ''));
+}
+let isValid = false;
 </script>
 
 <Drawer size="800px" bind:this={drawer}>
@@ -143,7 +146,7 @@ $: !dirtyGroupId &&
 		on:close={drawer.closeDrawer}
 	>
 		<svelte:fragment slot="actions">
-			{#if !drawerLoading && can_write}
+			{#if !drawerLoading}
 				{#if edit}
 					<div class="mr-8 center-center -mt-1">
 						<Toggle
@@ -161,21 +164,15 @@ $: !dirtyGroupId &&
 						/>
 					</div>
 				{/if}
-				<Button
-					startIcon={{ icon: Save }}
-					disabled={pathError != '' ||
-						emptyString(script_path) ||
-						emptyString(kafka_resource_path) ||
-						topics.length < 1 ||
-						topics.some((t) => emptyString(t)) ||
-						topicsError != '' ||
-						emptyString(group_id) ||
-						groupIdError != '' ||
-						!can_write}
-					on:click={updateTrigger}
-				>
-					Save
-				</Button>
+				{#if can_write}
+					<Button
+						startIcon={{ icon: Save }}
+						disabled={pathError != '' || emptyString(script_path) || !can_write || !isValid}
+						on:click={updateTrigger}
+					>
+						Save
+					</Button>
+				{/if}
 			{/if}
 		</svelte:fragment>
 		{#if drawerLoading}
@@ -204,81 +201,11 @@ $: !dirtyGroupId &&
 					</Label>
 				</div>
 
-				<Section label="Kafka">
-					<div class="flex flex-col w-full gap-4">
-						<div class="block grow w-full">
-							<div class="text-secondary text-sm mb-1">
-								Resource
-								<Required required={true} />
-							</div>
-							<ResourcePicker resourceType="kafka" bind:value={kafka_resource_path} />
-						</div>
-						<label class="block grow w-full">
-							<div class="text-secondary text-sm flex items-center gap-1 w-full justify-between">
-								<div>
-									Topics
-									<Required required={true} />
-								</div>
-							</div>
-
-							<div class="flex flex-col gap-4 mt-1">
-								{#each topics as v, i}
-									<div class="flex w-full gap-2 items-center">
-										<input type="text" bind:value={v} />
-
-										<button
-											transition:fade|local={{ duration: 100 }}
-											class="rounded-full p-1 bg-surface-secondary duration-200 hover:bg-surface-hover"
-											aria-label="Clear"
-											on:click={() => {
-												topics = topics.filter((_, index) => index !== i)
-											}}
-											class:hidden={topics.length === 1}
-										>
-											<X size={14} />
-										</button>
-									</div>
-								{/each}
-
-								<div class="flex items-baseline">
-									<Button
-										variant="border"
-										color="light"
-										size="xs"
-										on:click={() => {
-											if (topics == undefined || !Array.isArray(topics)) {
-												topics = []
-											}
-											topics = topics.concat('')
-										}}
-										startIcon={{ icon: Plus }}
-									>
-										Add topic
-									</Button>
-								</div>
-							</div>
-							<div class="text-red-600 dark:text-red-400 text-2xs mt-1.5">
-								{topicsError}
-							</div>
-						</label>
-
-						<label class="block grow w-full">
-							<div class="text-secondary text-sm flex items-center gap-1 w-full justify-between">
-								<div>
-									Group ID
-									<Required required={true} />
-								</div>
-							</div>
-							<div class="mt-1">
-								<input type="text" bind:value={group_id} on:focus={() => (dirtyGroupId = true)} />
-							</div>
-
-							<div class="text-red-600 dark:text-red-400 text-2xs mt-1.5">
-								{groupIdError}
-							</div>
-						</label>
-					</div>
-				</Section>
+				<KafkaTriggersConfigSection
+					bind:args
+					bind:isValid
+					defaultValues={useDefaultValues() ? defaultValues : undefined}
+				/>
 
 				<Section label="Runnable">
 					<p class="text-xs mb-1 text-tertiary">
@@ -292,7 +219,8 @@ $: !dirtyGroupId &&
 							allowFlow={true}
 							bind:itemKind
 							bind:scriptPath={script_path}
-							allowRefresh
+							allowRefresh={can_write}
+							allowEdit={!$userStore?.operator}
 						/>
 					</div>
 				</Section>

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

@@ -2,7 +2,7 @@ import { SvelteComponent } from "svelte";
 declare const __propDef: {
     props: {
         openEdit?: ((ePath: string, isFlow: boolean) => Promise<void>) | undefined;
-        openNew?: ((nis_flow: boolean, fixedScriptPath_?: string) => Promise<void>) | undefined;
+        openNew?: ((nis_flow: boolean, fixedScriptPath_?: string, nDefaultValues?: Record<string, any>) => Promise<void>) | undefined;
     };
     events: {
         update: CustomEvent<any>;
@@ -16,6 +16,6 @@ export type KafkaTriggerEditorInnerEvents = typeof __propDef.events;
 export type KafkaTriggerEditorInnerSlots = typeof __propDef.slots;
 export default class KafkaTriggerEditorInner extends SvelteComponent<KafkaTriggerEditorInnerProps, KafkaTriggerEditorInnerEvents, KafkaTriggerEditorInnerSlots> {
     get openEdit(): (ePath: string, isFlow: boolean) => Promise<void>;
-    get openNew(): (nis_flow: boolean, fixedScriptPath_?: string | undefined) => Promise<void>;
+    get openNew(): (nis_flow: boolean, fixedScriptPath_?: string | undefined, nDefaultValues?: Record<string, any> | undefined) => Promise<void>;
 }
 export {};

package/package/components/triggers/KafkaTriggersConfigSection.svelte

@@ -0,0 +1,215 @@
+<script>import ResourcePicker from '../ResourcePicker.svelte';
+import { Boxes } from 'lucide-svelte';
+import Section from '../Section.svelte';
+import Subsection from '../Subsection.svelte';
+import ToggleButton from '../common/toggleButton-v2/ToggleButton.svelte';
+import ToggleButtonGroup from '../common/toggleButton-v2/ToggleButtonGroup.svelte';
+import SchemaForm from '../SchemaForm.svelte';
+import CaptureSection, {} from './CaptureSection.svelte';
+import CaptureTable from './CaptureTable.svelte';
+export let defaultValues = undefined;
+export let headless = false;
+export let args = {};
+export let staticInputDisabled = true;
+export let showCapture = false;
+export let captureInfo = undefined;
+export let captureTable = undefined;
+export let isValid = false;
+let selected = staticInputDisabled ? 'resource' : 'static';
+const connnectionSchema = {
+    $schema: 'http://json-schema.org/draft-07/schema#',
+    type: 'object',
+    properties: {
+        brokers: {
+            type: 'array',
+            items: {
+                type: 'string'
+            },
+            nullable: false,
+            title: 'Brokers'
+        },
+        security: {
+            type: 'object',
+            title: 'Security',
+            oneOf: [
+                {
+                    type: 'object',
+                    title: 'PLAINTEXT',
+                    properties: {
+                        label: {
+                            enum: ['PLAINTEXT'],
+                            type: 'string'
+                        }
+                    }
+                },
+                {
+                    type: 'object',
+                    order: ['mechanism', 'username', 'password'],
+                    title: 'SASL_PLAINTEXT',
+                    required: ['mechanism', 'username', 'password'],
+                    properties: {
+                        label: {
+                            enum: ['SASL_PLAINTEXT'],
+                            type: 'string'
+                        },
+                        password: {
+                            type: 'string',
+                            password: true
+                        },
+                        username: {
+                            type: 'string'
+                        },
+                        mechanism: {
+                            enum: ['PLAIN', 'SCRAM-SHA-256', 'SCRAM-SHA-512'],
+                            type: 'string',
+                            disableCreate: true
+                        }
+                    }
+                },
+                {
+                    type: 'object',
+                    title: 'SSL',
+                    properties: {
+                        label: {
+                            enum: ['SSL'],
+                            type: 'string'
+                        }
+                    }
+                },
+                {
+                    type: 'object',
+                    order: ['mechanism', 'username', 'password'],
+                    title: 'SASL_SSL',
+                    required: ['mechanism', 'username', 'password'],
+                    properties: {
+                        label: {
+                            enum: ['SASL_SSL'],
+                            type: 'string'
+                        },
+                        password: {
+                            type: 'string',
+                            password: true
+                        },
+                        username: {
+                            type: 'string'
+                        },
+                        mechanism: {
+                            enum: ['PLAIN', 'SCRAM-SHA-256', 'SCRAM-SHA-512'],
+                            type: 'string',
+                            disableCreate: true
+                        }
+                    }
+                }
+            ]
+        }
+    },
+    required: ['brokers', 'security']
+};
+const argsSchema = {
+    $schema: 'http://json-schema.org/draft-07/schema#',
+    type: 'object',
+    properties: {
+        topics: {
+            type: 'array',
+            items: {
+                type: 'string'
+            },
+            nullable: false,
+            title: 'Topics'
+        },
+        group_id: {
+            type: 'string',
+            title: 'Group ID',
+            pattern: '^[a-zA-Z0-9-_.]+$',
+            customErrorMessage: 'Invalid group ID'
+        }
+    },
+    required: ['topics', 'group_id']
+};
+let connectionValid = false;
+let otherArgsValid = false;
+$: isValid =
+    (selected === 'resource'
+        ? !!args.kafka_resource_path
+        : connectionValid &&
+            args.brokers &&
+            args.brokers.length > 0 &&
+            args.brokers.every((b) => b.length > 0)) &&
+        otherArgsValid &&
+        args.topics &&
+        args.topics.length > 0 &&
+        args.topics.every((b) => /^[a-zA-Z0-9-_.]+$/.test(b));
+$: args.kafka_resource_path && (selected = 'resource');
+</script>
+
+<div>
+	{#if showCapture && captureInfo}
+		<CaptureSection
+			captureType="kafka"
+			disabled={!isValid}
+			{captureInfo}
+			on:captureToggle
+			on:applyArgs
+			on:updateSchema
+			on:addPreprocessor
+			bind:captureTable
+		/>
+	{/if}
+	<Section label="Kafka" {headless}>
+		<div class="flex flex-col w-full gap-4">
+			<div class="block grow w-full">
+				<Subsection label="Connection">
+					<svelte:fragment slot="header">
+						{#if !staticInputDisabled}
+							<ToggleButtonGroup
+								bind:selected
+								class="h-full"
+								on:selected={(ev) => {
+									if (ev.detail === 'static') {
+										delete args.kafka_resource_path
+										args.brokers = ['']
+										args.security = {
+											label: 'PLAINTEXT'
+										}
+									} else {
+										delete args.brokers
+										delete args.security
+									}
+								}}
+							>
+								<ToggleButton value="static" label="Static" small={true} />
+								<ToggleButton value="resource" label="Resource" icon={Boxes} small={true} />
+							</ToggleButtonGroup>
+						{/if}
+					</svelte:fragment>
+
+					{#if selected === 'resource'}
+						<ResourcePicker
+							resourceType="kafka"
+							bind:value={args.kafka_resource_path}
+							{defaultValues}
+						/>
+					{:else}
+						<SchemaForm
+							schema={connnectionSchema}
+							bind:args
+							bind:isValid={connectionValid}
+							lightHeader={true}
+						/>
+					{/if}
+				</Subsection>
+			</div>
+
+			<div class="block grow w-full">
+				<Subsection headless={true}>
+					<SchemaForm
+						schema={argsSchema}
+						bind:args
+						bind:isValid={otherArgsValid}
+						lightHeader={true}
+					/>
+				</Subsection>
+			</div>
+		</div>
+	</Section>
+</div>

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

@@ -0,0 +1,36 @@
+import { SvelteComponent } from "svelte";
+import { type CaptureInfo } from './CaptureSection.svelte';
+import CaptureTable from './CaptureTable.svelte';
+declare const __propDef: {
+    props: {
+        defaultValues?: Record<string, any> | undefined;
+        headless?: boolean | undefined;
+        args?: Record<string, any> | undefined;
+        staticInputDisabled?: boolean | undefined;
+        showCapture?: boolean | undefined;
+        captureInfo?: CaptureInfo | undefined;
+        captureTable?: CaptureTable | undefined;
+        isValid?: boolean | undefined;
+    };
+    events: {
+        captureToggle: CustomEvent<undefined>;
+        applyArgs: CustomEvent<{
+            kind: "main" | "preprocessor";
+            args: Record<string, any> | undefined;
+        }>;
+        updateSchema: CustomEvent<{
+            schema: any;
+            redirect: boolean;
+        }>;
+        addPreprocessor: CustomEvent<null>;
+    } & {
+        [evt: string]: CustomEvent<any>;
+    };
+    slots: {};
+};
+export type KafkaTriggersConfigSectionProps = typeof __propDef.props;
+export type KafkaTriggersConfigSectionEvents = typeof __propDef.events;
+export type KafkaTriggersConfigSectionSlots = typeof __propDef.slots;
+export default class KafkaTriggersConfigSection extends SvelteComponent<KafkaTriggersConfigSectionProps, KafkaTriggersConfigSectionEvents, KafkaTriggersConfigSectionSlots> {
+}
+export {};