diff --git a/backend/windmill-common/src/flows.rs b/backend/windmill-common/src/flows.rs index cbc0d9bdf0..de8afa8602 100644 --- a/backend/windmill-common/src/flows.rs +++ b/backend/windmill-common/src/flows.rs @@ -276,8 +276,9 @@ impl FlowModule { } pub fn is_simple(&self) -> bool { + //todo: flow modules could also be simple execpt for the fact that the case of having single parallel flow approval step is not handled well (Create SuspendedTimeout) self.get_type() - .is_ok_and(|x| x == "flow" || x == "script" || x == "rawscript") + .is_ok_and(|x| x == "script" || x == "rawscript") } pub fn get_type(&self) -> anyhow::Result { @@ -531,17 +532,6 @@ impl Into> for FlowModuleValue { } } -impl FlowModuleValue { - pub fn is_simple(&self) -> bool { - match self { - FlowModuleValue::Script { .. } => true, - FlowModuleValue::Flow { .. } => true, - FlowModuleValue::RawScript { .. } => true, - _ => false, - } - } -} - fn ordered_map(value: &HashMap, serializer: S) -> Result where S: Serializer, diff --git a/frontend/src/lib/components/FlowStatusViewerInner.svelte b/frontend/src/lib/components/FlowStatusViewerInner.svelte index 55f7b42706..aea27e13cd 100644 --- a/frontend/src/lib/components/FlowStatusViewerInner.svelte +++ b/frontend/src/lib/components/FlowStatusViewerInner.svelte @@ -139,12 +139,15 @@ $retryStatus[jobId ?? ''] = count } else if ($retryStatus[jobId ?? ''] != undefined) { delete $retryStatus[jobId ?? ''] + $retryStatus = $retryStatus } let jobStatus = job?.flow_status?.modules?.[job?.flow_status.step] + if (jobStatus && jobStatus.count != undefined) { $suspendStatus[jobId ?? ''] = { nb: jobStatus.count, job: job! } } else if ($suspendStatus[jobId ?? ''] != undefined) { delete $suspendStatus[jobId ?? ''] + $suspendStatus = $suspendStatus } }