From 34b130d01853641f6b1ef51bf999fab19ea8fe00 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Wed, 11 Sep 2024 23:01:56 +0200
Subject: [PATCH] fix: add tag_override for script in flows

---
 backend/windmill-worker/src/worker.rs         |  2 +-
 backend/windmill-worker/src/worker_flow.rs    |  9 +++-
 .../src/lib/components/FlowJobResult.svelte   |  2 +
 .../src/lib/components/TestJobLoader.svelte   |  4 ++
 .../ConfirmationModal.svelte                  |  2 +-
 .../flows/content/FlowModuleHeader.svelte     | 53 ++-----------------
 .../content/FlowModuleWorkerTagSelect.svelte  | 53 +++++++++++++++++++
 openflow.openapi.yaml                         |  2 +
 8 files changed, 76 insertions(+), 51 deletions(-)
 create mode 100644 frontend/src/lib/components/flows/content/FlowModuleWorkerTagSelect.svelte

diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs
index 11f231d272..96ed624612 100644
--- a/backend/windmill-worker/src/worker.rs
+++ b/backend/windmill-worker/src/worker.rs
@@ -1438,7 +1438,7 @@ pub async fn run_worker<R: rsmq_async::RsmqConnection + Send + Sync + Clone + 's
                 }
             } else if let Ok(_) = killpill_rx.try_recv() {
                 if !killed_but_draining_same_worker_jobs {
-                    tracing::info!("received killpill for worker {}, processing only same worker jobs", i_worker);
+                    tracing::info!("received killpill for worker {}, jobs are not pulled anymore except same_worker jobs", i_worker);
                     killed_but_draining_same_worker_jobs = true;
                     job_completed_tx.0.send(SendResult::Kill).await.expect("send kill to job completed tx");
                 }
diff --git a/backend/windmill-worker/src/worker_flow.rs b/backend/windmill-worker/src/worker_flow.rs
index 35732bda5c..57c3ffdb60 100644
--- a/backend/windmill-worker/src/worker_flow.rs
+++ b/backend/windmill-worker/src/worker_flow.rs
@@ -3557,7 +3557,14 @@ async fn script_to_payload(
     tag_override: &Option<String>,
 ) -> Result<JobPayloadWithTag, Error> {
     let (payload, tag, delete_after_use, script_timeout) = if script_hash.is_none() {
-        script_path_to_payload(script_path, db, &flow_job.workspace_id).await?
+        let (jp, tag, delete_after_use, script_timeout) =
+            script_path_to_payload(script_path, db, &flow_job.workspace_id).await?;
+        (
+            jp,
+            tag_override.to_owned().or(tag),
+            delete_after_use,
+            script_timeout,
+        )
     } else {
         let hash = script_hash.clone().unwrap();
         let mut tx: sqlx::Transaction<'_, sqlx::Postgres> = db.begin().await?;
diff --git a/frontend/src/lib/components/FlowJobResult.svelte b/frontend/src/lib/components/FlowJobResult.svelte
index 9cb8eb382a..a18ced04c0 100644
--- a/frontend/src/lib/components/FlowJobResult.svelte
+++ b/frontend/src/lib/components/FlowJobResult.svelte
@@ -40,6 +40,8 @@
 	let logOffset = 0
 	async function getLogs() {
 		if (jobId) {
+			console.log('getLogs')
+
 			const getUpdate = await JobService.getJobUpdates({
 				workspace: workspaceId ?? $workspaceStore!,
 				id: jobId,
diff --git a/frontend/src/lib/components/TestJobLoader.svelte b/frontend/src/lib/components/TestJobLoader.svelte
index 39230f8c3f..84dc5b835e 100644
--- a/frontend/src/lib/components/TestJobLoader.svelte
+++ b/frontend/src/lib/components/TestJobLoader.svelte
@@ -91,6 +91,8 @@
 
 	export async function getLogs() {
 		if (job) {
+			console.log('getLogs')
+
 			const getUpdate = await JobService.getJobUpdates({
 				workspace: workspace!,
 				id: job.id,
@@ -172,6 +174,8 @@
 			try {
 				if (job && `running` in job) {
 					const offset = logOffset == 0 ? (job.logs?.length ? job.logs?.length + 1 : 0) : logOffset
+					console.log('getLogs')
+
 					let previewJobUpdates = await JobService.getJobUpdates({
 						workspace: workspace!,
 						id,
diff --git a/frontend/src/lib/components/common/confirmationModal/ConfirmationModal.svelte b/frontend/src/lib/components/common/confirmationModal/ConfirmationModal.svelte
index 85c72b6dc3..e58db8dea6 100644
--- a/frontend/src/lib/components/common/confirmationModal/ConfirmationModal.svelte
+++ b/frontend/src/lib/components/common/confirmationModal/ConfirmationModal.svelte
@@ -54,7 +54,7 @@
 					class={classNames(
 						'relative transform overflow-hidden rounded-lg bg-surface px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-lg sm:p-6',
 						open
-							? 'ease-out duration-300 opacity-80 translate-y-0 sm:scale-100'
+							? 'ease-out duration-300 opacity-100 translate-y-0 sm:scale-100'
 							: 'ease-in duration-200 opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95'
 					)}
 				>
diff --git a/frontend/src/lib/components/flows/content/FlowModuleHeader.svelte b/frontend/src/lib/components/flows/content/FlowModuleHeader.svelte
index 6458fa3b0d..8ab01acdd7 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleHeader.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleHeader.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import Button from '$lib/components/common/button/Button.svelte'
-	import { WorkerService, type FlowModule } from '$lib/gen'
+	import { type FlowModule } from '$lib/gen'
 	import { createEventDispatcher, getContext } from 'svelte'
 	import {
 		Bed,
@@ -17,25 +17,16 @@
 	import Popover from '../../Popover.svelte'
 	import type { FlowEditorContext } from '../types'
 	import { sendUserToast } from '$lib/utils'
-	import { workerTags } from '$lib/stores'
 	import { getLatestHashForScript } from '$lib/scripts'
 	import type { FlowBuilderWhitelabelCustomUi } from '$lib/components/custom_ui'
+	import FlowModuleWorkerTagSelect from './FlowModuleWorkerTagSelect.svelte'
 
 	export let module: FlowModule
-	const { scriptEditorDrawer, flowStore, selectedId } =
-		getContext<FlowEditorContext>('FlowEditorContext')
+	const { scriptEditorDrawer } = getContext<FlowEditorContext>('FlowEditorContext')
 
 	const dispatch = createEventDispatcher()
 	let customUi: undefined | FlowBuilderWhitelabelCustomUi = getContext('customUi')
 
-	loadWorkerGroups()
-
-	async function loadWorkerGroups() {
-		if (!$workerTags) {
-			$workerTags = await WorkerService.getCustomTags()
-		}
-	}
-
 	$: moduleRetry = module.retry?.constant || module.retry?.exponential
 </script>
 
@@ -134,6 +125,7 @@
 				Edit {#if module.value.hash != undefined} (locked hash){/if}
 			</Button>
 		{/if}
+		<FlowModuleWorkerTagSelect bind:tag={module.value.tag_override} />
 		{#if customUi?.scriptFork != false}
 			<Button
 				size="xs"
@@ -148,42 +140,7 @@
 	{/if}
 	<div class="px-0.5" />
 	{#if module.value.type === 'rawscript'}
-		{#if $workerTags}
-			{#if $workerTags?.length > 0}
-				<div class="w-40">
-					{#if $flowStore.tag == undefined}
-						<select
-							placeholder="Tag"
-							bind:value={module.value.tag}
-							on:change={(e) => {
-								if (module.value.type === 'rawscript') {
-									if (module.value.tag == '') {
-										module.value.tag = undefined
-									}
-								}
-							}}
-						>
-							{#if module.value.tag}
-								<option value="">reset to default</option>
-							{:else}
-								<option value="" disabled selected>Tag</option>
-							{/if}
-							{#each $workerTags ?? [] as tag (tag)}
-								<option value={tag}>{tag}</option>
-							{/each}
-						</select>
-					{:else}
-						<button
-							title="Worker Group is defined at the flow level"
-							class="w-full text-left items-center font-normal p-1 border text-xs rounded"
-							on:click={() => ($selectedId = 'settings-worker-group')}
-						>
-							Flow's WG: {$flowStore.tag}
-						</button>
-					{/if}
-				</div>
-			{/if}
-		{/if}
+		<FlowModuleWorkerTagSelect bind:tag={module.value.tag} />
 		<Button
 			size="xs"
 			color="light"
diff --git a/frontend/src/lib/components/flows/content/FlowModuleWorkerTagSelect.svelte b/frontend/src/lib/components/flows/content/FlowModuleWorkerTagSelect.svelte
new file mode 100644
index 0000000000..1e26f35e82
--- /dev/null
+++ b/frontend/src/lib/components/flows/content/FlowModuleWorkerTagSelect.svelte
@@ -0,0 +1,53 @@
+<script lang="ts">
+	import { getContext } from 'svelte'
+	import type { FlowEditorContext } from '../types'
+	import { workerTags } from '$lib/stores'
+	import { WorkerService } from '$lib/gen'
+
+	export let tag: string | undefined
+
+	const { flowStore, selectedId } = getContext<FlowEditorContext>('FlowEditorContext')
+
+	loadWorkerGroups()
+
+	async function loadWorkerGroups() {
+		if (!$workerTags) {
+			$workerTags = await WorkerService.getCustomTags()
+		}
+	}
+</script>
+
+{#if $workerTags}
+	{#if $workerTags?.length > 0}
+		<div class="w-40">
+			{#if $flowStore.tag == undefined}
+				<select
+					placeholder="Tag"
+					bind:value={tag}
+					on:change={(e) => {
+						if (tag == '') {
+							tag = undefined
+						}
+					}}
+				>
+					{#if tag}
+						<option value="">reset to default</option>
+					{:else}
+						<option value="" disabled selected>Tag</option>
+					{/if}
+					{#each $workerTags ?? [] as tag (tag)}
+						<option value={tag}>{tag}</option>
+					{/each}
+				</select>
+			{:else}
+				<button
+					title="Worker Group is defined at the flow level"
+					class="w-full text-left items-center font-normal p-1 border text-xs rounded"
+					on:click={() => ($selectedId = 'settings-worker-group')}
+				>
+					Flow's WG: {$flowStore.tag}
+				</button>
+			{/if}
+		</div>
+	{/if}
+{/if}
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index a7bf20c5ff..d4fc8f8459 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -281,6 +281,8 @@ components:
           type: string
           enum:
             - script
+        tag_override:
+          type: string
       required:
         - type
         - path