From bb951a44342d251558646f66e0de0ee27839a986 Mon Sep 17 00:00:00 2001 From: Lucas Abel <22837557+uael@users.noreply.github.com> Date: Mon, 10 Feb 2025 18:55:31 +0100 Subject: [PATCH 1/6] backend: fix missing virtual modules when inserting flow version lite (#5257) --- backend/windmill-worker/src/worker_lockfiles.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/windmill-worker/src/worker_lockfiles.rs b/backend/windmill-worker/src/worker_lockfiles.rs index 3888d8eb63..03ba19d2ad 100644 --- a/backend/windmill-worker/src/worker_lockfiles.rs +++ b/backend/windmill-worker/src/worker_lockfiles.rs @@ -1130,7 +1130,6 @@ async fn insert_flow_modules<'c>( same_worker, )) .await?; - add_virtual_items_if_necessary(modules); if modules.is_empty() || crate::worker_flow::is_simple_modules(modules, failure_module) { return Ok(tx); } @@ -1259,6 +1258,7 @@ async fn reduce_flow<'c>( } module.value = to_raw_value(&val); } + add_virtual_items_if_necessary(&mut *modules); Ok(tx) } From f29492492ed4f2133d09d87062ea8aea8dbac28f Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Mon, 10 Feb 2025 20:53:28 +0100 Subject: [PATCH 2/6] clarify resume on suspend --- .../flows/content/FlowModuleSuspend.svelte | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/frontend/src/lib/components/flows/content/FlowModuleSuspend.svelte b/frontend/src/lib/components/flows/content/FlowModuleSuspend.svelte index 1c2ad440c6..13b0752380 100644 --- a/frontend/src/lib/components/flows/content/FlowModuleSuspend.svelte +++ b/frontend/src/lib/components/flows/content/FlowModuleSuspend.svelte @@ -122,8 +122,13 @@ + {#if Boolean(flowModule.suspend?.continue_on_disapprove_timeout)} + + We recommend using the expr resume?.error to handle null payload values. +
+ To filter timeout, use resume?.error?.name === "SuspendedTimedOut".
+ To filter disapproval, use resume?.error?.name === "SuspendedDisapproved" + + {/if} {:else if suspendTabSelected === 'permissions'}
From 41e542900ffeb7cb3fb6ebddfeac4d61933d812f Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Mon, 10 Feb 2025 20:57:07 +0100 Subject: [PATCH 3/6] whileloop flow inputs show correct flow_input --- frontend/src/lib/components/flows/previousResults.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/frontend/src/lib/components/flows/previousResults.ts b/frontend/src/lib/components/flows/previousResults.ts index d383b30a04..9f74b62de3 100644 --- a/frontend/src/lib/components/flows/previousResults.ts +++ b/frontend/src/lib/components/flows/previousResults.ts @@ -88,7 +88,7 @@ function getFlowInput( } } else { let parentFlowInput = getFlowInput(parentModules, flowState, args, schema) - if (parentModule.value.type === 'forloopflow') { + if (parentModule.value.type === 'forloopflow' || parentModule.value.type === 'whileloopflow') { let parentFlowInputIter = { ...parentFlowInput } if (parentFlowInputIter.hasOwnProperty('iter')) { parentFlowInputIter['iter_parent'] = parentFlowInputIter['iter'] @@ -263,9 +263,8 @@ declare const results = ${JSON.stringify(results)}; */ declare const previous_result: ${previousId ? JSON.stringify(results[previousId]) : 'any'}; -${ - resume - ? ` +${resume + ? ` /** * resume payload */ @@ -276,8 +275,8 @@ declare const resume: any */ declare const approvers: string ` - : '' -} + : '' + } ` } From deb18615c20c4650e1bf765350f7abf4d2320a0a Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Mon, 10 Feb 2025 21:50:59 +0100 Subject: [PATCH 4/6] fix: if user is authed, no need to use anonymous path for display result in apps --- frontend/src/lib/components/DisplayResult.svelte | 14 ++++++++++---- .../components/display/AppDisplayComponent.svelte | 3 ++- .../display/AppDisplayComponentByJobId.svelte | 4 +++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/frontend/src/lib/components/DisplayResult.svelte b/frontend/src/lib/components/DisplayResult.svelte index b5088c0a5f..80f7ce999f 100644 --- a/frontend/src/lib/components/DisplayResult.svelte +++ b/frontend/src/lib/components/DisplayResult.svelte @@ -677,16 +677,22 @@ preview rendered
{:else if result?.s3?.endsWith('.pdf')}
{/if} diff --git a/frontend/src/lib/components/apps/components/display/AppDisplayComponent.svelte b/frontend/src/lib/components/apps/components/display/AppDisplayComponent.svelte index 4b09156da2..c15855f873 100644 --- a/frontend/src/lib/components/apps/components/display/AppDisplayComponent.svelte +++ b/frontend/src/lib/components/apps/components/display/AppDisplayComponent.svelte @@ -15,6 +15,7 @@ import ResolveStyle from '../helpers/ResolveStyle.svelte' import { components } from '../../editor/component' import ResolveConfig from '../helpers/ResolveConfig.svelte' + import { userStore } from '$lib/stores' export let id: string export let componentInput: AppInput | undefined @@ -96,7 +97,7 @@ {result} {requireHtmlApproval} disableExpand={resolvedConfig?.hideDetails} - appPath={$appPath} + appPath={$userStore ? undefined : $appPath} /> diff --git a/frontend/src/lib/components/apps/components/display/AppDisplayComponentByJobId.svelte b/frontend/src/lib/components/apps/components/display/AppDisplayComponentByJobId.svelte index bb5aa888d6..f61db83517 100644 --- a/frontend/src/lib/components/apps/components/display/AppDisplayComponentByJobId.svelte +++ b/frontend/src/lib/components/apps/components/display/AppDisplayComponentByJobId.svelte @@ -16,6 +16,7 @@ import ResolveStyle from '../helpers/ResolveStyle.svelte' import InitializeComponent from '../helpers/InitializeComponent.svelte' import DisplayResult from '$lib/components/DisplayResult.svelte' + import { userStore } from '$lib/stores' export let id: string export let initializing: boolean | undefined = false @@ -23,7 +24,7 @@ export let configuration: RichConfigurations export let render: boolean - const { app, worldStore, workspace } = getContext('AppViewerContext') + const { app, worldStore, workspace, appPath } = getContext('AppViewerContext') const requireHtmlApproval = getContext(IS_APP_PUBLIC_CONTEXT_KEY) let resolvedConfig = initConfig( @@ -115,6 +116,7 @@ {result} {requireHtmlApproval} disableExpand={resolvedConfig?.hideDetails} + appPath={$userStore ? undefined : $appPath} /> From 5c7930a4afe5166967c5e57ce8d02f8980a00f71 Mon Sep 17 00:00:00 2001 From: Alexander Petric Date: Mon, 10 Feb 2025 15:57:32 -0500 Subject: [PATCH 5/6] fix typo in open drawer helper doc (#5258) --- frontend/src/lib/components/apps/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/lib/components/apps/utils.ts b/frontend/src/lib/components/apps/utils.ts index cb30aac94f..5e41d4ccfa 100644 --- a/frontend/src/lib/components/apps/utils.ts +++ b/frontend/src/lib/components/apps/utils.ts @@ -248,7 +248,7 @@ declare function setValue(id: string, value: any): void; */ declare function setSelectedIndex(id: string, index: number): void; -/** close a drawer or modal +/** open a drawer or modal * @param id component's id */ declare function open(id: string): void; From d0c0eca732bc675fa2edf71ac30c982913134b5e Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Mon, 10 Feb 2025 21:59:07 +0100 Subject: [PATCH 6/6] chore(main): release 1.459.0 (#5256) --- CHANGELOG.md | 12 ++++++++++++ version.txt | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d2b05e2f2..8dec2071f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [1.459.0](https://github.com/windmill-labs/windmill/compare/v1.458.4...v1.459.0) (2025-02-10) + + +### Features + +* triggers cli sync ([#5243](https://github.com/windmill-labs/windmill/issues/5243)) ([df62925](https://github.com/windmill-labs/windmill/commit/df6292589479766acfe642d757f3736dfc369e33)) + + +### Bug Fixes + +* if user is authed, no need to use anonymous path for display result in apps ([deb1861](https://github.com/windmill-labs/windmill/commit/deb18615c20c4650e1bf765350f7abf4d2320a0a)) + ## [1.458.4](https://github.com/windmill-labs/windmill/compare/v1.458.3...v1.458.4) (2025-02-10) diff --git a/version.txt b/version.txt index dcd4fcaeb2..d22eaab6f1 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.458.4 +1.459.0