Skip to content

Commit 748793e

Browse files
authored
fix(executor): handle condition dead-end branches in loops (#2944)
1 parent 91da7e1 commit 748793e

File tree

3 files changed

+1344
-104
lines changed

3 files changed

+1344
-104
lines changed

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/action-bar/action-bar.tsx

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,29 @@ export const ActionBar = memo(
151151
</Tooltip.Root>
152152
)}
153153

154+
{isSubflowBlock && (
155+
<Tooltip.Root>
156+
<Tooltip.Trigger asChild>
157+
<Button
158+
variant='ghost'
159+
onClick={(e) => {
160+
e.stopPropagation()
161+
if (!disabled) {
162+
collaborativeBatchToggleBlockEnabled([blockId])
163+
}
164+
}}
165+
className={ACTION_BUTTON_STYLES}
166+
disabled={disabled}
167+
>
168+
{isEnabled ? <Circle className={ICON_SIZE} /> : <CircleOff className={ICON_SIZE} />}
169+
</Button>
170+
</Tooltip.Trigger>
171+
<Tooltip.Content side='top'>
172+
{getTooltipMessage(isEnabled ? 'Disable Block' : 'Enable Block')}
173+
</Tooltip.Content>
174+
</Tooltip.Root>
175+
)}
176+
154177
{!isStartBlock && !isResponseBlock && (
155178
<Tooltip.Root>
156179
<Tooltip.Trigger asChild>
@@ -222,29 +245,6 @@ export const ActionBar = memo(
222245
</Tooltip.Root>
223246
)}
224247

225-
{isSubflowBlock && (
226-
<Tooltip.Root>
227-
<Tooltip.Trigger asChild>
228-
<Button
229-
variant='ghost'
230-
onClick={(e) => {
231-
e.stopPropagation()
232-
if (!disabled) {
233-
collaborativeBatchToggleBlockEnabled([blockId])
234-
}
235-
}}
236-
className={ACTION_BUTTON_STYLES}
237-
disabled={disabled}
238-
>
239-
{isEnabled ? <Circle className={ICON_SIZE} /> : <CircleOff className={ICON_SIZE} />}
240-
</Button>
241-
</Tooltip.Trigger>
242-
<Tooltip.Content side='top'>
243-
{getTooltipMessage(isEnabled ? 'Disable Block' : 'Enable Block')}
244-
</Tooltip.Content>
245-
</Tooltip.Root>
246-
)}
247-
248248
<Tooltip.Root>
249249
<Tooltip.Trigger asChild>
250250
<Button

0 commit comments

Comments
 (0)