windmill-components 1.623.2 → 1.642.0

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) {
@@ -121,7 +138,10 @@ async function handleUpdate(trigger, path) {
         await triggersState.fetchEmailTriggers(triggersCount, $workspaceStore, currentPath, isFlow, $userStore);
     }
     else if (triggerType === 'nextcloud') {
-        await triggersState.fetchNativeTriggers('nextcloud', $workspaceStore, currentPath, isFlow, $userStore);
+        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;

package/package/components/triggers/TriggersWrapper.svelte

@@ -145,6 +145,16 @@ $effect(() => {
 		{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 {

package/package/components/triggers/native/NativeTriggerEditor.svelte

@@ -10,6 +10,7 @@ import ScriptPicker from '../../ScriptPicker.svelte';
 import Section from '../../Section.svelte';
 import Required from '../../Required.svelte';
 import NextcloudTriggerForm from './services/nextcloud/NextcloudTriggerForm.svelte';
+import GoogleTriggerForm from './services/google/GoogleTriggerForm.svelte';
 import TriggerEditorToolbar from '../TriggerEditorToolbar.svelte';
 import { handleConfigChange } from '../utils';
 import { deepEqual } from 'fast-equals';
@@ -28,6 +29,8 @@ const ServiceFormComponent = $derived.by(() => {
     switch (service) {
         case 'nextcloud':
             return NextcloudTriggerForm;
+        case 'google':
+            return GoogleTriggerForm;
         default:
             return null;
     }
@@ -50,7 +53,7 @@ let isFlow = $state(false);
 let externalId = $state(null);
 let can_write = $state(true);
 let originalConfig = $state(undefined);
-let initialConfig = undefined;
+let initialConfig = $state(undefined);
 export function openNew(nis_flow, fixedScriptPath_, defaultValues) {
     if (useDrawer) {
         drawer?.openDrawer();
@@ -64,9 +67,10 @@ export function openNew(nis_flow, fixedScriptPath_, defaultValues) {
     fixedScriptPath = fixedScriptPath_ ?? '';
     scriptPath = fixedScriptPath;
     initialScriptPath = '';
-    isFlow = nis_flow ?? false;
+    itemKind = nis_flow ? 'flow' : 'script';
     externalId = null;
     loadingConfig = false;
+    loadingForm = false;
     can_write = true;
     originalConfig = undefined;
     initialConfig = undefined;
@@ -85,7 +89,7 @@ export function openRecreate(nativeTrigger) {
     errors = {};
     scriptPath = nativeTrigger.script_path;
     initialScriptPath = nativeTrigger.script_path;
-    isFlow = nativeTrigger.is_flow;
+    itemKind = nativeTrigger.is_flow ? 'flow' : 'script';
     externalId = null;
     loadingConfig = false;
     loadingForm = false;
@@ -108,7 +112,9 @@ export async function openEdit(externalIdOrPath, nis_flow, defaultValues) {
     externalId = externalIdOrPath;
     loadingConfig = true;
     loadingForm = true;
+    originalConfig = undefined;
     initialConfig = undefined;
+    itemKind = nis_flow ? 'flow' : 'script';
     try {
         const fullTrigger = await NativeTriggerService.getNativeTrigger({
             workspace: $workspaceStore,
@@ -118,7 +124,6 @@ export async function openEdit(externalIdOrPath, nis_flow, defaultValues) {
         serviceConfig = fullTrigger.service_config || {};
         scriptPath = fullTrigger.script_path;
         initialScriptPath = fullTrigger.script_path;
-        isFlow = nis_flow ?? fullTrigger.is_flow;
         can_write = canWrite(fullTrigger.script_path, {}, $userStore);
         externalData = fullTrigger.external_data;
         // Apply default values if provided (for draft triggers)
@@ -126,17 +131,12 @@ export async function openEdit(externalIdOrPath, nis_flow, defaultValues) {
             serviceConfig = { ...serviceConfig, ...defaultValues };
             externalData = { ...externalData, ...defaultValues };
         }
-        originalConfig = structuredClone($state.snapshot(getSaveCfg()));
     }
     catch (err) {
         sendUserToast(`Failed to load trigger configuration: ${err}`, true);
         externalData = null;
     }
     finally {
-        // For drawer mode, set initialConfig here; for inline mode, the effect handles it after form settles
-        if (!defaultValues) {
-            initialConfig = structuredClone($state.snapshot(getSaveCfg()));
-        }
         clearTimeout(loadingTimeout);
         loadingConfig = false;
         showLoading = false;
@@ -149,6 +149,14 @@ function getSaveCfg() {
         service_config: serviceConfig
     };
 }
+// Capture originalConfig after the form has settled (loadingConfig and loadingForm both false)
+// This ensures we compare against the form's normalized config, not raw backend data
+$effect(() => {
+    if (!loadingConfig && !loadingForm && originalConfig === undefined && !isNew) {
+        originalConfig = structuredClone($state.snapshot(getSaveCfg()));
+        initialConfig = structuredClone($state.snapshot(getSaveCfg()));
+    }
+});
 function close() {
     drawer?.closeDrawer();
 }
@@ -167,9 +175,6 @@ let validationErrors = $derived.by(() => {
 });
 let isValid = $derived.by(() => Object.keys(validationErrors).length === 0);
 let hasChanged = $derived(!deepEqual(getSaveCfg(), originalConfig ?? {}));
-$effect(() => {
-    console.log('loading', getSaveCfg(), originalConfig);
-});
 let saveDisabled = $derived(loading ||
     !isValid ||
     emptyString(scriptPath) ||
@@ -179,7 +184,7 @@ let saveDisabled = $derived(loading ||
     !hasChanged);
 const saveCfg = $derived.by(getSaveCfg);
 $effect(() => {
-    if (!loadingConfig && !loadingForm) {
+    if (!loadingConfig && !loadingForm && (isNew || initialConfig)) {
         handleConfigChange(saveCfg, initialConfig, saveDisabled, !isNew, onConfigChange);
     }
 });
@@ -216,7 +221,10 @@ async function save() {
     loading = false;
 }
 let templateUrl = $derived(isFlow ? flowTemplateUrl : scriptTemplateUrl);
-let itemKind = $derived(isFlow ? 'flow' : 'script');
+let itemKind = $state('script');
+$effect(() => {
+    isFlow = itemKind === 'flow';
+});
 </script>
 
 {#if useDrawer}
@@ -308,9 +316,6 @@ let itemKind = $derived(isFlow ? 'flow' : 'script');
 							bind:scriptPath
 							allowRefresh={can_write}
 							bind:itemKind
-							on:select={(e) => {
-								isFlow = e.detail.itemKind === 'flow'
-							}}
 							kinds={['script']}
 							allowFlow={true}
 							allowEdit={!$userStore?.operator}

package/package/components/triggers/native/NativeTriggerTable.svelte

@@ -10,6 +10,8 @@ import { Eye, Pen, RefreshCw, Trash } from 'lucide-svelte';
 import ConfirmationModal from '../../common/confirmationModal/ConfirmationModal.svelte';
 import { goto } from '../../../navigation';
 import Alert from '../../common/alert/Alert.svelte';
+import GoogleDriveIcon from '../../icons/GoogleDriveIcon.svelte';
+import GoogleCalendarIcon from '../../icons/GoogleCalendarIcon.svelte';
 let { service, triggers = [], loading = false, onEdit, onRecreate } = $props();
 const serviceConfig = $derived(getServiceConfig(service));
 let deleteConfirmationOpen = $state(false);
@@ -79,6 +81,20 @@ async function confirmDeleteTrigger() {
 									{trigger.script_path}
 								{/if}
 							</div>
+							{#if service === 'google'}
+								{@const triggerType = trigger.service_config?.triggerType}
+								{@const resourceName = trigger.service_config?.resourceName}
+								{@const calendarName = trigger.service_config?.calendarName}
+								<div class="text-secondary text-xs truncate text-left font-normal flex items-center gap-1 mb-0.5">
+									{#if triggerType === 'calendar'}
+										<GoogleCalendarIcon height="12px" width="12px" />
+										Calendar: {calendarName || trigger.service_config?.calendarId || ''}
+									{:else}
+										<GoogleDriveIcon height="12px" width="12px" />
+										Drive: {resourceName ? resourceName : trigger.service_config?.resourceId ? trigger.service_config.resourceId : 'All changes'}
+									{/if}
+								</div>
+							{/if}
 							<div class="text-secondary text-xs truncate text-left font-normal">
 								external ID: {trigger.external_id}
 							</div>

package/package/components/triggers/native/services/google/GoogleCalendarPicker.svelte

@@ -0,0 +1,112 @@
+<script lang="ts">import { NativeTriggerService } from '../../../../../gen/services.gen';
+import { workspaceStore } from '../../../../../stores';
+import { sendUserToast } from '../../../../../utils';
+import { Badge } from '../../../../common';
+import { Loader2, X, RefreshCw } from 'lucide-svelte';
+import GoogleCalendarIcon from '../../../../icons/GoogleCalendarIcon.svelte';
+let { calendarId = $bindable(), calendarName = $bindable(), disabled = false } = $props();
+let calendars = $state([]);
+let loading = $state(false);
+async function loadCalendars() {
+    if (!$workspaceStore)
+        return;
+    loading = true;
+    try {
+        calendars = await NativeTriggerService.listGoogleCalendars({
+            workspace: $workspaceStore
+        });
+        if (calendarId && !calendarName) {
+            const found = calendars.find((c) => c.id === calendarId);
+            if (found) {
+                calendarName = found.summary;
+            }
+        }
+    }
+    catch (err) {
+        sendUserToast(`Failed to load calendars: ${err.body || err.message}`, true);
+        calendars = [];
+    }
+    finally {
+        loading = false;
+    }
+}
+function selectCalendar(cal) {
+    calendarId = cal.id;
+    calendarName = cal.summary;
+}
+function clearSelection() {
+    calendarId = '';
+    calendarName = '';
+}
+$effect(() => {
+    if ($workspaceStore) {
+        loadCalendars();
+    }
+});
+</script>
+
+<div class="flex flex-col gap-2 border rounded-md p-2 bg-surface">
+	<div class="flex items-center gap-1 text-2xs">
+		<span class="font-medium text-secondary">Calendars</span>
+		<div class="flex-1"></div>
+		<button
+			class="p-0.5 text-tertiary hover:text-secondary"
+			title="Refresh"
+			onclick={() => loadCalendars()}
+			{disabled}
+		>
+			<RefreshCw size={12} />
+		</button>
+	</div>
+
+	{#if calendarId}
+		<div
+			class="flex items-center gap-2 px-2 py-1 rounded bg-surface-selected text-secondary text-xs border"
+		>
+			<GoogleCalendarIcon width="14px" height="14px" />
+			<span>
+				Selected: <strong>{calendarName || calendarId}</strong>
+			</span>
+			<button
+				class="ml-auto text-tertiary hover:text-secondary"
+				onclick={clearSelection}
+				{disabled}
+			>
+				<X size={14} />
+			</button>
+		</div>
+	{/if}
+
+	<div class="max-h-48 overflow-y-auto -mx-2 -mb-2 px-2 pb-1">
+		{#if loading}
+			<div class="flex items-center justify-center gap-2 py-4 text-xs text-tertiary">
+				<Loader2 class="animate-spin" size={14} />
+				Loading calendars...
+			</div>
+		{:else if calendars.length === 0}
+			<div class="text-center py-4 text-xs text-tertiary">
+				No calendars found. Check that the Google Calendar API is enabled.
+			</div>
+		{:else}
+			{#each calendars as cal (cal.id)}
+				<div
+					class="flex items-center gap-2 px-2 py-1.5 text-xs hover:bg-surface-hover border-b border-light last:border-b-0
+						{cal.id === calendarId ? 'bg-surface-selected' : ''}"
+				>
+					<GoogleCalendarIcon width="14px" height="14px" />
+					<button
+						class="flex-1 text-left truncate hover:underline"
+						title="Select {cal.summary}"
+						onclick={() => selectCalendar(cal)}
+						{disabled}
+					>
+						{cal.summary}
+					</button>
+					{#if cal.primary}
+						<Badge color="blue" small>Primary</Badge>
+					{/if}
+				</div>
+			{/each}
+		{/if}
+	</div>
+</div>

package/package/components/triggers/native/services/google/GoogleCalendarPicker.svelte.d.ts

@@ -0,0 +1,8 @@
+interface Props {
+    calendarId: string;
+    calendarName: string;
+    disabled?: boolean;
+}
+declare const GoogleCalendarPicker: import("svelte").Component<Props, {}, "calendarId" | "calendarName">;
+type GoogleCalendarPicker = ReturnType<typeof GoogleCalendarPicker>;
+export default GoogleCalendarPicker;