From b59d4b44e3638f2d99c65b9110a11a56ca554a4e Mon Sep 17 00:00:00 2001
From: HugoCasa <hugo@casademont.ch>
Date: Mon, 29 Jan 2024 15:52:24 +0100
Subject: [PATCH] fix: use extra headers when urlencoded (#3103)

* fix: use extra headers when urlencoded

* fix: webhook tabs reset
---
 backend/windmill-queue/src/jobs.rs            |  2 +-
 .../components/details/WebhooksPanel.svelte   | 26 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/backend/windmill-queue/src/jobs.rs b/backend/windmill-queue/src/jobs.rs
index 473c48d011..d8987eb19c 100644
--- a/backend/windmill-queue/src/jobs.rs
+++ b/backend/windmill-queue/src/jobs.rs
@@ -2289,7 +2289,7 @@ where
                 .into_iter()
                 .map(|(k, v)| (k, to_raw_value(&v)))
                 .collect::<HashMap<_, _>>();
-            return Ok(PushArgs { extra: HashMap::new(), args: Json(payload) });
+            return Ok(PushArgs { extra, args: Json(payload) });
         } else {
             Err(StatusCode::UNSUPPORTED_MEDIA_TYPE.into_response())
         }
diff --git a/frontend/src/lib/components/details/WebhooksPanel.svelte b/frontend/src/lib/components/details/WebhooksPanel.svelte
index 7278b5e2fb..cac1d6cbad 100644
--- a/frontend/src/lib/components/details/WebhooksPanel.svelte
+++ b/frontend/src/lib/components/details/WebhooksPanel.svelte
@@ -253,17 +253,17 @@ done`
 			</ToggleButtonGroup>
 		</div>
 	</div>
-	{#key token}
-		<!-- svelte-ignore a11y-click-events-have-key-events -->
-		<!-- svelte-ignore a11y-no-static-element-interactions -->
-		<Tabs selected="rest">
-			<Tab value="rest" size="xs">REST</Tab>
-			{#if SCRIPT_VIEW_SHOW_EXAMPLE_CURL}
-				<Tab value="curl" size="xs">Curl</Tab>
-			{/if}
-			<Tab value="fetch" size="xs">Fetch</Tab>
+	<!-- svelte-ignore a11y-click-events-have-key-events -->
+	<!-- svelte-ignore a11y-no-static-element-interactions -->
+	<Tabs selected="rest">
+		<Tab value="rest" size="xs">REST</Tab>
+		{#if SCRIPT_VIEW_SHOW_EXAMPLE_CURL}
+			<Tab value="curl" size="xs">Curl</Tab>
+		{/if}
+		<Tab value="fetch" size="xs">Fetch</Tab>
 
-			<svelte:fragment slot="content">
+		<svelte:fragment slot="content">
+			{#key token}
 				<TabContent value="rest" class="flex flex-col flex-1 h-full ">
 					<div class="flex flex-col gap-2">
 						<ClipboardPanel title="Url" content={url} />
@@ -319,7 +319,7 @@ done`
 									{/key}{/key}{/key}{/key}
 					{/key}
 				</TabContent>
-			</svelte:fragment>
-		</Tabs>
-	{/key}
+			{/key}
+		</svelte:fragment>
+	</Tabs>
 </div>