From da13fb20895fed7fc742968e02c5f4ad231ed11a Mon Sep 17 00:00:00 2001
From: Diego Imbert <70353967+diegoimbert@users.noreply.github.com>
Date: Wed, 9 Jul 2025 00:49:17 +0200
Subject: [PATCH] Fix resource picker auto select if single choice (#6143)

* Fix resource picker auto select if single choice

* clear value on resourceType change
---
 .../src/lib/components/ResourcePicker.svelte  | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/frontend/src/lib/components/ResourcePicker.svelte b/frontend/src/lib/components/ResourcePicker.svelte
index 2dc3690b5a..206af75c88 100644
--- a/frontend/src/lib/components/ResourcePicker.svelte
+++ b/frontend/src/lib/components/ResourcePicker.svelte
@@ -85,11 +85,7 @@
 	}
 
 	let loading = $state(true)
-	async function loadResources(
-		resourceType: string | undefined,
-		initialValue: string | undefined,
-		value: string | undefined
-	) {
+	async function loadResources(resourceType: string | undefined) {
 		loading = true
 		try {
 			const resourceTypesToQuery =
@@ -130,12 +126,9 @@
 	}
 
 	$effect(() => {
-		$workspaceStore &&
-			loadResources(
-				resourceType,
-				untrack(() => initialValue),
-				untrack(() => value)
-			)
+		$workspaceStore && resourceType
+		value = undefined
+		untrack(() => loadResources(resourceType))
 	})
 
 	let appConnect: AppConnect | undefined = $state()
@@ -144,7 +137,7 @@
 
 <AppConnect
 	on:refresh={async (e) => {
-		await loadResources(resourceType, initialValue, value)
+		await loadResources(resourceType)
 		value = e.detail
 		valueType = collection.find((x) => x?.value == value)?.type
 	}}
@@ -154,7 +147,7 @@
 <ResourceEditorDrawer
 	bind:this={resourceEditor}
 	on:refresh={async (e) => {
-		await loadResources(resourceType, initialValue, value)
+		await loadResources(resourceType)
 		if (e.detail) {
 			value = e.detail
 			valueType = collection.find((x) => x?.value == value)?.type
@@ -240,7 +233,7 @@
 			btnClasses="w-8 px-0.5 py-1.5"
 			size="sm"
 			on:click={() => {
-				loadResources(resourceType, initialValue, value)
+				loadResources(resourceType)
 			}}
 			startIcon={{ icon: RotateCw }}
 			iconOnly