diff --git a/backend/.sqlx/query-9a5b63783851d77ebb960967d14029e82772afa577f0626c8c98ef7e1ce04b0c.json b/backend/.sqlx/query-d581bfb507d3a875f07677187717a469ec6ab1db1585835c961409612d81ec7d.json similarity index 56% rename from backend/.sqlx/query-9a5b63783851d77ebb960967d14029e82772afa577f0626c8c98ef7e1ce04b0c.json rename to backend/.sqlx/query-d581bfb507d3a875f07677187717a469ec6ab1db1585835c961409612d81ec7d.json index f689dacce8..4e2aacc1b4 100644 --- a/backend/.sqlx/query-9a5b63783851d77ebb960967d14029e82772afa577f0626c8c98ef7e1ce04b0c.json +++ b/backend/.sqlx/query-d581bfb507d3a875f07677187717a469ec6ab1db1585835c961409612d81ec7d.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT content FROM script WHERE workspace_id = $1 AND path = $2\n ", + "query": "\n SELECT content FROM script WHERE path = $1 AND workspace_id = $2\n AND created_at = (SELECT max(created_at) FROM script WHERE path = $1 AND \n workspace_id = $2)\n ", "describe": { "columns": [ { @@ -19,5 +19,5 @@ false ] }, - "hash": "9a5b63783851d77ebb960967d14029e82772afa577f0626c8c98ef7e1ce04b0c" + "hash": "d581bfb507d3a875f07677187717a469ec6ab1db1585835c961409612d81ec7d" } diff --git a/backend/parsers/windmill-parser-py-imports/src/lib.rs b/backend/parsers/windmill-parser-py-imports/src/lib.rs index fd687ae1a8..8c31f8ab7f 100644 --- a/backend/parsers/windmill-parser-py-imports/src/lib.rs +++ b/backend/parsers/windmill-parser-py-imports/src/lib.rs @@ -146,10 +146,12 @@ pub async fn parse_python_imports( let nested = if n.starts_with("relative:") { let code = sqlx::query_scalar!( r#" - SELECT content FROM script WHERE workspace_id = $1 AND path = $2 + SELECT content FROM script WHERE path = $1 AND workspace_id = $2 + AND created_at = (SELECT max(created_at) FROM script WHERE path = $1 AND + workspace_id = $2) "#, - w_id, - n.replace("relative:", "") + n.replace("relative:", ""), + w_id ) .fetch_optional(db) .await? diff --git a/frontend/src/lib/components/Path.svelte b/frontend/src/lib/components/Path.svelte index acd937dd8d..3260e245ed 100644 --- a/frontend/src/lib/components/Path.svelte +++ b/frontend/src/lib/components/Path.svelte @@ -37,7 +37,7 @@ export let error = '' export let disabled = false export let checkInitialPathExistence = false - + export let autofocus = true export let kind: PathKind let inputP: HTMLInputElement | undefined = undefined @@ -393,7 +393,7 @@ {disabled} type="text" id="path" - autofocus + {autofocus} bind:this={inputP} autocomplete="off" on:keyup={handleKeyUp} diff --git a/frontend/src/lib/components/ScriptBuilder.svelte b/frontend/src/lib/components/ScriptBuilder.svelte index cd2c2061a8..61149d7dcf 100644 --- a/frontend/src/lib/components/ScriptBuilder.svelte +++ b/frontend/src/lib/components/ScriptBuilder.svelte @@ -281,6 +281,7 @@ @@ -290,6 +291,7 @@ bind:error={pathError} bind:path={script.path} {initialPath} + autofocus={false} namePlaceholder="script" kind="script" /> diff --git a/frontend/src/lib/components/flows/content/FlowSettings.svelte b/frontend/src/lib/components/flows/content/FlowSettings.svelte index 99f5dd81df..210b286552 100644 --- a/frontend/src/lib/components/flows/content/FlowSettings.svelte +++ b/frontend/src/lib/components/flows/content/FlowSettings.svelte @@ -71,6 +71,7 @@ > Path