From 8f564567018fa7ff5bfd74aeeb95699fefcf5a63 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 28 Nov 2024 16:02:45 +0100
Subject: [PATCH] fix: global timeout not set correctly on load

---
 backend/src/monitor.rs                                 |  1 +
 frontend/package.json                                  | 10 +++++++++-
 frontend/src/lib/components/FlowBuilder.svelte         |  9 +++++++--
 frontend/src/lib/components/custom_ui.ts               |  2 ++
 .../components/flows/content/FlowModuleHeader.svelte   |  7 +++++--
 5 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/backend/src/monitor.rs b/backend/src/monitor.rs
index 7c820f9fa1..733a841283 100644
--- a/backend/src/monitor.rs
+++ b/backend/src/monitor.rs
@@ -182,6 +182,7 @@ pub async fn initial_load(
     }
 
     if worker_mode {
+        reload_job_default_timeout_setting(&db).await;
         reload_extra_pip_index_url_setting(&db).await;
         reload_pip_index_url_setting(&db).await;
         reload_npm_config_registry_setting(&db).await;
diff --git a/frontend/package.json b/frontend/package.json
index 461c406501..a6ecec3d43 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -255,6 +255,11 @@
 			"svelte": "./package/components/FlowBuilder.svelte",
 			"default": "./package/components/FlowBuilder.svelte"
 		},
+		"./components/AppEditor.svelte": {
+			"types": "./package/components/app/editor/AppEditor.svelte.d.ts",
+			"svelte": "./package/components/app/editor/AppEditor.svelte",
+			"default": "./package/components/app/editor/AppEditor.svelte"
+		},
 		"./components/ScriptBuilder.svelte": {
 			"types": "./package/components/ScriptBuilder.svelte.d.ts",
 			"svelte": "./package/components/ScriptBuilder.svelte",
@@ -432,6 +437,9 @@
 			"components/FlowBuilder.svelte": [
 				"./package/components/FlowBuilder.svelte.d.ts"
 			],
+			"components/AppEditor.svelte": [
+				"./package/components/app/editor/AppEditor.svelte.d.ts"
+			],
 			"components/ScriptBuilder.svelte": [
 				"./package/components/ScriptBuilder.svelte.d.ts"
 			],
@@ -497,4 +505,4 @@
 	"optionalDependencies": {
 		"fsevents": "^2.3.3"
 	}
-}
\ No newline at end of file
+}
diff --git a/frontend/src/lib/components/FlowBuilder.svelte b/frontend/src/lib/components/FlowBuilder.svelte
index 1835c4f330..4ada01aea7 100644
--- a/frontend/src/lib/components/FlowBuilder.svelte
+++ b/frontend/src/lib/components/FlowBuilder.svelte
@@ -33,7 +33,7 @@
 	import { Drawer } from '$lib/components/common'
 	import DeployOverrideConfirmationModal from '$lib/components/common/confirmationModal/DeployOverrideConfirmationModal.svelte'
 
-	import { setContext, tick, type ComponentType } from 'svelte'
+	import { onMount, setContext, tick, type ComponentType } from 'svelte'
 	import { writable, type Writable } from 'svelte/store'
 	import CenteredPage from './CenteredPage.svelte'
 	import { Badge, Button, UndoRedo } from './common'
@@ -107,6 +107,7 @@
 	export let disabledFlowInputs = false
 	export let savedPrimarySchedule: ScheduleTrigger | undefined = undefined
 	export let version: number | undefined = undefined
+	export let setSavedraftCb:  ((cb: () => void) => void) | undefined = undefined
 
 	// Used by multiplayer deploy collision warning
 	let deployedValue: Value | undefined = undefined // Value to diff against
@@ -181,7 +182,7 @@
 	let loadingSave = false
 	let loadingDraft = false
 
-	async function saveDraft(forceSave = false): Promise<void> {
+	export async function saveDraft(forceSave = false): Promise<void> {
 		if (!newFlow && !savedFlow) {
 			return
 		}
@@ -278,6 +279,10 @@
 		loadingDraft = false
 	}
 
+	onMount(() => {
+		setSavedraftCb?.(() => saveDraft())
+	})
+
 	export function computeUnlockedSteps(flow: Flow) {
 		return Object.fromEntries(
 			getAllModules(flow.value.modules, flow.value.failure_module)
diff --git a/frontend/src/lib/components/custom_ui.ts b/frontend/src/lib/components/custom_ui.ts
index 3ec24fc9f6..109136c37b 100644
--- a/frontend/src/lib/components/custom_ui.ts
+++ b/frontend/src/lib/components/custom_ui.ts
@@ -29,6 +29,8 @@ export type FlowBuilderWhitelabelCustomUi = {
 	stepAdvancedSettings?: boolean
 	languages?: (SupportedLanguage | 'docker' | 'bunnative')[]
 	scriptFork?: boolean
+	scriptEdit?: boolean
+	tagEdit?: boolean
 	editorBar?: EditorBarUi
 	downloadLogs?: boolean
 }
diff --git a/frontend/src/lib/components/flows/content/FlowModuleHeader.svelte b/frontend/src/lib/components/flows/content/FlowModuleHeader.svelte
index a044fadada..faa3528279 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleHeader.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleHeader.svelte
@@ -108,7 +108,8 @@
 	{/if}
 	{#if module.value.type === 'script'}
 		<div class="w-2" />
-		{#if !module.value.path.startsWith('hub/')}
+
+		{#if !module.value.path.startsWith('hub/') && customUi?.scriptEdit != false}
 			<Button
 				size="xs"
 				color="light"
@@ -128,7 +129,9 @@
 				Edit {#if module.value.hash != undefined} (locked hash){/if}
 			</Button>
 		{/if}
-		<FlowModuleWorkerTagSelect nullTag={tag} bind:tag={module.value.tag_override} />
+		{#if customUi?.tagEdit != false}
+			<FlowModuleWorkerTagSelect nullTag={tag} bind:tag={module.value.tag_override} />
+		{/if}
 		{#if customUi?.scriptFork != false}
 			<Button
 				size="xs"