windmill-components 1.623.1 → 1.642.0

package/package/components/table/DataTable.svelte

@@ -10,7 +10,7 @@ let footerHeight = $state(0);
 let tableHeight = $state(0);
 const dispatch = createEventDispatcher();
 let tableContainer = $state();
-let { paginated = false, currentPage = $bindable(1), showNext = true, showPrev = true, loadMore = 0, shouldLoadMore = false, rounded = true, size = 'md', perPage = $bindable(undefined), shouldHidePagination = false, noBorder = false, rowCount = undefined, hasMore = true, contentHeight = $bindable(0), tableFixed = false, infiniteScroll = undefined, neverShowLoader = false, loading = false, loadingMore = false, children, emptyMessage } = $props();
+let { paginated = false, currentPage = $bindable(1), showNext = true, showPrev = true, loadMore = 0, shouldLoadMore = false, rounded = true, size = 'md', perPage = $bindable(undefined), shouldHidePagination = false, noBorder = false, rowCount = undefined, hasMore = true, contentHeight = $bindable(0), tableFixed = false, infiniteScroll = undefined, neverShowLoader = false, loading = false, loadingMore = false, containerClass = '', children, emptyMessage, preventXOverflow = false } = $props();
 setContext('datatable', {
     size
 });
@@ -63,12 +63,17 @@ $effect(() => {
 	class={twMerge(
 		'h-full',
 		rounded ? 'rounded-md overflow-hidden' : '',
-		noBorder ? 'border-0' : 'border'
+		noBorder ? 'border-0' : 'border',
+		containerClass
 	)}
 	bind:clientHeight={tableHeight}
 >
 	<List justify="between" gap="none" hFull={true}>
-		<div class="w-full overflow-auto h-fit" bind:this={tableContainer} onscroll={handleScroll}>
+		<div
+			class={twMerge('w-full overflow-auto h-fit', preventXOverflow ? 'overflow-x-hidden' : '')}
+			bind:this={tableContainer}
+			onscroll={handleScroll}
+		>
 			<table class={tableFixed ? 'table-fixed w-full' : 'min-w-full'}>
 				{@render children?.()}
 			</table>

package/package/components/table/DataTable.svelte.d.ts

@@ -21,6 +21,8 @@ interface Props {
     neverShowLoader?: boolean;
     loading?: boolean;
     loadingMore?: boolean;
+    containerClass?: string;
+    preventXOverflow?: boolean;
     children?: import('svelte').Snippet;
     emptyMessage?: import('svelte').Snippet;
 }

package/package/components/text_input/TextInput.svelte

@@ -20,6 +20,9 @@ export const inputSizeClasses = {
 export function focus() {
     inputEl?.focus();
 }
+export function select() {
+    inputEl?.select();
+}
 let inputEl = $state();
 let { inputProps: _inputProps, value = $bindable(), class: className = '', error, size = 'md', unifiedHeight = true, underlyingInputEl: _underlyingInputEl } = $props();
 let underlyingInputEl = $derived(_underlyingInputEl ?? 'input');

package/package/components/text_input/TextInput.svelte.d.ts

@@ -24,6 +24,7 @@ declare function $$render<UnderlyingInputElT extends 'input' | 'textarea' = 'inp
     props: Props<UnderlyingInputElT>;
     exports: {
         focus: () => void;
+        select: () => void;
     };
     bindings: "value";
     slots: {};
@@ -36,6 +37,7 @@ declare class __sveltets_Render<UnderlyingInputElT extends 'input' | 'textarea'
     bindings(): "value";
     exports(): {
         focus: () => void;
+        select: () => void;
     };
 }
 interface $$IsomorphicComponent {

package/package/components/toast.js

@@ -1,5 +1,4 @@
-//regex that match path starting with u/ or f/ and with at least 2 /
-const pathRegex = /\b(u|f)\/[^\/\s]+\/[^\/\s]+\b/g;
+const pathRegex = /\b(u|f)(\/[^\/\s]+){2,}\b/g;
 export function processMessage(message) {
     let msg = !message
         ? 'Error without message'

package/package/components/triggers/AddTriggersButton.svelte

@@ -3,11 +3,22 @@ import DropdownV2 from '../DropdownV2.svelte';
 import { SchedulePollIcon } from '../icons';
 import { isCloudHosted } from '../../cloud';
 import { CloudOff } from 'lucide-svelte';
+import { isServiceAvailable } from './native/utils';
+import { workspaceStore } from '../../stores';
 let { setDropdownWidthToButtonWidth = false, children, class: className, placement = 'bottom-start', isEditor = false, onAddDraftTrigger, onAddScheduledPoll, onClose } = $props();
 let dropdown;
 const cloudHosted = isCloudHosted();
-// Dropdown items for adding new triggers
-const addTriggerItems = [
+let nextcloudAvailable = $state(false);
+let googleAvailable = $state(false);
+async function setNextcloudState() {
+    nextcloudAvailable = await isServiceAvailable('nextcloud', $workspaceStore);
+}
+async function setGoogleState() {
+    googleAvailable = await isServiceAvailable('google', $workspaceStore);
+}
+setNextcloudState();
+setGoogleState();
+const addTriggerItems = $derived([
     {
         displayName: 'Schedule',
         action: () => onAddDraftTrigger?.('schedule'),
@@ -59,7 +70,8 @@ const addTriggerItems = [
     {
         displayName: 'Email',
         action: () => onAddDraftTrigger?.('email'),
-        icon: triggerIconMap.email
+        icon: triggerIconMap.email,
+        extra: cloudHosted ? extra : undefined
     },
     {
         displayName: 'Scheduled Poll',
@@ -69,8 +81,20 @@ const addTriggerItems = [
         },
         icon: SchedulePollIcon,
         hidden: !isEditor
+    },
+    {
+        displayName: 'Nextcloud',
+        action: () => onAddDraftTrigger?.('nextcloud'),
+        icon: triggerIconMap.nextcloud,
+        hidden: !nextcloudAvailable
+    },
+    {
+        displayName: 'Google',
+        action: () => onAddDraftTrigger?.('google'),
+        icon: triggerIconMap.google,
+        hidden: !googleAvailable
     }
-].filter((item) => !item.hidden);
+].filter((item) => !item.hidden));
 let triggersButtonWidth = $state(0);
 export function close() {
     dropdown?.close();

package/package/components/triggers/TriggerFilters.svelte

@@ -0,0 +1,71 @@
+<script lang="ts">import { Button } from '../common';
+import Section from '../Section.svelte';
+import { Plus, X } from 'lucide-svelte';
+import { fade } from 'svelte/transition';
+import JsonEditor from '../JsonEditor.svelte';
+let { filters = $bindable([]), disabled = false } = $props();
+</script>
+
+<Section label="Filters">
+	<p class="text-xs mb-1 text-primary">
+		Filters will limit the execution of the trigger to only messages that match all criteria.<br />
+		The JSON filter checks if the value at the key is equal or a superset of the filter value.
+	</p>
+	<div class="flex flex-col gap-4 mt-1">
+		{#each filters as v, i (i)}
+			<div class="flex w-full gap-2 items-center">
+				<div class="w-full flex flex-col gap-2 border p-2 rounded-md">
+					<label class="flex flex-col w-full">
+						<div class="text-secondary text-sm mb-2">Key</div>
+						<input type="text" bind:value={v.key} {disabled} />
+					</label>
+					<!-- svelte-ignore a11y_label_has_associated_control -->
+					<label class="flex flex-col w-full">
+						<div class="text-secondary text-sm mb-2">Value</div>
+						<JsonEditor bind:value={v.value} code={JSON.stringify(v.value)} {disabled} />
+					</label>
+					{#if v.key}
+						{@const isObject = v.value !== null && typeof v.value === 'object'}
+						<div class="text-xs text-tertiary font-mono mt-2 p-2 bg-surface-secondary rounded">
+							payload.{v.key}
+							{isObject ? '⊇' : '=='}
+							{JSON.stringify(v.value)}
+						</div>
+					{/if}
+				</div>
+				<button
+					transition:fade|local={{ duration: 100 }}
+					class="rounded-full p-1 bg-surface-secondary duration-200 hover:bg-surface-hover"
+					aria-label="Clear"
+					onclick={() => {
+						filters = filters.filter((_, index) => index !== i)
+					}}
+					{disabled}
+				>
+					<X size={14} />
+				</button>
+			</div>
+		{/each}
+
+		<div class="flex items-baseline">
+			<Button
+				variant="default"
+				size="xs"
+				btnClasses="mt-1"
+				onclick={() => {
+					if (filters == undefined || !Array.isArray(filters)) {
+						filters = []
+					}
+					filters = filters.concat({
+						key: '',
+						value: ''
+					})
+				}}
+				{disabled}
+				startIcon={{ icon: Plus }}
+			>
+				Add filter
+			</Button>
+		</div>
+	</div>
+</Section>

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

@@ -0,0 +1,10 @@
+interface Props {
+    filters: {
+        key: string;
+        value: any;
+    }[];
+    disabled?: boolean;
+}
+declare const TriggerFilters: import("svelte").Component<Props, {}, "filters">;
+type TriggerFilters = ReturnType<typeof TriggerFilters>;
+export default TriggerFilters;

package/package/components/triggers/TriggersEditor.svelte

@@ -12,7 +12,7 @@ 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, EmailTriggerService } from '../../gen';
+import { ScheduleService, WebsocketTriggerService, PostgresTriggerService, KafkaTriggerService, NatsTriggerService, MqttTriggerService, HttpTriggerService, GcpTriggerService, SqsTriggerService, EmailTriggerService, NativeTriggerService } from '../../gen';
 import { sendUserToast } from '../../toast';
 import Alert from '../common/alert/Alert.svelte';
 let { noEditor, newItem = false, currentPath, fakeInitialPath = '', runnableVersion = undefined, args = {}, initialPath, isFlow, canHavePreprocessor = false, hasPreprocessor = false, isDeployed = false, schema = undefined, noCapture = false, isEditor = true, onDeployTrigger } = $props();
@@ -52,22 +52,39 @@ async function deleteDeployedTrigger(triggerIndex) {
         http: () => HttpTriggerService.deleteHttpTrigger,
         email: () => EmailTriggerService.deleteEmailTrigger
     };
+    const nativeTriggerServices = {
+        nextcloud: 'nextcloud',
+        google: 'google'
+    };
     const deleteHandler = deleteHandlers[triggerType];
-    if (deleteHandler && deletingTrigger !== triggerIndex) {
-        deletingTrigger = triggerIndex;
-        try {
+    const nativeServiceName = nativeTriggerServices[triggerType];
+    if (deletingTrigger === triggerIndex)
+        return;
+    deletingTrigger = triggerIndex;
+    try {
+        if (nativeServiceName) {
+            await NativeTriggerService.deleteNativeTrigger({
+                workspace: $workspaceStore ?? '',
+                serviceName: nativeServiceName,
+                externalId: triggerPath ?? ''
+            });
+        }
+        else if (deleteHandler) {
             await deleteHandler()({
                 workspace: $workspaceStore ?? '',
                 path: triggerPath ?? ''
             });
-            sendUserToast(`Successfully deleted ${triggerType} trigger: ${triggerPath}`);
         }
-        catch (error) {
-            sendUserToast(error.body || error.message, true);
-        }
-        finally {
-            deletingTrigger = undefined;
+        else {
+            return;
         }
+        sendUserToast(`Successfully deleted ${triggerType} trigger: ${triggerPath}`);
+    }
+    catch (error) {
+        sendUserToast(error.body || error.message, true);
+    }
+    finally {
+        deletingTrigger = undefined;
     }
 }
 async function deleteTrigger(triggerIndex) {
@@ -120,11 +137,18 @@ async function handleUpdate(trigger, path) {
     else if (triggerType === 'email') {
         await triggersState.fetchEmailTriggers(triggersCount, $workspaceStore, currentPath, isFlow, $userStore);
     }
+    else if (triggerType === 'nextcloud') {
+        await triggersState.fetchNativeTriggers(triggersCount, 'nextcloud', $workspaceStore, currentPath, isFlow, $userStore);
+    }
+    else if (triggerType === 'google') {
+        await triggersState.fetchNativeTriggers(triggersCount, 'google', $workspaceStore, currentPath, isFlow, $userStore);
+    }
     triggersState.selectedTriggerIndex = triggersState.triggers.findIndex((t) => t.path === path && t.type === triggerType);
     loading = false;
     onDeployTrigger?.({ type: triggerType, id: triggerId, path: triggerPath });
 }
 function handleUpdateDraftConfig(triggerIndex, newConfig, saveDisabled) {
+    console.log('handleUpdateDraftConfig', triggerIndex, newConfig, saveDisabled);
     if (triggerIndex && triggerIndex !== -1 && newConfig) {
         triggersState.setDraftConfig(triggerIndex, { ...newConfig, canSave: !saveDisabled });
     }

package/package/components/triggers/TriggersWrapper.svelte

@@ -15,7 +15,11 @@ import { triggerIconMap } from './utils';
 import ClipboardPanel from '../details/ClipboardPanel.svelte';
 import CliHelpBox from '../CliHelpBox.svelte';
 import TriggerLabel from './TriggerLabel.svelte';
+import NativeTriggersPanel from './native/NativeTriggersPanel.svelte';
 let { selectedTrigger, isFlow = false, initialPath, fakeInitialPath, currentPath, runnableVersion, small, args, newItem, schema, onEmailDomain, ...props } = $props();
+$effect(() => {
+    console.log('selectedTrigger', selectedTrigger);
+});
 </script>
 
 {#if selectedTrigger.type === 'http'}
@@ -131,6 +135,26 @@ let { selectedTrigger, isFlow = false, initialPath, fakeInitialPath, currentPath
 	/>
 {:else if selectedTrigger.type === 'poll'}
 	<ScheduledPollPanel />
+{:else if selectedTrigger.type === 'nextcloud'}
+	<NativeTriggersPanel
+		service="nextcloud"
+		{isFlow}
+		path={initialPath || fakeInitialPath}
+		{selectedTrigger}
+		defaultValues={selectedTrigger.draftConfig ?? selectedTrigger.captureConfig ?? undefined}
+		{customLabel}
+		{...props}
+	/>
+{:else if selectedTrigger.type === 'google'}
+	<NativeTriggersPanel
+		service="google"
+		{isFlow}
+		path={initialPath || fakeInitialPath}
+		{selectedTrigger}
+		defaultValues={selectedTrigger.draftConfig ?? selectedTrigger.captureConfig ?? undefined}
+		{customLabel}
+		{...props}
+	/>
 {:else if selectedTrigger.type === 'cli'}
 	<div class="py-1 flex flex-col gap-6">
 		<ClipboardPanel content={selectedTrigger.extra?.cliCommand ?? ''} />

package/package/components/triggers/http/RouteEditorInner.svelte

@@ -240,7 +240,7 @@ function loadTriggerConfig(cfg) {
         signature_options_type = 'custom_signature';
     }
     if (!isCloudHosted()) {
-        static_asset_config = cfg?.static_asset_config;
+        static_asset_config = cfg?.static_asset_config ?? undefined;
         s3FileUploadRawMode = !!cfg?.static_asset_config;
         is_static_website = cfg?.is_static_website ?? false;
     }

package/package/components/triggers/kafka/KafkaTriggerEditorInner.svelte

@@ -21,6 +21,7 @@ import TriggerRetriesAndErrorHandler from '../TriggerRetriesAndErrorHandler.svel
 import { deepEqual } from 'fast-equals';
 import TriggerSuspendedJobsAlert from '../TriggerSuspendedJobsAlert.svelte';
 import TriggerSuspendedJobsModal from '../TriggerSuspendedJobsModal.svelte';
+import TriggerFilters from '../TriggerFilters.svelte';
 let { useDrawer = true, description = undefined, hideTarget = false, hideTooltips = false, isEditor = false, allowDraft = false, trigger = undefined, customLabel, isDeployed = false, cloudDisabled = false, onConfigChange = undefined, onCaptureConfigChange = undefined, onUpdate = undefined, onDelete = undefined, onReset = undefined } = $props();
 let drawer = $state();
 let is_flow = $state(false);
@@ -48,6 +49,7 @@ let errorHandlerSelected = $state('slack');
 let error_handler_path = $state();
 let error_handler_args = $state({});
 let retry = $state();
+let filters = $state([]);
 let suspendedJobsModal = $state(null);
 let originalConfig = $state(undefined);
 const isValid = $derived(!!kafkaResourcePath &&
@@ -120,6 +122,7 @@ export async function openNew(nis_flow, fixedScriptPath_, nDefaultValues) {
         error_handler_path = nDefaultValues?.error_handler_path ?? undefined;
         error_handler_args = nDefaultValues?.error_handler_args ?? {};
         retry = nDefaultValues?.retry ?? undefined;
+        filters = nDefaultValues?.filters ?? [];
         errorHandlerSelected = getHandlerType(error_handler_path ?? '');
         mode = nDefaultValues?.mode ?? 'enabled';
         originalConfig = undefined;
@@ -146,6 +149,7 @@ function loadTriggerConfig(cfg) {
     error_handler_path = cfg?.error_handler_path;
     error_handler_args = cfg?.error_handler_args ?? {};
     retry = cfg?.retry;
+    filters = cfg?.filters ?? [];
     errorHandlerSelected = getHandlerType(error_handler_path ?? '');
 }
 async function loadTrigger(defaultConfig) {
@@ -169,6 +173,7 @@ function getSaveCfg() {
         kafka_resource_path: kafkaResourcePath,
         group_id: kafkaCfg.group_id,
         topics: kafkaCfg.topics,
+        filters,
         mode,
         extra_perms: extra_perms,
         error_handler_path,
@@ -373,6 +378,8 @@ $effect(() => {
 				showTestingBadge={isEditor}
 			/>
 
+			<TriggerFilters bind:filters disabled={!can_write} />
+
 			<Section label="Advanced" collapsable>
 				<div class="flex flex-col gap-4">
 					<div class="min-h-96">

package/package/components/triggers/kafka/utils.js

@@ -16,6 +16,7 @@ export async function saveKafkaTriggerFromCfg(initialPath, cfg, edit, workspace,
         kafka_resource_path: cfg.kafka_resource_path,
         group_id: cfg.group_id,
         topics: cfg.topics,
+        filters: cfg.filters ?? [],
         ...errorHandlerAndRetries
     };
     try {