Skip to content

Commit 029d4d5

Browse files
committed
fix(core): remove UUID_REGEX shim, use isValidUuid directly
1 parent cf15265 commit 029d4d5

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

apps/sim/lib/copilot/tools/server/workflow/edit-workflow/builders.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { createLogger } from '@sim/logger'
2-
import { generateId } from '@/lib/core/utils/uuid'
2+
import { generateId, isValidUuid } from '@/lib/core/utils/uuid'
33
import type { PermissionGroupConfig } from '@/lib/permission-groups/types'
44
import { getEffectiveBlockOutputs } from '@/lib/workflows/blocks/block-outputs'
55
import {
@@ -12,7 +12,7 @@ import { getAllBlocks } from '@/blocks/registry'
1212
import type { BlockConfig } from '@/blocks/types'
1313
import { TRIGGER_RUNTIME_SUBBLOCK_IDS } from '@/triggers/constants'
1414
import type { EditWorkflowOperation, SkippedItem, ValidationError } from './types'
15-
import { logSkippedItem, UUID_REGEX } from './types'
15+
import { logSkippedItem } from './types'
1616
import {
1717
validateInputsForBlock,
1818
validateSourceHandleForBlock,
@@ -302,7 +302,7 @@ export function normalizeArrayWithIds(value: unknown): any[] {
302302
return item
303303
}
304304

305-
const hasValidUUID = typeof item.id === 'string' && UUID_REGEX.test(item.id)
305+
const hasValidUUID = typeof item.id === 'string' && isValidUuid(item.id)
306306
if (!hasValidUUID) {
307307
return { ...item, id: generateId() }
308308
}
@@ -669,7 +669,7 @@ export function normalizeBlockIdsInOperations(operations: EditWorkflowOperation[
669669
// First pass: collect all non-UUID block_ids from add/insert operations
670670
for (const op of operations) {
671671
if (op.operation_type === 'add' || op.operation_type === 'insert_into_subflow') {
672-
if (op.block_id && !UUID_REGEX.test(op.block_id)) {
672+
if (op.block_id && !isValidUuid(op.block_id)) {
673673
const newId = generateId()
674674
idMapping.set(op.block_id, newId)
675675
logger.debug('Normalizing block ID', { oldId: op.block_id, newId })

apps/sim/lib/copilot/tools/server/workflow/edit-workflow/types.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { createLogger } from '@sim/logger'
2-
import { isValidUuid } from '@/lib/core/utils/uuid'
32
import type { PermissionGroupConfig } from '@/lib/permission-groups/types'
43

54
/** Selector subblock types that can be validated */
@@ -18,9 +17,6 @@ export const SELECTOR_TYPES = new Set([
1817

1918
const validationLogger = createLogger('EditWorkflowValidation')
2019

21-
/** @deprecated Use `isValidUuid` from `@/lib/core/utils/uuid` directly. */
22-
export const UUID_REGEX = { test: (v: string) => isValidUuid(v) }
23-
2420
/**
2521
* Validation error for a specific field
2622
*/

0 commit comments

Comments
 (0)