From 669a1ff8e6ab782ce1168170db684deb5f0ec99a Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Tue, 21 Jan 2025 18:05:58 +0100
Subject: [PATCH] fix: improve workspace specific tags behavior

---
 backend/windmill-api/src/workers.rs                    | 10 +++++-----
 backend/windmill-common/src/worker.rs                  |  7 +------
 .../src/lib/components/RunFormAdvancedPopup.svelte     |  4 ++--
 frontend/src/lib/components/WorkerTagPicker.svelte     |  4 ++--
 .../flows/content/FlowModuleWorkerTagSelect.svelte     |  4 ++--
 frontend/vite.config.js                                |  2 +-
 6 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/backend/windmill-api/src/workers.rs b/backend/windmill-api/src/workers.rs
index 4c3334e511af9..2f93b55a6e995 100644
--- a/backend/windmill-api/src/workers.rs
+++ b/backend/windmill-api/src/workers.rs
@@ -148,9 +148,10 @@ async fn get_custom_tags(Query(query): Query<CustomTagQuery>) -> JsonResult<Vec<
         let tags_o = CUSTOM_TAGS_PER_WORKSPACE.read().await;
         let workspace_tags = tags_o
             .1
-            .get(&workspace)
-            .map(|x| x.clone())
-            .unwrap_or_default();
+            .iter()
+            .filter(|(_, workspaces)| workspaces.contains(&workspace))
+            .map(|(tag, _)| tag.clone())
+            .collect::<Vec<String>>();
         let all_tags = tags_o.0.clone();
         return Ok(Json(
             all_tags
@@ -163,8 +164,7 @@ async fn get_custom_tags(Query(query): Query<CustomTagQuery>) -> JsonResult<Vec<
         let workspace_tags = tags_o
             .1
             .iter()
-            .map(|(workspace, tags)| tags.iter().map(move |tag| format!("{tag}({workspace})")))
-            .flatten()
+            .map(|(tag, workspaces)| format!("{}({})", tag, workspaces.join("+")))
             .collect::<Vec<String>>();
         let all_tags = tags_o.0.clone();
         return Ok(Json(
diff --git a/backend/windmill-common/src/worker.rs b/backend/windmill-common/src/worker.rs
index c95833726d50d..81c3537c8aa84 100644
--- a/backend/windmill-common/src/worker.rs
+++ b/backend/windmill-common/src/worker.rs
@@ -296,12 +296,7 @@ pub async fn reload_custom_tags_setting(db: &DB) -> error::Result<()> {
         let mut l = ALL_TAGS.write().await;
         *l = [
             custom_tags.0.clone(),
-            custom_tags
-                .1
-                .values()
-                .flatten()
-                .map(|x| x.to_string())
-                .collect_vec(),
+            custom_tags.1.keys().map(|x| x.to_string()).collect_vec(),
         ]
         .concat();
     }
diff --git a/frontend/src/lib/components/RunFormAdvancedPopup.svelte b/frontend/src/lib/components/RunFormAdvancedPopup.svelte
index ecf4671aba155..da7508a114219 100644
--- a/frontend/src/lib/components/RunFormAdvancedPopup.svelte
+++ b/frontend/src/lib/components/RunFormAdvancedPopup.svelte
@@ -4,7 +4,7 @@
 	import CloseButton from './common/CloseButton.svelte'
 	import Toggle from './Toggle.svelte'
 	import Tooltip from './Tooltip.svelte'
-	import { userStore, workerTags } from '$lib/stores'
+	import { userStore, workerTags, workspaceStore } from '$lib/stores'
 	import { Button } from './common'
 	import { WorkerService } from '$lib/gen'
 	import DateTimeInput from './DateTimeInput.svelte'
@@ -31,7 +31,7 @@
 
 	async function loadWorkerGroups() {
 		if (!$workerTags) {
-			$workerTags = await WorkerService.getCustomTags()
+			$workerTags = await WorkerService.getCustomTags({ workspace: $workspaceStore })
 		}
 	}
 </script>
diff --git a/frontend/src/lib/components/WorkerTagPicker.svelte b/frontend/src/lib/components/WorkerTagPicker.svelte
index 0aabbeaa2e5a3..83b0ecd018d71 100644
--- a/frontend/src/lib/components/WorkerTagPicker.svelte
+++ b/frontend/src/lib/components/WorkerTagPicker.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Button } from '$lib/components/common'
 	import { ExternalLink, RotateCw, Loader2 } from 'lucide-svelte'
-	import { workerTags } from '$lib/stores'
+	import { workerTags, workspaceStore } from '$lib/stores'
 	import AssignableTags from './AssignableTags.svelte'
 	import { WorkerService } from '$lib/gen'
 	import WorkerTagSelect from './WorkerTagSelect.svelte'
@@ -13,7 +13,7 @@
 	loadWorkerGroups()
 	async function loadWorkerGroups() {
 		if (!$workerTags) {
-			$workerTags = await WorkerService.getCustomTags()
+			$workerTags = await WorkerService.getCustomTags({ workspace: $workspaceStore })
 		}
 	}
 </script>
diff --git a/frontend/src/lib/components/flows/content/FlowModuleWorkerTagSelect.svelte b/frontend/src/lib/components/flows/content/FlowModuleWorkerTagSelect.svelte
index c65d7a78efb41..0a8c6852396eb 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleWorkerTagSelect.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleWorkerTagSelect.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { getContext } from 'svelte'
 	import type { FlowEditorContext } from '../types'
-	import { workerTags } from '$lib/stores'
+	import { workerTags, workspaceStore } from '$lib/stores'
 	import { WorkerService } from '$lib/gen'
 	import WorkerTagSelect from '$lib/components/WorkerTagSelect.svelte'
 
@@ -14,7 +14,7 @@
 
 	async function loadWorkerGroups() {
 		if (!$workerTags) {
-			$workerTags = await WorkerService.getCustomTags()
+			$workerTags = await WorkerService.getCustomTags({ workspace: $workspaceStore })
 		}
 	}
 </script>
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index 873a68c042e0e..98800b8508f12 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -13,7 +13,7 @@ const version = JSON.parse(json)
 const config = {
 	server: {
 		https: false,
-		port: 3000,
+		port: 3006,
 		proxy: {
 			'^/api/.*': {
 				target: process.env.REMOTE ?? 'https://app.windmill.dev/',