fix import/bugs and nits

backend/windmill-api/src/capture.rs

@@ -23,7 +23,10 @@ use {
     http::HeaderMap,
 };
 
-#[cfg(any(all(feature = "enterprise", feature = "gcp_trigger"), feature = "postgres_trigger"))]
+#[cfg(any(
+    all(feature = "enterprise", feature = "gcp_trigger"),
+    feature = "postgres_trigger"
+))]
 use windmill_common::utils::empty_as_none;
 
 #[cfg(all(feature = "enterprise", feature = "sqs_trigger"))]
@@ -33,7 +36,14 @@ use windmill_common::auth::aws::AwsAuthResourceType;
     feature = "http_trigger",
     all(feature = "enterprise", feature = "gcp_trigger")
 ))]
-use {serde::de::DeserializeOwned, windmill_common::error::Error};
+use serde::de::DeserializeOwned;
+
+#[cfg(any(
+    feature = "http_trigger",
+    feature = "postgres_trigger",
+    all(feature = "enterprise", feature = "gcp_trigger")
+))]
+use windmill_common::error::Error;
 
 #[cfg(all(feature = "enterprise", feature = "kafka"))]
 use crate::kafka_triggers_ee::KafkaTriggerConfigConnection;
@@ -361,9 +371,7 @@ async fn set_gcp_trigger_config(
     mut capture_config: NewCaptureConfig,
 ) -> Result<NewCaptureConfig> {
     let Some(TriggerConfig::Gcp(mut gcp_config)) = capture_config.trigger_config else {
-        return Err(windmill_common::error::Error::BadRequest(
-            "Invalid GCP Pub/Sub config".to_string(),
-        ));
+        return Err(Error::BadRequest("Invalid GCP Pub/Sub config".to_string()));
     };
 
     let config = manage_google_subscription(

frontend/src/lib/components/triggers/postgres/PostgresTriggerEditorInner.svelte

@@ -72,27 +72,27 @@
 	let drawer: Drawer | undefined = $state(undefined)
 	let is_flow: boolean = $state(false)
 	let initialPath = $state('')
-	let edit = $state(true)
+	let edit: boolean = $state(true)
 	let itemKind: 'flow' | 'script' = $state('script')
-	let script_path = $state('')
-	let initialScriptPath = $state('')
-	let fixedScriptPath = $state('')
+	let script_path: string = $state('')
+	let initialScriptPath: string = $state('')
+	let fixedScriptPath: string = $state('')
 	let path: string = $state('')
 	let pathError = $state('')
-	let enabled = $state(false)
-	let dirtyPath = $state(false)
-	let can_write = $state(true)
-	let drawerLoading = $state(true)
-	let showLoading = $state(false)
-	let postgres_resource_path = $state('')
+	let enabled: boolean = $state(false)
+	let dirtyPath: boolean = $state(false)
+	let can_write: boolean = $state(true)
+	let drawerLoading: boolean = $state(true)
+	let showLoading: boolean = $state(false)
+	let postgres_resource_path: string = $state('')
 	let publication_name: string = $state('')
 	let replication_slot_name: string = $state('')
 	let relations: Relations[] | undefined = $state([])
 	let transaction_to_track: string[] = $state([])
 	let language: Language = 'Typescript'
 	let loading = $state(false)
-	let postgresVersion = ''
-	let loadingPostgres = $state(false)
+	let postgresVersion: string = $state('')
+	let loadingPostgres: boolean = $state(false)
 	type actions = 'create' | 'get'
 	let selectedPublicationAction: actions | undefined = $state(undefined)
 	let selectedSlotAction: actions | undefined = $state(undefined)
@@ -103,6 +103,7 @@
 	let deploymentLoading = $state(false)
 	let creatingSlot: boolean = $state(false)
 	let creatingPublication: boolean = $state(false)
+	let pg14: boolean = $derived(postgresVersion.startsWith('14'))
 
 	const errorMessage = $derived.by(() => {
 		if (relations && relations.length > 0) {
@@ -134,16 +135,8 @@
 	const postgresConfig = $derived.by(getSaveCfg)
 	const captureConfig = $derived.by(isEditor ? getCaptureConfig : () => ({}))
 
-	let saveDisabled = $derived(
-		pathError !== '' ||
-			emptyString(postgres_resource_path) ||
-			emptyString(script_path) ||
-			(isAdvancedTab(tab) && emptyString(replication_slot_name)) ||
-			emptyString(publication_name) ||
-			(relations && isBasicTab(tab) && relations.length === 0) ||
-			transaction_to_track.length === 0 ||
-			drawerLoading ||
-			!can_write
+	const saveDisabled = $derived(
+		pathError !== '' || emptyString(script_path) || drawerLoading || !can_write || !isValid
 	)
 
 	async function createPublication() {
@@ -482,8 +475,10 @@
 {#snippet content()}
 	{#if drawerLoading}
 		{#if showLoading}
-			<Loader2 size="50" class="animate-spin" />
-			<p>Loading...</p>
+			<div class="flex flex-col items-center justify-center h-full w-full">
+				<Loader2 size="50" class="animate-spin" />
+				<p>Loading...</p>
+			</div>
 		{/if}
 	{:else}
 		<div class="flex flex-col gap-4">
@@ -671,7 +666,7 @@
 								<svelte:fragment slot="content">
 									<div class="mt-5 overflow-hidden bg-surface">
 										<TabContent value="basic">
-											<RelationPicker {can_write} bind:relations disabled={!can_write} />
+											<RelationPicker {can_write} bind:pg14 bind:relations disabled={!can_write} />
 										</TabContent>
 										<TabContent value="advanced">
 											<div class="flex flex-col gap-6"
@@ -780,7 +775,12 @@
 																disabled={!can_write}
 															/>
 														{/if}
-														<RelationPicker {can_write} bind:relations disabled={!can_write} />
+														<RelationPicker
+															bind:pg14
+															{can_write}
+															bind:relations
+															disabled={!can_write}
+														/>
 													</div>
 												</Section></div
 											>

frontend/src/lib/components/triggers/postgres/RelationPicker.svelte

@@ -5,18 +5,16 @@
 	import Tooltip from '$lib/components/Tooltip.svelte'
 	import type { Relations } from '$lib/gen'
 	import { Plus, Trash, X } from 'lucide-svelte'
-	import MultiSelect from 'svelte-multiselect'
 	import { getDefaultTableToTrack, invalidRelations } from './utils'
 	import AddPropertyFormV2 from '$lib/components/schema/AddPropertyFormV2.svelte'
 	import Label from '$lib/components/Label.svelte'
 	import { emptyStringTrimmed, sendUserToast } from '$lib/utils'
+	import MultiSelect from 'svelte-multiselect'
 
 	export let relations: Relations[] | undefined = undefined
 	export let can_write: boolean = true
-	export let postgresVersion: string = ''
 	export let disabled: boolean = false
-
-	$: pg14 = postgresVersion?.startsWith('14')
+	export let pg14: boolean = false
 
 	$: selected = relations && relations.length > 0 ? 'specific' : 'all'
 
@@ -172,23 +170,23 @@
 												selected={table_to_track.columns_name ?? []}
 												placeholder="Select columns"
 												--sms-options-margin="4px"
-												on:change={(e) => {
-													const option = e.detail.option?.toString()
+												onchange={(e) => {
+													const option = e.option?.toString()
 													updateRelationsFor(i, (rel) => {
 														const updatedTables = rel.table_to_track.map((t, idx) => {
 															if (idx !== j) return t
 
 															let updatedColumns = t.columns_name ?? []
 
-															if (e.detail.type === 'add' && option) {
+															if (e.type === 'add' && option) {
 																updatedColumns = [...updatedColumns, option]
-															} else if (e.detail.type === 'remove') {
+															} else if (e.type === 'remove') {
 																updatedColumns = updatedColumns.filter((col) => col !== option)
-															} else if (e.detail.type === 'removeAll') {
+															} else if (e.type === 'removeAll') {
 																updatedColumns = []
 															} else {
 																console.error(
-																	`Priority tags multiselect - unknown event type: '${e.detail.type}'`
+																	`Priority tags multiselect - unknown event type: '${e.type}'`
 																)
 															}
 

frontend/src/lib/components/triggers/postgres/utils.ts

@@ -149,10 +149,10 @@ export async function savePostgresTriggerFromCfg(
 }
 
 export function getDefaultTableToTrack(pg14: boolean): Relations[] {
-  return [
-    {
-      schema_name: 'public',
-      table_to_track: pg14 ? [{ table_name: '' }] : []
-    }
-  ];
-}
+	return [
+		{
+			schema_name: 'public',
+			table_to_track: pg14 ? [{ table_name: '' }] : []
+		}
+	]
+}