fix: global timeout not set correctly on load

This commit is contained in:
Ruben Fiszel
2024-11-28 16:02:45 +01:00
parent 77937a494a
commit 8f56456701
5 changed files with 24 additions and 5 deletions

View File

@@ -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;

View File

@@ -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"
}
}
}

View File

@@ -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)

View File

@@ -29,6 +29,8 @@ export type FlowBuilderWhitelabelCustomUi = {
stepAdvancedSettings?: boolean
languages?: (SupportedLanguage | 'docker' | 'bunnative')[]
scriptFork?: boolean
scriptEdit?: boolean
tagEdit?: boolean
editorBar?: EditorBarUi
downloadLogs?: boolean
}

View File

@@ -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"