fix(subflow): fixed subflow execution regardless of path decision (#707)

* fix typo in docs file

* fix(subflows): fixed subflows executing irrespective of active path

* added routing strategy

* reorganized executor

* brought folder renaming inline

* cleanup

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/folder-context-menu/folder-context-menu.tsx

@@ -24,32 +24,29 @@ interface FolderContextMenuProps {
   folderId: string
   folderName: string
   onCreateWorkflow: (folderId: string) => void
-  onRename?: (folderId: string, newName: string) => void
   onDelete?: (folderId: string) => void
+  onStartEdit?: () => void
   level: number
 }
 
 export function FolderContextMenu({
   folderId,
   folderName,
   onCreateWorkflow,
-  onRename,
   onDelete,
+  onStartEdit,
   level,
 }: FolderContextMenuProps) {
   const [showSubfolderDialog, setShowSubfolderDialog] = useState(false)
-  const [showRenameDialog, setShowRenameDialog] = useState(false)
   const [subfolderName, setSubfolderName] = useState('')
-  const [renameName, setRenameName] = useState(folderName)
   const [isCreating, setIsCreating] = useState(false)
-  const [isRenaming, setIsRenaming] = useState(false)
   const params = useParams()
   const workspaceId = params.workspaceId as string
 
   // Get user permissions for the workspace
   const userPermissions = useUserPermissionsContext()
 
-  const { createFolder, updateFolder, deleteFolder } = useFolderStore()
+  const { createFolder, deleteFolder } = useFolderStore()
 
   const handleCreateWorkflow = () => {
     onCreateWorkflow(folderId)
@@ -60,8 +57,9 @@ export function FolderContextMenu({
   }
 
   const handleRename = () => {
-    setRenameName(folderName)
-    setShowRenameDialog(true)
+    if (onStartEdit) {
+      onStartEdit()
+    }
   }
 
   const handleDelete = async () => {
@@ -98,31 +96,9 @@ export function FolderContextMenu({
     }
   }
 
-  const handleRenameSubmit = async (e: React.FormEvent) => {
-    e.preventDefault()
-    if (!renameName.trim()) return
-
-    setIsRenaming(true)
-    try {
-      if (onRename) {
-        onRename(folderId, renameName.trim())
-      } else {
-        // Default rename behavior
-        await updateFolder(folderId, { name: renameName.trim() })
-      }
-      setShowRenameDialog(false)
-    } catch (error) {
-      console.error('Failed to rename folder:', error)
-    } finally {
-      setIsRenaming(false)
-    }
-  }
-
   const handleCancel = () => {
     setSubfolderName('')
     setShowSubfolderDialog(false)
-    setRenameName(folderName)
-    setShowRenameDialog(false)
   }
 
   return (
@@ -230,37 +206,6 @@ export function FolderContextMenu({
           </form>
         </DialogContent>
       </Dialog>
-
-      {/* Rename dialog */}
-      <Dialog open={showRenameDialog} onOpenChange={setShowRenameDialog}>
-        <DialogContent className='sm:max-w-[425px]' onClick={(e) => e.stopPropagation()}>
-          <DialogHeader>
-            <DialogTitle>Rename Folder</DialogTitle>
-          </DialogHeader>
-          <form onSubmit={handleRenameSubmit} className='space-y-4'>
-            <div className='space-y-2'>
-              <Label htmlFor='rename-folder'>Folder Name</Label>
-              <Input
-                id='rename-folder'
-                value={renameName}
-                onChange={(e) => setRenameName(e.target.value)}
-                placeholder='Enter folder name...'
-                maxLength={50}
-                autoFocus
-                required
-              />
-            </div>
-            <div className='flex justify-end space-x-2'>
-              <Button type='button' variant='outline' onClick={handleCancel}>
-                Cancel
-              </Button>
-              <Button type='submit' disabled={!renameName.trim() || isRenaming}>
-                {isRenaming ? 'Renaming...' : 'Rename'}
-              </Button>
-            </div>
-          </form>
-        </DialogContent>
-      </Dialog>
     </>
   )
 }

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/folder-tree/components/folder-item.tsx

@@ -14,6 +14,7 @@ import {
   AlertDialogHeader,
   AlertDialogTitle,
 } from '@/components/ui/alert-dialog'
+import { Input } from '@/components/ui/input'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { createLogger } from '@/lib/logs/console-logger'
 import { type FolderTreeNode, useFolderStore } from '@/stores/folders/store'
@@ -48,14 +49,33 @@ export function FolderItem({
   const [showDeleteDialog, setShowDeleteDialog] = useState(false)
   const [isDeleting, setIsDeleting] = useState(false)
   const [isDragging, setIsDragging] = useState(false)
+  const [isEditing, setIsEditing] = useState(false)
+  const [editValue, setEditValue] = useState(folder.name)
+  const [isRenaming, setIsRenaming] = useState(false)
   const dragStartedRef = useRef(false)
+  const inputRef = useRef<HTMLInputElement>(null)
   const params = useParams()
   const workspaceId = params.workspaceId as string
   const isExpanded = expandedFolders.has(folder.id)
   const updateTimeoutRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined)
   const pendingStateRef = useRef<boolean | null>(null)
 
+  // Update editValue when folder name changes
+  useEffect(() => {
+    setEditValue(folder.name)
+  }, [folder.name])
+
+  // Focus input when entering edit mode
+  useEffect(() => {
+    if (isEditing && inputRef.current) {
+      inputRef.current.focus()
+      inputRef.current.select()
+    }
+  }, [isEditing])
+
   const handleToggleExpanded = useCallback(() => {
+    if (isEditing) return // Don't toggle when editing
+
     const newExpandedState = !isExpanded
     toggleExpanded(folder.id)
     pendingStateRef.current = newExpandedState
@@ -73,9 +93,11 @@ export function FolderItem({
           })
       }
     }, 300)
-  }, [folder.id, isExpanded, toggleExpanded, updateFolderAPI])
+  }, [folder.id, isExpanded, toggleExpanded, updateFolderAPI, isEditing])
 
   const handleDragStart = (e: React.DragEvent) => {
+    if (isEditing) return
+
     dragStartedRef.current = true
     setIsDragging(true)
 
@@ -101,7 +123,7 @@ export function FolderItem({
   }
 
   const handleClick = (e: React.MouseEvent) => {
-    if (dragStartedRef.current) {
+    if (dragStartedRef.current || isEditing) {
       e.preventDefault()
       return
     }
@@ -116,15 +138,57 @@ export function FolderItem({
     }
   }, [])
 
-  const handleRename = async (folderId: string, newName: string) => {
+  const handleStartEdit = () => {
+    setIsEditing(true)
+    setEditValue(folder.name)
+  }
+
+  const handleSaveEdit = async () => {
+    if (!editValue.trim() || editValue.trim() === folder.name) {
+      setIsEditing(false)
+      setEditValue(folder.name)
+      return
+    }
+
+    setIsRenaming(true)
     try {
-      await updateFolderAPI(folderId, { name: newName })
+      await updateFolderAPI(folder.id, { name: editValue.trim() })
+      logger.info(`Successfully renamed folder from "${folder.name}" to "${editValue.trim()}"`)
+      setIsEditing(false)
     } catch (error) {
-      logger.error('Failed to rename folder:', { error })
+      logger.error('Failed to rename folder:', {
+        error,
+        folderId: folder.id,
+        oldName: folder.name,
+        newName: editValue.trim(),
+      })
+      // Reset to original name on error
+      setEditValue(folder.name)
+    } finally {
+      setIsRenaming(false)
+    }
+  }
+
+  const handleCancelEdit = () => {
+    setIsEditing(false)
+    setEditValue(folder.name)
+  }
+
+  const handleKeyDown = (e: React.KeyboardEvent) => {
+    if (e.key === 'Enter') {
+      e.preventDefault()
+      handleSaveEdit()
+    } else if (e.key === 'Escape') {
+      e.preventDefault()
+      handleCancelEdit()
     }
   }
 
-  const handleDelete = async (folderId: string) => {
+  const handleInputBlur = () => {
+    handleSaveEdit()
+  }
+
+  const handleDelete = async () => {
     setShowDeleteDialog(true)
   }
 
@@ -154,7 +218,7 @@ export function FolderItem({
               onDragLeave={onDragLeave}
               onDrop={onDrop}
               onClick={handleClick}
-              draggable={true}
+              draggable={!isEditing}
               onDragStart={handleDragStart}
               onDragEnd={handleDragEnd}
             >
@@ -222,7 +286,7 @@ export function FolderItem({
             maxWidth: isFirstItem ? `${164 - level * 20}px` : `${206 - level * 20}px`,
           }}
           onClick={handleClick}
-          draggable={true}
+          draggable={!isEditing}
           onDragStart={handleDragStart}
           onDragEnd={handleDragEnd}
         >
@@ -234,18 +298,34 @@ export function FolderItem({
             )}
           </div>
 
-          <span className='flex-1 select-none truncate text-muted-foreground'>{folder.name}</span>
-
-          <div className='flex items-center justify-center' onClick={(e) => e.stopPropagation()}>
-            <FolderContextMenu
-              folderId={folder.id}
-              folderName={folder.name}
-              onCreateWorkflow={onCreateWorkflow}
-              onRename={handleRename}
-              onDelete={handleDelete}
-              level={level}
+          {isEditing ? (
+            <Input
+              ref={inputRef}
+              value={editValue}
+              onChange={(e) => setEditValue(e.target.value)}
+              onKeyDown={handleKeyDown}
+              onBlur={handleInputBlur}
+              className='h-6 flex-1 border-0 bg-transparent p-0 text-muted-foreground text-sm outline-none focus:outline-none focus:ring-0 focus-visible:outline-none focus-visible:ring-0 focus-visible:ring-offset-0'
+              maxLength={50}
+              disabled={isRenaming}
+              onClick={(e) => e.stopPropagation()} // Prevent folder toggle when clicking input
             />
-          </div>
+          ) : (
+            <span className='flex-1 select-none truncate text-muted-foreground'>{folder.name}</span>
+          )}
+
+          {!isEditing && (
+            <div className='flex items-center justify-center' onClick={(e) => e.stopPropagation()}>
+              <FolderContextMenu
+                folderId={folder.id}
+                folderName={folder.name}
+                onCreateWorkflow={onCreateWorkflow}
+                onDelete={handleDelete}
+                onStartEdit={handleStartEdit}
+                level={level}
+              />
+            </div>
+          )}
         </div>
       </div>
 

apps/sim/blocks/blocks/google_calendar.ts

@@ -21,7 +21,7 @@ export const GoogleCalendarBlock: BlockConfig<GoogleCalendarResponse> = {
   description: 'Manage Google Calendar events',
   longDescription:
     "Integrate Google Calendar functionality to create, read, update, and list calendar events within your workflow. Automate scheduling, check availability, and manage events using OAuth authentication. Email invitations are sent asynchronously and delivery depends on recipients' Google Calendar settings.",
-  docsLink: 'https://docs.simstudio.ai/tools/google-calendar',
+  docsLink: 'https://docs.simstudio.ai/tools/google_calendar',
   category: 'tools',
   bgColor: '#E0E0E0',
   icon: GoogleCalendarIcon,

apps/sim/executor/consts.ts

@@ -0,0 +1,29 @@
+/**
+ * Enum defining all supported block types in the executor.
+ * This centralizes block type definitions and eliminates magic strings.
+ */
+export enum BlockType {
+  PARALLEL = 'parallel',
+  LOOP = 'loop',
+  ROUTER = 'router',
+  CONDITION = 'condition',
+  FUNCTION = 'function',
+  AGENT = 'agent',
+  API = 'api',
+  EVALUATOR = 'evaluator',
+  RESPONSE = 'response',
+  WORKFLOW = 'workflow',
+  STARTER = 'starter',
+}
+
+/**
+ * Array of all block types for iteration and validation
+ */
+export const ALL_BLOCK_TYPES = Object.values(BlockType) as string[]
+
+/**
+ * Type guard to check if a string is a valid block type
+ */
+export function isValidBlockType(type: string): type is BlockType {
+  return ALL_BLOCK_TYPES.includes(type)
+}