update ui for trigger

windmill-labs · Feb 14, 2025 · 217b0fe · 217b0fe
1 parent a4dc39c
commit 217b0fe
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 43 deletions.
diff --git a/frontend/src/lib/components/triggers/http/RouteEditorInner.svelte b/frontend/src/lib/components/triggers/http/RouteEditorInner.svelte
@@ -226,16 +226,6 @@
 					</Label>
 				</div>
 
-				<RouteEditorConfigSection
-					initialTriggerPath={initialPath}
-					bind:route_path
-					bind:isValid
-					bind:dirtyRoutePath
-					bind:http_method
-					{can_write}
-					bind:static_asset_config
-				/>
-
 				<Section label="Target">
 					{#if !isCloudHosted()}
 						<ToggleButtonGroup
@@ -376,6 +366,16 @@
 					{/if}
 				</Section>
 
+				<RouteEditorConfigSection
+					initialTriggerPath={initialPath}
+					bind:route_path
+					bind:isValid
+					bind:dirtyRoutePath
+					bind:http_method
+					{can_write}
+					bind:static_asset_config
+				/>
+
 				{#if !is_static_website}
 					<Section label="Advanced">
 						<div class="flex flex-col gap-4">

diff --git a/frontend/src/lib/components/triggers/kafka/KafkaTriggerEditorInner.svelte b/frontend/src/lib/components/triggers/kafka/KafkaTriggerEditorInner.svelte
@@ -215,13 +215,6 @@
 					</Label>
 				</div>
 
-				<KafkaTriggersConfigSection
-					bind:args
-					bind:isValid
-					{path}
-					defaultValues={useDefaultValues() ? defaultValues : undefined}
-				/>
-
 				<Section label="Runnable">
 					<p class="text-xs mb-1 text-tertiary">
 						Pick a script or flow to be triggered<Required required={true} />
@@ -239,6 +232,13 @@
 						/>
 					</div>
 				</Section>
+
+				<KafkaTriggersConfigSection
+					bind:args
+					bind:isValid
+					{path}
+					defaultValues={useDefaultValues() ? defaultValues : undefined}
+				/>
 			</div>
 		{/if}
 	</DrawerContent>

diff --git a/frontend/src/lib/components/triggers/nats/NatsTriggerEditorInner.svelte b/frontend/src/lib/components/triggers/nats/NatsTriggerEditorInner.svelte
@@ -222,14 +222,6 @@
 						/>
 					</Label>
 				</div>
-
-				<NatsTriggersConfigSection
-					{path}
-					bind:args
-					bind:isValid
-					defaultValues={useDefaultValues() ? defaultValues : undefined}
-				/>
-
 				<Section label="Runnable">
 					<p class="text-xs mb-1 text-tertiary">
 						Pick a script or flow to be triggered<Required required={true} />
@@ -247,6 +239,13 @@
 						/>
 					</div>
 				</Section>
+
+				<NatsTriggersConfigSection
+					{path}
+					bind:args
+					bind:isValid
+					defaultValues={useDefaultValues() ? defaultValues : undefined}
+				/>
 			</div>
 		{/if}
 	</DrawerContent>

diff --git a/frontend/src/lib/components/triggers/sqs/SqsTriggerEditorInner.svelte b/frontend/src/lib/components/triggers/sqs/SqsTriggerEditorInner.svelte
@@ -69,7 +69,7 @@
 			aws_resource_path = defaultValues?.aws_resource_path ?? ''
 			queue_url = defaultValues?.queue_url ?? ''
 			path = ''
-			message_attributes = defaultValues?.message_attributes ?? []
+			message_attributes = defaultValues?.message_attributes ?? ['All']
 			initialPath = ''
 			edit = false
 			dirtyPath = false
@@ -201,15 +201,6 @@
 					</Label>
 				</div>
 
-				<SqsTriggerEditorConfigSection
-					bind:isValid
-					bind:queue_url
-					bind:message_attributes
-					bind:aws_resource_path
-					{can_write}
-					headless={true}
-				/>
-
 				<Section label="Runnable">
 					<p class="text-xs mb-1 text-tertiary">
 						Pick a script or flow to be triggered <Required required={true} />
@@ -235,6 +226,15 @@
 						{/if}
 					</div>
 				</Section>
+
+				<SqsTriggerEditorConfigSection
+					bind:isValid
+					bind:queue_url
+					bind:message_attributes
+					bind:aws_resource_path
+					{can_write}
+					headless={true}
+				/>
 			</div>
 		{/if}
 	</DrawerContent>

diff --git a/frontend/src/lib/components/triggers/websocket/WebsocketTriggerEditorInner.svelte b/frontend/src/lib/components/triggers/websocket/WebsocketTriggerEditorInner.svelte
@@ -274,14 +274,6 @@
 					</Label>
 				</div>
 
-				<WebsocketEditorConfigSection
-					bind:url
-					bind:url_runnable_args
-					{dirtyUrl}
-					{can_write}
-					bind:isValid
-				/>
-
 				<Section label="Runnable" class="flex flex-col gap-4">
 					<div>
 						<p class="text-xs mb-1 text-tertiary">
@@ -314,6 +306,14 @@
 					/>
 				</Section>
 
+				<WebsocketEditorConfigSection
+					bind:url
+					bind:url_runnable_args
+					{dirtyUrl}
+					{can_write}
+					bind:isValid
+				/>
+
 				<Section label="Initial messages">
 					<p class="text-xs mb-1 text-tertiary">
 						Initial messages are sent at the beginning of the connection. They are sent in order.<br