Skip to content

Commit f9d4725

Browse files
icecrasher321icecrasher321
committed
ui inconsistencies
1 parent 92f26f9 commit f9d4725

9 files changed

Lines changed: 182 additions & 96 deletions

File tree

‎apps/realtime/src/database/operations.ts‎

Lines changed: 44 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ const db = socketDb
4040

4141
const DEFAULT_LOOP_ITERATIONS = 5
4242
const DEFAULT_PARALLEL_COUNT = 5
43+
const DEFAULT_PARALLEL_BATCH_SIZE = 20
4344

4445
/** Minimal block shape needed for protection and descendant checks */
4546
interface DbBlockRef {
@@ -740,9 +741,9 @@ async function handleBlocksOperationTx(
740741
workflowId,
741742
type: 'parallel',
742743
config: {
743-
parallelType: 'fixed',
744+
parallelType: 'count',
744745
count: DEFAULT_PARALLEL_COUNT,
745-
batchSize: 20,
746+
batchSize: DEFAULT_PARALLEL_BATCH_SIZE,
746747
nodes: [],
747748
},
748749
})
@@ -1621,11 +1622,23 @@ async function handleSubflowOperationTx(
16211622

16221623
logger.debug(`Updating subflow ${payload.id} with config:`, payload.config)
16231624

1624-
// Update the subflow configuration
1625+
// Read-modify-write merge so partial config payloads never wipe other fields
1626+
// (e.g. an iteration-only update from one client should not drop batchSize set by another)
1627+
const existingSubflow = await tx
1628+
.select({ config: workflowSubflows.config })
1629+
.from(workflowSubflows)
1630+
.where(
1631+
and(eq(workflowSubflows.id, payload.id), eq(workflowSubflows.workflowId, workflowId))
1632+
)
1633+
.limit(1)
1634+
1635+
const existingConfig = (existingSubflow[0]?.config as Record<string, unknown>) || {}
1636+
const mergedConfig = { ...existingConfig, ...payload.config }
1637+
16251638
const updateResult = await tx
16261639
.update(workflowSubflows)
16271640
.set({
1628-
config: payload.config,
1641+
config: mergedConfig,
16291642
updatedAt: new Date(),
16301643
})
16311644
.where(
@@ -1678,31 +1691,35 @@ async function handleSubflowOperationTx(
16781691
})
16791692
.where(and(eq(workflowBlocks.id, payload.id), eq(workflowBlocks.workflowId, workflowId)))
16801693
} else if (payload.type === 'parallel') {
1681-
// Update the parallel block's data properties
1682-
const blockData = {
1683-
...payload.config,
1684-
width: 500,
1685-
height: 300,
1686-
type: 'subflowNode',
1687-
}
1688-
1689-
// Include count if provided
1690-
if (payload.config.count !== undefined) {
1691-
blockData.count = payload.config.count
1692-
}
1693-
1694-
// Include collection if provided
1695-
if (payload.config.distribution !== undefined) {
1696-
blockData.collection = payload.config.distribution
1697-
}
1694+
const existingBlock = await tx
1695+
.select({ data: workflowBlocks.data })
1696+
.from(workflowBlocks)
1697+
.where(and(eq(workflowBlocks.id, payload.id), eq(workflowBlocks.workflowId, workflowId)))
1698+
.limit(1)
16981699

1699-
// Include parallelType if provided
1700-
if (payload.config.parallelType !== undefined) {
1701-
blockData.parallelType = payload.config.parallelType
1702-
}
1700+
const existingData = (existingBlock[0]?.data as any) || {}
17031701

1704-
if (payload.config.batchSize !== undefined) {
1705-
blockData.batchSize = payload.config.batchSize
1702+
const blockData: any = {
1703+
...existingData,
1704+
type: 'subflowNode',
1705+
width: existingData.width ?? 500,
1706+
height: existingData.height ?? 300,
1707+
count:
1708+
payload.config.count !== undefined
1709+
? payload.config.count
1710+
: (existingData.count ?? DEFAULT_PARALLEL_COUNT),
1711+
parallelType:
1712+
payload.config.parallelType !== undefined
1713+
? payload.config.parallelType
1714+
: (existingData.parallelType ?? 'count'),
1715+
collection:
1716+
payload.config.distribution !== undefined
1717+
? payload.config.distribution
1718+
: (existingData.collection ?? ''),
1719+
batchSize:
1720+
payload.config.batchSize !== undefined
1721+
? payload.config.batchSize
1722+
: (existingData.batchSize ?? DEFAULT_PARALLEL_BATCH_SIZE),
17061723
}
17071724

17081725
await tx

‎apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/subflow-editor/subflow-editor.tsx‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ export function SubflowEditor({
6161
editorContainerRef,
6262
handleSubflowTypeChange,
6363
handleSubflowIterationsChange,
64-
handleSubflowIterationsSave,
64+
handleSubflowIterationsBlur,
6565
handleParallelBatchSizeChange,
66-
handleParallelBatchSizeSave,
66+
handleParallelBatchSizeBlur,
6767
handleSubflowEditorChange,
6868
handleSubflowTagSelect,
6969
highlightWithReferences,
@@ -153,8 +153,7 @@ export function SubflowEditor({
153153
type='text'
154154
value={inputValue}
155155
onChange={handleSubflowIterationsChange}
156-
onBlur={handleSubflowIterationsSave}
157-
onKeyDown={(e) => e.key === 'Enter' && handleSubflowIterationsSave()}
156+
onBlur={handleSubflowIterationsBlur}
158157
disabled={!userCanEdit}
159158
className='mb-1'
160159
/>
@@ -219,8 +218,7 @@ export function SubflowEditor({
219218
type='text'
220219
value={batchSizeValue}
221220
onChange={handleParallelBatchSizeChange}
222-
onBlur={handleParallelBatchSizeSave}
223-
onKeyDown={(e) => e.key === 'Enter' && handleParallelBatchSizeSave()}
221+
onBlur={handleParallelBatchSizeBlur}
224222
disabled={!userCanEdit}
225223
className='mb-1'
226224
/>

‎apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-subflow-editor.ts‎

Lines changed: 49 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,17 @@ export function useSubflowEditor(currentBlock: BlockState | null, currentBlockId
5959

6060
const textareaRef = useRef<HTMLTextAreaElement | null>(null)
6161
const editorContainerRef = useRef<HTMLDivElement>(null)
62-
const [tempInputValue, setTempInputValue] = useState<string | null>(null)
63-
const [tempBatchSizeValue, setTempBatchSizeValue] = useState<string | null>(null)
6462
const [showTagDropdown, setShowTagDropdown] = useState(false)
6563
const [cursorPosition, setCursorPosition] = useState(0)
64+
/**
65+
* In-flight string buffers for the numeric inputs. These let the user
66+
* temporarily clear or mid-type the field (e.g. backspace to empty before
67+
* typing a new value) without React snapping the value back from the store.
68+
* Persistence still happens on every keystroke that parses to a number;
69+
* the buffer is cleared on blur so the input rebinds to the store value.
70+
*/
71+
const [iterationsBuffer, setIterationsBuffer] = useState<string | null>(null)
72+
const [batchSizeBuffer, setBatchSizeBuffer] = useState<string | null>(null)
6673

6774
const isSubflow =
6875
currentBlock && (currentBlock.type === 'loop' || currentBlock.type === 'parallel')
@@ -218,66 +225,54 @@ export function useSubflowEditor(currentBlock: BlockState | null, currentBlockId
218225
)
219226

220227
/**
221-
* Handle iterations input change
228+
* Persist iterations on every keystroke that parses to a number. The
229+
* visible string is buffered so transient states (empty, "0", partial typing)
230+
* render correctly without snapping back to the persisted value.
222231
*/
223232
const handleSubflowIterationsChange = useCallback(
224233
(e: React.ChangeEvent<HTMLInputElement>) => {
225-
if (!subflowConfig) return
234+
if (!currentBlockId || !isSubflow || !subflowConfig || !currentBlock) return
226235
const sanitizedValue = e.target.value.replace(/[^0-9]/g, '')
236+
setIterationsBuffer(sanitizedValue)
227237
const numValue = Number.parseInt(sanitizedValue)
228-
229-
if (!Number.isNaN(numValue)) {
230-
setTempInputValue(numValue.toString())
231-
} else {
232-
setTempInputValue(sanitizedValue)
233-
}
238+
if (Number.isNaN(numValue)) return
239+
collaborativeUpdateIterationCount(
240+
currentBlockId,
241+
currentBlock.type as 'loop' | 'parallel',
242+
Math.max(1, numValue)
243+
)
234244
},
235-
[subflowConfig]
245+
[currentBlockId, isSubflow, subflowConfig, currentBlock, collaborativeUpdateIterationCount]
236246
)
237247

238248
/**
239-
* Save iterations value
249+
* Clears the iterations buffer on blur so the field re-binds to the
250+
* canonical store value (e.g. if the user left it empty, it snaps back
251+
* to the last persisted count).
240252
*/
241-
const handleSubflowIterationsSave = useCallback(() => {
242-
if (!currentBlockId || !isSubflow || !subflowConfig || !currentBlock) return
243-
const value = Number.parseInt(tempInputValue ?? '5')
244-
245-
if (!Number.isNaN(value)) {
246-
const newValue = Math.max(1, value)
247-
collaborativeUpdateIterationCount(
248-
currentBlockId,
249-
currentBlock.type as 'loop' | 'parallel',
250-
newValue
251-
)
252-
}
253-
setTempInputValue(null)
254-
}, [
255-
tempInputValue,
256-
currentBlockId,
257-
isSubflow,
258-
subflowConfig,
259-
currentBlock,
260-
collaborativeUpdateIterationCount,
261-
])
262-
263-
const handleParallelBatchSizeChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
264-
const sanitizedValue = e.target.value.replace(/[^0-9]/g, '')
265-
const numValue = Number.parseInt(sanitizedValue)
266-
if (!Number.isNaN(numValue)) {
267-
setTempBatchSizeValue(Math.min(20, numValue).toString())
268-
} else {
269-
setTempBatchSizeValue(sanitizedValue)
270-
}
253+
const handleSubflowIterationsBlur = useCallback(() => {
254+
setIterationsBuffer(null)
271255
}, [])
272256

273-
const handleParallelBatchSizeSave = useCallback(() => {
274-
if (!currentBlockId || currentBlock?.type !== 'parallel') return
275-
const value = Number.parseInt(tempBatchSizeValue ?? '20')
276-
if (!Number.isNaN(value)) {
277-
collaborativeUpdateParallelBatchSize(currentBlockId, Math.min(20, Math.max(1, value)))
278-
}
279-
setTempBatchSizeValue(null)
280-
}, [tempBatchSizeValue, currentBlockId, currentBlock, collaborativeUpdateParallelBatchSize])
257+
/**
258+
* Persist parallel batch size on every keystroke that parses to a number,
259+
* clamped to 1..20. Buffered the same way as iterations.
260+
*/
261+
const handleParallelBatchSizeChange = useCallback(
262+
(e: React.ChangeEvent<HTMLInputElement>) => {
263+
if (!currentBlockId || currentBlock?.type !== 'parallel') return
264+
const sanitizedValue = e.target.value.replace(/[^0-9]/g, '')
265+
setBatchSizeBuffer(sanitizedValue)
266+
const numValue = Number.parseInt(sanitizedValue)
267+
if (Number.isNaN(numValue)) return
268+
collaborativeUpdateParallelBatchSize(currentBlockId, Math.min(20, Math.max(1, numValue)))
269+
},
270+
[currentBlockId, currentBlock, collaborativeUpdateParallelBatchSize]
271+
)
272+
273+
const handleParallelBatchSizeBlur = useCallback(() => {
274+
setBatchSizeBuffer(null)
275+
}, [])
281276

282277
/**
283278
* Handle editor value change (collection/condition)
@@ -369,8 +364,8 @@ export function useSubflowEditor(currentBlock: BlockState | null, currentBlockId
369364
typeof configCollection === 'string' ? configCollection : JSON.stringify(configCollection) || ''
370365
const conditionString = typeof configCondition === 'string' ? configCondition : ''
371366

372-
const inputValue = tempInputValue ?? iterations.toString()
373-
const batchSizeValue = tempBatchSizeValue ?? parallelBatchSize.toString()
367+
const inputValue = iterationsBuffer ?? iterations.toString()
368+
const batchSizeValue = batchSizeBuffer ?? parallelBatchSize.toString()
374369
const editorValue = isConditionMode ? conditionString : collectionString
375370

376371
// Type options for combobox
@@ -401,9 +396,9 @@ export function useSubflowEditor(currentBlock: BlockState | null, currentBlockId
401396
// Handlers
402397
handleSubflowTypeChange,
403398
handleSubflowIterationsChange,
404-
handleSubflowIterationsSave,
399+
handleSubflowIterationsBlur,
405400
handleParallelBatchSizeChange,
406-
handleParallelBatchSizeSave,
401+
handleParallelBatchSizeBlur,
407402
handleSubflowEditorChange,
408403
handleSubflowTagSelect,
409404
highlightWithReferences,

‎apps/sim/executor/utils/parallel-expansion.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,11 @@ export class ParallelExpander {
212212
const baseTargetId = extractBaseBlockId(edge.target)
213213
if (!blocksSet.has(baseTargetId)) continue
214214

215-
for (let i = 1; i < branchCount; i++) {
215+
// Include branch 0 so per-batch re-expansion restores the template's
216+
// incoming-edge bookkeeping that earlier batches consumed during
217+
// edge processing. Without this, identifyBoundaryNodes mis-classifies
218+
// chained children as entry nodes after the first batch.
219+
for (let i = 0; i < branchCount; i++) {
216220
const sourceNodeId = buildBranchNodeId(blockId, i)
217221
const targetNodeId = buildBranchNodeId(baseTargetId, i)
218222
const sourceNode = dag.nodes.get(sourceNodeId)

‎apps/sim/hooks/use-collaborative-workflow.ts‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1774,23 +1774,32 @@ export function useCollaborativeWorkflow() {
17741774
.filter((b) => b.data?.parentId === nodeId)
17751775
.map((b) => b.id)
17761776

1777+
const clampedCount = Math.max(1, count)
1778+
17771779
if (iterationType === 'loop') {
17781780
const currentLoopType = currentBlock.data?.loopType || 'for'
1779-
const currentCollection = currentBlock.data?.collection || ''
1781+
const existingLoop = useWorkflowStore.getState().loops[nodeId]
1782+
const nextForEachItems = existingLoop?.forEachItems ?? currentBlock.data?.collection ?? ''
1783+
const nextWhileCondition =
1784+
existingLoop?.whileCondition ?? currentBlock.data?.whileCondition ?? ''
1785+
const nextDoWhileCondition =
1786+
existingLoop?.doWhileCondition ?? currentBlock.data?.doWhileCondition ?? ''
17801787

17811788
const config = {
17821789
id: nodeId,
17831790
nodes: childNodes,
1784-
iterations: Math.max(1, count),
1791+
iterations: clampedCount,
17851792
loopType: currentLoopType,
1786-
forEachItems: currentCollection,
1793+
forEachItems: nextForEachItems,
1794+
whileCondition: nextWhileCondition,
1795+
doWhileCondition: nextDoWhileCondition,
17871796
}
17881797

17891798
executeQueuedOperation(
17901799
SUBFLOW_OPERATIONS.UPDATE,
17911800
OPERATION_TARGETS.SUBFLOW,
17921801
{ id: nodeId, type: 'loop', config },
1793-
() => useWorkflowStore.getState().updateLoopCount(nodeId, count)
1802+
() => useWorkflowStore.getState().updateLoopCount(nodeId, clampedCount)
17941803
)
17951804
} else {
17961805
const currentDistribution = currentBlock.data?.collection || ''
@@ -1800,7 +1809,7 @@ export function useCollaborativeWorkflow() {
18001809
const config = {
18011810
id: nodeId,
18021811
nodes: childNodes,
1803-
count: Math.max(1, count),
1812+
count: clampedCount,
18041813
distribution: currentDistribution,
18051814
parallelType: currentParallelType,
18061815
batchSize,
@@ -1810,7 +1819,7 @@ export function useCollaborativeWorkflow() {
18101819
SUBFLOW_OPERATIONS.UPDATE,
18111820
OPERATION_TARGETS.SUBFLOW,
18121821
{ id: nodeId, type: 'parallel', config },
1813-
() => useWorkflowStore.getState().updateParallelCount(nodeId, count)
1822+
() => useWorkflowStore.getState().updateParallelCount(nodeId, clampedCount)
18141823
)
18151824
}
18161825
},

‎apps/sim/lib/api/contracts/workflows.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ const workflowBlockDataSchema = z.object({
2020
whileCondition: z.string().optional(),
2121
doWhileCondition: z.string().optional(),
2222
parallelType: z.enum(['collection', 'count']).optional(),
23+
batchSize: z.number().optional(),
2324
type: z.string().optional(),
2425
canonicalModes: z.record(z.string(), z.enum(['basic', 'advanced'])).optional(),
2526
})
@@ -90,6 +91,7 @@ const workflowParallelSchema = z.object({
9091
.optional(),
9192
count: z.number().optional(),
9293
parallelType: z.enum(['count', 'collection']).optional(),
94+
batchSize: z.number().optional(),
9395
enabled: z.boolean().optional(),
9496
locked: z.boolean().optional(),
9597
})

0 commit comments

Comments
 (0)